summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorSandy Walsh <sandy.walsh@rackspace.com>2011-03-21 07:49:58 -0700
committerSandy Walsh <sandy.walsh@rackspace.com>2011-03-21 07:49:58 -0700
commit8f0b60f598c28b2f558f3ecdaa2f9604926393e6 (patch)
tree55eed559dc31bdd7266bb017d5b1ded63bc01611 /nova/tests
parentabc6c82449dfc46a33dcd8190840e51f44b5b930 (diff)
remove scheduler.api.API. naming changes.
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/api/openstack/test_zones.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/nova/tests/api/openstack/test_zones.py b/nova/tests/api/openstack/test_zones.py
index 12d39fd29..a3f191aaa 100644
--- a/nova/tests/api/openstack/test_zones.py
+++ b/nova/tests/api/openstack/test_zones.py
@@ -75,7 +75,7 @@ def zone_get_all_db(context):
]
-def zone_caps(method, context, params):
+def zone_capabilities(method, context, params):
return dict()
@@ -98,13 +98,13 @@ class ZonesTest(test.TestCase):
self.stubs.Set(nova.db, 'zone_delete', zone_delete)
self.old_zone_name = FLAGS.zone_name
- self.old_zone_caps = FLAGS.zone_capabilities
+ self.old_zone_capabilities = FLAGS.zone_capabilities
def tearDown(self):
self.stubs.UnsetAll()
FLAGS.allow_admin_api = self.allow_admin
FLAGS.zone_name = self.old_zone_name
- FLAGS.zone_capabilities = self.old_zone_caps
+ FLAGS.zone_capabilities = self.old_zone_capabilities
super(ZonesTest, self).tearDown()
def test_get_zone_list_scheduler(self):
@@ -179,7 +179,7 @@ class ZonesTest(test.TestCase):
def test_zone_info(self):
FLAGS.zone_name = 'darksecret'
FLAGS.zone_capabilities = ['cap1=a;b', 'cap2=c;d']
- self.stubs.Set(api, '_call_scheduler', zone_caps)
+ self.stubs.Set(api, '_call_scheduler', zone_capabilities)
body = dict(zone=dict(username='zeb', password='sneaky'))
req = webob.Request.blank('/v1.0/zones/info')