x/python-ganttclient
Code Issues Proposed changes

indenting cleanup

Browse Source
This commit is contained in:
Sandy Walsh
2011-03-23 12:31:15 -07:00
parent c41f46efb2
commit 8cf49562b2
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nova/flags.py
View File

@@ -360,4 +360,4 @@ DEFINE_string('node_availability_zone', 'nova',
DEFINE_string('zone_name', 'nova', 'name of this zone') DEFINE_string('zone_name', 'nova', 'name of this zone')
DEFINE_list('zone_capabilities', DEFINE_list('zone_capabilities',
['hypervisor=xenserver;kvm', 'os=linux;windows'], ['hypervisor=xenserver;kvm', 'os=linux;windows'],
'Key/Multi-value list representng capabilities of this zone') 'Key/Multi-value list representng capabilities of this zone')

4
nova/rpc.py
View File

@@ -219,8 +219,8 @@ class FanoutAdapterConsumer(AdapterConsumer):
self.queue = "%s_fanout_%s" % (topic, unique) self.queue = "%s_fanout_%s" % (topic, unique)
self.durable = False self.durable = False
LOG.info(_("Created '%(exchange)s' fanout exchange " LOG.info(_("Created '%(exchange)s' fanout exchange "
"with '%(key)s' routing key"), "with '%(key)s' routing key"),
dict(exchange=self.exchange, key=self.routing_key)) dict(exchange=self.exchange, key=self.routing_key))
super(FanoutAdapterConsumer, self).__init__(connection=connection, super(FanoutAdapterConsumer, self).__init__(connection=connection,
topic=topic, proxy=proxy) topic=topic, proxy=proxy)

2
nova/scheduler/api.py
View File

@@ -52,7 +52,7 @@ def get_zone_capabilities(context, service=None):
"""Returns a dict of key, value capabilities for this zone, """Returns a dict of key, value capabilities for this zone,
or for a particular class of services running in this zone.""" or for a particular class of services running in this zone."""
return _call_scheduler('get_zone_capabilities', context=context, return _call_scheduler('get_zone_capabilities', context=context,
params=dict(service=service)) params=dict(service=service))
def update_service_capabilities(context, service_name, host, capabilities): def update_service_capabilities(context, service_name, host, capabilities):

2
nova/tests/test_zones.py
View File

@@ -96,7 +96,7 @@ class ZoneManagerTestCase(test.TestCase):
zm.update_service_capabilities("svc10", "host1", dict(a=99, b=99)) zm.update_service_capabilities("svc10", "host1", dict(a=99, b=99))
caps = zm.get_zone_capabilities(self, None) caps = zm.get_zone_capabilities(self, None)
self.assertEquals(caps, dict(svc1_a=(2, 20), svc1_b=(3, 30), self.assertEquals(caps, dict(svc1_a=(2, 20), svc1_b=(3, 30),
svc10_a=(99, 99), svc10_b=(99, 99))) svc10_a=(99, 99), svc10_b=(99, 99)))
zm.update_service_capabilities("svc1", "host3", dict(c=5)) zm.update_service_capabilities("svc1", "host3", dict(c=5))
caps = zm.get_zone_capabilities(self, None) caps = zm.get_zone_capabilities(self, None)