[rpc] pull: removed a hack to avoid object backport triggered

Since oslo.versionedobjects 0.8.0, the object is not backported if the
requested version is the same as the latest known.

Change-Id: Ia1e9aa77b75261e4b2d2b24f31250ce2a2f028a7

diff --git a/neutron/api/rpc/handlers/resources_rpc.py b/neutron/api/rpc/handlers/resources_rpc.py
index 55344a8110427772bde2773546d1f7cb1c9f5667..42316c115790a478a5fb446877b5e5dfd3b60285 100755 (executable)
--- a/neutron/api/rpc/handlers/resources_rpc.py
+++ b/neutron/api/rpc/handlers/resources_rpc.py
@@ -110,11 +110,6 @@ class ResourcesPullRpcCallback(object):
     def pull(self, context, resource_type, version, resource_id):
         obj = prod_registry.pull(resource_type, resource_id, context=context)
         if obj:
-            #TODO(QoS): Remove in the future with new version of
-            #           versionedobjects containing
-            #           https://review.openstack.org/#/c/207998/
-            if version == obj.VERSION:
-                version = None
             return obj.obj_to_primitive(target_version=version)
 
 

diff --git a/neutron/tests/unit/api/rpc/handlers/test_resources_rpc.py b/neutron/tests/unit/api/rpc/handlers/test_resources_rpc.py
index 64d67dacff0b806f2976cf8dbae875491252db22..179bf5150cffb94ba531eca47ac85e13c4af3d40 100755 (executable)
--- a/neutron/tests/unit/api/rpc/handlers/test_resources_rpc.py
+++ b/neutron/tests/unit/api/rpc/handlers/test_resources_rpc.py
@@ -146,16 +146,6 @@ class ResourcesPullRpcCallbackTestCase(ResourcesRpcBaseTestCase):
                          primitive['versioned_object.data'])
         self.assertEqual(self.resource_obj.obj_to_primitive(), primitive)
 
-    @mock.patch.object(FakeResource, 'obj_to_primitive')
-    def test_pull_no_backport_for_latest_version(self, to_prim_mock):
-        with mock.patch.object(resources_rpc.prod_registry, 'pull',
-                               return_value=self.resource_obj):
-            self.callbacks.pull(
-                self.context, resource_type=FakeResource.obj_name(),
-                version=FakeResource.VERSION,
-                resource_id=self.resource_obj.id)
-        to_prim_mock.assert_called_with(target_version=None)
-
     @mock.patch.object(FakeResource, 'obj_to_primitive')
     def test_pull_backports_to_older_version(self, to_prim_mock):
         with mock.patch.object(resources_rpc.prod_registry, 'pull',