openstack/nova
Code Issues Proposed changes

Merge "Cleanup pyflakes in nova-manage"

Browse Source
This commit is contained in:
Jenkins 2013-01-11 07:32:41 +00:00 committed by Gerrit Code Review
commit 40993f83ef
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/nova-manage
View File

@ -307,7 +307,6 @@ class FixedIpCommands(object):
for fixed_ip in fixed_ips: for fixed_ip in fixed_ips:
hostname = None hostname = None
host = None host = None
mac_address = None
network = all_networks.get(fixed_ip['network_id']) network = all_networks.get(fixed_ip['network_id'])
if network: if network:
has_ip = True has_ip = True
@ -627,7 +626,7 @@ class ServiceCommands(object):
ctxt = context.get_admin_context() ctxt = context.get_admin_context()
now = timeutils.utcnow() now = timeutils.utcnow()
services = db.service_get_all(ctxt) services = db.service_get_all(ctxt)
services = availability_zone.set_availability_zones(ctxt, services) services = availability_zones.set_availability_zones(ctxt, services)
if host: if host:
services = [s for s in services if s['host'] == host] services = [s for s in services if s['host'] == host]
if service: if service:
@ -741,7 +740,6 @@ class HostCommands(object):
print "%-25s\t%-15s" % (_('host'), print "%-25s\t%-15s" % (_('host'),
_('zone')) _('zone'))
ctxt = context.get_admin_context() ctxt = context.get_admin_context()
now = timeutils.utcnow()
services = db.service_get_all(ctxt) services = db.service_get_all(ctxt)
services = availability_zones.set_availability_zones(ctxt, services) services = availability_zones.set_availability_zones(ctxt, services)
if zone: if zone:
@ -776,7 +774,6 @@ class InstanceTypeCommands(object):
"""Class for managing instance types / flavors.""" """Class for managing instance types / flavors."""
def _print_instance_types(self, name, val): def _print_instance_types(self, name, val):
deleted = ('', ', inactive')[val["deleted"] == 1]
is_public = ('private', 'public')[val["is_public"] == 1] is_public = ('private', 'public')[val["is_public"] == 1]
print ("%s: Memory: %sMB, VCPUS: %s, Root: %sGB, Ephemeral: %sGb, " print ("%s: Memory: %sMB, VCPUS: %s, Root: %sGB, Ephemeral: %sGb, "
"FlavorID: %s, Swap: %sMB, RXTX Factor: %s, %s, ExtraSpecs %s") % ( "FlavorID: %s, Swap: %sMB, RXTX Factor: %s, %s, ExtraSpecs %s") % (