summaryrefslogtreecommitdiff
path: root/nova/tests/test_nova_manage.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-07-29 22:07:33 +0000
committerGerrit Code Review <review@openstack.org>2013-07-29 22:07:33 +0000
commit0ae9a6dfa848d122431a96bb76d662a8538f373c (patch)
tree4af138b8bd349036a23cf53e8bfc5b48fe343877 /nova/tests/test_nova_manage.py
parent52b43c2f4cbe999e60d71e41bd5efbd919d623c4 (diff)
parenta607aa3316544aa48e582bb34cd9531a6940276c (diff)
downloadnova-0ae9a6dfa848d122431a96bb76d662a8538f373c.tar.gz
Merge "Clarify instance_type vs flavor in nova-manage"
Diffstat (limited to 'nova/tests/test_nova_manage.py')
-rw-r--r--nova/tests/test_nova_manage.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/nova/tests/test_nova_manage.py b/nova/tests/test_nova_manage.py
index 4f91da517c..20e48d6727 100644
--- a/nova/tests/test_nova_manage.py
+++ b/nova/tests/test_nova_manage.py
@@ -281,9 +281,9 @@ class NetworkCommandsTestCase(test.TestCase):
dis_host=True)
-class InstanceTypeCommandsTestCase(test.TestCase):
+class FlavorCommandsTestCase(test.TestCase):
def setUp(self):
- super(InstanceTypeCommandsTestCase, self).setUp()
+ super(FlavorCommandsTestCase, self).setUp()
values = dict(name="test.small",
memory_mb=220,
@@ -296,13 +296,13 @@ class InstanceTypeCommandsTestCase(test.TestCase):
self.instance_type_name = ref["name"]
self.instance_type_id = ref["id"]
self.instance_type_flavorid = ref["flavorid"]
- self.set_key = manage.InstanceTypeCommands().set_key
- self.unset_key = manage.InstanceTypeCommands().unset_key
+ self.set_key = manage.FlavorCommands().set_key
+ self.unset_key = manage.FlavorCommands().unset_key
def tearDown(self):
db.flavor_destroy(context.get_admin_context(),
"test.small")
- super(InstanceTypeCommandsTestCase, self).tearDown()
+ super(FlavorCommandsTestCase, self).tearDown()
def _test_extra_specs_empty(self):
empty_specs = {}