Merge "Remove deprecated 'default_flavor' config option"

Author: Zuul

nova/compute/flavors.py

@@ -125,23 +125,6 @@ def create(name, memory, vcpus, root_gb, ephemeral_gb=0, flavorid=None,
     return flavor
 
 
-def get_default_flavor():
-    """Get the default flavor."""
-    name = CONF.default_flavor
-    return get_flavor_by_name(name)
-
-
-def get_flavor_by_name(name, ctxt=None):
-    """Retrieves single flavor by name."""
-    if name is None:
-        return get_default_flavor()
-
-    if ctxt is None:
-        ctxt = context.get_admin_context()
-
-    return objects.Flavor.get_by_name(ctxt, name)
-
-
 # TODO(termie): flavor-specific code should probably be in the API that uses
 #               flavors.
 def get_flavor_by_flavor_id(flavorid, ctxt=None, read_deleted="yes"):

nova/conf/__init__.py

@@ -33,7 +33,6 @@
 from nova.conf import database
 from nova.conf import devices
 from nova.conf import ephemeral_storage
-from nova.conf import flavors
 from nova.conf import glance
 from nova.conf import guestfs
 from nova.conf import hyperv
@@ -88,7 +87,6 @@
 database.register_opts(CONF)
 devices.register_opts(CONF)
 ephemeral_storage.register_opts(CONF)
-flavors.register_opts(CONF)
 glance.register_opts(CONF)
 guestfs.register_opts(CONF)
 hyperv.register_opts(CONF)

nova/conf/flavors.py

@@ -21,9 +21,9 @@
 
 from nova.api.openstack import compute
 from nova.compute import api as compute_api
-from nova.compute import flavors
 from nova import context as nova_context
 from nova import exception
+from nova import objects
 from nova import test
 from nova.tests.unit.api.openstack import fakes
 from nova.tests.unit import fake_instance
@@ -83,7 +83,8 @@ def fake_instance_create(context, inst_, session=None):
                     'vm_state': '',
                     'auto_disk_config': inst_['auto_disk_config'],
                     'security_groups': inst_['security_groups'],
-                    'instance_type': flavors.get_default_flavor(),
+                    'instance_type': objects.Flavor.get_by_name(context,
+                                                                'm1.small'),
                     })
 
             return inst

nova/tests/unit/api/openstack/compute/test_disk_config.py

@@ -487,7 +487,8 @@ def stub_instance(id=1, user_id=None, project_id=None, host=None,
     info_cache = create_info_cache(nw_cache)
 
     if instance_type is None:
-        instance_type = flavors.get_default_flavor()
+        instance_type = objects.Flavor.get_by_name(
+            context.get_admin_context(), 'm1.small')
     flavorinfo = jsonutils.dumps({
         'cur': instance_type.obj_to_primitive(),
         'old': None,

nova/tests/unit/api/openstack/fakes.py

@@ -176,7 +176,7 @@ def test_create_instance_over_quota_during_recheck(
                                   headroom=fake_headroom, usages=fake_usages)
         check_deltas_mock.side_effect = [None, exc]
 
-        inst_type = flavors.get_default_flavor()
+        inst_type = objects.Flavor.get_by_name(self.context, 'm1.small')
         # Try to create 3 instances.
         self.assertRaises(exception.QuotaError, self.compute_api.create,
             self.context, inst_type, self.fake_image['id'], min_count=3)
@@ -220,7 +220,7 @@ def test_create_instance_no_quota_recheck(
         # Disable recheck_quota.
         self.flags(recheck_quota=False, group='quota')
 
-        inst_type = flavors.get_default_flavor()
+        inst_type = objects.Flavor.get_by_name(self.context, 'm1.small')
         (refs, resv_id) = self.compute_api.create(self.context,
                                                   inst_type,
                                                   self.fake_image['id'])
@@ -550,7 +550,7 @@ def _fake_validate_cell(*args, **kwargs):
 
     def _create_fake_instance_obj(self, params=None, type_name='m1.tiny',
                                   services=False, context=None):
-        flavor = flavors.get_flavor_by_name(type_name)
+        flavor = objects.Flavor.get_by_name(self.context, type_name)
         inst = objects.Instance(context=context or self.context)
         inst.cell_name = 'api!child'
         inst.vm_state = vm_states.ACTIVE

nova/tests/unit/compute/test_compute.py

@@ -27,7 +27,6 @@
 from oslo_utils import uuidutils
 import six
 
-from nova.compute import flavors
 from nova.compute import manager
 from nova.compute import power_state
 from nova.compute import task_states
@@ -60,7 +59,7 @@
 
 def create_instance(context, user_id='fake', project_id='fake', params=None):
     """Create a test instance."""
-    flavor = flavors.get_flavor_by_name('m1.tiny')
+    flavor = objects.Flavor.get_by_name(context, 'm1.tiny')
     net_info = model.NetworkInfo([])
     info_cache = objects.InstanceInfoCache(network_info=net_info)
     inst = objects.Instance(context=context,
@@ -410,6 +409,7 @@ def fake_get_nw_info(cls, ctxt, instance):
         self.user_id = 'fake'
         self.project_id = 'fake'
         self.context = context.RequestContext(self.user_id, self.project_id)
+        self.flavor = objects.Flavor.get_by_name(self.context, 'm1.tiny')
 
         def fake_show(meh, context, id, **kwargs):
             return {'id': 1, 'properties': {'kernel_id': 1, 'ramdisk_id': 1}}
@@ -440,9 +440,9 @@ def test_notify_usage_exists(self):
         self.assertEqual(payload['user_id'], self.user_id)
         self.assertEqual(payload['instance_id'], instance['uuid'])
         self.assertEqual(payload['instance_type'], 'm1.tiny')
-        type_id = flavors.get_flavor_by_name('m1.tiny')['id']
+        type_id = self.flavor.id
         self.assertEqual(str(payload['instance_type_id']), str(type_id))
-        flavor_id = flavors.get_flavor_by_name('m1.tiny')['flavorid']
+        flavor_id = self.flavor.flavorid
         self.assertEqual(str(payload['instance_flavor_id']), str(flavor_id))
         for attr in ('display_name', 'created_at', 'launched_at',
                      'state', 'state_description',
@@ -473,7 +473,7 @@ def test_notify_usage_exists_emits_versioned(self):
         self.assertEqual(payload['uuid'], instance['uuid'])
         flavor = payload['flavor']['nova_object.data']
         self.assertEqual(flavor['name'], 'm1.tiny')
-        flavorid = flavors.get_flavor_by_name('m1.tiny')['flavorid']
+        flavorid = self.flavor.flavorid
         self.assertEqual(str(flavor['flavorid']), str(flavorid))
 
         for attr in ('display_name', 'created_at', 'launched_at',
@@ -504,9 +504,9 @@ def test_notify_usage_exists_deleted_instance(self):
         self.assertEqual(payload['user_id'], self.user_id)
         self.assertEqual(payload['instance_id'], instance['uuid'])
         self.assertEqual(payload['instance_type'], 'm1.tiny')
-        type_id = flavors.get_flavor_by_name('m1.tiny')['id']
+        type_id = self.flavor.id
         self.assertEqual(str(payload['instance_type_id']), str(type_id))
-        flavor_id = flavors.get_flavor_by_name('m1.tiny')['flavorid']
+        flavor_id = self.flavor.flavorid
         self.assertEqual(str(payload['instance_flavor_id']), str(flavor_id))
         for attr in ('display_name', 'created_at', 'launched_at',
                      'state', 'state_description',
@@ -552,9 +552,9 @@ def test_notify_about_instance_action(self):
         self.assertEqual(payload['user_id'], self.user_id)
         self.assertEqual(payload['uuid'], instance['uuid'])
 
-        flavorid = flavors.get_flavor_by_name('m1.tiny')['flavorid']
-        flavor = payload['flavor']['nova_object.data']
-        self.assertEqual(str(flavor['flavorid']), flavorid)
+        self.assertEqual(
+            self.flavor.flavorid,
+            str(payload['flavor']['nova_object.data']['flavorid']))
 
         for attr in ('display_name', 'created_at', 'launched_at',
                      'state', 'task_state', 'display_description', 'locked',
@@ -598,7 +598,7 @@ def test_notify_about_instance_create(self):
         self.assertEqual('fake', payload['user_id'])
         self.assertEqual(instance['uuid'], payload['uuid'])
 
-        flavorid = flavors.get_flavor_by_name('m1.tiny')['flavorid']
+        flavorid = self.flavor.flavorid
         flavor = payload['flavor']['nova_object.data']
         self.assertEqual(flavorid, str(flavor['flavorid']))
 
@@ -641,9 +641,9 @@ def test_notify_about_instance_create_without_keypair(self):
         self.assertEqual('fake', payload['user_id'])
         self.assertEqual(instance['uuid'], payload['uuid'])
 
-        flavorid = flavors.get_flavor_by_name('m1.tiny')['flavorid']
-        flavor = payload['flavor']['nova_object.data']
-        self.assertEqual(flavorid, str(flavor['flavorid']))
+        self.assertEqual(
+            self.flavor.flavorid,
+            str(payload['flavor']['nova_object.data']['flavorid']))
 
         self.assertEqual(0, len(payload['keypairs']))
         for attr in ('display_name', 'created_at', 'launched_at',
@@ -680,9 +680,9 @@ def test_notify_about_instance_create_with_tags(self):
         self.assertEqual('fake', payload['user_id'])
         self.assertEqual(instance.uuid, payload['uuid'])
 
-        flavorid = flavors.get_flavor_by_name('m1.tiny')['flavorid']
-        flavor = payload['flavor']['nova_object.data']
-        self.assertEqual(flavorid, str(flavor['flavorid']))
+        self.assertEqual(
+            self.flavor.flavorid,
+            str(payload['flavor']['nova_object.data']['flavorid']))
 
         self.assertEqual(0, len(payload['keypairs']))
         for attr in ('display_name', 'created_at', 'launched_at',
@@ -718,9 +718,9 @@ def test_notify_about_volume_swap(self):
         self.assertEqual(self.user_id, payload['user_id'])
         self.assertEqual(instance['uuid'], payload['uuid'])
 
-        flavorid = flavors.get_flavor_by_name('m1.tiny')['flavorid']
-        flavor = payload['flavor']['nova_object.data']
-        self.assertEqual(flavorid, str(flavor['flavorid']))
+        self.assertEqual(
+            self.flavor.flavorid,
+            str(payload['flavor']['nova_object.data']['flavorid']))
 
         for attr in ('display_name', 'created_at', 'launched_at',
                      'state', 'task_state'):
@@ -760,9 +760,9 @@ def test_notify_about_volume_swap_with_error(self):
         self.assertEqual(self.user_id, payload['user_id'])
         self.assertEqual(instance['uuid'], payload['uuid'])
 
-        flavorid = flavors.get_flavor_by_name('m1.tiny')['flavorid']
-        flavor = payload['flavor']['nova_object.data']
-        self.assertEqual(flavorid, str(flavor['flavorid']))
+        self.assertEqual(
+            self.flavor.flavorid,
+            str(payload['flavor']['nova_object.data']['flavorid']))
 
         for attr in ('display_name', 'created_at', 'launched_at',
                      'state', 'task_state'):
@@ -808,9 +808,9 @@ def test_notify_about_instance_rescue_action(self):
         self.assertEqual(payload['user_id'], self.user_id)
         self.assertEqual(payload['uuid'], instance['uuid'])
 
-        flavorid = flavors.get_flavor_by_name('m1.tiny')['flavorid']
-        flavor = payload['flavor']['nova_object.data']
-        self.assertEqual(str(flavor['flavorid']), flavorid)
+        self.assertEqual(
+            self.flavor.flavorid,
+            str(payload['flavor']['nova_object.data']['flavorid']))
 
         for attr in ('display_name', 'created_at', 'launched_at',
                      'state', 'task_state', 'display_description', 'locked',
@@ -823,7 +823,7 @@ def test_notify_about_instance_rescue_action(self):
     def test_notify_about_resize_prep_instance(self):
         instance = create_instance(self.context)
 
-        new_flavor = flavors.get_flavor_by_name('m1.small')
+        new_flavor = objects.Flavor.get_by_name(self.context, 'm1.small')
 
         compute_utils.notify_about_resize_prep_instance(
             self.context, instance, 'fake-compute', 'start', new_flavor)
@@ -842,9 +842,9 @@ def test_notify_about_resize_prep_instance(self):
         self.assertEqual(payload['user_id'], self.user_id)
         self.assertEqual(payload['uuid'], instance['uuid'])
 
-        flavorid = flavors.get_flavor_by_name('m1.tiny')['flavorid']
-        flavor = payload['flavor']['nova_object.data']
-        self.assertEqual(str(flavor['flavorid']), flavorid)
+        self.assertEqual(
+            self.flavor.flavorid,
+            str(payload['flavor']['nova_object.data']['flavorid']))
 
         for attr in ('display_name', 'created_at', 'launched_at',
                      'state', 'task_state', 'display_description', 'locked',
@@ -869,10 +869,10 @@ def test_notify_usage_exists_instance_not_found(self):
         self.assertEqual(payload['user_id'], self.user_id)
         self.assertEqual(payload['instance_id'], instance['uuid'])
         self.assertEqual(payload['instance_type'], 'm1.tiny')
-        type_id = flavors.get_flavor_by_name('m1.tiny')['id']
-        self.assertEqual(str(payload['instance_type_id']), str(type_id))
-        flavor_id = flavors.get_flavor_by_name('m1.tiny')['flavorid']
-        self.assertEqual(str(payload['instance_flavor_id']), str(flavor_id))
+        self.assertEqual(str(self.flavor.id),
+                         str(payload['instance_type_id']))
+        self.assertEqual(str(self.flavor.flavorid),
+                         str(payload['instance_flavor_id']))
         for attr in ('display_name', 'created_at', 'launched_at',
                      'state', 'state_description',
                      'bandwidth', 'audit_period_beginning',
@@ -943,10 +943,9 @@ def test_notify_about_instance_usage(self):
         self.assertEqual(payload['user_id'], self.user_id)
         self.assertEqual(payload['instance_id'], instance['uuid'])
         self.assertEqual(payload['instance_type'], 'm1.tiny')
-        type_id = flavors.get_flavor_by_name('m1.tiny')['id']
-        self.assertEqual(str(payload['instance_type_id']), str(type_id))
-        flavor_id = flavors.get_flavor_by_name('m1.tiny')['flavorid']
-        self.assertEqual(str(payload['instance_flavor_id']), str(flavor_id))
+        self.assertEqual(str(self.flavor.id), str(payload['instance_type_id']))
+        self.assertEqual(str(self.flavor.flavorid),
+                         str(payload['instance_flavor_id']))
         for attr in ('display_name', 'created_at', 'launched_at',
                      'state', 'state_description', 'image_meta'):
             self.assertIn(attr, payload, "Key %s not in payload" % attr)
@@ -1299,8 +1298,8 @@ def setUp(self):
         self.context = context.RequestContext('fake', 'fake')
 
     def test_upsize_quota_delta(self):
-        old_flavor = flavors.get_flavor_by_name('m1.tiny')
-        new_flavor = flavors.get_flavor_by_name('m1.medium')
+        old_flavor = objects.Flavor.get_by_name(self.context, 'm1.tiny')
+        new_flavor = objects.Flavor.get_by_name(self.context, 'm1.medium')
 
         expected_deltas = {
             'cores': new_flavor['vcpus'] - old_flavor['vcpus'],