diff options
| author | Joe Gordon <jogo@cloudscaling.com> | 2013-05-07 20:08:53 +0000 |
|---|---|---|
| committer | Joe Gordon <jogo@cloudscaling.com> | 2013-05-07 21:41:19 +0000 |
| commit | 3222d8bb021effb3156ed86e263cdc0ac64fd44a (patch) | |
| tree | 748c322d33532f654acee8659ab9cc4725e68d53 /nova/tests | |
| parent | f917d24bd333e7068ae17cc1027dd8e80896e5a5 (diff) | |
| download | nova-3222d8bb021effb3156ed86e263cdc0ac64fd44a.tar.gz nova-3222d8bb021effb3156ed86e263cdc0ac64fd44a.tar.xz nova-3222d8bb021effb3156ed86e263cdc0ac64fd44a.zip | |
Rename nova.compute.instance_types to flavors
First step in removing references to instance_types. Rename instnace_types.py
and update references to it. We currently use instance_type and flavor as
synonyms, to reduce confusion we are picking one. We are going with our own
terminology, flavors.
renamed: nova/compute/instance_types.py -> nova/compute/flavors.py
Partially implements bp flavor-instance-type-dedup
Change-Id: I9dc04cf311aa8813be4f5329f23729d2c43cae6d
Diffstat (limited to 'nova/tests')
31 files changed, 276 insertions, 275 deletions
diff --git a/nova/tests/api/ec2/test_cinder_cloud.py b/nova/tests/api/ec2/test_cinder_cloud.py index 4a21f7fad..60797c8f7 100644 --- a/nova/tests/api/ec2/test_cinder_cloud.py +++ b/nova/tests/api/ec2/test_cinder_cloud.py @@ -26,7 +26,7 @@ from oslo.config import cfg from nova.api.ec2 import cloud from nova.api.ec2 import ec2utils from nova.compute import api as compute_api -from nova.compute import instance_types +from nova.compute import flavors from nova.compute import utils as compute_utils from nova import context from nova import db @@ -40,7 +40,7 @@ from nova import volume CONF = cfg.CONF CONF.import_opt('compute_driver', 'nova.virt.driver') -CONF.import_opt('default_instance_type', 'nova.compute.instance_types') +CONF.import_opt('default_instance_type', 'nova.compute.flavors') CONF.import_opt('use_ipv6', 'nova.netconf') @@ -413,8 +413,8 @@ class CinderCloudTestCase(test.TestCase): def _setUpBlockDeviceMapping(self): image_uuid = 'cedef40a-ed67-4d10-800e-17455edce175' - sys_meta = instance_types.save_instance_type_info( - {}, instance_types.get_instance_type(1)) + sys_meta = flavors.save_instance_type_info( + {}, flavors.get_instance_type(1)) inst1 = db.instance_create(self.context, {'image_ref': image_uuid, 'instance_type_id': 1, diff --git a/nova/tests/api/ec2/test_cloud.py b/nova/tests/api/ec2/test_cloud.py index c6ec305c6..e58d260fb 100644 --- a/nova/tests/api/ec2/test_cloud.py +++ b/nova/tests/api/ec2/test_cloud.py @@ -33,7 +33,7 @@ from nova.api.ec2 import ec2utils from nova.api.ec2 import inst_state from nova.api.metadata import password from nova.compute import api as compute_api -from nova.compute import instance_types +from nova.compute import flavors from nova.compute import power_state from nova.compute import rpcapi as compute_rpcapi from nova.compute import utils as compute_utils @@ -58,7 +58,7 @@ from nova import volume CONF = cfg.CONF CONF.import_opt('compute_driver', 'nova.virt.driver') -CONF.import_opt('default_instance_type', 'nova.compute.instance_types') +CONF.import_opt('default_instance_type', 'nova.compute.flavors') CONF.import_opt('use_ipv6', 'nova.netconf') LOG = logging.getLogger(__name__) @@ -762,8 +762,8 @@ class CloudTestCase(test.TestCase): self._stub_instance_get_with_fixed_ips('get') image_uuid = 'cedef40a-ed67-4d10-800e-17455edce175' - sys_meta = instance_types.save_instance_type_info( - {}, instance_types.get_instance_type(1)) + sys_meta = flavors.save_instance_type_info( + {}, flavors.get_instance_type(1)) inst1 = db.instance_create(self.context, {'reservation_id': 'a', 'image_ref': image_uuid, 'instance_type_id': 1, @@ -868,8 +868,8 @@ class CloudTestCase(test.TestCase): fake_change_instance_metadata) # Create some test images - sys_meta = instance_types.save_instance_type_info( - {}, instance_types.get_instance_type(1)) + sys_meta = flavors.save_instance_type_info( + {}, flavors.get_instance_type(1)) image_uuid = 'cedef40a-ed67-4d10-800e-17455edce175' inst1_kwargs = { 'reservation_id': 'a', @@ -1040,8 +1040,8 @@ class CloudTestCase(test.TestCase): self._stub_instance_get_with_fixed_ips('get') image_uuid = 'cedef40a-ed67-4d10-800e-17455edce175' - sys_meta = instance_types.save_instance_type_info( - {}, instance_types.get_instance_type(1)) + sys_meta = flavors.save_instance_type_info( + {}, flavors.get_instance_type(1)) inst_base = { 'reservation_id': 'a', 'image_ref': image_uuid, @@ -1095,8 +1095,8 @@ class CloudTestCase(test.TestCase): def test_instance_state(expected_code, expected_name, power_state_, vm_state_, values=None): image_uuid = 'cedef40a-ed67-4d10-800e-17455edce175' - sys_meta = instance_types.save_instance_type_info( - {}, instance_types.get_instance_type(1)) + sys_meta = flavors.save_instance_type_info( + {}, flavors.get_instance_type(1)) values = values or {} values.update({'image_ref': image_uuid, 'instance_type_id': 1, 'power_state': power_state_, 'vm_state': vm_state_, @@ -1130,8 +1130,8 @@ class CloudTestCase(test.TestCase): self._stub_instance_get_with_fixed_ips('get') image_uuid = 'cedef40a-ed67-4d10-800e-17455edce175' - sys_meta = instance_types.save_instance_type_info( - {}, instance_types.get_instance_type(1)) + sys_meta = flavors.save_instance_type_info( + {}, flavors.get_instance_type(1)) inst1 = db.instance_create(self.context, {'reservation_id': 'a', 'image_ref': image_uuid, 'instance_type_id': 1, @@ -1157,8 +1157,8 @@ class CloudTestCase(test.TestCase): def test_describe_instances_deleted(self): image_uuid = 'cedef40a-ed67-4d10-800e-17455edce175' - sys_meta = instance_types.save_instance_type_info( - {}, instance_types.get_instance_type(1)) + sys_meta = flavors.save_instance_type_info( + {}, flavors.get_instance_type(1)) args1 = {'reservation_id': 'a', 'image_ref': image_uuid, 'instance_type_id': 1, @@ -1182,8 +1182,8 @@ class CloudTestCase(test.TestCase): def test_describe_instances_with_image_deleted(self): image_uuid = 'aebef54a-ed67-4d10-912f-14455edce176' - sys_meta = instance_types.save_instance_type_info( - {}, instance_types.get_instance_type(1)) + sys_meta = flavors.save_instance_type_info( + {}, flavors.get_instance_type(1)) args1 = {'reservation_id': 'a', 'image_ref': image_uuid, 'instance_type_id': 1, @@ -2256,9 +2256,9 @@ class CloudTestCase(test.TestCase): self._fake_bdm_get) def fake_get(ctxt, instance_id): - inst_type = instance_types.get_default_instance_type() + inst_type = flavors.get_default_instance_type() inst_type['name'] = 'fake_type' - sys_meta = instance_types.save_instance_type_info({}, inst_type) + sys_meta = flavors.save_instance_type_info({}, inst_type) sys_meta = utils.dict_to_metadata(sys_meta) return { 'id': 0, diff --git a/nova/tests/api/openstack/compute/contrib/test_flavor_access.py b/nova/tests/api/openstack/compute/contrib/test_flavor_access.py index b3564dede..6bae7882f 100644 --- a/nova/tests/api/openstack/compute/contrib/test_flavor_access.py +++ b/nova/tests/api/openstack/compute/contrib/test_flavor_access.py @@ -19,8 +19,8 @@ from lxml import etree from webob import exc from nova.api.openstack.compute.contrib import flavor_access -from nova.api.openstack.compute import flavors -from nova.compute import instance_types +from nova.api.openstack.compute import flavors as flavors_api +from nova.compute import flavors from nova import context from nova import exception from nova import test @@ -116,15 +116,15 @@ class FakeResponse(object): class FlavorAccessTest(test.TestCase): def setUp(self): super(FlavorAccessTest, self).setUp() - self.flavor_controller = flavors.Controller() + self.flavor_controller = flavors_api.Controller() self.flavor_access_controller = flavor_access.FlavorAccessController() self.flavor_action_controller = flavor_access.FlavorActionController() self.req = FakeRequest() self.context = self.req.environ['nova.context'] - self.stubs.Set(instance_types, 'get_instance_type_by_flavor_id', + self.stubs.Set(flavors, 'get_instance_type_by_flavor_id', fake_get_instance_type_by_flavor_id) - self.stubs.Set(instance_types, 'get_all_types', fake_get_all_types) - self.stubs.Set(instance_types, 'get_instance_type_access_by_flavor_id', + self.stubs.Set(flavors, 'get_all_types', fake_get_all_types) + self.stubs.Set(flavors, 'get_instance_type_access_by_flavor_id', fake_get_instance_type_access_by_flavor_id) def _verify_flavor_list(self, result, expected): @@ -249,7 +249,7 @@ class FlavorAccessTest(test.TestCase): def stub_add_instance_type_access(flavorid, projectid, ctxt=None): self.assertEqual('3', flavorid, "flavorid") self.assertEqual("proj2", projectid, "projectid") - self.stubs.Set(instance_types, 'add_instance_type_access', + self.stubs.Set(flavors, 'add_instance_type_access', stub_add_instance_type_access) expected = {'flavor_access': [{'flavor_id': '3', 'tenant_id': 'proj3'}]} @@ -264,7 +264,7 @@ class FlavorAccessTest(test.TestCase): def stub_add_instance_type_access(flavorid, projectid, ctxt=None): raise exception.FlavorAccessExists(flavor_id=flavorid, project_id=projectid) - self.stubs.Set(instance_types, 'add_instance_type_access', + self.stubs.Set(flavors, 'add_instance_type_access', stub_add_instance_type_access) body = {'addTenantAccess': {'tenant': 'proj2'}} req = fakes.HTTPRequest.blank('/v2/fake/flavors/2/action', @@ -277,7 +277,7 @@ class FlavorAccessTest(test.TestCase): def stub_remove_instance_type_access(flavorid, projectid, ctxt=None): raise exception.FlavorAccessNotFound(flavor_id=flavorid, project_id=projectid) - self.stubs.Set(instance_types, 'remove_instance_type_access', + self.stubs.Set(flavors, 'remove_instance_type_access', stub_remove_instance_type_access) body = {'removeTenantAccess': {'tenant': 'proj2'}} req = fakes.HTTPRequest.blank('/v2/fake/flavors/2/action', diff --git a/nova/tests/api/openstack/compute/contrib/test_flavor_disabled.py b/nova/tests/api/openstack/compute/contrib/test_flavor_disabled.py index 5d15264ab..8a8660a67 100644 --- a/nova/tests/api/openstack/compute/contrib/test_flavor_disabled.py +++ b/nova/tests/api/openstack/compute/contrib/test_flavor_disabled.py @@ -16,7 +16,7 @@ from lxml import etree import webob from nova.api.openstack.compute.contrib import flavor_disabled -from nova.compute import instance_types +from nova.compute import flavors from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes @@ -57,9 +57,9 @@ class FlavorDisabledTest(test.TestCase): '.flavor_disabled.Flavor_disabled') self.flags(osapi_compute_extension=[ext]) fakes.stub_out_nw_api(self.stubs) - self.stubs.Set(instance_types, "get_all_types", + self.stubs.Set(flavors, "get_all_types", fake_instance_type_get_all) - self.stubs.Set(instance_types, + self.stubs.Set(flavors, "get_instance_type_by_flavor_id", fake_instance_type_get_by_flavor_id) diff --git a/nova/tests/api/openstack/compute/contrib/test_flavor_manage.py b/nova/tests/api/openstack/compute/contrib/test_flavor_manage.py index 9b58e7b74..2ca02cafa 100644 --- a/nova/tests/api/openstack/compute/contrib/test_flavor_manage.py +++ b/nova/tests/api/openstack/compute/contrib/test_flavor_manage.py @@ -18,7 +18,7 @@ import datetime import webob from nova.api.openstack.compute.contrib import flavormanage -from nova.compute import instance_types +from nova.compute import flavors from nova import exception from nova.openstack.common import jsonutils from nova import test @@ -80,11 +80,11 @@ def fake_create(name, memory_mb, vcpus, root_gb, ephemeral_gb, class FlavorManageTest(test.TestCase): def setUp(self): super(FlavorManageTest, self).setUp() - self.stubs.Set(instance_types, + self.stubs.Set(flavors, "get_instance_type_by_flavor_id", fake_get_instance_type_by_flavor_id) - self.stubs.Set(instance_types, "destroy", fake_destroy) - self.stubs.Set(instance_types, "create", fake_create) + self.stubs.Set(flavors, "destroy", fake_destroy) + self.stubs.Set(flavors, "create", fake_create) self.flags( osapi_compute_extension=[ 'nova.api.openstack.compute.contrib.select_extensions'], @@ -156,7 +156,7 @@ class FlavorManageTest(test.TestCase): } } - self.stubs.Set(instance_types, "create", fake_create) + self.stubs.Set(flavors, "create", fake_create) url = '/v2/fake/flavors' req = webob.Request.blank(url) req.headers['Content-Type'] = 'application/json' @@ -210,7 +210,7 @@ class FlavorManageTest(test.TestCase): flavorid, swap, rxtx_factor, is_public): raise exception.InstanceTypeExists(name=name) - self.stubs.Set(instance_types, "create", fake_create) + self.stubs.Set(flavors, "create", fake_create) url = '/v2/fake/flavors' req = webob.Request.blank(url) req.headers['Content-Type'] = 'application/json' diff --git a/nova/tests/api/openstack/compute/contrib/test_flavor_rxtx.py b/nova/tests/api/openstack/compute/contrib/test_flavor_rxtx.py index d86f750cf..965d0e1bb 100644 --- a/nova/tests/api/openstack/compute/contrib/test_flavor_rxtx.py +++ b/nova/tests/api/openstack/compute/contrib/test_flavor_rxtx.py @@ -15,7 +15,7 @@ from lxml import etree import webob -from nova.compute import instance_types +from nova.compute import flavors from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes @@ -56,9 +56,9 @@ class FlavorRxtxTest(test.TestCase): '.flavor_rxtx.Flavor_rxtx') self.flags(osapi_compute_extension=[ext]) fakes.stub_out_nw_api(self.stubs) - self.stubs.Set(instance_types, "get_all_types", + self.stubs.Set(flavors, "get_all_types", fake_instance_type_get_all) - self.stubs.Set(instance_types, + self.stubs.Set(flavors, "get_instance_type_by_flavor_id", fake_instance_type_get_by_flavor_id) diff --git a/nova/tests/api/openstack/compute/contrib/test_flavor_swap.py b/nova/tests/api/openstack/compute/contrib/test_flavor_swap.py index eeb0fe632..ea3ab6e34 100644 --- a/nova/tests/api/openstack/compute/contrib/test_flavor_swap.py +++ b/nova/tests/api/openstack/compute/contrib/test_flavor_swap.py @@ -15,7 +15,7 @@ from lxml import etree import webob -from nova.compute import instance_types +from nova.compute import flavors from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes @@ -56,9 +56,9 @@ class FlavorSwapTest(test.TestCase): '.flavor_swap.Flavor_swap') self.flags(osapi_compute_extension=[ext]) fakes.stub_out_nw_api(self.stubs) - self.stubs.Set(instance_types, "get_all_types", + self.stubs.Set(flavors, "get_all_types", fake_instance_type_get_all) - self.stubs.Set(instance_types, + self.stubs.Set(flavors, "get_instance_type_by_flavor_id", fake_instance_type_get_by_flavor_id) diff --git a/nova/tests/api/openstack/compute/contrib/test_flavorextradata.py b/nova/tests/api/openstack/compute/contrib/test_flavorextradata.py index 1c5703381..f45f98bbc 100644 --- a/nova/tests/api/openstack/compute/contrib/test_flavorextradata.py +++ b/nova/tests/api/openstack/compute/contrib/test_flavorextradata.py @@ -17,7 +17,7 @@ import datetime import webob -from nova.compute import instance_types +from nova.compute import flavors from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes @@ -54,9 +54,9 @@ class FlavorextradataTest(test.TestCase): ext = ('nova.api.openstack.compute.contrib' '.flavorextradata.Flavorextradata') self.flags(osapi_compute_extension=[ext]) - self.stubs.Set(instance_types, 'get_instance_type_by_flavor_id', + self.stubs.Set(flavors, 'get_instance_type_by_flavor_id', fake_get_instance_type_by_flavor_id) - self.stubs.Set(instance_types, 'get_all_types', fake_get_all_types) + self.stubs.Set(flavors, 'get_all_types', fake_get_all_types) def _verify_flavor_response(self, flavor, expected): for key in expected: diff --git a/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py b/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py index ea692c8e6..004a6716e 100644 --- a/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py +++ b/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py @@ -22,7 +22,7 @@ import webob from nova.api.openstack.compute.contrib import simple_tenant_usage from nova.compute import api -from nova.compute import instance_types +from nova.compute import flavors from nova import context from nova import exception from nova.openstack.common import jsonutils @@ -59,7 +59,7 @@ FAKE_INST_TYPE = {'id': 1, def get_fake_db_instance(start, end, instance_id, tenant_id): sys_meta = utils.dict_to_metadata( - instance_types.save_instance_type_info({}, FAKE_INST_TYPE)) + flavors.save_instance_type_info({}, FAKE_INST_TYPE)) return {'id': instance_id, 'uuid': '00000000-0000-0000-0000-00000000000000%02d' % instance_id, 'image_ref': '1', @@ -415,7 +415,7 @@ class SimpleTenantUsageControllerTest(test.TestCase): class FakeComputeAPI: def get_instance_type(self, context, flavor_type): if flavor_type == 1: - return instance_types.get_default_instance_type() + return flavors.get_default_instance_type() else: raise exception.InstanceTypeNotFound(flavor_type) @@ -429,11 +429,11 @@ class SimpleTenantUsageControllerTest(test.TestCase): instance_type_id=1, vm_state='deleted', deleted=0) - basetype = instance_types.get_default_instance_type() + basetype = flavors.get_default_instance_type() sys_meta = utils.dict_to_metadata( - instance_types.save_instance_type_info({}, basetype)) + flavors.save_instance_type_info({}, basetype)) self.baseinst['system_metadata'] = sys_meta - self.basetype = instance_types.extract_instance_type(self.baseinst) + self.basetype = flavors.extract_instance_type(self.baseinst) def test_get_flavor_from_sys_meta(self): # Non-deleted instances get their type information from their @@ -458,7 +458,7 @@ class SimpleTenantUsageControllerTest(test.TestCase): deleted=1) flavor = self.controller._get_flavor(self.context, self.compute_api, inst_without_sys_meta, {}) - self.assertEqual(flavor, instance_types.get_default_instance_type()) + self.assertEqual(flavor, flavors.get_default_instance_type()) def test_get_flavor_from_deleted_with_id_of_deleted(self): # Verify the legacy behavior of instance_type_id pointing to a diff --git a/nova/tests/api/openstack/compute/contrib/test_volumes.py b/nova/tests/api/openstack/compute/contrib/test_volumes.py index 83372b251..cc0c1c1cc 100644 --- a/nova/tests/api/openstack/compute/contrib/test_volumes.py +++ b/nova/tests/api/openstack/compute/contrib/test_volumes.py @@ -22,7 +22,7 @@ from webob import exc from nova.api.openstack.compute.contrib import volumes from nova.compute import api as compute_api -from nova.compute import instance_types +from nova.compute import flavors from nova import context from nova.openstack.common import jsonutils from nova.openstack.common import timeutils @@ -46,7 +46,7 @@ def fake_compute_api_create(cls, context, instance_type, image_href, **kwargs): global _block_device_mapping_seen _block_device_mapping_seen = kwargs.get('block_device_mapping') - inst_type = instance_types.get_instance_type_by_flavor_id(2) + inst_type = flavors.get_instance_type_by_flavor_id(2) resv_id = None return ([{'id': 1, 'display_name': 'test_server', diff --git a/nova/tests/api/openstack/compute/test_flavors.py b/nova/tests/api/openstack/compute/test_flavors.py index 3a11c92fe..45eeeb34b 100644 --- a/nova/tests/api/openstack/compute/test_flavors.py +++ b/nova/tests/api/openstack/compute/test_flavors.py @@ -22,7 +22,7 @@ import urlparse from nova.api.openstack.compute import flavors from nova.api.openstack import xmlutil -import nova.compute.instance_types +import nova.compute.flavors from nova import context from nova import db from nova import exception @@ -86,16 +86,16 @@ class FlavorsTest(test.TestCase): self.flags(osapi_compute_extension=[]) fakes.stub_out_networking(self.stubs) fakes.stub_out_rate_limiting(self.stubs) - self.stubs.Set(nova.compute.instance_types, "get_all_types", + self.stubs.Set(nova.compute.flavors, "get_all_types", fake_instance_type_get_all) - self.stubs.Set(nova.compute.instance_types, + self.stubs.Set(nova.compute.flavors, "get_instance_type_by_flavor_id", fake_instance_type_get_by_flavor_id) self.controller = flavors.Controller() def test_get_flavor_by_invalid_id(self): - self.stubs.Set(nova.compute.instance_types, + self.stubs.Set(nova.compute.flavors, "get_instance_type_by_flavor_id", return_instance_type_not_found) req = fakes.HTTPRequest.blank('/v2/fake/flavors/asdf') @@ -341,7 +341,7 @@ class FlavorsTest(test.TestCase): self.assertEqual(flavor, expected) def test_get_empty_flavor_list(self): - self.stubs.Set(nova.compute.instance_types, "get_all_types", + self.stubs.Set(nova.compute.flavors, "get_all_types", empty_instance_type_get_all) req = fakes.HTTPRequest.blank('/v2/fake/flavors') @@ -683,7 +683,7 @@ class DisabledFlavorsWithRealDBTest(test.TestCase): super(DisabledFlavorsWithRealDBTest, self).setUp() self.controller = flavors.Controller() - # Add a new disabled type to the list of instance_types/flavors + # Add a new disabled type to the list of flavors self.req = fakes.HTTPRequest.blank('/v2/fake/flavors') self.context = self.req.environ['nova.context'] self.admin_context = context.get_admin_context() diff --git a/nova/tests/api/openstack/compute/test_servers.py b/nova/tests/api/openstack/compute/test_servers.py index 4fe8a41db..43d5d3306 100644 --- a/nova/tests/api/openstack/compute/test_servers.py +++ b/nova/tests/api/openstack/compute/test_servers.py @@ -34,7 +34,7 @@ from nova.api.openstack.compute import views from nova.api.openstack import extensions from nova.api.openstack import xmlutil from nova.compute import api as compute_api -from nova.compute import instance_types +from nova.compute import flavors from nova.compute import task_states from nova.compute import vm_states from nova import context @@ -1728,7 +1728,7 @@ class ServersControllerCreateTest(test.TestCase): self.controller = servers.Controller(self.ext_mgr) def instance_create(context, inst): - inst_type = instance_types.get_instance_type_by_flavor_id(3) + inst_type = flavors.get_instance_type_by_flavor_id(3) image_uuid = '76fa36fc-c930-4bf3-8c8a-ea2a2420deb6' def_image_ref = 'http://localhost/images/%s' % image_uuid self.instance_cache_num += 1 diff --git a/nova/tests/api/openstack/fakes.py b/nova/tests/api/openstack/fakes.py index 386d27618..0a78020bd 100644 --- a/nova/tests/api/openstack/fakes.py +++ b/nova/tests/api/openstack/fakes.py @@ -33,7 +33,7 @@ from nova.api.openstack.compute import versions from nova.api.openstack import urlmap from nova.api.openstack import wsgi as os_wsgi from nova.compute import api as compute_api -from nova.compute import instance_types +from nova.compute import flavors from nova.compute import vm_states from nova import context from nova.db.sqlalchemy import models @@ -437,8 +437,8 @@ def stub_instance(id, user_id=None, project_id=None, host=None, else: metadata = [] - inst_type = instance_types.get_instance_type_by_flavor_id(int(flavor_id)) - sys_meta = instance_types.save_instance_type_info({}, inst_type) + inst_type = flavors.get_instance_type_by_flavor_id(int(flavor_id)) + sys_meta = flavors.save_instance_type_info({}, inst_type) if host is not None: host = str(host) diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index 3be5819ab..5e43c63da 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -33,7 +33,7 @@ from oslo.config import cfg import nova from nova import compute from nova.compute import api as compute_api -from nova.compute import instance_types +from nova.compute import flavors from nova.compute import manager as compute_manager from nova.compute import power_state from nova.compute import rpcapi as compute_rpcapi @@ -220,8 +220,8 @@ class BaseTestCase(test.TestCase): def make_fake_sys_meta(): sys_meta = {} - inst_type = instance_types.get_instance_type_by_name(type_name) - for key in instance_types.system_metadata_instance_type_props: + inst_type = flavors.get_instance_type_by_name(type_name) + for key in flavors.system_metadata_instance_type_props: sys_meta['instance_type_%s' % key] = inst_type[key] return sys_meta @@ -234,7 +234,7 @@ class BaseTestCase(test.TestCase): inst['project_id'] = self.project_id inst['host'] = 'fake_host' inst['node'] = NODENAME - type_id = instance_types.get_instance_type_by_name(type_name)['id'] + type_id = flavors.get_instance_type_by_name(type_name)['id'] inst['instance_type_id'] = type_id inst['ami_launch_index'] = 0 inst['memory_mb'] = 0 @@ -2160,7 +2160,7 @@ class ComputeTestCase(BaseTestCase): self.assertEquals(payload['user_id'], self.user_id) self.assertEquals(payload['instance_id'], inst_ref['uuid']) self.assertEquals(payload['instance_type'], 'm1.tiny') - type_id = instance_types.get_instance_type_by_name('m1.tiny')['id'] + type_id = flavors.get_instance_type_by_name('m1.tiny')['id'] self.assertEquals(str(payload['instance_type_id']), str(type_id)) self.assertEquals(payload['state'], 'active') self.assertTrue('display_name' in payload) @@ -2273,7 +2273,7 @@ class ComputeTestCase(BaseTestCase): self.assertEquals(payload['user_id'], self.user_id) self.assertEquals(payload['instance_id'], instance['uuid']) self.assertEquals(payload['instance_type'], 'm1.tiny') - type_id = instance_types.get_instance_type_by_name('m1.tiny')['id'] + type_id = flavors.get_instance_type_by_name('m1.tiny')['id'] self.assertEquals(str(payload['instance_type_id']), str(type_id)) self.assertTrue('display_name' in payload) self.assertTrue('created_at' in payload) @@ -2647,7 +2647,7 @@ class ComputeTestCase(BaseTestCase): reservations = self._ensure_quota_reservations_committed() instance = jsonutils.to_primitive(self._create_fake_instance()) - instance_type = instance_types.get_default_instance_type() + instance_type = flavors.get_default_instance_type() db.instance_update(self.context, instance["uuid"], {"task_state": task_states.RESIZE_PREP}) self.compute.prep_resize(self.context, instance=instance, @@ -2727,7 +2727,7 @@ class ComputeTestCase(BaseTestCase): jsonutils.dumps(connection_info)) # begin resize - instance_type = instance_types.get_default_instance_type() + instance_type = flavors.get_default_instance_type() db.instance_update(self.context, instance["uuid"], {"task_state": task_states.RESIZE_PREP}) self.compute.prep_resize(self.context, instance=instance, @@ -2821,7 +2821,7 @@ class ComputeTestCase(BaseTestCase): reservations = self._ensure_quota_reservations_rolledback() instance = jsonutils.to_primitive(self._create_fake_instance()) - instance_type = instance_types.get_default_instance_type() + instance_type = flavors.get_default_instance_type() self.compute.prep_resize(self.context, instance=instance, instance_type=instance_type, image={}, reservations=reservations) @@ -2899,7 +2899,7 @@ class ComputeTestCase(BaseTestCase): self.assertEquals(payload['user_id'], self.user_id) self.assertEquals(payload['instance_id'], inst_ref['uuid']) self.assertEquals(payload['instance_type'], 'm1.tiny') - type_id = instance_types.get_instance_type_by_name('m1.tiny')['id'] + type_id = flavors.get_instance_type_by_name('m1.tiny')['id'] self.assertEquals(str(payload['instance_type_id']), str(type_id)) self.assertTrue('display_name' in payload) self.assertTrue('created_at' in payload) @@ -2915,7 +2915,7 @@ class ComputeTestCase(BaseTestCase): cur_time = datetime.datetime(2012, 12, 21, 12, 21) timeutils.set_time_override(old_time) instance = jsonutils.to_primitive(self._create_fake_instance()) - new_type = instance_types.get_instance_type_by_name('m1.small') + new_type = flavors.get_instance_type_by_name('m1.small') new_type = jsonutils.to_primitive(new_type) new_type_id = new_type['id'] self.compute.run_instance(self.context, instance=instance) @@ -2977,7 +2977,7 @@ class ComputeTestCase(BaseTestCase): new_instance = db.instance_update(self.context, instance['uuid'], {'host': 'foo'}) new_instance = jsonutils.to_primitive(new_instance) - instance_type = instance_types.get_default_instance_type() + instance_type = flavors.get_default_instance_type() self.compute.prep_resize(self.context, instance=new_instance, instance_type=instance_type, image={}) db.migration_get_by_instance_and_status(self.context.elevated(), @@ -3000,7 +3000,7 @@ class ComputeTestCase(BaseTestCase): self.assertEquals(payload['user_id'], self.user_id) self.assertEquals(payload['instance_id'], new_instance['uuid']) self.assertEquals(payload['instance_type'], 'm1.tiny') - type_id = instance_types.get_instance_type_by_name('m1.tiny')['id'] + type_id = flavors.get_instance_type_by_name('m1.tiny')['id'] self.assertEquals(str(payload['instance_type_id']), str(type_id)) self.assertTrue('display_name' in payload) self.assertTrue('created_at' in payload) @@ -3023,7 +3023,7 @@ class ComputeTestCase(BaseTestCase): new_instance = db.instance_update(self.context, instance['uuid'], {'host': self.compute.host}) new_instance = jsonutils.to_primitive(new_instance) - instance_type = instance_types.get_default_instance_type() + instance_type = flavors.get_default_instance_type() self.assertRaises(exception.MigrationError, self.compute.prep_resize, self.context, instance=new_instance, @@ -3043,7 +3043,7 @@ class ComputeTestCase(BaseTestCase): new_instance = db.instance_update(self.context, instance['uuid'], {'host': None}) new_instance = jsonutils.to_primitive(new_instance) - instance_type = instance_types.get_default_instance_type() + instance_type = flavors.get_default_instance_type() self.assertRaises(exception.MigrationError, self.compute.prep_resize, self.context, instance=new_instance, @@ -3061,7 +3061,7 @@ class ComputeTestCase(BaseTestCase): throw_up) instance = jsonutils.to_primitive(self._create_fake_instance()) - instance_type = instance_types.get_default_instance_type() + instance_type = flavors.get_default_instance_type() reservations = self._ensure_quota_reservations_rolledback() @@ -3092,7 +3092,7 @@ class ComputeTestCase(BaseTestCase): def test_resize_instance(self): # Ensure instance can be migrated/resized. instance = jsonutils.to_primitive(self._create_fake_instance()) - instance_type = instance_types.get_default_instance_type() + instance_type = flavors.get_default_instance_type() self.compute.run_instance(self.context, instance=instance) new_instance = db.instance_update(self.context, instance['uuid'], @@ -3216,20 +3216,20 @@ class ComputeTestCase(BaseTestCase): instance['system_metadata'].append(dict(key='instance_type_id', value=old)) sys_meta = dict(instance_type_id=old) - self.mox.StubOutWithMock(instance_types, 'extract_instance_type') - self.mox.StubOutWithMock(instance_types, 'delete_instance_type_info') - self.mox.StubOutWithMock(instance_types, 'save_instance_type_info') + self.mox.StubOutWithMock(flavors, 'extract_instance_type') + self.mox.StubOutWithMock(flavors, 'delete_instance_type_info') + self.mox.StubOutWithMock(flavors, 'save_instance_type_info') if revert: - instance_types.extract_instance_type(instance, 'old_').AndReturn( + flavors.extract_instance_type(instance, 'old_').AndReturn( {'instance_type_id': old}) - instance_types.save_instance_type_info( + flavors.save_instance_type_info( sys_meta, {'instance_type_id': old}).AndReturn(sys_meta) else: - instance_types.extract_instance_type(instance).AndReturn( + flavors.extract_instance_type(instance).AndReturn( {'instance_type_id': new}) - instance_types.delete_instance_type_info( + flavors.delete_instance_type_info( sys_meta, 'old_').AndReturn(sys_meta) - instance_types.delete_instance_type_info( + flavors.delete_instance_type_info( sys_meta, 'new_').AndReturn(sys_meta) self.mox.ReplayAll() @@ -3252,7 +3252,7 @@ class ComputeTestCase(BaseTestCase): self._test_cleanup_stored_instance_types('1', '1', True) def test_get_by_flavor_id(self): - type = instance_types.get_instance_type_by_flavor_id(1) + type = flavors.get_instance_type_by_flavor_id(1) self.assertEqual(type['name'], 'm1.tiny') def test_resize_same_source_fails(self): @@ -3262,7 +3262,7 @@ class ComputeTestCase(BaseTestCase): instance = jsonutils.to_primitive(self._create_fake_instance()) self.compute.run_instance(self.context, instance=instance) instance = db.instance_get_by_uuid(self.context, instance['uuid']) - instance_type = instance_types.get_default_instance_type() + instance_type = flavors.get_default_instance_type() self.assertRaises(exception.MigrationError, self.compute.prep_resize, self.context, instance=instance, instance_type=instance_type, image={}, @@ -3281,7 +3281,7 @@ class ComputeTestCase(BaseTestCase): reservations = self._ensure_quota_reservations_rolledback() inst_ref = jsonutils.to_primitive(self._create_fake_instance()) - instance_type = instance_types.get_default_instance_type() + instance_type = flavors.get_default_instance_type() self.compute.run_instance(self.context, instance=inst_ref) inst_ref = db.instance_update(self.context, inst_ref['uuid'], @@ -4775,7 +4775,7 @@ class ComputeAPITestCase(BaseTestCase): def test_create_with_too_little_ram(self): # Test an instance type with too little memory. - inst_type = instance_types.get_default_instance_type() + inst_type = flavors.get_default_instance_type() inst_type['memory_mb'] = 1 self.fake_image['min_ram'] = 2 @@ -4794,7 +4794,7 @@ class ComputeAPITestCase(BaseTestCase): def test_create_with_too_little_disk(self): # Test an instance type with too little disk space. - inst_type = instance_types.get_default_instance_type() + inst_type = flavors.get_default_instance_type() inst_type['root_gb'] = 1 self.fake_image['min_disk'] = 2 @@ -4813,7 +4813,7 @@ class ComputeAPITestCase(BaseTestCase): def test_create_just_enough_ram_and_disk(self): # Test an instance type with just enough ram and disk space. - inst_type = instance_types.get_default_instance_type() + inst_type = flavors.get_default_instance_type() inst_type['root_gb'] = 2 inst_type['memory_mb'] = 2 @@ -4829,7 +4829,7 @@ class ComputeAPITestCase(BaseTestCase): def test_create_with_no_ram_and_disk_reqs(self): # Test an instance type with no min_ram or min_disk. - inst_type = instance_types.get_default_instance_type() + inst_type = flavors.get_default_instance_type() inst_type['root_gb'] = 1 inst_type['memory_mb'] = 1 @@ -4842,7 +4842,7 @@ class ComputeAPITestCase(BaseTestCase): def test_create_with_deleted_image(self): # If we're given a deleted image by glance, we should not be able to # build from it - inst_type = instance_types.get_default_instance_type() + inst_type = flavors.get_default_instance_type() self.fake_image['name'] = 'fake_name' self.fake_image['status'] = 'DELETED' @@ -4861,7 +4861,7 @@ class ComputeAPITestCase(BaseTestCase): cases = [dict(), dict(display_name=None)] for instance in cases: (ref, resv_id) = self.compute_api.create(self.context, - instance_types.get_default_instance_type(), + flavors.get_default_instance_type(), 'fake-image-uuid', **instance) try: self.assertNotEqual(ref[0]['display_name'], None) @@ -4872,7 +4872,7 @@ class ComputeAPITestCase(BaseTestCase): # Make sure image properties are copied into system metadata. (ref, resv_id) = self.compute_api.create( self.context, - instance_type=instance_types.get_default_instance_type(), + instance_type=flavors.get_default_instance_type(), image_href='fake-image-uuid') try: sys_metadata = db.instance_system_metadata_get(self.context, @@ -4889,7 +4889,7 @@ class ComputeAPITestCase(BaseTestCase): db.instance_destroy(self.context, ref[0]['uuid']) def test_create_saves_type_in_system_metadata(self): - instance_type = instance_types.get_default_instance_type() + instance_type = flavors.get_default_instance_type() (ref, resv_id) = self.compute_api.create( self.context, instance_type=instance_type, @@ -4915,7 +4915,7 @@ class ComputeAPITestCase(BaseTestCase): group = self._create_group() (ref, resv_id) = self.compute_api.create( self.context, - instance_type=instance_types.get_default_instance_type(), + instance_type=flavors.get_default_instance_type(), image_href=None, security_group=['testgroup']) try: @@ -4928,7 +4928,7 @@ class ComputeAPITestCase(BaseTestCase): db.instance_destroy(self.context, ref[0]['uuid']) def test_create_instance_with_invalid_security_group_raises(self): - instance_type = instance_types.get_default_instance_type() + instance_type = flavors.get_default_instance_type() pre_build_len = len(db.instance_get_all(self.context)) self.assertRaises(exception.SecurityGroupNotFoundForProject, @@ -4943,7 +4943,7 @@ class ComputeAPITestCase(BaseTestCase): def test_create_with_large_user_data(self): # Test an instance type with too much user data. - inst_type = instance_types.get_default_instance_type() + inst_type = flavors.get_default_instance_type() self.fake_image['min_ram'] = 2 self.stubs.Set(fake_image._FakeImageService, 'show', self.fake_show) @@ -4955,7 +4955,7 @@ class ComputeAPITestCase(BaseTestCase): def test_create_with_malformed_user_data(self): # Test an instance type with malformed user data. - inst_type = instance_types.get_default_instance_type() + inst_type = flavors.get_default_instance_type() self.fake_image['min_ram'] = 2 self.stubs.Set(fake_image._FakeImageService, 'show', self.fake_show) @@ -4967,7 +4967,7 @@ class ComputeAPITestCase(BaseTestCase): def test_create_with_base64_user_data(self): # Test an instance type with ok much user data. - inst_type = instance_types.get_default_instance_type() + inst_type = flavors.get_default_instance_type() self.fake_image['min_ram'] = 2 self.stubs.Set(fake_image._FakeImageService, 'show', self.fake_show) @@ -4998,7 +4998,7 @@ class ComputeAPITestCase(BaseTestCase): ('hello_server', 'hello-server')] for display_name, hostname in cases: (ref, resv_id) = self.compute_api.create(self.context, - instance_types.get_default_instance_type(), None, + flavors.get_default_instance_type(), None, display_name=display_name) try: self.assertEqual(ref[0]['hostname'], hostname) @@ -5011,7 +5011,7 @@ class ComputeAPITestCase(BaseTestCase): (ref, resv_id) = self.compute_api.create( self.context, - instance_type=instance_types.get_default_instance_type(), + instance_type=flavors.get_default_instance_type(), image_href=None, security_group=['testgroup']) try: @@ -5027,7 +5027,7 @@ class ComputeAPITestCase(BaseTestCase): (ref, resv_id) = self.compute_api.create( self.context, - instance_type=instance_types.get_default_instance_type(), + instance_type=flavors.get_default_instance_type(), image_href=None, security_group=['testgroup']) @@ -5138,7 +5138,7 @@ class ComputeAPITestCase(BaseTestCase): def test_delete_in_resizing(self): def fake_quotas_reserve(context, expire=None, project_id=None, **deltas): - old_type = instance_types.get_instance_type_by_name('m1.tiny') + old_type = flavors.get_instance_type_by_name('m1.tiny') # ensure using old instance type to create reservations self.assertEqual(deltas['cores'], -old_type['vcpus']) self.assertEqual(deltas['ram'], -old_type['memory_mb']) @@ -5149,7 +5149,7 @@ class ComputeAPITestCase(BaseTestCase): 'host': CONF.host}) # create a fake migration record (manager does this) - new_inst_type = instance_types.get_instance_type_by_name('m1.small') + new_inst_type = flavors.get_instance_type_by_name('m1.small') db.migration_create(self.context.elevated(), {'instance_uuid': instance['uuid'], 'old_instance_type_id': instance['instance_type_id'], @@ -5592,7 +5592,7 @@ class ComputeAPITestCase(BaseTestCase): def test_hostname_create(self): # Ensure instance hostname is set during creation. - inst_type = instance_types.get_instance_type_by_name('m1.tiny') + inst_type = flavors.get_instance_type_by_name('m1.tiny') (instances, _) = self.compute_api.create(self.context, inst_type, None, @@ -5753,7 +5753,7 @@ class ComputeAPITestCase(BaseTestCase): {'extra_param': 'value1'}) self.assertEqual(image['name'], 'snap1') - instance_type = instance_types.extract_instance_type(instance) + instance_type = flavors.extract_instance_type(instance) self.assertEqual(image['min_ram'], self.fake_image['min_ram']) self.assertEqual(image['min_disk'], instance_type['root_gb']) properties = image['properties'] @@ -5981,14 +5981,14 @@ class ComputeAPITestCase(BaseTestCase): self.compute_api.resize(self.context, instance, '4') # Do the prep/finish_resize steps (manager does this) - old_type = instance_types.extract_instance_type(instance) - new_type = instance_types.get_instance_type_by_flavor_id('4') + old_type = flavors.extract_instance_type(instance) + new_type = flavors.get_instance_type_by_flavor_id('4') sys_meta = utils.metadata_to_dict(instance['system_metadata']) - sys_meta = instance_types.save_instance_type_info(sys_meta, + sys_meta = flavors.save_instance_type_info(sys_meta, old_type, 'old_') - sys_meta = instance_types.save_instance_type_info(sys_meta, + sys_meta = flavors.save_instance_type_info(sys_meta, new_type, 'new_') - sys_meta = instance_types.save_instance_type_info(sys_meta, + sys_meta = flavors.save_instance_type_info(sys_meta, new_type) # create a fake migration record (manager does this) @@ -6053,9 +6053,9 @@ class ComputeAPITestCase(BaseTestCase): memory_mb = 128 root_gb = 0 vcpus = 1 - instance_types.create(name, memory_mb, vcpus, root_gb, 0, + flavors.create(name, memory_mb, vcpus, root_gb, 0, flavorid, 0, 1.0, True) - instance_types.destroy(name) + flavors.destroy(name) self.assertRaises(exception.FlavorNotFound, self.compute_api.resize, self.context, instance, flavorid) @@ -6085,12 +6085,12 @@ class ComputeAPITestCase(BaseTestCase): memory_mb = 102400 root_gb = 0 vcpus = 1 - instance_types.create(name, memory_mb, vcpus, root_gb, 0, + flavors.create(name, memory_mb, vcpus, root_gb, 0, flavorid, 0, 1.0, True) self.assertRaises(exception.TooManyInstances, self.compute_api.resize, self.context, instance, flavorid) - instance_types.destroy(name) + flavors.destroy(name) self.compute.terminate_instance(self.context, instance=instance) def test_resize_revert_deleted_flavor_fails(self): @@ -6099,7 +6099,7 @@ class ComputeAPITestCase(BaseTestCase): memory_mb = 128 root_gb = 0 vcpus = 1 - instance_types.create(orig_name, memory_mb, vcpus, root_gb, 0, + flavors.create(orig_name, memory_mb, vcpus, root_gb, 0, orig_flavorid, 0, 1.0, True) instance = self._create_fake_instance(type_name=orig_name) @@ -6108,7 +6108,7 @@ class ComputeAPITestCase(BaseTestCase): self.compute.run_instance(self.context, instance=instance) old_instance_type_id = instance['instance_type_id'] - new_flavor = instance_types.get_instance_type_by_name('m1.tiny') + new_flavor = flavors.get_instance_type_by_name('m1.tiny') new_flavorid = new_flavor['flavorid'] new_instance_type_id = new_flavor['id'] self.compute_api.resize(self.context, instance, new_flavorid) @@ -6121,7 +6121,7 @@ class ComputeAPITestCase(BaseTestCase): instance = db.instance_update(self.context, instance['uuid'], {'task_state': None, 'vm_state': vm_states.RESIZED}) - instance_types.destroy(orig_name) + flavors.destroy(orig_name) self.assertRaises(exception.InstanceTypeNotFound, self.compute_api.revert_resize, self.context, instance) @@ -6169,7 +6169,7 @@ class ComputeAPITestCase(BaseTestCase): instance = self._create_fake_instance(dict(host='host2')) instance = db.instance_get_by_uuid(self.context, instance['uuid']) instance = jsonutils.to_primitive(instance) - orig_instance_type = instance_types.extract_instance_type(instance) + orig_instance_type = flavors.extract_instance_type(instance) self.compute.run_instance(self.context, instance=instance) # We need to set the host to something 'known'. Unfortunately, # the compute manager is using a cached copy of CONF.host, @@ -6730,7 +6730,7 @@ class ComputeAPITestCase(BaseTestCase): self.assertThat(bdms, matchers.DictListMatches(expected_result)) self.compute_api._update_block_device_mapping( - self.context, instance_types.get_default_instance_type(), + self.context, flavors.get_default_instance_type(), instance['uuid'], block_device_mapping) bdms = [self._parse_db_block_device_mapping(bdm_ref) for bdm_ref in db.block_device_mapping_get_all_by_instance( @@ -6789,7 +6789,7 @@ class ComputeAPITestCase(BaseTestCase): """Verify building an instance has a reservation_id that matches return value from create""" (refs, resv_id) = self.compute_api.create(self.context, - instance_types.get_default_instance_type(), None) + flavors.get_default_instance_type(), None) try: self.assertEqual(len(refs), 1) self.assertEqual(refs[0]['reservation_id'], resv_id) @@ -6802,7 +6802,7 @@ class ComputeAPITestCase(BaseTestCase): in both instances """ (refs, resv_id) = self.compute_api.create(self.context, - instance_types.get_default_instance_type(), None, + flavors.get_default_instance_type(), None, min_count=2, max_count=2) try: self.assertEqual(len(refs), 2) @@ -6816,7 +6816,7 @@ class ComputeAPITestCase(BaseTestCase): def test_multi_instance_display_name_template(self): self.flags(multi_instance_display_name_template='%(name)s') (refs, resv_id) = self.compute_api.create(self.context, - instance_types.get_default_instance_type(), None, + flavors.get_default_instance_type(), None, min_count=2, max_count=2, display_name='x') self.assertEqual(refs[0]['display_name'], 'x') self.assertEqual(refs[0]['hostname'], 'x') @@ -6825,7 +6825,7 @@ class ComputeAPITestCase(BaseTestCase): self.flags(multi_instance_display_name_template='%(name)s-%(count)s') (refs, resv_id) = self.compute_api.create(self.context, - instance_types.get_default_instance_type(), None, + flavors.get_default_instance_type(), None, min_count=2, max_count=2, display_name='x') self.assertEqual(refs[0]['display_name'], 'x-1') self.assertEqual(refs[0]['hostname'], 'x-1') @@ -6834,7 +6834,7 @@ class ComputeAPITestCase(BaseTestCase): self.flags(multi_instance_display_name_template='%(name)s-%(uuid)s') (refs, resv_id) = self.compute_api.create(self.context, - instance_types.get_default_instance_type(), None, + flavors.get_default_instance_type(), None, min_count=2, max_count=2, display_name='x') self.assertEqual(refs[0]['display_name'], 'x-%s' % refs[0]['uuid']) self.assertEqual(refs[0]['hostname'], 'x-%s' % refs[0]['uuid']) @@ -7537,7 +7537,7 @@ class ComputeAPITestCase(BaseTestCase): inst['project_id'] = self.project_id inst['host'] = 'fake_host' inst['node'] = NODENAME - type_id = instance_types.get_instance_type_by_name('m1.tiny')['id'] + type_id = flavors.get_instance_type_by_name('m1.tiny')['id'] inst['instance_type_id'] = type_id inst['ami_launch_index'] = 0 inst['memory_mb'] = 0 @@ -8046,7 +8046,7 @@ class DisabledInstanceTypesTestCase(BaseTestCase): def setUp(self): super(DisabledInstanceTypesTestCase, self).setUp() self.compute_api = compute.API() - self.inst_type = instance_types.get_default_instance_type() + self.inst_type = flavors.get_default_instance_type() def test_can_build_instance_from_visible_instance_type(self): self.inst_type['disabled'] = False @@ -8061,7 +8061,7 @@ class DisabledInstanceTypesTestCase(BaseTestCase): def test_can_resize_to_visible_instance_type(self): instance = self._create_fake_instance() orig_get_instance_type_by_flavor_id =\ - instance_types.get_instance_type_by_flavor_id + flavors.get_instance_type_by_flavor_id def fake_get_instance_type_by_flavor_id(flavor_id, ctxt=None, read_deleted="yes"): @@ -8071,7 +8071,7 @@ class DisabledInstanceTypesTestCase(BaseTestCase): instance_type['disabled'] = False return instance_type - self.stubs.Set(instance_types, 'get_instance_type_by_flavor_id', + self.stubs.Set(flavors, 'get_instance_type_by_flavor_id', fake_get_instance_type_by_flavor_id) # FIXME(sirp): for legacy this raises FlavorNotFound instead of @@ -8082,7 +8082,7 @@ class DisabledInstanceTypesTestCase(BaseTestCase): def test_cannot_resize_to_disabled_instance_type(self): instance = self._create_fake_instance() orig_get_instance_type_by_flavor_id = \ - instance_types.get_instance_type_by_flavor_id + flavors.get_instance_type_by_flavor_id def fake_get_instance_type_by_flavor_id(flavor_id, ctxt=None, read_deleted="yes"): @@ -8092,7 +8092,7 @@ class DisabledInstanceTypesTestCase(BaseTestCase): instance_type['disabled'] = True return instance_type - self.stubs.Set(instance_types, 'get_instance_type_by_flavor_id', + self.stubs.Set(flavors, 'get_instance_type_by_flavor_id', fake_get_instance_type_by_flavor_id) # FIXME(sirp): for legacy this raises FlavorNotFound instead of @@ -8386,7 +8386,7 @@ class ComputeRescheduleResizeOrReraiseTestCase(BaseTestCase): super(ComputeRescheduleResizeOrReraiseTestCase, self).setUp() self.instance = self._create_fake_instance() self.instance_uuid = self.instance['uuid'] - self.instance_type = instance_types.get_instance_type_by_name( + self.instance_type = flavors.get_instance_type_by_name( "m1.tiny") def test_reschedule_resize_or_reraise_called(self): @@ -8493,7 +8493,7 @@ class ComputeInactiveImageTestCase(BaseTestCase): def test_create_instance_with_deleted_image(self): # Make sure we can't start an instance with a deleted image. - inst_type = instance_types.get_instance_type_by_name('m1.tiny') + inst_type = flavors.get_instance_type_by_name('m1.tiny') self.assertRaises(exception.ImageNotActive, self.compute_api.create, self.context, inst_type, 'fake-image-uuid') diff --git a/nova/tests/compute/test_compute_utils.py b/nova/tests/compute/test_compute_utils.py index 05d91075c..d2bc41003 100644 --- a/nova/tests/compute/test_compute_utils.py +++ b/nova/tests/compute/test_compute_utils.py @@ -21,7 +21,7 @@ import string from oslo.config import cfg -from nova.compute import instance_types +from nova.compute import flavors from nova.compute import utils as compute_utils from nova import context from nova import db @@ -185,7 +185,7 @@ class ComputeValidateDeviceTestCase(test.TestCase): 'ephemeral_gb': 10, 'swap': 0, }) - self.stubs.Set(instance_types, 'get_instance_type', + self.stubs.Set(flavors, 'get_instance_type', lambda instance_type_id, ctxt=None: self.instance_type) device = self._validate_device() self.assertEqual(device, '/dev/xvdc') @@ -195,7 +195,7 @@ class ComputeValidateDeviceTestCase(test.TestCase): 'ephemeral_gb': 0, 'swap': 10, }) - self.stubs.Set(instance_types, 'get_instance_type', + self.stubs.Set(flavors, 'get_instance_type', lambda instance_type_id, ctxt=None: self.instance_type) device = self._validate_device() self.assertEqual(device, '/dev/xvdb') @@ -205,7 +205,7 @@ class ComputeValidateDeviceTestCase(test.TestCase): 'ephemeral_gb': 10, 'swap': 10, }) - self.stubs.Set(instance_types, 'get_instance_type', + self.stubs.Set(flavors, 'get_instance_type', lambda instance_type_id, ctxt=None: self.instance_type) device = self._validate_device() self.assertEqual(device, '/dev/xvdd') @@ -215,7 +215,7 @@ class ComputeValidateDeviceTestCase(test.TestCase): 'ephemeral_gb': 0, 'swap': 10, }) - self.stubs.Set(instance_types, 'get_instance_type', + self.stubs.Set(flavors, 'get_instance_type', lambda instance_type_id, ctxt=None: self.instance_type) device = self._validate_device() self.assertEqual(device, '/dev/xvdb') @@ -258,8 +258,8 @@ class UsageInfoTestCase(test.TestCase): def _create_instance(self, params={}): """Create a test instance.""" - instance_type = instance_types.get_instance_type_by_name('m1.tiny') - sys_meta = instance_types.save_instance_type_info({}, instance_type) + instance_type = flavors.get_instance_type_by_name('m1.tiny') + sys_meta = flavors.save_instance_type_info({}, instance_type) inst = {} inst['image_ref'] = 1 inst['reservation_id'] = 'r-fakeres' @@ -295,7 +295,7 @@ class UsageInfoTestCase(test.TestCase): self.assertEquals(payload['user_id'], self.user_id) self.assertEquals(payload['instance_id'], instance['uuid']) self.assertEquals(payload['instance_type'], 'm1.tiny') - type_id = instance_types.get_instance_type_by_name('m1.tiny')['id'] + type_id = flavors.get_instance_type_by_name('m1.tiny')['id'] self.assertEquals(str(payload['instance_type_id']), str(type_id)) for attr in ('display_name', 'created_at', 'launched_at', 'state', 'state_description', @@ -340,7 +340,7 @@ class UsageInfoTestCase(test.TestCase): self.assertEquals(payload['user_id'], self.user_id) self.assertEquals(payload['instance_id'], instance['uuid']) self.assertEquals(payload['instance_type'], 'm1.tiny') - type_id = instance_types.get_instance_type_by_name('m1.tiny')['id'] + type_id = flavors.get_instance_type_by_name('m1.tiny')['id'] self.assertEquals(str(payload['instance_type_id']), str(type_id)) for attr in ('display_name', 'created_at', 'launched_at', 'state', 'state_description', @@ -376,7 +376,7 @@ class UsageInfoTestCase(test.TestCase): self.assertEquals(payload['user_id'], self.user_id) self.assertEquals(payload['instance_id'], instance['uuid']) self.assertEquals(payload['instance_type'], 'm1.tiny') - type_id = instance_types.get_instance_type_by_name('m1.tiny')['id'] + type_id = flavors.get_instance_type_by_name('m1.tiny')['id'] self.assertEquals(str(payload['instance_type_id']), str(type_id)) for attr in ('display_name', 'created_at', 'launched_at', 'state', 'state_description', 'image_meta'): diff --git a/nova/tests/compute/test_resource_tracker.py b/nova/tests/compute/test_resource_tracker.py index 6d26174c7..43bed38ba 100644 --- a/nova/tests/compute/test_resource_tracker.py +++ b/nova/tests/compute/test_resource_tracker.py @@ -21,7 +21,7 @@ import uuid from oslo.config import cfg -from nova.compute import instance_types +from nova.compute import flavors from nova.compute import resource_tracker from nova.compute import task_states from nova.compute import vm_states @@ -153,7 +153,7 @@ class BaseTestCase(test.TestCase): def _fake_instance_system_metadata(self, instance_type, prefix=''): sys_meta = [] - for key in instance_types.system_metadata_instance_type_props.keys(): + for key in flavors.system_metadata_instance_type_props.keys(): sys_meta.append({'key': '%sinstance_type_%s' % (prefix, key), 'value': instance_type[key]}) return sys_meta diff --git a/nova/tests/conductor/test_conductor.py b/nova/tests/conductor/test_conductor.py index b3088855a..3780fc7cf 100644 --- a/nova/tests/conductor/test_conductor.py +++ b/nova/tests/conductor/test_conductor.py @@ -17,7 +17,7 @@ import mox from nova.api.ec2 import ec2utils -from nova.compute import instance_types +from nova.compute import flavors from nova.compute import utils as compute_utils from nova.compute import vm_states from nova import conductor @@ -73,7 +73,7 @@ class _BaseTestCase(object): inst['user_id'] = self.user_id inst['project_id'] = self.project_id inst['host'] = 'fake_host' - type_id = instance_types.get_instance_type_by_name(type_name)['id'] + type_id = flavors.get_instance_type_by_name(type_name)['id'] inst['instance_type_id'] = type_id inst['ami_launch_index'] = 0 inst['memory_mb'] = 0 diff --git a/nova/tests/network/test_api.py b/nova/tests/network/test_api.py index 304229b20..1e92fa286 100644 --- a/nova/tests/network/test_api.py +++ b/nova/tests/network/test_api.py @@ -22,7 +22,7 @@ import random import mox -from nova.compute import instance_types +from nova.compute import flavors from nova import context from nova import exception from nova import network @@ -81,9 +81,9 @@ class ApiTestCase(test.TestCase): self.network_api.network_rpcapi.allocate_for_instance( mox.IgnoreArg(), **kwargs).AndReturn([]) self.mox.ReplayAll() - inst_type = instance_types.get_default_instance_type() + inst_type = flavors.get_default_instance_type() inst_type['rxtx_factor'] = 0 - sys_meta = instance_types.save_instance_type_info({}, inst_type) + sys_meta = flavors.save_instance_type_info({}, inst_type) instance = dict(id='id', uuid='uuid', project_id='project_id', host='host', system_metadata=utils.dict_to_metadata(sys_meta)) self.network_api.allocate_for_instance( @@ -140,10 +140,10 @@ class ApiTestCase(test.TestCase): self._do_test_associate_floating_ip(None) def _stub_migrate_instance_calls(self, method, multi_host, info): - fake_instance_type = instance_types.get_default_instance_type() + fake_instance_type = flavors.get_default_instance_type() fake_instance_type['rxtx_factor'] = 1.21 sys_meta = utils.dict_to_metadata( - instance_types.save_instance_type_info({}, fake_instance_type)) + flavors.save_instance_type_info({}, fake_instance_type)) fake_instance = {'uuid': 'fake_uuid', 'instance_type_id': fake_instance_type['id'], 'project_id': 'fake_project_id', diff --git a/nova/tests/network/test_quantumv2.py b/nova/tests/network/test_quantumv2.py index 5922d7e1e..ec1e88d86 100644 --- a/nova/tests/network/test_quantumv2.py +++ b/nova/tests/network/test_quantumv2.py @@ -21,7 +21,7 @@ import mox from oslo.config import cfg from quantumclient.v2_0 import client -from nova.compute import instance_types +from nova.compute import flavors from nova import context from nova import exception from nova.network import model @@ -389,10 +389,10 @@ class TestQuantumv2(test.TestCase): self.moxed_client.list_extensions().AndReturn( {'extensions': [{'name': 'nvp-qos'}]}) self.mox.ReplayAll() - instance_type = instance_types.get_default_instance_type() + instance_type = flavors.get_default_instance_type() instance_type['rxtx_factor'] = 1 sys_meta = utils.dict_to_metadata( - instance_types.save_instance_type_info({}, instance_type)) + flavors.save_instance_type_info({}, instance_type)) instance = {'system_metadata': sys_meta} port_req_body = {'port': {}} api._populate_quantum_extension_values(instance, port_req_body) diff --git a/nova/tests/scheduler/fakes.py b/nova/tests/scheduler/fakes.py index 4e4ab7c37..024d37969 100644 --- a/nova/tests/scheduler/fakes.py +++ b/nova/tests/scheduler/fakes.py @@ -18,7 +18,7 @@ Fakes For Scheduler tests. import mox -from nova.compute import instance_types +from nova.compute import flavors from nova.compute import vm_states from nova import db from nova.scheduler import filter_scheduler @@ -126,7 +126,7 @@ class FakeInstance(object): inst['launch_time'] = '10' inst['user_id'] = 'fake' inst['project_id'] = 'fake' - type_id = instance_types.get_instance_type_by_name(type_name)['id'] + type_id = flavors.get_instance_type_by_name(type_name)['id'] inst['instance_type_id'] = type_id inst['ami_launch_index'] = 0 inst.update(params) diff --git a/nova/tests/scheduler/test_filter_scheduler.py b/nova/tests/scheduler/test_filter_scheduler.py index 74952aa0e..c8c04dc77 100644 --- a/nova/tests/scheduler/test_filter_scheduler.py +++ b/nova/tests/scheduler/test_filter_scheduler.py @@ -18,7 +18,7 @@ Tests For Filter Scheduler. import mox -from nova.compute import instance_types +from nova.compute import flavors from nova.compute import rpcapi as compute_rpcapi from nova.compute import utils as compute_utils from nova.compute import vm_states @@ -329,7 +329,7 @@ class FilterSchedulerTestCase(test_scheduler.SchedulerTestCase): instance = db.instance_create(self.context, {}) instance_properties = {'project_id': 'fake', 'os_type': 'Linux'} - instance_type = instance_types.get_instance_type_by_name("m1.tiny") + instance_type = flavors.get_instance_type_by_name("m1.tiny") request_spec = {'instance_properties': instance_properties, 'instance_type': instance_type} retry = {'hosts': [], 'num_attempts': 1} diff --git a/nova/tests/scheduler/test_scheduler.py b/nova/tests/scheduler/test_scheduler.py index 461b81b4b..60d45fed4 100644 --- a/nova/tests/scheduler/test_scheduler.py +++ b/nova/tests/scheduler/test_scheduler.py @@ -22,7 +22,7 @@ Tests For Scheduler import mox from nova.compute import api as compute_api -from nova.compute import instance_types +from nova.compute import flavors from nova.compute import power_state from nova.compute import rpcapi as compute_rpcapi from nova.compute import task_states @@ -435,11 +435,11 @@ class SchedulerTestCase(test.TestCase): self.assertEqual(result, ['host2']) def _live_migration_instance(self): - inst_type = instance_types.get_instance_type(1) + inst_type = flavors.get_instance_type(1) # NOTE(danms): we have _got_ to stop doing this! inst_type['memory_mb'] = 1024 sys_meta = utils.dict_to_metadata( - instance_types.save_instance_type_info({}, inst_type)) + flavors.save_instance_type_info({}, inst_type)) return {'id': 31337, 'uuid': 'fake_uuid', 'name': 'fake-instance', @@ -788,7 +788,7 @@ class SchedulerTestCase(test.TestCase): # Confirm dest is picked by scheduler if not set. self.mox.StubOutWithMock(self.driver, 'select_hosts') - self.mox.StubOutWithMock(instance_types, 'extract_instance_type') + self.mox.StubOutWithMock(flavors, 'extract_instance_type') request_spec = {'instance_properties': instance, 'instance_type': {}, @@ -799,7 +799,7 @@ class SchedulerTestCase(test.TestCase): ignore_hosts = [instance['host']] filter_properties = {'ignore_hosts': ignore_hosts} - instance_types.extract_instance_type(instance).AndReturn({}) + flavors.extract_instance_type(instance).AndReturn({}) self.driver.select_hosts(self.context, request_spec, filter_properties).AndReturn(['fake_host2']) @@ -812,7 +812,7 @@ class SchedulerTestCase(test.TestCase): instance = self._live_migration_instance() # Confirm scheduler picks target host if none given. - self.mox.StubOutWithMock(instance_types, 'extract_instance_type') + self.mox.StubOutWithMock(flavors, 'extract_instance_type') self.mox.StubOutWithMock(self.driver, '_live_migration_src_check') self.mox.StubOutWithMock(self.driver, 'select_hosts') self.mox.StubOutWithMock(self.driver, '_live_migration_common_check') @@ -831,7 +831,7 @@ class SchedulerTestCase(test.TestCase): self.driver._live_migration_src_check(self.context, instance) - instance_types.extract_instance_type( + flavors.extract_instance_type( instance).MultipleTimes().AndReturn({}) # First selected host raises exception.InvalidHypervisorType diff --git a/nova/tests/test_instance_types.py b/nova/tests/test_instance_types.py index 5c8b4be14..5afa4005f 100644 --- a/nova/tests/test_instance_types.py +++ b/nova/tests/test_instance_types.py @@ -17,7 +17,7 @@ Unit Tests for instance types code """ import time -from nova.compute import instance_types +from nova.compute import flavors from nova import context from nova import db from nova.db.sqlalchemy import models @@ -31,7 +31,7 @@ class InstanceTypeTestCase(test.TestCase): def _generate_name(self): """return a name not in the DB.""" nonexistent_flavor = str(int(time.time())) - flavors = instance_types.get_all_types() + flavors = flavors.get_all_types() while nonexistent_flavor in flavors: nonexistent_flavor += "z" else: @@ -41,7 +41,7 @@ class InstanceTypeTestCase(test.TestCase): """return a flavorid not in the DB.""" nonexistent_flavor = 2700 flavor_ids = [value["id"] for key, value in - instance_types.get_all_types().iteritems()] + flavors.get_all_types().iteritems()] while nonexistent_flavor in flavor_ids: nonexistent_flavor += 1 else: @@ -49,17 +49,17 @@ class InstanceTypeTestCase(test.TestCase): def _existing_flavor(self): """return first instance type name.""" - return instance_types.get_all_types().keys()[0] + return flavors.get_all_types().keys()[0] def test_instance_type_create(self): # Ensure instance types can be created. name = 'Instance create test' flavor_id = '512' - original_list = instance_types.get_all_types() + original_list = flavors.get_all_types() # create new type and make sure values stick - inst_type = instance_types.create(name, 256, 1, 120, + inst_type = flavors.create(name, 256, 1, 120, flavorid=flavor_id) self.assertEqual(inst_type['flavorid'], flavor_id) self.assertEqual(inst_type['name'], name) @@ -71,7 +71,7 @@ class InstanceTypeTestCase(test.TestCase): self.assertEqual(inst_type['rxtx_factor'], 1.0) # make sure new type shows up in list - new_list = instance_types.get_all_types() + new_list = flavors.get_all_types() self.assertNotEqual(len(original_list), len(new_list), 'instance type was not created') @@ -80,10 +80,10 @@ class InstanceTypeTestCase(test.TestCase): name = 'Small Flavor' flavorid = 'flavor1' - original_list = instance_types.get_all_types() + original_list = flavors.get_all_types() # create new type and make sure values stick - inst_type = instance_types.create(name, 256, 1, 120, 100, flavorid) + inst_type = flavors.create(name, 256, 1, 120, 100, flavorid) inst_type_id = inst_type['id'] self.assertEqual(inst_type['flavorid'], flavorid) self.assertEqual(inst_type['name'], name) @@ -95,21 +95,21 @@ class InstanceTypeTestCase(test.TestCase): self.assertEqual(inst_type['rxtx_factor'], 1.0) # make sure new type shows up in list - new_list = instance_types.get_all_types() + new_list = flavors.get_all_types() self.assertNotEqual(len(original_list), len(new_list), 'instance type was not created') - instance_types.destroy(name) + flavors.destroy(name) self.assertRaises(exception.InstanceTypeNotFound, - instance_types.get_instance_type, inst_type_id) + flavors.get_instance_type, inst_type_id) # deleted instance should not be in list anymoer - new_list = instance_types.get_all_types() + new_list = flavors.get_all_types() self.assertEqual(original_list, new_list) def test_instance_type_create_without_flavorid(self): name = 'Small Flavor' - inst_type = instance_types.create(name, 256, 1, 120, 100) + inst_type = flavors.create(name, 256, 1, 120, 100) self.assertNotEqual(inst_type['flavorid'], None) self.assertEqual(inst_type['name'], name) self.assertEqual(inst_type['memory_mb'], 256) @@ -123,7 +123,7 @@ class InstanceTypeTestCase(test.TestCase): # Ensure that auto-generated uuid is assigned. name = 'Empty String ID Flavor' flavorid = '' - inst_type = instance_types.create(name, 256, 1, 120, 100, flavorid) + inst_type = flavors.create(name, 256, 1, 120, 100, flavorid) self.assertEqual(len(inst_type['flavorid']), 36) self.assertEqual(inst_type['name'], name) self.assertEqual(inst_type['memory_mb'], 256) @@ -135,7 +135,7 @@ class InstanceTypeTestCase(test.TestCase): def test_instance_type_create_with_custom_rxtx_factor(self): name = 'Custom RXTX Factor' - inst_type = instance_types.create(name, 256, 1, 120, 100, + inst_type = flavors.create(name, 256, 1, 120, 100, rxtx_factor=9.9) self.assertNotEqual(inst_type['flavorid'], None) self.assertEqual(inst_type['name'], name) @@ -150,18 +150,18 @@ class InstanceTypeTestCase(test.TestCase): # Ensure instance types raises InvalidInput for invalid characters. name = "foo.bar!@#$%^-test_name" flavorid = "flavor1" - self.assertRaises(exception.InvalidInput, instance_types.create, + self.assertRaises(exception.InvalidInput, flavors.create, name, 256, 1, 120, 100, flavorid) def test_instance_type_create_with_long_flavor_name(self): # Flavor name with 255 characters or less is valid. name = 'a' * 255 - inst_type = instance_types.create(name, 64, 1, 120, flavorid=11) + inst_type = flavors.create(name, 64, 1, 120, flavorid=11) self.assertEqual(inst_type['name'], name) # Flavor name which is more than 255 characters will cause error. name = 'a' * 256 - self.assertRaises(exception.InvalidInput, instance_types.create, + self.assertRaises(exception.InvalidInput, flavors.create, name, 64, 1, 120, flavorid=11) def test_add_instance_type_access(self): @@ -169,9 +169,9 @@ class InstanceTypeTestCase(test.TestCase): project_id = 'fake' ctxt = context.RequestContext(user_id, project_id, is_admin=True) flavor_id = 'flavor1' - type_ref = instance_types.create('some flavor', 256, 1, 120, 100, + type_ref = flavors.create('some flavor', 256, 1, 120, 100, flavorid=flavor_id) - access_ref = instance_types.add_instance_type_access(flavor_id, + access_ref = flavors.add_instance_type_access(flavor_id, project_id, ctxt=ctxt) self.assertEqual(access_ref["project_id"], project_id) @@ -182,13 +182,13 @@ class InstanceTypeTestCase(test.TestCase): project_id = 'fake' ctxt = context.RequestContext(user_id, project_id, is_admin=True) flavor_id = 'flavor1' - type_ref = instance_types.create('some flavor', 256, 1, 120, 100, + type_ref = flavors.create('some flavor', 256, 1, 120, 100, flavorid=flavor_id) - access_ref = instance_types.add_instance_type_access(flavor_id, + access_ref = flavors.add_instance_type_access(flavor_id, project_id, ctxt=ctxt) self.assertRaises(exception.FlavorAccessExists, - instance_types.add_instance_type_access, + flavors.add_instance_type_access, flavor_id, project_id, ctxt) def test_add_instance_type_access_invalid_flavor(self): @@ -197,7 +197,7 @@ class InstanceTypeTestCase(test.TestCase): ctxt = context.RequestContext(user_id, project_id, is_admin=True) flavor_id = 'no_such_flavor' self.assertRaises(exception.FlavorNotFound, - instance_types.add_instance_type_access, + flavors.add_instance_type_access, flavor_id, project_id, ctxt) def test_remove_instance_type_access(self): @@ -205,13 +205,14 @@ class InstanceTypeTestCase(test.TestCase): project_id = 'fake' ctxt = context.RequestContext(user_id, project_id, is_admin=True) flavor_id = 'flavor1' - it = instance_types - type_ref = it.create('some flavor', 256, 1, 120, 100, + type_ref = flavors.create('some flavor', 256, 1, 120, 100, flavorid=flavor_id) - access_ref = it.add_instance_type_access(flavor_id, project_id, ctxt) - it.remove_instance_type_access(flavor_id, project_id, ctxt) + access_ref = flavors.add_instance_type_access(flavor_id, project_id, + ctxt) + flavors.remove_instance_type_access(flavor_id, project_id, ctxt) - projects = it.get_instance_type_access_by_flavor_id(flavor_id, ctxt) + projects = flavors.get_instance_type_access_by_flavor_id(flavor_id, + ctxt) self.assertEqual([], projects) def test_remove_instance_type_access_doesnt_exists(self): @@ -219,17 +220,17 @@ class InstanceTypeTestCase(test.TestCase): project_id = 'fake' ctxt = context.RequestContext(user_id, project_id, is_admin=True) flavor_id = 'flavor1' - type_ref = instance_types.create('some flavor', 256, 1, 120, 100, + type_ref = flavors.create('some flavor', 256, 1, 120, 100, flavorid=flavor_id) self.assertRaises(exception.FlavorAccessNotFound, - instance_types.remove_instance_type_access, + flavors.remove_instance_type_access, flavor_id, project_id, ctxt=ctxt) def test_get_all_instance_types(self): # Ensures that all instance types can be retrieved. session = sql_session.get_session() total_instance_types = session.query(models.InstanceTypes).count() - inst_types = instance_types.get_all_types() + inst_types = flavors.get_all_types() self.assertEqual(total_instance_types, len(inst_types)) def test_invalid_create_args_should_fail(self): @@ -257,78 +258,78 @@ class InstanceTypeTestCase(test.TestCase): for (args, kwargs) in invalid_sigs: self.assertRaises(exception.InvalidInput, - instance_types.create, *args, **kwargs) + flavors.create, *args, **kwargs) def test_non_existent_inst_type_shouldnt_delete(self): # Ensures that instance type creation fails with invalid args. self.assertRaises(exception.InstanceTypeNotFoundByName, - instance_types.destroy, + flavors.destroy, 'unknown_flavor') def test_duplicate_names_fail(self): # Ensures that name duplicates raise InstanceTypeCreateFailed. name = 'some_name' - instance_types.create(name, 256, 1, 120, 200, 'flavor1') + flavors.create(name, 256, 1, 120, 200, 'flavor1') self.assertRaises(exception.InstanceTypeExists, - instance_types.create, + flavors.create, name, 256, 1, 120, 200, 'flavor2') def test_duplicate_flavorids_fail(self): # Ensures that flavorid duplicates raise InstanceTypeCreateFailed. flavorid = 'flavor1' - instance_types.create('name one', 256, 1, 120, 200, flavorid) + flavors.create('name one', 256, 1, 120, 200, flavorid) self.assertRaises(exception.InstanceTypeIdExists, - instance_types.create, + flavors.create, 'name two', 256, 1, 120, 200, flavorid) def test_will_not_destroy_with_no_name(self): # Ensure destroy said path of no name raises error. self.assertRaises(exception.InstanceTypeNotFoundByName, - instance_types.destroy, None) + flavors.destroy, None) def test_will_not_get_bad_default_instance_type(self): # ensures error raised on bad default instance type. self.flags(default_instance_type='unknown_flavor') self.assertRaises(exception.InstanceTypeNotFound, - instance_types.get_default_instance_type) + flavors.get_default_instance_type) def test_will_get_instance_type_by_id(self): - default_instance_type = instance_types.get_default_instance_type() + default_instance_type = flavors.get_default_instance_type() instance_type_id = default_instance_type['id'] - fetched = instance_types.get_instance_type(instance_type_id) + fetched = flavors.get_instance_type(instance_type_id) self.assertEqual(default_instance_type, fetched) def test_will_not_get_instance_type_by_unknown_id(self): # Ensure get by name returns default flavor with no name. self.assertRaises(exception.InstanceTypeNotFound, - instance_types.get_instance_type, 10000) + flavors.get_instance_type, 10000) def test_will_not_get_instance_type_with_bad_id(self): # Ensure get by name returns default flavor with bad name. self.assertRaises(exception.InstanceTypeNotFound, - instance_types.get_instance_type, 'asdf') + flavors.get_instance_type, 'asdf') def test_instance_type_get_by_None_name_returns_default(self): # Ensure get by name returns default flavor with no name. - default = instance_types.get_default_instance_type() - actual = instance_types.get_instance_type_by_name(None) + default = flavors.get_default_instance_type() + actual = flavors.get_instance_type_by_name(None) self.assertEqual(default, actual) def test_will_not_get_instance_type_with_bad_name(self): # Ensure get by name returns default flavor with bad name. self.assertRaises(exception.InstanceTypeNotFound, - instance_types.get_instance_type_by_name, 10000) + flavors.get_instance_type_by_name, 10000) def test_will_not_get_instance_by_unknown_flavor_id(self): # Ensure get by flavor raises error with wrong flavorid. self.assertRaises(exception.FlavorNotFound, - instance_types.get_instance_type_by_flavor_id, + flavors.get_instance_type_by_flavor_id, 'unknown_flavor') def test_will_get_instance_by_flavor_id(self): - default_instance_type = instance_types.get_default_instance_type() + default_instance_type = flavors.get_default_instance_type() flavorid = default_instance_type['flavorid'] - fetched = instance_types.get_instance_type_by_flavor_id(flavorid) + fetched = flavors.get_instance_type_by_flavor_id(flavorid) self.assertEqual(default_instance_type, fetched) def test_can_read_deleted_types_using_flavor_id(self): @@ -336,15 +337,15 @@ class InstanceTypeTestCase(test.TestCase): inst_type_name = "test" inst_type_flavor_id = "test1" - inst_type = instance_types.create(inst_type_name, 256, 1, 120, 100, + inst_type = flavors.create(inst_type_name, 256, 1, 120, 100, inst_type_flavor_id) self.assertEqual(inst_type_name, inst_type["name"]) # NOTE(jk0): The deleted flavor will show up here because the context # in get_instance_type_by_flavor_id() is set to use read_deleted by # default. - instance_types.destroy(inst_type["name"]) - deleted_inst_type = instance_types.get_instance_type_by_flavor_id( + flavors.destroy(inst_type["name"]) + deleted_inst_type = flavors.get_instance_type_by_flavor_id( inst_type_flavor_id) self.assertEqual(inst_type_name, deleted_inst_type["name"]) @@ -354,11 +355,11 @@ class InstanceTypeTestCase(test.TestCase): example when creating a server and attempting to translate from flavorid to instance_type_id. """ - instance_types.create("instance_type1", 256, 1, 120, 100, "test1") - instance_types.destroy("instance_type1") - instance_types.create("instance_type1_redo", 256, 1, 120, 100, "test1") + flavors.create("instance_type1", 256, 1, 120, 100, "test1") + flavors.destroy("instance_type1") + flavors.create("instance_type1_redo", 256, 1, 120, 100, "test1") - instance_type = instance_types.get_instance_type_by_flavor_id( + instance_type = flavors.get_instance_type_by_flavor_id( "test1", read_deleted="no") self.assertEqual("instance_type1_redo", instance_type["name"]) @@ -368,15 +369,15 @@ class InstanceTypeToolsTest(test.TestCase): return [{'key': key, 'value': value} for key, value in data.items()] def _test_extract_instance_type(self, prefix): - instance_type = instance_types.get_default_instance_type() + instance_type = flavors.get_default_instance_type() metadata = {} - instance_types.save_instance_type_info(metadata, instance_type, + flavors.save_instance_type_info(metadata, instance_type, prefix) instance = {'system_metadata': self._dict_to_metadata(metadata)} - _instance_type = instance_types.extract_instance_type(instance, prefix) + _instance_type = flavors.extract_instance_type(instance, prefix) - props = instance_types.system_metadata_instance_type_props.keys() + props = flavors.system_metadata_instance_type_props.keys() for key in instance_type.keys(): if key not in props: del instance_type[key] @@ -390,29 +391,29 @@ class InstanceTypeToolsTest(test.TestCase): self._test_extract_instance_type('foo_') def test_save_instance_type_info(self): - instance_type = instance_types.get_default_instance_type() + instance_type = flavors.get_default_instance_type() example = {} example_prefix = {} - for key in instance_types.system_metadata_instance_type_props.keys(): + for key in flavors.system_metadata_instance_type_props.keys(): example['instance_type_%s' % key] = instance_type[key] example_prefix['fooinstance_type_%s' % key] = instance_type[key] metadata = {} - instance_types.save_instance_type_info(metadata, instance_type) + flavors.save_instance_type_info(metadata, instance_type) self.assertEqual(example, metadata) metadata = {} - instance_types.save_instance_type_info(metadata, instance_type, 'foo') + flavors.save_instance_type_info(metadata, instance_type, 'foo') self.assertEqual(example_prefix, metadata) def test_delete_instance_type_info(self): - instance_type = instance_types.get_default_instance_type() + instance_type = flavors.get_default_instance_type() metadata = {} - instance_types.save_instance_type_info(metadata, instance_type) - instance_types.save_instance_type_info(metadata, instance_type, '_') - instance_types.delete_instance_type_info(metadata, '', '_') + flavors.save_instance_type_info(metadata, instance_type) + flavors.save_instance_type_info(metadata, instance_type, '_') + flavors.delete_instance_type_info(metadata, '', '_') self.assertEqual(metadata, {}) diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py index a955d2f38..35b65d764 100644 --- a/nova/tests/test_libvirt.py +++ b/nova/tests/test_libvirt.py @@ -31,7 +31,7 @@ from oslo.config import cfg from xml.dom import minidom from nova.api.ec2 import cloud -from nova.compute import instance_types +from nova.compute import flavors from nova.compute import power_state from nova.compute import task_states from nova.compute import vm_mode @@ -320,7 +320,7 @@ class LibvirtConnTestCase(test.TestCase): lambda *a, **k: self.conn) instance_type = db.instance_type_get(self.context, 5) - sys_meta = instance_types.save_instance_type_info({}, instance_type) + sys_meta = flavors.save_instance_type_info({}, instance_type) nova.tests.image.fake.stub_out_image_service(self.stubs) self.test_instance = { @@ -2557,7 +2557,7 @@ class LibvirtConnTestCase(test.TestCase): instance_ref['image_ref'] = 123456 # we send an int to test sha1 call instance_type = db.instance_type_get(self.context, instance_ref['instance_type_id']) - sys_meta = instance_types.save_instance_type_info({}, instance_type) + sys_meta = flavors.save_instance_type_info({}, instance_type) instance_ref['system_metadata'] = sys_meta instance = db.instance_create(self.context, instance_ref) @@ -4724,8 +4724,8 @@ class LibvirtDriverTestCase(test.TestCase): if not params: params = {} - sys_meta = instance_types.save_instance_type_info( - {}, instance_types.get_instance_type_by_name('m1.tiny')) + sys_meta = flavors.save_instance_type_info( + {}, flavors.get_instance_type_by_name('m1.tiny')) inst = {} inst['image_ref'] = '1' @@ -4733,7 +4733,7 @@ class LibvirtDriverTestCase(test.TestCase): inst['launch_time'] = '10' inst['user_id'] = 'fake' inst['project_id'] = 'fake' - type_id = instance_types.get_instance_type_by_name('m1.tiny')['id'] + type_id = flavors.get_instance_type_by_name('m1.tiny')['id'] inst['instance_type_id'] = type_id inst['ami_launch_index'] = 0 inst['host'] = 'host1' diff --git a/nova/tests/test_libvirt_blockinfo.py b/nova/tests/test_libvirt_blockinfo.py index eef2deb50..aae5bec58 100644 --- a/nova/tests/test_libvirt_blockinfo.py +++ b/nova/tests/test_libvirt_blockinfo.py @@ -16,7 +16,7 @@ # under the License. from nova import block_device -from nova.compute import instance_types +from nova.compute import flavors from nova import context from nova import db from nova import exception @@ -34,7 +34,7 @@ class LibvirtBlockInfoTest(test.TestCase): self.project_id = 'fake' self.context = context.get_admin_context() instance_type = db.instance_type_get(self.context, 2) - sys_meta = instance_types.save_instance_type_info({}, instance_type) + sys_meta = flavors.save_instance_type_info({}, instance_type) nova.tests.image.fake.stub_out_image_service(self.stubs) self.test_instance = { 'uuid': '32dfcb37-5af1-552b-357c-be8c3aa38310', diff --git a/nova/tests/test_metadata.py b/nova/tests/test_metadata.py index 01f274f7c..86d618930 100644 --- a/nova/tests/test_metadata.py +++ b/nova/tests/test_metadata.py @@ -37,7 +37,7 @@ from nova.api.metadata import base from nova.api.metadata import handler from nova.api.metadata import password from nova import block_device -from nova.compute import instance_types +from nova.compute import flavors from nova.conductor import api as conductor_api from nova import db from nova.db.sqlalchemy import api @@ -77,8 +77,8 @@ INSTANCES = ( def get_default_sys_meta(): return utils.dict_to_metadata( - instance_types.save_instance_type_info( - {}, instance_types.get_default_instance_type())) + flavors.save_instance_type_info( + {}, flavors.get_default_instance_type())) def return_non_existing_address(*args, **kwarg): diff --git a/nova/tests/test_notifications.py b/nova/tests/test_notifications.py index 68ef540b1..0d2108557 100644 --- a/nova/tests/test_notifications.py +++ b/nova/tests/test_notifications.py @@ -21,7 +21,7 @@ import copy from oslo.config import cfg -from nova.compute import instance_types +from nova.compute import flavors from nova.compute import task_states from nova.compute import vm_states from nova import context @@ -69,8 +69,8 @@ class NotificationsTestCase(test.TestCase): self.instance = self._wrapped_create() def _wrapped_create(self, params=None): - instance_type = instance_types.get_instance_type_by_name('m1.tiny') - sys_meta = instance_types.save_instance_type_info({}, instance_type) + instance_type = flavors.get_instance_type_by_name('m1.tiny') + sys_meta = flavors.save_instance_type_info({}, instance_type) inst = {} inst['image_ref'] = 1 inst['user_id'] = self.user_id diff --git a/nova/tests/test_powervm.py b/nova/tests/test_powervm.py index 73299f23a..2a2a072b7 100644 --- a/nova/tests/test_powervm.py +++ b/nova/tests/test_powervm.py @@ -24,7 +24,7 @@ from nova import context from nova import db from nova import test -from nova.compute import instance_types +from nova.compute import flavors from nova.compute import power_state from nova.compute import task_states from nova.network import model as network_model @@ -180,7 +180,7 @@ class PowerVMDriverTestCase(test.TestCase): fake.stub_out_image_service(self.stubs) ctxt = context.get_admin_context() instance_type = db.instance_type_get(ctxt, 1) - sys_meta = instance_types.save_instance_type_info({}, instance_type) + sys_meta = flavors.save_instance_type_info({}, instance_type) return db.instance_create(ctxt, {'user_id': 'fake', 'project_id': 'fake', diff --git a/nova/tests/test_quota.py b/nova/tests/test_quota.py index 1f422748b..b585aede5 100644 --- a/nova/tests/test_quota.py +++ b/nova/tests/test_quota.py @@ -21,7 +21,7 @@ import datetime from oslo.config import cfg from nova import compute -from nova.compute import instance_types +from nova.compute import flavors from nova import context from nova import db from nova.db.sqlalchemy import api as sqa_api @@ -95,7 +95,7 @@ class QuotaIntegrationTestCase(test.TestCase): for i in range(CONF.quota_instances): instance = self._create_instance() instance_uuids.append(instance['uuid']) - inst_type = instance_types.get_instance_type_by_name('m1.small') + inst_type = flavors.get_instance_type_by_name('m1.small') image_uuid = 'cedef40a-ed67-4d10-800e-17455edce175' self.assertRaises(exception.QuotaError, compute.API().create, self.context, @@ -108,7 +108,7 @@ class QuotaIntegrationTestCase(test.TestCase): def test_too_many_cores(self): instance = self._create_instance(cores=4) - inst_type = instance_types.get_instance_type_by_name('m1.small') + inst_type = flavors.get_instance_type_by_name('m1.small') image_uuid = 'cedef40a-ed67-4d10-800e-17455edce175' self.assertRaises(exception.QuotaError, compute.API().create, self.context, @@ -146,7 +146,7 @@ class QuotaIntegrationTestCase(test.TestCase): metadata = {} for i in range(CONF.quota_metadata_items + 1): metadata['key%s' % i] = 'value%s' % i - inst_type = instance_types.get_instance_type_by_name('m1.small') + inst_type = flavors.get_instance_type_by_name('m1.small') image_uuid = 'cedef40a-ed67-4d10-800e-17455edce175' self.assertRaises(exception.QuotaError, compute.API().create, self.context, @@ -158,7 +158,7 @@ class QuotaIntegrationTestCase(test.TestCase): def _create_with_injected_files(self, files): api = compute.API() - inst_type = instance_types.get_instance_type_by_name('m1.small') + inst_type = flavors.get_instance_type_by_name('m1.small') image_uuid = 'cedef40a-ed67-4d10-800e-17455edce175' api.create(self.context, min_count=1, max_count=1, instance_type=inst_type, image_href=image_uuid, @@ -166,7 +166,7 @@ class QuotaIntegrationTestCase(test.TestCase): def test_no_injected_files(self): api = compute.API() - inst_type = instance_types.get_instance_type_by_name('m1.small') + inst_type = flavors.get_instance_type_by_name('m1.small') image_uuid = 'cedef40a-ed67-4d10-800e-17455edce175' api.create(self.context, instance_type=inst_type, diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py index 3490a5dbf..091bf4722 100644 --- a/nova/tests/test_xenapi.py +++ b/nova/tests/test_xenapi.py @@ -26,7 +26,7 @@ import re from oslo.config import cfg from nova.compute import api as compute_api -from nova.compute import instance_types +from nova.compute import flavors from nova.compute import power_state from nova.compute import task_states from nova.compute import vm_states @@ -179,7 +179,7 @@ def stub_vm_utils_with_vdi_attached_here(function, should_return=True): def create_instance_with_system_metadata(context, instance_values): instance_type = db.instance_type_get(context, instance_values['instance_type_id']) - sys_meta = instance_types.save_instance_type_info({}, + sys_meta = flavors.save_instance_type_info({}, instance_type) instance_values['system_metadata'] = sys_meta return db.instance_create(context, instance_values) @@ -1188,7 +1188,7 @@ class XenAPIVMTestCase(stubs.XenAPITestBase): def test_per_instance_usage_running(self): instance = self._create_instance(spawn=True) - instance_type = instance_types.get_instance_type(3) + instance_type = flavors.get_instance_type(3) expected = {instance['uuid']: {'memory_mb': instance_type['memory_mb'], 'uuid': instance['uuid']}} @@ -1461,7 +1461,7 @@ class XenAPIMigrateInstance(stubs.XenAPITestBase): self.assertEqual(self.fake_vm_start_called, True) def test_finish_migrate_no_local_storage(self): - tiny_type = instance_types.get_instance_type_by_name('m1.tiny') + tiny_type = flavors.get_instance_type_by_name('m1.tiny') tiny_type_id = tiny_type['id'] self.instance_values.update({'instance_type_id': tiny_type_id, 'root_gb': 0}) diff --git a/nova/tests/utils.py b/nova/tests/utils.py index e9248c7b7..3d429aada 100644 --- a/nova/tests/utils.py +++ b/nova/tests/utils.py @@ -18,7 +18,7 @@ import platform from oslo.config import cfg -from nova.compute import instance_types +from nova.compute import flavors import nova.context import nova.db from nova import exception @@ -72,7 +72,7 @@ def get_test_instance(context=None, instance_type=None): instance_type = get_test_instance_type(context) metadata = {} - instance_types.save_instance_type_info(metadata, instance_type, '') + flavors.save_instance_type_info(metadata, instance_type, '') test_instance = {'memory_kb': '2048000', 'basepath': '/some/path', |