Bump the Compute RPC API to version 6.0

Even if we want to bump the compute rpc api to a new major version, we still
need to support 5.x for the rolling upgrade case.

Adding a proxy that will handle those old RPC calls/casts so we could easily
cut it in a later change in the next X release timeframe (as we won't longer
support Victoria 5.x calls)

On the client side, we're making sure that we can still support v5.x methods
until the next X release (as operators could pin on 5.0 version for Victoria
compute nodes)

NOTE(sbauza): Now that the compute service only supports the 6.0
version, we could remove all the unnecessary verifications in both the
manager but also the functional and unittests. That being said, given
the patch would be large, I think it's better to just amend the needed
modifications for supporting 6.0 and delete the above in later changes.
For example, the NUMA live migration functests verify a lot of RPC API
compatibities in betwen 5.2, 5.3 and later. We need to stop verifying
this but let's do this in later changes, please.

Change-Id: Id2e467c43d5b7c6bafd5dbbbf8d5d06be6dc7e30

Author: sbauza

nova/compute/manager.py

@@ -31,7 +31,7 @@
 
 
 # NOTE(danms): This is the global service version counter
-SERVICE_VERSION = 55
+SERVICE_VERSION = 56
 
 
 # NOTE(danms): This is our SERVICE_VERSION history. The idea is that any
@@ -197,6 +197,8 @@
     # Version 55: Compute RPC v5.13:
     # Add support for qos interface attach
     {'compute_rpc': '5.13'},
+    # Version 56: Compute RPC v6.0:
+    {'compute_rpc': '6.0'},
 )
 
 # This is used to raise an error at service startup if older than N-1 computes

nova/compute/rpcapi.py

@@ -86,7 +86,7 @@ def __init__(self, version):
     @property
     def router(self):
         with lockutils.lock('compute-rpcapi-router'):
-            target = messaging.Target(topic='compute', version='5.0')
+            target = messaging.Target(topic='compute', version='6.0')
             version_cap = self.version
             serializer = objects_base.NovaObjectSerializer()
             rpc.get_client(target, version_cap, serializer)

nova/objects/service.py

@@ -479,9 +479,21 @@ def _test(self, pin_source, pin_cond, expect_success=True):
         if pin_source:
             src_mgr.compute_rpcapi = integrated_helpers.StubComputeRPCAPI(
                 '5.2')
+        else:
+            # Since we upgraded the RPC API to 6.0, we somehow need to pin the
+            # compute service here to 5.max to verify the legacy behaviours.
+            # TODO(sbauza): Remove this cruft
+            src_mgr.compute_rpcapi = integrated_helpers.StubComputeRPCAPI(
+                '5.13')
         if pin_cond:
             cond_mgr.compute_rpcapi = integrated_helpers.StubComputeRPCAPI(
                 '5.2')
+        else:
+            # Since we upgraded the RPC API to 6.0, we somehow need to pin the
+            # compute service here to 5.max to verify the legacy behaviours.
+            # TODO(sbauza): Remove this cruft
+            cond_mgr.compute_rpcapi = integrated_helpers.StubComputeRPCAPI(
+                '5.13')
 
         self.assertEqual(
             not pin_source,

nova/tests/functional/integrated_helpers.py

@@ -80,6 +80,6 @@ def _test(mock_spawn, mock_grt, mock_notify, mock_cinoh, mock_can):
                 filter_properties)
             self.compute.manager.build_and_run_instance(
                     self.context, instance, {}, request_spec,
-                    filter_properties, block_device_mapping=[])
+                    filter_properties, accel_uuids=[], block_device_mapping=[])
         _test()
         self.assertIn('Preserve this', instance.fault.message)

nova/tests/functional/libvirt/test_numa_live_migration.py

@@ -242,7 +242,8 @@ def stub_instance_save(inst, *args, **kwargs):
 
         self.stub_out('nova.objects.Instance.save', stub_instance_save)
         self.compute.shelve_offload_instance(self.context, instance,
-                                             clean_shutdown=clean_shutdown)
+                                             clean_shutdown=clean_shutdown,
+                                             accel_uuids=[])
         mock_notify.assert_has_calls([
             mock.call(self.context, instance, 'fake-mini',
                       action='shelve_offload', phase='start',
@@ -509,7 +510,7 @@ def check_save(expected_task_state=None):
             mock_save.side_effect = check_save
             self.compute.unshelve_instance(self.context, instance, image=None,
                     filter_properties=filter_properties, node=node,
-                    request_spec=objects.RequestSpec())
+                    request_spec=objects.RequestSpec(), accel_uuids=[])
 
         mock_notify_instance_action.assert_has_calls([
             mock.call(self.context, instance, 'fake-mini',
@@ -604,7 +605,8 @@ def check_save(expected_task_state=None):
                               self.compute.unshelve_instance,
                               self.context, instance, image=None,
                               filter_properties=filter_properties, node=node,
-                              request_spec=objects.RequestSpec())
+                              request_spec=objects.RequestSpec(),
+                              accel_uuids=[])
 
         mock_notify_instance_action.assert_called_once_with(
             self.context, instance, 'fake-mini', action='unshelve',
@@ -638,7 +640,8 @@ def test_unshelve_with_resource_request(
 
         self.compute.unshelve_instance(
             self.context, instance, image=None,
-            filter_properties={}, node='fake-node', request_spec=request_spec)
+            filter_properties={}, node='fake-node', request_spec=request_spec,
+            accel_uuids=[])
 
         mock_update_pci.assert_called_once_with(
             self.context, self.compute.reportclient, [],
@@ -667,7 +670,8 @@ def test_unshelve_with_resource_request_update_raises(
         self.assertRaises(
             exception.UnexpectedResourceProviderNameForPCIRequest,
             self.compute.unshelve_instance, self.context, instance, image=None,
-            filter_properties={}, node='fake-node', request_spec=request_spec)
+            filter_properties={}, node='fake-node', request_spec=request_spec,
+            accel_uuids=[])
 
         mock_update_pci.assert_called_once_with(
             self.context, self.compute.reportclient, [],
@@ -724,7 +728,7 @@ def test_shelved_poll_timedout(self):
 
         data = []
 
-        def fake_soi(context, instance, **kwargs):
+        def fake_soi(context, instance, accel_uuids, **kwargs):
             data.append(instance.uuid)
 
         with mock.patch.object(self.compute, 'shelve_offload_instance') as soi:
@@ -753,7 +757,7 @@ def test_shelved_poll_filters_task_state(self, mock_parse, mock_older):
 
         data = []
 
-        def fake_soi(context, instance, **kwargs):
+        def fake_soi(context, instance, accel_uuids, **kwargs):
             data.append(instance.uuid)
 
         with mock.patch.object(self.compute, 'shelve_offload_instance') as soi: