openstack/nova
Code Issues Proposed changes

More bin/ pep8/pylint cleanup.

Browse Source
This commit is contained in:
Eric Day
2010-08-18 17:39:12 -07:00
parent 663667cdcf
commit b8747fb38e
8 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/nova-compute
View File

@@ -29,4 +29,4 @@ if __name__ == '__main__':
twistd.serve(__file__) twistd.serve(__file__)
if __name__ == '__builtin__': if __name__ == '__builtin__':
application = service.ComputeService.create() application = service.ComputeService.create() # pylint: disable-msg=C0103

14
bin/nova-dhcpbridge
View File

@@ -40,29 +40,29 @@ from nova.network import service
FLAGS = flags.FLAGS FLAGS = flags.FLAGS
def add_lease(_mac, ip, _hostname, _interface): def add_lease(_mac, ip_address, _hostname, _interface):
"""Set the IP that was assigned by the DHCP server.""" """Set the IP that was assigned by the DHCP server."""
if FLAGS.fake_rabbit: if FLAGS.fake_rabbit:
service.VlanNetworkService().lease_ip(ip) service.VlanNetworkService().lease_ip(ip_address)
else: else:
rpc.cast("%s.%s" % (FLAGS.network_topic, FLAGS.node_name), rpc.cast("%s.%s" % (FLAGS.network_topic, FLAGS.node_name),
{"method": "lease_ip", {"method": "lease_ip",
"args": {"fixed_ip": ip}}) "args": {"fixed_ip": ip_address}})
def old_lease(_mac, _ip, _hostname, _interface): def old_lease(_mac, _ip_address, _hostname, _interface):
"""Do nothing, just an old lease update.""" """Do nothing, just an old lease update."""
logging.debug("Adopted old lease or got a change of mac/hostname") logging.debug("Adopted old lease or got a change of mac/hostname")
def del_lease(_mac, ip, _hostname, _interface): def del_lease(_mac, ip_address, _hostname, _interface):
"""Called when a lease expires.""" """Called when a lease expires."""
if FLAGS.fake_rabbit: if FLAGS.fake_rabbit:
service.VlanNetworkService().release_ip(ip) service.VlanNetworkService().release_ip(ip_address)
else: else:
rpc.cast("%s.%s" % (FLAGS.network_topic, FLAGS.node_name), rpc.cast("%s.%s" % (FLAGS.network_topic, FLAGS.node_name),
{"method": "release_ip", {"method": "release_ip",
"args": {"fixed_ip": ip}}) "args": {"fixed_ip": ip_address}})
def init_leases(interface): def init_leases(interface):

4
bin/nova-import-canonical-imagestore
View File

@@ -35,12 +35,12 @@ from nova.objectstore import image
FLAGS = flags.FLAGS FLAGS = flags.FLAGS
api_url = 'https://imagestore.canonical.com/api/dashboard' API_URL = 'https://imagestore.canonical.com/api/dashboard'
def get_images(): def get_images():
"""Get a list of the images from the imagestore URL.""" """Get a list of the images from the imagestore URL."""
images = json.load(urllib2.urlopen(api_url))['images'] images = json.load(urllib2.urlopen(API_URL))['images']
images = [img for img in images if img['title'].find('amd64') > -1] images = [img for img in images if img['title'].find('amd64') > -1]
return images return images

5
bin/nova-instancemonitor
View File

@@ -35,9 +35,10 @@ if __name__ == '__main__':
if __name__ == '__builtin__': if __name__ == '__builtin__':
logging.warn('Starting instance monitor') logging.warn('Starting instance monitor')
m = monitor.InstanceMonitor() # pylint: disable-msg=C0103
monitor = monitor.InstanceMonitor()
# This is the parent service that twistd will be looking for when it # This is the parent service that twistd will be looking for when it
# parses this file, return it so that we can get it into globals below # parses this file, return it so that we can get it into globals below
application = service.Application('nova-instancemonitor') application = service.Application('nova-instancemonitor')
m.setServiceParent(application) monitor.setServiceParent(application)

6
bin/nova-manage
View File

@@ -211,7 +211,7 @@ class ProjectCommands(object):
f.write(zip_file) f.write(zip_file)
categories = [ CATEGORIES = [
('user', UserCommands), ('user', UserCommands),
('project', ProjectCommands), ('project', ProjectCommands),
('role', RoleCommands), ('role', RoleCommands),
@@ -258,11 +258,11 @@ def main():
if len(argv) < 1: if len(argv) < 1:
print script_name + " category action [<args>]" print script_name + " category action [<args>]"
print "Available categories:" print "Available categories:"
for k, _ in categories: for k, _ in CATEGORIES:
print "\t%s" % k print "\t%s" % k
sys.exit(2) sys.exit(2)
category = argv.pop(0) category = argv.pop(0)
matches = lazy_match(category, categories) matches = lazy_match(category, CATEGORIES)
# instantiate the command group object # instantiate the command group object
category, fn = matches[0] category, fn = matches[0]
command_object = fn() command_object = fn()

1
bin/nova-network
View File

@@ -33,4 +33,5 @@ if __name__ == '__main__':
twistd.serve(__file__) twistd.serve(__file__)
if __name__ == '__builtin__': if __name__ == '__builtin__':
# pylint: disable-msg=C0103
application = service.type_to_class(FLAGS.network_type).create() application = service.type_to_class(FLAGS.network_type).create()

2
bin/nova-objectstore
View File

@@ -35,4 +35,4 @@ if __name__ == '__main__':
if __name__ == '__builtin__': if __name__ == '__builtin__':
utils.default_flagfile() utils.default_flagfile()
application = handler.get_application() application = handler.get_application() # pylint: disable-msg=C0103

2
bin/nova-volume
View File

@@ -29,4 +29,4 @@ if __name__ == '__main__':
twistd.serve(__file__) twistd.serve(__file__)
if __name__ == '__builtin__': if __name__ == '__builtin__':
application = service.VolumeService.create() application = service.VolumeService.create() # pylint: disable-msg=C0103