Fix incorrect use of context object

As in nova/availability_zones.py, the method get_host_availability_zone()
expects "context" as a module rather than a RequestContext object.
But for our preference, the argument "context" is better to be a
RequestContext object. So fix this by passing an context object into the
method.

* Fix the usage of argument "context"
* Add unittest for the module "availability_zones"

Fix bug lp:#1100598

Change-Id: I5886ba26131261d97be65f18e9492c40401c5a7f
This commit is contained in:
gtt116
2013-01-17 07:36:43 +00:00
parent 6fee72f8d5
commit 556defbcaa

View File

@@ -46,7 +46,7 @@ def set_availability_zones(context, services):
az = CONF.internal_service_availability_zone
if service['topic'] == "compute":
if metadata.get(service['host']):
az = str(metadata[service['host']])[5:-2]
az = u','.join(list(metadata[service['host']]))
else:
az = CONF.default_availability_zone
service['availability_zone'] = az
@@ -55,7 +55,7 @@ def set_availability_zones(context, services):
def get_host_availability_zone(context, host):
metadata = db.aggregate_metadata_get_by_host(
context.get_admin_context(), host, key='availability_zone')
context, host, key='availability_zone')
if 'availability_zone' in metadata:
return list(metadata['availability_zone'])[0]
else: