diff options
| author | gtt116 <gtt116@126.com> | 2013-01-17 07:36:43 +0000 |
|---|---|---|
| committer | gtt116 <gtt116@126.com> | 2013-01-22 02:15:36 +0000 |
| commit | 6d5e0fd2d488329f66f31a4d6a1153a4a64ed6aa (patch) | |
| tree | 8ee569bd2bf9f054a9e1b822cb06b2773b6b5e9f /nova/availability_zones.py | |
| parent | a4d608fa33b328d7ed77c7f9c40ffbb43c0ade6b (diff) | |
| download | nova-6d5e0fd2d488329f66f31a4d6a1153a4a64ed6aa.tar.gz | |
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
Diffstat (limited to 'nova/availability_zones.py')
| -rw-r--r-- | nova/availability_zones.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/availability_zones.py b/nova/availability_zones.py index 7493ce5c5e..62c83f6edd 100644 --- a/nova/availability_zones.py +++ b/nova/availability_zones.py @@ -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: |