Merge "Remove (almost) all references to 'instance_type'"

Author: Zuul

nova/api/metadata/base.py

@@ -279,8 +279,8 @@ def get_ec2_metadata(self, version):
             meta_data['public-ipv4'] = floating_ip
 
         if self._check_version('2007-08-29', version):
-            instance_type = self.instance.get_flavor()
-            meta_data['instance-type'] = instance_type['name']
+            flavor = self.instance.get_flavor()
+            meta_data['instance-type'] = flavor['name']
 
         if self._check_version('2007-12-15', version):
             meta_data['block-device-mapping'] = self.mappings

nova/api/openstack/compute/views/servers.py

@@ -547,34 +547,32 @@ def _get_image(self, request, instance):
         else:
             return ""
 
-    def _get_flavor_dict(self, request, instance_type, show_extra_specs):
+    def _get_flavor_dict(self, request, flavor, show_extra_specs):
         flavordict = {
-            "vcpus": instance_type.vcpus,
-            "ram": instance_type.memory_mb,
-            "disk": instance_type.root_gb,
-            "ephemeral": instance_type.ephemeral_gb,
-            "swap": instance_type.swap,
-            "original_name": instance_type.name
+            "vcpus": flavor.vcpus,
+            "ram": flavor.memory_mb,
+            "disk": flavor.root_gb,
+            "ephemeral": flavor.ephemeral_gb,
+            "swap": flavor.swap,
+            "original_name": flavor.name
         }
         if show_extra_specs:
-            flavordict['extra_specs'] = instance_type.extra_specs
+            flavordict['extra_specs'] = flavor.extra_specs
         return flavordict
 
     def _get_flavor(self, request, instance, show_extra_specs):
-        instance_type = instance.get_flavor()
-        if not instance_type:
-            LOG.warning("Instance has had its instance_type removed "
+        flavor = instance.get_flavor()
+        if not flavor:
+            LOG.warning("Instance has had its flavor removed "
                         "from the DB", instance=instance)
             return {}
 
         if api_version_request.is_supported(request, min_version="2.47"):
-            return self._get_flavor_dict(request, instance_type,
-                                         show_extra_specs)
+            return self._get_flavor_dict(request, flavor, show_extra_specs)
 
-        flavor_id = instance_type["flavorid"]
-        flavor_bookmark = self._flavor_builder._get_bookmark_link(request,
-                                                                  flavor_id,
-                                                                  "flavors")
+        flavor_id = flavor["flavorid"]
+        flavor_bookmark = self._flavor_builder._get_bookmark_link(
+            request, flavor_id, "flavors")
         return {
             "id": str(flavor_id),
             "links": [{

nova/compute/claims.py

@@ -57,9 +57,11 @@ class Claim(NopClaim):
     correct decisions with respect to host selection.
     """
 
-    def __init__(self, context, instance, nodename, tracker, compute_node,
-                 pci_requests, migration=None, limits=None):
-        super(Claim, self).__init__(migration=migration)
+    def __init__(
+        self, context, instance, nodename, tracker, compute_node, pci_requests,
+        migration=None, limits=None,
+    ):
+        super().__init__(migration=migration)
         # Stash a copy of the instance at the current point of time
         self.instance = instance.obj_clone()
         self.nodename = nodename
@@ -159,21 +161,24 @@ class MoveClaim(Claim):
 
     Move can be either a migrate/resize, live-migrate or an evacuate operation.
     """
-    def __init__(self, context, instance, nodename, instance_type, image_meta,
-                 tracker, compute_node, pci_requests, migration, limits=None):
+    def __init__(
+        self, context, instance, nodename, flavor, image_meta, tracker,
+        compute_node, pci_requests, migration, limits=None,
+    ):
         self.context = context
-        self.instance_type = instance_type
+        self.flavor = flavor
         if isinstance(image_meta, dict):
             image_meta = objects.ImageMeta.from_dict(image_meta)
         self.image_meta = image_meta
-        super(MoveClaim, self).__init__(context, instance, nodename, tracker,
-                                        compute_node, pci_requests,
-                                        migration=migration, limits=limits)
+
+        super().__init__(
+            context, instance, nodename, tracker, compute_node, pci_requests,
+            migration=migration, limits=limits,
+        )
 
     @property
     def numa_topology(self):
-        return hardware.numa_get_constraints(self.instance_type,
-                                             self.image_meta)
+        return hardware.numa_get_constraints(self.flavor, self.image_meta)
 
     def abort(self):
         """Compute operation requiring claimed resources has failed or
@@ -183,7 +188,7 @@ def abort(self):
         self.tracker.drop_move_claim(
             self.context,
             self.instance, self.nodename,
-            instance_type=self.instance_type)
+            flavor=self.flavor)
         self.instance.drop_migration_context()
 
     def _test_pci(self):

nova/compute/flavors.py

@@ -173,26 +173,27 @@ def extract_flavor(instance, prefix=''):
 # NOTE(danms): This method is deprecated, do not use it!
 # Use instance.{old_,new_,}flavor instead, as instances no longer
 # have flavor information in system_metadata.
-def save_flavor_info(metadata, instance_type, prefix=''):
-    """Save properties from instance_type into instance's system_metadata,
+# NOTE(stephenfin): 'prefix' is unused and could be removed
+def save_flavor_info(metadata, flavor, prefix=''):
+    """Save properties from flavor into instance's system_metadata,
     in the format of:
 
       [prefix]instance_type_[key]
 
     This can be used to update system_metadata in place from a type, as well
-    as stash information about another instance_type for later use (such as
+    as stash information about another flavor for later use (such as
     during resize).
     """
 
     for key in system_metadata_flavor_props.keys():
         to_key = '%sinstance_type_%s' % (prefix, key)
-        metadata[to_key] = instance_type[key]
+        metadata[to_key] = flavor[key]
 
     # NOTE(danms): We do NOT save all of extra_specs here, but only the
     # NUMA-related ones that we need to avoid an uglier alternative. This
     # should be replaced by a general split-out of flavor information from
     # system_metadata very soon.
-    extra_specs = instance_type.get('extra_specs', {})
+    extra_specs = flavor.get('extra_specs', {})
     for extra_prefix in system_metadata_flavor_extra_props:
         for key in extra_specs:
             if key.startswith(extra_prefix):

nova/compute/manager.py

@@ -5083,9 +5083,10 @@ def _revert_allocation(self, context, instance, migration):
                                            instance.uuid)
         return orig_alloc
 
-    def _prep_resize(self, context, image, instance, instance_type,
-                     filter_properties, node, migration, request_spec,
-                     clean_shutdown=True):
+    def _prep_resize(
+        self, context, image, instance, flavor, filter_properties, node,
+        migration, request_spec, clean_shutdown=True,
+    ):
 
         if not filter_properties:
             filter_properties = {}
@@ -5097,7 +5098,7 @@ def _prep_resize(self, context, image, instance, instance_type,
 
         same_host = instance.host == self.host
         # if the flavor IDs match, it's migrate; otherwise resize
-        if same_host and instance_type.id == instance['instance_type_id']:
+        if same_host and flavor.id == instance['instance_type_id']:
             # check driver whether support migrate to same host
             if not self.driver.capabilities.get(
                     'supports_migrate_to_same_host', False):
@@ -5108,9 +5109,9 @@ def _prep_resize(self, context, image, instance, instance_type,
                     inner_exception=exception.UnableToMigrateToSelf(
                         instance_id=instance.uuid, host=self.host))
 
-        # NOTE(danms): Stash the new instance_type to avoid having to
+        # NOTE(danms): Stash the new flavor to avoid having to
         # look it up in the database later
-        instance.new_flavor = instance_type
+        instance.new_flavor = flavor
         # NOTE(mriedem): Stash the old vm_state so we can set the
         # resized/reverted instance back to the same state later.
         vm_state = instance.vm_state
@@ -5149,14 +5150,15 @@ def _prep_resize(self, context, image, instance, instance_type,
         limits = filter_properties.get('limits', {})
         allocs = self.reportclient.get_allocations_for_consumer(
             context, instance.uuid)
-        with self.rt.resize_claim(context, instance, instance_type, node,
-                                  migration, allocs, image_meta=image,
-                                  limits=limits) as claim:
+        with self.rt.resize_claim(
+            context, instance, flavor, node, migration, allocs,
+            image_meta=image, limits=limits,
+        ) as claim:
             LOG.info('Migrating', instance=instance)
             # RPC cast to the source host to start the actual resize/migration.
             self.compute_rpcapi.resize_instance(
-                    context, instance, claim.migration, image,
-                    instance_type, request_spec, clean_shutdown)
+                context, instance, claim.migration, image,
+                flavor, request_spec, clean_shutdown)
 
     def _send_prep_resize_notifications(
             self, context, instance, phase, flavor):
@@ -5262,7 +5264,7 @@ def prep_resize(self, context, image, instance, flavor,
                     flavor)
 
     def _reschedule_resize_or_reraise(self, context, instance, exc_info,
-            instance_type, request_spec, filter_properties, host_list):
+            flavor, request_spec, filter_properties, host_list):
         """Try to re-schedule the resize or re-raise the original error to
         error out the instance.
         """
@@ -5291,7 +5293,7 @@ def _reschedule_resize_or_reraise(self, context, instance, exc_info,
                 scheduler_hint = {'filter_properties': filter_properties}
 
                 self.compute_task_api.resize_instance(
-                    context, instance, scheduler_hint, instance_type,
+                    context, instance, scheduler_hint, flavor,
                     request_spec=request_spec, host_list=host_list)
 
                 rescheduled = True
@@ -5561,9 +5563,10 @@ def resize_instance(self, context, instance, image,
             with excutils.save_and_reraise_exception():
                 self._revert_allocation(context, instance, migration)
 
-    def _resize_instance(self, context, instance, image,
-                         migration, instance_type, clean_shutdown,
-                         request_spec):
+    def _resize_instance(
+        self, context, instance, image, migration, flavor,
+        clean_shutdown, request_spec,
+    ):
         # Pass instance_state=instance.vm_state because we can resize
         # a STOPPED server and we don't want to set it back to ACTIVE
         # in case migrate_disk_and_power_off raises InstanceFaultRollback.
@@ -5592,10 +5595,10 @@ def _resize_instance(self, context, instance, image,
             timeout, retry_interval = self._get_power_off_values(
                 instance, clean_shutdown)
             disk_info = self.driver.migrate_disk_and_power_off(
-                    context, instance, migration.dest_host,
-                    instance_type, network_info,
-                    block_device_info,
-                    timeout, retry_interval)
+                context, instance, migration.dest_host,
+                flavor, network_info,
+                block_device_info,
+                timeout, retry_interval)
 
             self._terminate_volume_connections(context, instance, bdms)
 
@@ -5672,13 +5675,13 @@ def _terminate_volume_connections(self, context, instance, bdms):
                                                          connector)
 
     @staticmethod
-    def _set_instance_info(instance, instance_type):
-        instance.instance_type_id = instance_type.id
-        instance.memory_mb = instance_type.memory_mb
-        instance.vcpus = instance_type.vcpus
-        instance.root_gb = instance_type.root_gb
-        instance.ephemeral_gb = instance_type.ephemeral_gb
-        instance.flavor = instance_type
+    def _set_instance_info(instance, flavor):
+        instance.instance_type_id = flavor.id
+        instance.memory_mb = flavor.memory_mb
+        instance.vcpus = flavor.vcpus
+        instance.root_gb = flavor.root_gb
+        instance.ephemeral_gb = flavor.ephemeral_gb
+        instance.flavor = flavor
 
     def _update_volume_attachments(self, context, instance, bdms):
         """Updates volume attachments using the virt driver host connector.
@@ -9160,7 +9163,7 @@ def drop_move_claim_at_destination(self, context, instance):
         LOG.debug('Dropping live migration resource claim on destination '
                   'node %s', nodename, instance=instance)
         self.rt.drop_move_claim(
-            context, instance, nodename, instance_type=instance.flavor)
+            context, instance, nodename, flavor=instance.flavor)
 
     @wrap_exception()
     @wrap_instance_event(prefix='compute')