Merge "[rpc] pull: removed a hack to avoid object backport triggered"
This commit is contained in:
commit
72f9f09398
|
@ -110,11 +110,6 @@ class ResourcesPullRpcCallback(object):
|
||||||
def pull(self, context, resource_type, version, resource_id):
|
def pull(self, context, resource_type, version, resource_id):
|
||||||
obj = prod_registry.pull(resource_type, resource_id, context=context)
|
obj = prod_registry.pull(resource_type, resource_id, context=context)
|
||||||
if obj:
|
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)
|
return obj.obj_to_primitive(target_version=version)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -146,16 +146,6 @@ class ResourcesPullRpcCallbackTestCase(ResourcesRpcBaseTestCase):
|
||||||
primitive['versioned_object.data'])
|
primitive['versioned_object.data'])
|
||||||
self.assertEqual(self.resource_obj.obj_to_primitive(), primitive)
|
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')
|
@mock.patch.object(FakeResource, 'obj_to_primitive')
|
||||||
def test_pull_backports_to_older_version(self, to_prim_mock):
|
def test_pull_backports_to_older_version(self, to_prim_mock):
|
||||||
with mock.patch.object(resources_rpc.prod_registry, 'pull',
|
with mock.patch.object(resources_rpc.prod_registry, 'pull',
|
||||||
|
|
Loading…
Reference in New Issue