Add request_spec to server move RPC calls

To be able to fill the allocation key in the port binding:profile during
the move operations the nova-compute needs to get the RequestSpec object
to have access to the port - resource provider mapping calculated in the
conductor.

This patch bumps the compute RPC api version and adds a new request_spec
parameter to multiple calls. Also it makes sure that the request_spec is
passed by the sender.

Change-Id: If1f465112b8e9b0304b8b5b864b985f72168d839
blueprint: support-move-ops-with-qos-ports

Author: Balazs Gibizer

nova/compute/api.py

@@ -3456,7 +3456,8 @@ def revert_resize(self, context, instance):
         # by compute.
         self.compute_rpcapi.revert_resize(context, instance,
                                           migration,
-                                          migration.dest_compute)
+                                          migration.dest_compute,
+                                          reqspec)
 
     @check_instance_lock
     @check_instance_state(vm_state=[vm_states.RESIZED])

nova/compute/manager.py

@@ -519,7 +519,7 @@ def update_compute_provider_status(self, context, rp_uuid, enabled):
 class ComputeManager(manager.Manager):
     """Manages the running instances from creation to destruction."""
 
-    target = messaging.Target(version='5.1')
+    target = messaging.Target(version='5.2')
 
     def __init__(self, compute_driver=None, *args, **kwargs):
         """Load configuration options and connect to the hypervisor."""
@@ -4148,7 +4148,7 @@ def _delete_allocation_after_move(self, context, instance, migration):
     @wrap_instance_event(prefix='compute')
     @errors_out_migration
     @wrap_instance_fault
-    def revert_resize(self, context, instance, migration):
+    def revert_resize(self, context, instance, migration, request_spec=None):
         """Destroys the new instance on the destination machine.
 
         Reverts the model changes, and powers on the old instance on the
@@ -4201,7 +4201,7 @@ def revert_resize(self, context, instance, migration):
 
             # RPC cast back to the source host to finish the revert there.
             self.compute_rpcapi.finish_revert_resize(context, instance,
-                    migration, migration.source_compute)
+                    migration, migration.source_compute, request_spec)
 
     def _finish_revert_resize_network_migrate_finish(self, context, instance,
                                                      migration):
@@ -4251,7 +4251,8 @@ def _finish_revert_resize_network_migrate_finish(self, context, instance,
     @wrap_instance_event(prefix='compute')
     @errors_out_migration
     @wrap_instance_fault
-    def finish_revert_resize(self, context, instance, migration):
+    def finish_revert_resize(
+            self, context, instance, migration, request_spec=None):
         """Finishes the second half of reverting a resize on the source host.
 
         Bring the original source instance state back (active/shutoff) and
@@ -4383,7 +4384,8 @@ def _revert_allocation(self, context, instance, migration):
         return True
 
     def _prep_resize(self, context, image, instance, instance_type,
-                     filter_properties, node, migration, clean_shutdown=True):
+                     filter_properties, node, migration, request_spec,
+                     clean_shutdown=True):
 
         if not filter_properties:
             filter_properties = {}
@@ -4424,7 +4426,7 @@ def _prep_resize(self, context, image, instance, instance_type,
             # RPC cast to the source host to start the actual resize/migration.
             self.compute_rpcapi.resize_instance(
                     context, instance, claim.migration, image,
-                    instance_type, clean_shutdown)
+                    instance_type, request_spec, clean_shutdown)
 
     def _send_prep_resize_notifications(
             self, context, instance, phase, flavor):
@@ -4491,7 +4493,8 @@ def prep_resize(self, context, image, instance, instance_type,
             try:
                 self._prep_resize(context, image, instance,
                                   instance_type, filter_properties,
-                                  node, migration, clean_shutdown)
+                                  node, migration, request_spec,
+                                  clean_shutdown)
             except Exception:
                 # Since we hit a failure, we're either rescheduling or dead
                 # and either way we need to cleanup any allocations created
@@ -4583,21 +4586,23 @@ def _reschedule_resize_or_reraise(self, context, instance, exc_info,
     @wrap_instance_event(prefix='compute')
     @wrap_instance_fault
     def resize_instance(self, context, instance, image,
-                        migration, instance_type, clean_shutdown):
+                        migration, instance_type, clean_shutdown,
+                        request_spec=None):
         """Starts the migration of a running instance to another host.
 
         This is initiated from the destination host's ``prep_resize`` routine
         and runs on the source host.
         """
         try:
             self._resize_instance(context, instance, image, migration,
-                                  instance_type, clean_shutdown)
+                                  instance_type, clean_shutdown, request_spec)
         except Exception:
             with excutils.save_and_reraise_exception():
                 self._revert_allocation(context, instance, migration)
 
     def _resize_instance(self, context, instance, image,
-                         migration, instance_type, clean_shutdown):
+                         migration, instance_type, clean_shutdown,
+                         request_spec):
         with self._error_out_instance_on_exception(context, instance), \
              errors_out_migration_ctxt(migration):
             network_info = self.network_api.get_instance_nw_info(context,
@@ -4643,7 +4648,8 @@ def _resize_instance(self, context, instance, image,
 
             # RPC cast to the destination host to finish the resize/migration.
             self.compute_rpcapi.finish_resize(context, instance,
-                    migration, image, disk_info, migration.dest_compute)
+                migration, image, disk_info, migration.dest_compute,
+                request_spec)
 
         self._send_resize_instance_notifications(
             context, instance, bdms, network_info,
@@ -4835,7 +4841,7 @@ def _finish_resize(self, context, instance, migration, disk_info,
     @errors_out_migration
     @wrap_instance_fault
     def finish_resize(self, context, disk_info, image, instance,
-                      migration):
+                      migration, request_spec=None):
         """Completes the migration process.
 
         Sets up the newly transferred disk and turns on the instance at its
@@ -5353,7 +5359,7 @@ def _shelve_offload_instance(self, context, instance, clean_shutdown,
     @wrap_instance_event(prefix='compute')
     @wrap_instance_fault
     def unshelve_instance(self, context, instance, image,
-                          filter_properties, node):
+                          filter_properties, node, request_spec=None):
         """Unshelve the instance.
 
         :param context: request context
@@ -5362,6 +5368,8 @@ def unshelve_instance(self, context, instance, image,
             volume backed instance.
         :param filter_properties: dict containing limits, retry info etc.
         :param node: target compute node
+        :param request_spec: the RequestSpec object used to schedule the
+            instance
         """
         if filter_properties is None:
             filter_properties = {}

nova/compute/rpcapi.py

@@ -364,6 +364,9 @@ class ComputeAPI(object):
         * 5.0 - Remove 4.x compatibility
         * 5.1 - Make prep_resize() take a RequestSpec object rather than a
                 legacy dict.
+        * 5.2 - Add request_spec parameter for the following: resize_instance,
+                finish_resize, revert_resize, finish_revert_resize,
+                unshelve_instance
     '''
 
     VERSION_ALIASES = {
@@ -596,22 +599,45 @@ def detach_volume(self, ctxt, instance, volume_id, attachment_id=None):
                    instance=instance, volume_id=volume_id,
                    attachment_id=attachment_id)
 
-    def finish_resize(self, ctxt, instance, migration, image, disk_info, host):
+    def finish_resize(self, ctxt, instance, migration, image, disk_info, host,
+                      request_spec):
+        msg_args = {
+            'instance': instance,
+            'migration': migration,
+            'image': image,
+            'disk_info': disk_info,
+            'request_spec': request_spec,
+        }
+
         client = self.router.client(ctxt)
-        version = '5.0'
+        version = '5.2'
+
+        if not client.can_send_version(version):
+            msg_args.pop('request_spec')
+            version = '5.0'
+
         cctxt = client.prepare(
                 server=host, version=version)
-        cctxt.cast(ctxt, 'finish_resize',
-                   instance=instance, migration=migration,
-                   image=image, disk_info=disk_info)
+        cctxt.cast(ctxt, 'finish_resize', **msg_args)
+
+    def finish_revert_resize(self, ctxt, instance, migration, host,
+                             request_spec):
+        msg_args = {
+            'instance': instance,
+            'migration': migration,
+            'request_spec': request_spec,
+        }
 
-    def finish_revert_resize(self, ctxt, instance, migration, host):
         client = self.router.client(ctxt)
-        version = '5.0'
+        version = '5.2'
+
+        if not client.can_send_version(version):
+            msg_args.pop('request_spec')
+            version = '5.0'
+
         cctxt = client.prepare(
                 server=host, version=version)
-        cctxt.cast(ctxt, 'finish_revert_resize',
-                   instance=instance, migration=migration)
+        cctxt.cast(ctxt, 'finish_revert_resize', **msg_args)
 
     def get_console_output(self, ctxt, instance, tail_length):
         version = '5.0'
@@ -882,14 +908,20 @@ def reset_network(self, ctxt, instance):
         cctxt.cast(ctxt, 'reset_network', instance=instance)
 
     def resize_instance(self, ctxt, instance, migration, image, instance_type,
-                        clean_shutdown=True):
+                        request_spec, clean_shutdown=True):
         msg_args = {'instance': instance, 'migration': migration,
                     'image': image,
                     'instance_type': instance_type,
                     'clean_shutdown': clean_shutdown,
+                    'request_spec': request_spec,
         }
-        version = '5.0'
+        version = '5.2'
         client = self.router.client(ctxt)
+
+        if not client.can_send_version(version):
+            msg_args.pop('request_spec')
+            version = '5.0'
+
         cctxt = client.prepare(server=_compute_host(None, instance),
                 version=version)
         cctxt.cast(ctxt, 'resize_instance', **msg_args)
@@ -900,13 +932,24 @@ def resume_instance(self, ctxt, instance):
                 server=_compute_host(None, instance), version=version)
         cctxt.cast(ctxt, 'resume_instance', instance=instance)
 
-    def revert_resize(self, ctxt, instance, migration, host):
+    def revert_resize(self, ctxt, instance, migration, host, request_spec):
+
+        msg_args = {
+            'instance': instance,
+            'migration': migration,
+            'request_spec': request_spec,
+        }
+
         client = self.router.client(ctxt)
-        version = '5.0'
+        version = '5.2'
+
+        if not client.can_send_version(version):
+            msg_args.pop('request_spec')
+            version = '5.0'
+
         cctxt = client.prepare(
                 server=_compute_host(host, instance), version=version)
-        cctxt.cast(ctxt, 'revert_resize',
-                   instance=instance, migration=migration)
+        cctxt.cast(ctxt, 'revert_resize', **msg_args)
 
     def rollback_live_migration_at_destination(self, ctxt, instance, host,
                                                destroy_disks,
@@ -1052,16 +1095,24 @@ def shelve_offload_instance(self, ctxt, instance,
         cctxt.cast(ctxt, 'shelve_offload_instance', instance=instance,
                    clean_shutdown=clean_shutdown)
 
-    def unshelve_instance(self, ctxt, instance, host, image=None,
+    def unshelve_instance(self, ctxt, instance, host, request_spec, image=None,
                           filter_properties=None, node=None):
-        version = '5.0'
+        version = '5.2'
         msg_kwargs = {
             'instance': instance,
             'image': image,
             'filter_properties': filter_properties,
             'node': node,
+            'request_spec': request_spec,
         }
-        cctxt = self.router.client(ctxt).prepare(
+
+        client = self.router.client(ctxt)
+
+        if not client.can_send_version(version):
+            msg_kwargs.pop('request_spec')
+            version = '5.0'
+
+        cctxt = client.prepare(
                 server=host, version=version)
         cctxt.cast(ctxt, 'unshelve_instance', **msg_kwargs)
 

nova/conductor/manager.py

@@ -902,8 +902,8 @@ def safe_image_show(ctx, image_id):
                         availability_zones.get_host_availability_zone(
                             context, host))
                     self.compute_rpcapi.unshelve_instance(
-                            context, instance, host, image=image,
-                            filter_properties=filter_properties, node=node)
+                        context, instance, host, request_spec, image=image,
+                        filter_properties=filter_properties, node=node)
             except (exception.NoValidHost,
                     exception.UnsupportedPolicyException):
                 instance.task_state = None

nova/objects/service.py

@@ -31,7 +31,7 @@
 
 
 # NOTE(danms): This is the global service version counter
-SERVICE_VERSION = 38
+SERVICE_VERSION = 39
 
 
 # NOTE(danms): This is our SERVICE_VERSION history. The idea is that any
@@ -153,6 +153,9 @@
     {'compute_rpc': '5.1'},
     # Version 38: set_host_enabled reflects COMPUTE_STATUS_DISABLED trait
     {'compute_rpc': '5.1'},
+    # Version 39: resize_instance, finish_resize, revert_resize,
+    # finish_revert_resize, unshelve_instance takes a RequestSpec object
+    {'compute_rpc': '5.2'},
 )