openstack/openstacksdk
Code Issues Proposed changes

Merge "tests: Remove final use of 'TestProxyBase._verify'"

Browse Source
This commit is contained in:
Zuul
2021-05-19 21:31:24 +00:00
committed by Gerrit Code Review
parent 32d2a5522c 6f98539497
commit 4feb26d46f
8 changed files with 437 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
openstack/tests/unit/block_storage/v2/test_proxy.py
View File

@@ -88,10 +88,11 @@ class TestVolumeProxy(test_proxy_base.TestProxyBase):
self.verify_delete(self.proxy.delete_volume, volume.Volume, True)
def test_volume_extend(self):
self._verify("openstack.block_storage.v2.volume.Volume.extend",
self.proxy.extend_volume,
method_args=["value", "new-size"],
expected_args=["new-size"])
self._verify2(
"openstack.block_storage.v2.volume.Volume.extend",
self.proxy.extend_volume,
method_args=["value", "new-size"],
expected_args=[self.proxy, "new-size"])
def test_backend_pools(self):
self.verify_list(self.proxy.backend_pools, stats.Pools)

27
openstack/tests/unit/block_storage/v3/test_proxy.py
View File

@@ -156,22 +156,25 @@ class TestVolumeProxy(test_proxy_base.TestProxyBase):
self.verify_delete(self.proxy.delete_volume, volume.Volume, True)
def test_volume_extend(self):
self._verify("openstack.block_storage.v3.volume.Volume.extend",
self.proxy.extend_volume,
method_args=["value", "new-size"],
expected_args=["new-size"])
self._verify2(
"openstack.block_storage.v3.volume.Volume.extend",
self.proxy.extend_volume,
method_args=["value", "new-size"],
expected_args=[self.proxy, "new-size"])
def test_volume_set_readonly_no_argument(self):
self._verify("openstack.block_storage.v3.volume.Volume.set_readonly",
self.proxy.set_volume_readonly,
method_args=["value"],
expected_args=[True])
self._verify2(
"openstack.block_storage.v3.volume.Volume.set_readonly",
self.proxy.set_volume_readonly,
method_args=["value"],
expected_args=[self.proxy, True])
def test_volume_set_readonly_false(self):
self._verify("openstack.block_storage.v3.volume.Volume.set_readonly",
self.proxy.set_volume_readonly,
method_args=["value", False],
expected_args=[False])
self._verify2(
"openstack.block_storage.v3.volume.Volume.set_readonly",
self.proxy.set_volume_readonly,
method_args=["value", False],
expected_args=[self.proxy, False])
def test_volume_retype_without_migration_policy(self):
self._verify("openstack.block_storage.v3.volume.Volume.retype",

92
openstack/tests/unit/clustering/v1/test_proxy.py
View File

@@ -91,9 +91,11 @@ class TestClusterProxy(test_proxy_base.TestProxyBase):
self.verify_delete(self.proxy.delete_cluster, cluster.Cluster, True)
def test_cluster_force_delete(self):
self._verify("openstack.clustering.v1.cluster.Cluster.force_delete",
self.proxy.delete_cluster,
method_args=["value", False, True])
self._verify2(
"openstack.clustering.v1.cluster.Cluster.force_delete",
self.proxy.delete_cluster,
method_args=["value", False, True],
expected_args=[self.proxy])
def test_cluster_find(self):
self.verify_find(self.proxy.find_cluster, cluster.Cluster)
@@ -117,21 +119,25 @@ class TestClusterProxy(test_proxy_base.TestProxyBase):
def test_resize_cluster(self, mock_find):
mock_cluster = cluster.Cluster.new(id='FAKE_CLUSTER')
mock_find.return_value = mock_cluster
self._verify("openstack.clustering.v1.cluster.Cluster.resize",
self.proxy.resize_cluster,
method_args=["FAKE_CLUSTER"],
method_kwargs={'k1': 'v1', 'k2': 'v2'},
expected_kwargs={'k1': 'v1', 'k2': 'v2'})
self._verify2(
"openstack.clustering.v1.cluster.Cluster.resize",
self.proxy.resize_cluster,
method_args=["FAKE_CLUSTER"],
method_kwargs={'k1': 'v1', 'k2': 'v2'},
expected_args=[self.proxy],
expected_kwargs={'k1': 'v1', 'k2': 'v2'})
mock_find.assert_called_once_with(cluster.Cluster, "FAKE_CLUSTER",
ignore_missing=False)
def test_resize_cluster_with_obj(self):
mock_cluster = cluster.Cluster.new(id='FAKE_CLUSTER')
self._verify("openstack.clustering.v1.cluster.Cluster.resize",
self.proxy.resize_cluster,
method_args=[mock_cluster],
method_kwargs={'k1': 'v1', 'k2': 'v2'},
expected_kwargs={'k1': 'v1', 'k2': 'v2'})
self._verify2(
"openstack.clustering.v1.cluster.Cluster.resize",
self.proxy.resize_cluster,
method_args=[mock_cluster],
method_kwargs={'k1': 'v1', 'k2': 'v2'},
expected_args=[self.proxy],
expected_kwargs={'k1': 'v1', 'k2': 'v2'})
def test_collect_cluster_attrs(self):
self.verify_list(self.proxy.collect_cluster_attrs,
@@ -145,18 +151,22 @@ class TestClusterProxy(test_proxy_base.TestProxyBase):
def test_cluster_check(self, mock_get):
mock_cluster = cluster.Cluster.new(id='FAKE_CLUSTER')
mock_get.return_value = mock_cluster
self._verify("openstack.clustering.v1.cluster.Cluster.check",
self.proxy.check_cluster,
method_args=["FAKE_CLUSTER"])
self._verify2(
"openstack.clustering.v1.cluster.Cluster.check",
self.proxy.check_cluster,
method_args=["FAKE_CLUSTER"],
expected_args=[self.proxy])
mock_get.assert_called_once_with(cluster.Cluster, "FAKE_CLUSTER")
@mock.patch.object(proxy_base.Proxy, '_get_resource')
def test_cluster_recover(self, mock_get):
mock_cluster = cluster.Cluster.new(id='FAKE_CLUSTER')
mock_get.return_value = mock_cluster
self._verify("openstack.clustering.v1.cluster.Cluster.recover",
self.proxy.recover_cluster,
method_args=["FAKE_CLUSTER"])
self._verify2(
"openstack.clustering.v1.cluster.Cluster.recover",
self.proxy.recover_cluster,
method_args=["FAKE_CLUSTER"],
expected_args=[self.proxy])
mock_get.assert_called_once_with(cluster.Cluster, "FAKE_CLUSTER")
def test_node_create(self):
@@ -169,9 +179,11 @@ class TestClusterProxy(test_proxy_base.TestProxyBase):
self.verify_delete(self.proxy.delete_node, node.Node, True)
def test_node_force_delete(self):
self._verify("openstack.clustering.v1.node.Node.force_delete",
self.proxy.delete_node,
method_args=["value", False, True])
self._verify2(
"openstack.clustering.v1.node.Node.force_delete",
self.proxy.delete_node,
method_args=["value", False, True],
expected_args=[self.proxy])
def test_node_find(self):
self.verify_find(self.proxy.find_node, node.Node)
@@ -200,28 +212,34 @@ class TestClusterProxy(test_proxy_base.TestProxyBase):
def test_node_check(self, mock_get):
mock_node = node.Node.new(id='FAKE_NODE')
mock_get.return_value = mock_node
self._verify("openstack.clustering.v1.node.Node.check",
self.proxy.check_node,
method_args=["FAKE_NODE"])
self._verify2(
"openstack.clustering.v1.node.Node.check",
self.proxy.check_node,
method_args=["FAKE_NODE"],
expected_args=[self.proxy])
mock_get.assert_called_once_with(node.Node, "FAKE_NODE")
@mock.patch.object(proxy_base.Proxy, '_get_resource')
def test_node_recover(self, mock_get):
mock_node = node.Node.new(id='FAKE_NODE')
mock_get.return_value = mock_node
self._verify("openstack.clustering.v1.node.Node.recover",
self.proxy.recover_node,
method_args=["FAKE_NODE"])
self._verify2(
"openstack.clustering.v1.node.Node.recover",
self.proxy.recover_node,
method_args=["FAKE_NODE"],
expected_args=[self.proxy])
mock_get.assert_called_once_with(node.Node, "FAKE_NODE")
@mock.patch.object(proxy_base.Proxy, '_get_resource')
def test_node_adopt(self, mock_get):
mock_node = node.Node.new()
mock_get.return_value = mock_node
self._verify("openstack.clustering.v1.node.Node.adopt",
self.proxy.adopt_node,
method_kwargs={"preview": False, "foo": "bar"},
expected_kwargs={"preview": False, "foo": "bar"})
self._verify2(
"openstack.clustering.v1.node.Node.adopt",
self.proxy.adopt_node,
method_kwargs={"preview": False, "foo": "bar"},
expected_args=[self.proxy],
expected_kwargs={"preview": False, "foo": "bar"})
mock_get.assert_called_once_with(node.Node, None)
@@ -229,10 +247,12 @@ class TestClusterProxy(test_proxy_base.TestProxyBase):
def test_node_adopt_preview(self, mock_get):
mock_node = node.Node.new()
mock_get.return_value = mock_node
self._verify("openstack.clustering.v1.node.Node.adopt",
self.proxy.adopt_node,
method_kwargs={"preview": True, "foo": "bar"},
expected_kwargs={"preview": True, "foo": "bar"})
self._verify2(
"openstack.clustering.v1.node.Node.adopt",
self.proxy.adopt_node,
method_kwargs={"preview": True, "foo": "bar"},
expected_args=[self.proxy],
expected_kwargs={"preview": True, "foo": "bar"})
mock_get.assert_called_once_with(node.Node, None)

403
openstack/tests/unit/compute/v2/test_proxy.py
View File

@@ -193,58 +193,61 @@ class TestFlavor(TestComputeProxy):
)
def test_flavor_get_access(self):
self._verify("openstack.compute.v2.flavor.Flavor.get_access",
self.proxy.get_flavor_access,
method_args=["value"],
expected_args=[])
self._verify2(
"openstack.compute.v2.flavor.Flavor.get_access",
self.proxy.get_flavor_access,
method_args=["value"],
expected_args=[self.proxy])
def test_flavor_add_tenant_access(self):
self._verify("openstack.compute.v2.flavor.Flavor.add_tenant_access",
self.proxy.flavor_add_tenant_access,
method_args=["value", "fake-tenant"],
expected_args=["fake-tenant"])
self._verify2(
"openstack.compute.v2.flavor.Flavor.add_tenant_access",
self.proxy.flavor_add_tenant_access,
method_args=["value", "fake-tenant"],
expected_args=[self.proxy, "fake-tenant"])
def test_flavor_remove_tenant_access(self):
self._verify("openstack.compute.v2.flavor.Flavor.remove_tenant_access",
self.proxy.flavor_remove_tenant_access,
method_args=["value", "fake-tenant"],
expected_args=["fake-tenant"])
self._verify2(
"openstack.compute.v2.flavor.Flavor.remove_tenant_access",
self.proxy.flavor_remove_tenant_access,
method_args=["value", "fake-tenant"],
expected_args=[self.proxy, "fake-tenant"])
def test_flavor_fetch_extra_specs(self):
self._verify("openstack.compute.v2.flavor.Flavor.fetch_extra_specs",
self.proxy.fetch_flavor_extra_specs,
method_args=["value"],
expected_args=[])
self._verify2(
"openstack.compute.v2.flavor.Flavor.fetch_extra_specs",
self.proxy.fetch_flavor_extra_specs,
method_args=["value"],
expected_args=[self.proxy])
def test_create_flavor_extra_specs(self):
specs = {
'a': 'b'
}
self._verify("openstack.compute.v2.flavor.Flavor.create_extra_specs",
self.proxy.create_flavor_extra_specs,
method_args=["value", specs],
expected_kwargs={"specs": specs})
self._verify2(
"openstack.compute.v2.flavor.Flavor.create_extra_specs",
self.proxy.create_flavor_extra_specs,
method_args=["value", {'a': 'b'}],
expected_args=[self.proxy],
expected_kwargs={"specs": {'a': 'b'}})
def test_get_flavor_extra_specs_prop(self):
self._verify(
self._verify2(
"openstack.compute.v2.flavor.Flavor.get_extra_specs_property",
self.proxy.get_flavor_extra_specs_property,
method_args=["value", "prop"],
expected_args=["prop"])
expected_args=[self.proxy, "prop"])
def test_update_flavor_extra_specs_prop(self):
self._verify(
self._verify2(
"openstack.compute.v2.flavor.Flavor.update_extra_specs_property",
self.proxy.update_flavor_extra_specs_property,
method_args=["value", "prop", "val"],
expected_args=["prop", "val"])
expected_args=[self.proxy, "prop", "val"])
def test_delete_flavor_extra_specs_prop(self):
self._verify(
self._verify2(
"openstack.compute.v2.flavor.Flavor.delete_extra_specs_property",
self.proxy.delete_flavor_extra_specs_property,
method_args=["value", "prop"],
expected_args=["prop"])
expected_args=[self.proxy, "prop"])
class TestKeyPair(TestComputeProxy):
@@ -321,36 +324,39 @@ class TestAggregate(TestComputeProxy):
self.verify_update(self.proxy.update_aggregate, aggregate.Aggregate)
def test_aggregate_add_host(self):
self._verify("openstack.compute.v2.aggregate.Aggregate.add_host",
self.proxy.add_host_to_aggregate,
method_args=["value", "host"],
expected_args=["host"])
self._verify2(
"openstack.compute.v2.aggregate.Aggregate.add_host",
self.proxy.add_host_to_aggregate,
method_args=["value", "host"],
expected_args=[self.proxy, "host"])
def test_aggregate_remove_host(self):
self._verify("openstack.compute.v2.aggregate.Aggregate.remove_host",
self.proxy.remove_host_from_aggregate,
method_args=["value", "host"],
expected_args=["host"])
self._verify2(
"openstack.compute.v2.aggregate.Aggregate.remove_host",
self.proxy.remove_host_from_aggregate,
method_args=["value", "host"],
expected_args=[self.proxy, "host"])
def test_aggregate_set_metadata(self):
self._verify("openstack.compute.v2.aggregate.Aggregate.set_metadata",
self.proxy.set_aggregate_metadata,
method_args=["value", {'a': 'b'}],
expected_args=[{'a': 'b'}])
self._verify2(
"openstack.compute.v2.aggregate.Aggregate.set_metadata",
self.proxy.set_aggregate_metadata,
method_args=["value", {'a': 'b'}],
expected_args=[self.proxy, {'a': 'b'}])
def test_aggregate_precache_image(self):
self._verify(
self._verify2(
"openstack.compute.v2.aggregate.Aggregate.precache_images",
self.proxy.aggregate_precache_images,
method_args=["value", '1'],
expected_args=[[{'id': '1'}]])
expected_args=[self.proxy, [{'id': '1'}]])
def test_aggregate_precache_images(self):
self._verify(
self._verify2(
"openstack.compute.v2.aggregate.Aggregate.precache_images",
self.proxy.aggregate_precache_images,
method_args=["value", ['1', '2']],
expected_args=[[{'id': '1'}, {'id': '2'}]])
expected_args=[self.proxy, [{'id': '1'}, {'id': '2'}]])
class TestService(TestComputeProxy):
@@ -510,11 +516,11 @@ class TestHypervisor(TestComputeProxy):
hypervisor.Hypervisor)
def test_get_hypervisor_uptime(self):
self._verify(
self._verify2(
"openstack.compute.v2.hypervisor.Hypervisor.get_uptime",
self.proxy.get_hypervisor_uptime,
method_args=["value"],
expected_args=[])
expected_args=[self.proxy])
class TestCompute(TestComputeProxy):
@@ -649,9 +655,11 @@ class TestCompute(TestComputeProxy):
self.verify_delete(self.proxy.delete_server, server.Server, True)
def test_server_force_delete(self):
self._verify("openstack.compute.v2.server.Server.force_delete",
self.proxy.delete_server,
method_args=["value", False, True])
self._verify2(
"openstack.compute.v2.server.Server.force_delete",
self.proxy.delete_server,
method_args=["value", False, True],
expected_args=[self.proxy])
def test_server_find(self):
self.verify_find(self.proxy.find_server, server.Server)
@@ -680,23 +688,28 @@ class TestCompute(TestComputeProxy):
self.verify_wait_for_status(
self.proxy.wait_for_server,
method_args=[value],
expected_args=[value, 'ACTIVE', ['ERROR'], 2, 120])
expected_args=[self.proxy, value, 'ACTIVE', ['ERROR'], 2, 120])
def test_server_resize(self):
self._verify("openstack.compute.v2.server.Server.resize",
self.proxy.resize_server,
method_args=["value", "test-flavor"],
expected_args=["test-flavor"])
self._verify2(
"openstack.compute.v2.server.Server.resize",
self.proxy.resize_server,
method_args=["value", "test-flavor"],
expected_args=[self.proxy, "test-flavor"])
def test_server_confirm_resize(self):
self._verify("openstack.compute.v2.server.Server.confirm_resize",
self.proxy.confirm_server_resize,
method_args=["value"])
self._verify2(
"openstack.compute.v2.server.Server.confirm_resize",
self.proxy.confirm_server_resize,
method_args=["value"],
expected_args=[self.proxy])
def test_server_revert_resize(self):
self._verify("openstack.compute.v2.server.Server.revert_resize",
self.proxy.revert_server_resize,
method_args=["value"])
self._verify2(
"openstack.compute.v2.server.Server.revert_resize",
self.proxy.revert_server_resize,
method_args=["value"],
expected_args=[self.proxy])
def test_server_rebuild(self):
id = 'test_image_id'
@@ -705,156 +718,191 @@ class TestCompute(TestComputeProxy):
# Case1: image object is provided
# NOTE: Inside of Server.rebuild is where image_obj gets converted
# to an ID instead of object.
self._verify('openstack.compute.v2.server.Server.rebuild',
self.proxy.rebuild_server,
method_args=["value", "test_server", "test_pass"],
method_kwargs={"metadata": {"k1": "v1"},
"image": image_obj},
expected_args=["test_server", "test_pass"],
expected_kwargs={"metadata": {"k1": "v1"},
"image": image_obj})
self._verify2(
'openstack.compute.v2.server.Server.rebuild',
self.proxy.rebuild_server,
method_args=["value", "test_server", "test_pass"],
method_kwargs={"metadata": {"k1": "v1"}, "image": image_obj},
expected_args=[self.proxy, "test_server", "test_pass"],
expected_kwargs={"metadata": {"k1": "v1"}, "image": image_obj})
# Case2: image name or id is provided
self._verify('openstack.compute.v2.server.Server.rebuild',
self.proxy.rebuild_server,
method_args=["value", "test_server", "test_pass"],
method_kwargs={"metadata": {"k1": "v1"},
"image": id},
expected_args=["test_server", "test_pass"],
expected_kwargs={"metadata": {"k1": "v1"},
"image": id})
self._verify2(
'openstack.compute.v2.server.Server.rebuild',
self.proxy.rebuild_server,
method_args=["value", "test_server", "test_pass"],
method_kwargs={"metadata": {"k1": "v1"}, "image": id},
expected_args=[self.proxy, "test_server", "test_pass"],
expected_kwargs={"metadata": {"k1": "v1"}, "image": id})
def test_add_fixed_ip_to_server(self):
self._verify("openstack.compute.v2.server.Server.add_fixed_ip",
self.proxy.add_fixed_ip_to_server,
method_args=["value", "network-id"],
expected_args=["network-id"])
self._verify2(
"openstack.compute.v2.server.Server.add_fixed_ip",
self.proxy.add_fixed_ip_to_server,
method_args=["value", "network-id"],
expected_args=[self.proxy, "network-id"])
def test_fixed_ip_from_server(self):
self._verify("openstack.compute.v2.server.Server.remove_fixed_ip",
self.proxy.remove_fixed_ip_from_server,
method_args=["value", "address"],
expected_args=["address"])
self._verify2(
"openstack.compute.v2.server.Server.remove_fixed_ip",
self.proxy.remove_fixed_ip_from_server,
method_args=["value", "address"],
expected_args=[self.proxy, "address"])
def test_floating_ip_to_server(self):
self._verify("openstack.compute.v2.server.Server.add_floating_ip",
self.proxy.add_floating_ip_to_server,
method_args=["value", "floating-ip"],
expected_args=["floating-ip"],
expected_kwargs={'fixed_address': None})
self._verify2(
"openstack.compute.v2.server.Server.add_floating_ip",
self.proxy.add_floating_ip_to_server,
method_args=["value", "floating-ip"],
expected_args=[self.proxy, "floating-ip"],
expected_kwargs={'fixed_address': None})
def test_add_floating_ip_to_server_with_fixed_addr(self):
self._verify("openstack.compute.v2.server.Server.add_floating_ip",
self.proxy.add_floating_ip_to_server,
method_args=["value", "floating-ip", 'fixed-addr'],
expected_args=["floating-ip"],
expected_kwargs={'fixed_address': 'fixed-addr'})
self._verify2(
"openstack.compute.v2.server.Server.add_floating_ip",
self.proxy.add_floating_ip_to_server,
method_args=["value", "floating-ip", 'fixed-addr'],
expected_args=[self.proxy, "floating-ip"],
expected_kwargs={'fixed_address': 'fixed-addr'})
def test_remove_floating_ip_from_server(self):
self._verify("openstack.compute.v2.server.Server.remove_floating_ip",
self.proxy.remove_floating_ip_from_server,
method_args=["value", "address"],
expected_args=["address"])
self._verify2(
"openstack.compute.v2.server.Server.remove_floating_ip",
self.proxy.remove_floating_ip_from_server,
method_args=["value", "address"],
expected_args=[self.proxy, "address"])
def test_server_backup(self):
self._verify("openstack.compute.v2.server.Server.backup",
self.proxy.backup_server,
method_args=["value", "name", "daily", 1],
expected_args=["name", "daily", 1])
self._verify2(
"openstack.compute.v2.server.Server.backup",
self.proxy.backup_server,
method_args=["value", "name", "daily", 1],
expected_args=[self.proxy, "name", "daily", 1])
def test_server_pause(self):
self._verify("openstack.compute.v2.server.Server.pause",
self.proxy.pause_server,
method_args=["value"])
self._verify2(
"openstack.compute.v2.server.Server.pause",
self.proxy.pause_server,
method_args=["value"],
expected_args=[self.proxy])
def test_server_unpause(self):
self._verify("openstack.compute.v2.server.Server.unpause",
self.proxy.unpause_server,
method_args=["value"])
self._verify2(
"openstack.compute.v2.server.Server.unpause",
self.proxy.unpause_server,
method_args=["value"],
expected_args=[self.proxy])
def test_server_suspend(self):
self._verify("openstack.compute.v2.server.Server.suspend",
self.proxy.suspend_server,
method_args=["value"])
self._verify2(
"openstack.compute.v2.server.Server.suspend",
self.proxy.suspend_server,
method_args=["value"],
expected_args=[self.proxy])
def test_server_resume(self):
self._verify("openstack.compute.v2.server.Server.resume",
self.proxy.resume_server,
method_args=["value"])
self._verify2(
"openstack.compute.v2.server.Server.resume",
self.proxy.resume_server,
method_args=["value"],
expected_args=[self.proxy])
def test_server_lock(self):
self._verify("openstack.compute.v2.server.Server.lock",
self.proxy.lock_server,
method_args=["value"])
self._verify2(
"openstack.compute.v2.server.Server.lock",
self.proxy.lock_server,
method_args=["value"],
expected_args=[self.proxy])
def test_server_unlock(self):
self._verify("openstack.compute.v2.server.Server.unlock",
self.proxy.unlock_server,
method_args=["value"])
self._verify2(
"openstack.compute.v2.server.Server.unlock",
self.proxy.unlock_server,
method_args=["value"],
expected_args=[self.proxy])
def test_server_rescue(self):
self._verify("openstack.compute.v2.server.Server.rescue",
self.proxy.rescue_server,
method_args=["value"],
expected_kwargs={"admin_pass": None, "image_ref": None})
self._verify2(
"openstack.compute.v2.server.Server.rescue",
self.proxy.rescue_server,
method_args=["value"],
expected_args=[self.proxy],
expected_kwargs={"admin_pass": None, "image_ref": None})
def test_server_rescue_with_options(self):
self._verify("openstack.compute.v2.server.Server.rescue",
self.proxy.rescue_server,
method_args=["value", 'PASS', 'IMG'],
expected_kwargs={"admin_pass": 'PASS',
"image_ref": 'IMG'})
self._verify2(
"openstack.compute.v2.server.Server.rescue",
self.proxy.rescue_server,
method_args=["value", 'PASS', 'IMG'],
expected_args=[self.proxy],
expected_kwargs={"admin_pass": 'PASS', "image_ref": 'IMG'})
def test_server_unrescue(self):
self._verify("openstack.compute.v2.server.Server.unrescue",
self.proxy.unrescue_server,
method_args=["value"])
self._verify2(
"openstack.compute.v2.server.Server.unrescue",
self.proxy.unrescue_server,
method_args=["value"],
expected_args=[self.proxy])
def test_server_evacuate(self):
self._verify("openstack.compute.v2.server.Server.evacuate",
self.proxy.evacuate_server,
method_args=["value"],
expected_kwargs={"host": None, "admin_pass": None,
"force": None})
self._verify2(
"openstack.compute.v2.server.Server.evacuate",
self.proxy.evacuate_server,
method_args=["value"],
expected_args=[self.proxy],
expected_kwargs={"host": None, "admin_pass": None, "force": None})
def test_server_evacuate_with_options(self):
self._verify("openstack.compute.v2.server.Server.evacuate",
self.proxy.evacuate_server,
method_args=["value", 'HOST2', 'NEW_PASS', True],
expected_kwargs={"host": "HOST2",
"admin_pass": 'NEW_PASS',
"force": True})
self._verify2(
"openstack.compute.v2.server.Server.evacuate",
self.proxy.evacuate_server,
method_args=["value", 'HOST2', 'NEW_PASS', True],
expected_args=[self.proxy],
expected_kwargs={
"host": "HOST2", "admin_pass": 'NEW_PASS', "force": True})
def test_server_start(self):
self._verify("openstack.compute.v2.server.Server.start",
self.proxy.start_server,
method_args=["value"])
self._verify2(
"openstack.compute.v2.server.Server.start",
self.proxy.start_server,
method_args=["value"],
expected_args=[self.proxy])
def test_server_stop(self):
self._verify("openstack.compute.v2.server.Server.stop",
self.proxy.stop_server,
method_args=["value"])
self._verify2(
"openstack.compute.v2.server.Server.stop",
self.proxy.stop_server,
method_args=["value"],
expected_args=[self.proxy])
def test_server_shelve(self):
self._verify("openstack.compute.v2.server.Server.shelve",
self.proxy.shelve_server,
method_args=["value"])
self._verify2(
"openstack.compute.v2.server.Server.shelve",
self.proxy.shelve_server,
method_args=["value"],
expected_args=[self.proxy])
def test_server_unshelve(self):
self._verify("openstack.compute.v2.server.Server.unshelve",
self.proxy.unshelve_server,
method_args=["value"])
self._verify2(
"openstack.compute.v2.server.Server.unshelve",
self.proxy.unshelve_server,
method_args=["value"],
expected_args=[self.proxy])
def test_get_server_output(self):
self._verify("openstack.compute.v2.server.Server.get_console_output",
self.proxy.get_server_console_output,
method_args=["value"],
expected_kwargs={"length": None})
self._verify2(
"openstack.compute.v2.server.Server.get_console_output",
self.proxy.get_server_console_output,
method_args=["value"],
expected_args=[self.proxy],
expected_kwargs={"length": None})
self._verify("openstack.compute.v2.server.Server.get_console_output",
self.proxy.get_server_console_output,
method_args=["value", 1],
expected_kwargs={"length": 1})
self._verify2(
"openstack.compute.v2.server.Server.get_console_output",
self.proxy.get_server_console_output,
method_args=["value", 1],
expected_args=[self.proxy],
expected_kwargs={"length": 1})
def test_availability_zones_not_detailed(self):
self.verify_list(self.proxy.availability_zones,
@@ -947,32 +995,33 @@ class TestCompute(TestComputeProxy):
self.verify_list(self.proxy.server_groups, server_group.ServerGroup)
def test_live_migrate_server(self):
self._verify('openstack.compute.v2.server.Server.live_migrate',
self.proxy.live_migrate_server,
method_args=["value", "host1", False],
expected_args=["host1"],
expected_kwargs={'force': False, 'block_migration': None})
self._verify2(
'openstack.compute.v2.server.Server.live_migrate',
self.proxy.live_migrate_server,
method_args=["value", "host1", False],
expected_args=[self.proxy, "host1"],
expected_kwargs={'force': False, 'block_migration': None})
def test_fetch_security_groups(self):
self._verify(
self._verify2(
'openstack.compute.v2.server.Server.fetch_security_groups',
self.proxy.fetch_server_security_groups,
method_args=["value"],
expected_args=[])
expected_args=[self.proxy])
def test_add_security_groups(self):
self._verify(
self._verify2(
'openstack.compute.v2.server.Server.add_security_group',
self.proxy.add_security_group_to_server,
method_args=["value", {'id': 'id', 'name': 'sg'}],
expected_args=['sg'])
expected_args=[self.proxy, 'sg'])
def test_remove_security_groups(self):
self._verify(
self._verify2(
'openstack.compute.v2.server.Server.remove_security_group',
self.proxy.remove_security_group_from_server,
method_args=["value", {'id': 'id', 'name': 'sg'}],
expected_args=['sg'])
expected_args=[self.proxy, 'sg'])
def test_create_server_remote_console(self):
self.verify_create(
@@ -982,11 +1031,11 @@ class TestCompute(TestComputeProxy):
expected_kwargs={"server_id": "test_id", "type": "fake"})
def test_get_console_url(self):
self._verify(
self._verify2(
'openstack.compute.v2.server.Server.get_console_url',
self.proxy.get_server_console_url,
method_args=["value", "console_type"],
expected_args=["console_type"])
expected_args=[self.proxy, "console_type"])
@mock.patch('openstack.utils.supports_microversion', autospec=True)
@mock.patch('openstack.compute.v2._proxy.Proxy._create', autospec=True)

63
openstack/tests/unit/image/v2/test_proxy.py
View File

@@ -54,10 +54,11 @@ class TestImageProxy(test_proxy_base.TestProxyBase):
def test_image_import(self):
original_image = image.Image(**EXAMPLE)
self._verify(
self._verify2(
"openstack.image.v2.image.Image.import_image",
self.proxy.import_image,
method_args=[original_image, "method", "uri"],
expected_args=[self.proxy],
expected_kwargs={
"method": "method",
"store": None,
@@ -218,17 +219,21 @@ class TestImageProxy(test_proxy_base.TestProxyBase):
def test_image_download(self):
original_image = image.Image(**EXAMPLE)
self._verify('openstack.image.v2.image.Image.download',
self.proxy.download_image,
method_args=[original_image],
method_kwargs={
'output': 'some_output',
'chunk_size': 1,
'stream': True
},
expected_kwargs={'output': 'some_output',
'chunk_size': 1,
'stream': True})
self._verify2(
'openstack.image.v2.image.Image.download',
self.proxy.download_image,
method_args=[original_image],
method_kwargs={
'output': 'some_output',
'chunk_size': 1,
'stream': True
},
expected_args=[self.proxy],
expected_kwargs={
'output': 'some_output',
'chunk_size': 1,
'stream': True,
})
@mock.patch("openstack.image.v2.image.Image.fetch")
def test_image_stage(self, mock_fetch):
@@ -289,26 +294,32 @@ class TestImageProxy(test_proxy_base.TestProxyBase):
self.verify_list(self.proxy.images, image.Image)
def test_add_tag(self):
self._verify("openstack.image.v2.image.Image.add_tag",
self.proxy.add_tag,
method_args=["image", "tag"],
expected_args=["tag"])
self._verify2(
"openstack.image.v2.image.Image.add_tag",
self.proxy.add_tag,
method_args=["image", "tag"],
expected_args=[self.proxy, "tag"])
def test_remove_tag(self):
self._verify("openstack.image.v2.image.Image.remove_tag",
self.proxy.remove_tag,
method_args=["image", "tag"],
expected_args=["tag"])
self._verify2(
"openstack.image.v2.image.Image.remove_tag",
self.proxy.remove_tag,
method_args=["image", "tag"],
expected_args=[self.proxy, "tag"])
def test_deactivate_image(self):
self._verify("openstack.image.v2.image.Image.deactivate",
self.proxy.deactivate_image,
method_args=["image"])
self._verify2(
"openstack.image.v2.image.Image.deactivate",
self.proxy.deactivate_image,
method_args=["image"],
expected_args=[self.proxy])
def test_reactivate_image(self):
self._verify("openstack.image.v2.image.Image.reactivate",
self.proxy.reactivate_image,
method_args=["image"])
self._verify2(
"openstack.image.v2.image.Image.reactivate",
self.proxy.reactivate_image,
method_args=["image"],
expected_args=[self.proxy])
def test_member_create(self):
self.verify_create(self.proxy.add_member, member.Member,

29
openstack/tests/unit/message/v2/test_proxy.py
View File

@@ -50,10 +50,11 @@ class TestMessageProxy(test_proxy_base.TestProxyBase):
def test_message_post(self, mock_get_resource):
message_obj = message.Message(queue_name="test_queue")
mock_get_resource.return_value = message_obj
self._verify("openstack.message.v2.message.Message.post",
self.proxy.post_message,
method_args=["test_queue", ["msg1", "msg2"]],
expected_args=[["msg1", "msg2"]])
self._verify2(
"openstack.message.v2.message.Message.post",
self.proxy.post_message,
method_args=["test_queue", ["msg1", "msg2"]],
expected_args=[self.proxy, ["msg1", "msg2"]])
mock_get_resource.assert_called_once_with(message.Message, None,
queue_name="test_queue")
@@ -128,10 +129,12 @@ class TestMessageProxy(test_proxy_base.TestProxyBase):
queue_name="test_queue")
def test_subscription_create(self):
self._verify("openstack.message.v2.subscription.Subscription.create",
self.proxy.create_subscription,
method_args=["test_queue"],
expected_kwargs={"base_path": None})
self._verify2(
"openstack.message.v2.subscription.Subscription.create",
self.proxy.create_subscription,
method_args=["test_queue"],
expected_args=[self.proxy],
expected_kwargs={"base_path": None})
@mock.patch.object(proxy_base.Proxy, '_get_resource')
def test_subscription_get(self, mock_get_resource):
@@ -178,10 +181,12 @@ class TestMessageProxy(test_proxy_base.TestProxyBase):
queue_name="test_queue")
def test_claim_create(self):
self._verify("openstack.message.v2.claim.Claim.create",
self.proxy.create_claim,
method_args=["test_queue"],
expected_kwargs={"base_path": None})
self._verify2(
"openstack.message.v2.claim.Claim.create",
self.proxy.create_claim,
method_args=["test_queue"],
expected_args=[self.proxy],
expected_kwargs={"base_path": None})
def test_claim_get(self):
self._verify2("openstack.proxy.Proxy._get",

107
openstack/tests/unit/network/v2/test_proxy.py
View File

@@ -891,11 +891,13 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
x_router = router.Router.new(id="ROUTER_ID")
mock_get.return_value = x_router
self._verify("openstack.network.v2.router.Router.add_interface",
self.proxy.add_interface_to_router,
method_args=["FAKE_ROUTER"],
method_kwargs={"port_id": "PORT"},
expected_kwargs={"port_id": "PORT"})
self._verify2(
"openstack.network.v2.router.Router.add_interface",
self.proxy.add_interface_to_router,
method_args=["FAKE_ROUTER"],
method_kwargs={"port_id": "PORT"},
expected_args=[self.proxy],
expected_kwargs={"port_id": "PORT"})
mock_get.assert_called_once_with(router.Router, "FAKE_ROUTER")
@mock.patch.object(proxy_base.Proxy, '_get_resource')
@@ -905,11 +907,13 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
x_router = router.Router.new(id="ROUTER_ID")
mock_get.return_value = x_router
self._verify("openstack.network.v2.router.Router.add_interface",
self.proxy.add_interface_to_router,
method_args=["FAKE_ROUTER"],
method_kwargs={"subnet_id": "SUBNET"},
expected_kwargs={"subnet_id": "SUBNET"})
self._verify2(
"openstack.network.v2.router.Router.add_interface",
self.proxy.add_interface_to_router,
method_args=["FAKE_ROUTER"],
method_kwargs={"subnet_id": "SUBNET"},
expected_args=[self.proxy],
expected_kwargs={"subnet_id": "SUBNET"})
mock_get.assert_called_once_with(router.Router, "FAKE_ROUTER")
@mock.patch.object(proxy_base.Proxy, '_get_resource')
@@ -919,11 +923,13 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
x_router = router.Router.new(id="ROUTER_ID")
mock_get.return_value = x_router
self._verify("openstack.network.v2.router.Router.remove_interface",
self.proxy.remove_interface_from_router,
method_args=["FAKE_ROUTER"],
method_kwargs={"port_id": "PORT"},
expected_kwargs={"port_id": "PORT"})
self._verify2(
"openstack.network.v2.router.Router.remove_interface",
self.proxy.remove_interface_from_router,
method_args=["FAKE_ROUTER"],
method_kwargs={"port_id": "PORT"},
expected_args=[self.proxy],
expected_kwargs={"port_id": "PORT"})
mock_get.assert_called_once_with(router.Router, "FAKE_ROUTER")
@mock.patch.object(proxy_base.Proxy, '_get_resource')
@@ -933,11 +939,13 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
x_router = router.Router.new(id="ROUTER_ID")
mock_get.return_value = x_router
self._verify("openstack.network.v2.router.Router.remove_interface",
self.proxy.remove_interface_from_router,
method_args=["FAKE_ROUTER"],
method_kwargs={"subnet_id": "SUBNET"},
expected_kwargs={"subnet_id": "SUBNET"})
self._verify2(
"openstack.network.v2.router.Router.remove_interface",
self.proxy.remove_interface_from_router,
method_args=["FAKE_ROUTER"],
method_kwargs={"subnet_id": "SUBNET"},
expected_args=[self.proxy],
expected_kwargs={"subnet_id": "SUBNET"})
mock_get.assert_called_once_with(router.Router, "FAKE_ROUTER")
@mock.patch.object(proxy_base.Proxy, '_get_resource')
@@ -947,11 +955,13 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
x_router = router.Router.new(id="ROUTER_ID")
mock_get.return_value = x_router
self._verify("openstack.network.v2.router.Router.add_extra_routes",
self.proxy.add_extra_routes_to_router,
method_args=["FAKE_ROUTER"],
method_kwargs={"body": {"router": {"routes": []}}},
expected_kwargs={"body": {"router": {"routes": []}}})
self._verify2(
"openstack.network.v2.router.Router.add_extra_routes",
self.proxy.add_extra_routes_to_router,
method_args=["FAKE_ROUTER"],
method_kwargs={"body": {"router": {"routes": []}}},
expected_args=[self.proxy],
expected_kwargs={"body": {"router": {"routes": []}}})
mock_get.assert_called_once_with(router.Router, "FAKE_ROUTER")
@mock.patch.object(proxy_base.Proxy, '_get_resource')
@@ -961,11 +971,13 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
x_router = router.Router.new(id="ROUTER_ID")
mock_get.return_value = x_router
self._verify("openstack.network.v2.router.Router.remove_extra_routes",
self.proxy.remove_extra_routes_from_router,
method_args=["FAKE_ROUTER"],
method_kwargs={"body": {"router": {"routes": []}}},
expected_kwargs={"body": {"router": {"routes": []}}})
self._verify2(
"openstack.network.v2.router.Router.remove_extra_routes",
self.proxy.remove_extra_routes_from_router,
method_args=["FAKE_ROUTER"],
method_kwargs={"body": {"router": {"routes": []}}},
expected_args=[self.proxy],
expected_kwargs={"body": {"router": {"routes": []}}})
mock_get.assert_called_once_with(router.Router, "FAKE_ROUTER")
@mock.patch.object(proxy_base.Proxy, '_get_resource')
@@ -974,11 +986,13 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
x_router = router.Router.new(id="ROUTER_ID")
mock_get.return_value = x_router
self._verify("openstack.network.v2.router.Router.add_gateway",
self.proxy.add_gateway_to_router,
method_args=["FAKE_ROUTER"],
method_kwargs={"foo": "bar"},
expected_kwargs={"foo": "bar"})
self._verify2(
"openstack.network.v2.router.Router.add_gateway",
self.proxy.add_gateway_to_router,
method_args=["FAKE_ROUTER"],
method_kwargs={"foo": "bar"},
expected_args=[self.proxy],
expected_kwargs={"foo": "bar"})
mock_get.assert_called_once_with(router.Router, "FAKE_ROUTER")
@mock.patch.object(proxy_base.Proxy, '_get_resource')
@@ -987,11 +1001,13 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
x_router = router.Router.new(id="ROUTER_ID")
mock_get.return_value = x_router
self._verify("openstack.network.v2.router.Router.remove_gateway",
self.proxy.remove_gateway_from_router,
method_args=["FAKE_ROUTER"],
method_kwargs={"foo": "bar"},
expected_kwargs={"foo": "bar"})
self._verify2(
"openstack.network.v2.router.Router.remove_gateway",
self.proxy.remove_gateway_from_router,
method_args=["FAKE_ROUTER"],
method_kwargs={"foo": "bar"},
expected_args=[self.proxy],
expected_kwargs={"foo": "bar"})
mock_get.assert_called_once_with(router.Router, "FAKE_ROUTER")
def test_router_hosting_l3_agents_list(self):
@@ -1341,11 +1357,12 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
def test_set_tags(self):
x_network = network.Network.new(id='NETWORK_ID')
self._verify('openstack.network.v2.network.Network.set_tags',
self.proxy.set_tags,
method_args=[x_network, ['TAG1', 'TAG2']],
expected_args=[['TAG1', 'TAG2']],
expected_result=mock.sentinel.result_set_tags)
self._verify2(
'openstack.network.v2.network.Network.set_tags',
self.proxy.set_tags,
method_args=[x_network, ['TAG1', 'TAG2']],
expected_args=[self.proxy, ['TAG1', 'TAG2']],
expected_result=mock.sentinel.result_set_tags)
@mock.patch('openstack.network.v2.network.Network.set_tags')
def test_set_tags_resource_without_tag_suport(self, mock_set_tags):

27
openstack/tests/unit/test_proxy_base.py
View File

@@ -55,22 +55,32 @@ class TestProxyBase(base.TestCase):
expected_result=None):
with mock.patch(mock_method) as mocked:
mocked.return_value = expected_result
if any([method_args, method_kwargs,
expected_args, expected_kwargs]):
if any([
method_args,
method_kwargs,
expected_args,
expected_kwargs,
]):
method_args = method_args or ()
method_kwargs = method_kwargs or {}
expected_args = expected_args or ()
expected_kwargs = expected_kwargs or {}
if method_result:
self.assertEqual(method_result, test_method(*method_args,
**method_kwargs))
self.assertEqual(
method_result,
test_method(*method_args, **method_kwargs),
)
else:
self.assertEqual(expected_result, test_method(*method_args,
**method_kwargs))
self.assertEqual(
expected_result,
test_method(*method_args, **method_kwargs),
)
# Check how the mock was called in detail
(called_args, called_kwargs) = mocked.call_args
called_args, called_kwargs = mocked.call_args
self.assertEqual(expected_args, list(called_args))
# NOTE(gtema): if base_path is not in expected_kwargs or empty
# exclude it from the comparison, since some methods might
# still invoke method with None value
@@ -88,6 +98,7 @@ class TestProxyBase(base.TestCase):
if ignore_missing is None:
expected_kwargs.pop('ignore_missing', None)
called_kwargs.pop('ignore_missing', None)
self.assertDictEqual(expected_kwargs, called_kwargs)
else:
self.assertEqual(expected_result, test_method())
@@ -275,4 +286,4 @@ class TestProxyBase(base.TestCase):
mock_method="openstack.resource.wait_for_status",
**kwargs,
):
self._verify(mock_method, test_method, **kwargs)
self._verify2(mock_method, test_method, **kwargs)