openstack/python-openstackclient
Code Issues Proposed changes

tests: Remove unnecessary nesting of compute resources

Browse Source 
Change-Id: I27326b8f2e0d84d3ef2c2fbdcb5c96a5ac1d79e4
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
This commit is contained in:
Stephen Finucane 2022-12-14 11:19:04 +00:00
parent 347b444feb
commit 19be070204
26 changed files with 1151 additions and 1301 deletions

4
openstackclient/tests/unit/common/test_availability_zone.py

@ -114,9 +114,7 @@ class TestAvailabilityZone(utils.TestCommand):
class TestAvailabilityZoneList(TestAvailabilityZone):
compute_azs = (
compute_fakes.FakeAvailabilityZone.create_availability_zones()
)
compute_azs = compute_fakes.create_availability_zones()
volume_azs = volume_fakes.create_availability_zones(count=1)
network_azs = network_fakes.create_availability_zones()

2
openstackclient/tests/unit/common/test_extension.py

@ -72,7 +72,7 @@ class TestExtensionList(TestExtension):
volume_extension = volume_fakes.create_one_extension()
identity_extension = identity_fakes.FakeExtension.create_one_extension()
compute_extension = compute_fakes.FakeExtension.create_one_extension()
compute_extension = compute_fakes.create_one_extension()
network_extension = network_fakes.FakeExtension.create_one_extension()
def setUp(self):

2
openstackclient/tests/unit/common/test_project_purge.py

@ -67,7 +67,7 @@ class TestProjectPurgeInit(tests_utils.TestCommand):
class TestProjectPurge(TestProjectPurgeInit):
project = identity_fakes.FakeProject.create_one_project()
server = compute_fakes.FakeServer.create_one_server()
server = compute_fakes.create_one_server()
image = image_fakes.create_one_image()
volume = volume_fakes.create_one_volume()
backup = volume_fakes.create_one_backup()

22
openstackclient/tests/unit/common/test_quota.py

@ -123,12 +123,12 @@ class TestQuotaList(TestQuota):
self.projects_mock.list.return_value = self.projects
self.compute_quotas = [
compute_fakes.FakeQuota.create_one_comp_quota(),
compute_fakes.FakeQuota.create_one_comp_quota(),
compute_fakes.create_one_comp_quota(),
compute_fakes.create_one_comp_quota(),
]
self.compute_default_quotas = [
compute_fakes.FakeQuota.create_one_default_comp_quota(),
compute_fakes.FakeQuota.create_one_default_comp_quota(),
compute_fakes.create_one_default_comp_quota(),
compute_fakes.create_one_default_comp_quota(),
]
self.compute = self.app.client_manager.compute
self.compute.quotas.defaults = mock.Mock(
@ -216,9 +216,7 @@ class TestQuotaList(TestQuota):
return reference_data
def test_quota_list_details_compute(self):
detailed_quota = (
compute_fakes.FakeQuota.create_one_comp_detailed_quota()
)
detailed_quota = compute_fakes.create_one_comp_detailed_quota()
detailed_column_header = (
'Resource',
@ -338,7 +336,7 @@ class TestQuotaList(TestQuota):
self.compute.quotas.get = mock.Mock(
side_effect=[
self.compute_quotas[0],
compute_fakes.FakeQuota.create_one_default_comp_quota(),
compute_fakes.create_one_default_comp_quota(),
],
)
@ -1087,10 +1085,10 @@ class TestQuotaShow(TestQuota):
def setUp(self):
super().setUp()
self.compute_quota = compute_fakes.FakeQuota.create_one_comp_quota()
self.compute_quota = compute_fakes.create_one_comp_quota()
self.compute_quotas_mock.get.return_value = self.compute_quota
self.compute_default_quota = (
compute_fakes.FakeQuota.create_one_default_comp_quota()
compute_fakes.create_one_default_comp_quota()
)
self.compute_quotas_mock.defaults.return_value = (
self.compute_default_quota
@ -1269,9 +1267,7 @@ class TestQuotaShow(TestQuota):
def test_quota_show__with_usage(self):
# update mocks to return detailed quota instead
self.compute_quota = (
compute_fakes.FakeQuota.create_one_comp_detailed_quota()
)
self.compute_quota = compute_fakes.create_one_comp_detailed_quota()
self.compute_quotas_mock.get.return_value = self.compute_quota
self.volume_quota = volume_fakes.create_one_detailed_quota()
self.volume_quotas_mock.get.return_value = self.volume_quota

2084
openstackclient/tests/unit/compute/v2/fakes.py

File diff suppressed because it is too large Load Diff

6
openstackclient/tests/unit/compute/v2/test_agent.py

@ -26,7 +26,7 @@ from openstackclient.tests.unit import utils as tests_utils
class TestAgent(compute_fakes.TestComputev2):
attr = {}
attr['agent_id'] = 1
fake_agent = compute_fakes.FakeAgent.create_one_agent(attr)
fake_agent = compute_fakes.create_one_agent(attr)
columns = (
'agent_id',
@ -96,7 +96,7 @@ class TestAgentCreate(TestAgent):
class TestAgentDelete(TestAgent):
fake_agents = compute_fakes.FakeAgent.create_agents(count=2)
fake_agents = compute_fakes.create_agents(count=2)
def setUp(self):
super(TestAgentDelete, self).setUp()
@ -172,7 +172,7 @@ class TestAgentDelete(TestAgent):
class TestAgentList(TestAgent):
agents = compute_fakes.FakeAgent.create_agents(count=3)
agents = compute_fakes.create_agents(count=3)
list_columns = (
"Agent ID",
"Hypervisor",

8
openstackclient/tests/unit/compute/v2/test_aggregate.py

@ -27,7 +27,7 @@ from openstackclient.tests.unit.image.v2 import fakes as image_fakes
class TestAggregate(compute_fakes.TestComputev2):
fake_ag = compute_fakes.FakeAggregate.create_one_aggregate()
fake_ag = compute_fakes.create_one_aggregate()
columns = (
'availability_zone',
@ -158,13 +158,13 @@ class TestAggregateCreate(TestAggregate):
class TestAggregateDelete(TestAggregate):
fake_ags = compute_fakes.FakeAggregate.create_aggregates(count=2)
fake_ags = compute_fakes.create_aggregates(count=2)
def setUp(self):
super(TestAggregateDelete, self).setUp()
self.sdk_client.find_aggregate = (
compute_fakes.FakeAggregate.get_aggregates(self.fake_ags)
self.sdk_client.find_aggregate = compute_fakes.get_aggregates(
self.fake_ags
)
self.cmd = aggregate.DeleteAggregate(self.app, None)

4
openstackclient/tests/unit/compute/v2/test_console.py

@ -33,7 +33,7 @@ class TestConsole(compute_fakes.TestComputev2):
class TestConsoleLog(TestConsole):
_server = compute_fakes.FakeServer.create_one_server()
_server = compute_fakes.create_one_server()
def setUp(self):
super(TestConsoleLog, self).setUp()
@ -89,7 +89,7 @@ class TestConsoleLog(TestConsole):
class TestConsoleUrlShow(TestConsole):
_server = compute_fakes.FakeServer.create_one_server()
_server = compute_fakes.create_one_server()
def setUp(self):
super(TestConsoleUrlShow, self).setUp()

22
openstackclient/tests/unit/compute/v2/test_flavor.py

@ -49,9 +49,7 @@ class TestFlavor(compute_fakes.TestComputev2):
class TestFlavorCreate(TestFlavor):
flavor = compute_fakes.FakeFlavor.create_one_flavor(
attrs={'links': 'flavor-links'}
)
flavor = compute_fakes.create_one_flavor(attrs={'links': 'flavor-links'})
project = identity_fakes.FakeProject.create_one_project()
columns = (
@ -412,7 +410,7 @@ class TestFlavorCreate(TestFlavor):
class TestFlavorDelete(TestFlavor):
flavors = compute_fakes.FakeFlavor.create_flavors(count=2)
flavors = compute_fakes.create_flavors(count=2)
def setUp(self):
super(TestFlavorDelete, self).setUp()
@ -489,7 +487,7 @@ class TestFlavorDelete(TestFlavor):
class TestFlavorList(TestFlavor):
_flavor = compute_fakes.FakeFlavor.create_one_flavor()
_flavor = compute_fakes.create_one_flavor()
columns = (
'ID',
@ -668,9 +666,7 @@ class TestFlavorList(TestFlavor):
def test_flavor_list_long_no_extra_specs(self):
# use flavor with no extra specs for this test
flavor = compute_fakes.FakeFlavor.create_one_flavor(
attrs={"extra_specs": {}}
)
flavor = compute_fakes.create_one_flavor(attrs={"extra_specs": {}})
self.data = (
(
flavor.id,
@ -760,7 +756,7 @@ class TestFlavorList(TestFlavor):
class TestFlavorSet(TestFlavor):
# Return value of self.sdk_client.find_flavor().
flavor = compute_fakes.FakeFlavor.create_one_flavor(
flavor = compute_fakes.create_one_flavor(
attrs={'os-flavor-access:is_public': False}
)
project = identity_fakes.FakeProject.create_one_project()
@ -982,8 +978,8 @@ class TestFlavorSet(TestFlavor):
class TestFlavorShow(TestFlavor):
# Return value of self.sdk_client.find_flavor().
flavor_access = compute_fakes.FakeFlavorAccess.create_one_flavor_access()
flavor = compute_fakes.FakeFlavor.create_one_flavor()
flavor_access = compute_fakes.create_one_flavor_access()
flavor = compute_fakes.create_one_flavor()
columns = (
'OS-FLV-DISABLED:disabled',
@ -1054,7 +1050,7 @@ class TestFlavorShow(TestFlavor):
self.assertCountEqual(self.data, data)
def test_private_flavor_show(self):
private_flavor = compute_fakes.FakeFlavor.create_one_flavor(
private_flavor = compute_fakes.create_one_flavor(
attrs={
'os-flavor-access:is_public': False,
}
@ -1097,7 +1093,7 @@ class TestFlavorShow(TestFlavor):
class TestFlavorUnset(TestFlavor):
# Return value of self.sdk_client.find_flavor().
flavor = compute_fakes.FakeFlavor.create_one_flavor(
flavor = compute_fakes.create_one_flavor(
attrs={'os-flavor-access:is_public': False}
)
project = identity_fakes.FakeProject.create_one_project()

6
openstackclient/tests/unit/compute/v2/test_host.py

@ -34,7 +34,7 @@ class TestHost(compute_fakes.TestComputev2):
@mock.patch('openstackclient.api.compute_v2.APIv2.host_list')
class TestHostList(TestHost):
_host = compute_fakes.FakeHost.create_one_host()
_host = compute_fakes.create_one_host()
def setUp(self):
super(TestHostList, self).setUp()
@ -92,7 +92,7 @@ class TestHostSet(TestHost):
def setUp(self):
super(TestHostSet, self).setUp()
self.host = compute_fakes.FakeHost.create_one_host()
self.host = compute_fakes.create_one_host()
self.cmd = host.SetHost(self.app, None)
@ -139,7 +139,7 @@ class TestHostSet(TestHost):
@mock.patch('openstackclient.api.compute_v2.APIv2.host_show')
class TestHostShow(TestHost):
_host = compute_fakes.FakeHost.create_one_host()
_host = compute_fakes.create_one_host()
def setUp(self):
super(TestHostShow, self).setUp()

8
openstackclient/tests/unit/compute/v2/test_keypair.py

@ -55,7 +55,7 @@ class TestKeypairCreate(TestKeypair):
def setUp(self):
super().setUp()
self.keypair = compute_fakes.FakeKeypair.create_one_keypair()
self.keypair = compute_fakes.create_one_keypair()
self.columns = ('fingerprint', 'name', 'type', 'user_id')
self.data = (
@ -288,7 +288,7 @@ class TestKeypairCreate(TestKeypair):
class TestKeypairDelete(TestKeypair):
keypairs = compute_fakes.FakeKeypair.create_keypairs(count=2)
keypairs = compute_fakes.create_keypairs(count=2)
def setUp(self):
super(TestKeypairDelete, self).setUp()
@ -394,7 +394,7 @@ class TestKeypairDelete(TestKeypair):
class TestKeypairList(TestKeypair):
# Return value of self.sdk_client.keypairs().
keypairs = compute_fakes.FakeKeypair.create_keypairs(count=1)
keypairs = compute_fakes.create_keypairs(count=1)
def setUp(self):
super(TestKeypairList, self).setUp()
@ -661,7 +661,7 @@ class TestKeypairList(TestKeypair):
class TestKeypairShow(TestKeypair):
keypair = compute_fakes.FakeKeypair.create_one_keypair()
keypair = compute_fakes.create_one_keypair()
def setUp(self):
super(TestKeypairShow, self).setUp()

136
openstackclient/tests/unit/compute/v2/test_server.py

@ -141,7 +141,7 @@ class TestServer(compute_fakes.TestComputev2):
# If we are creating more than one server, make one of them
# boot-from-volume
include_bfv = count > 1
servers = compute_fakes.FakeServer.create_servers(
servers = compute_fakes.create_servers(
attrs=self.attrs,
methods=self.methods,
count=count - 1 if include_bfv else count,
@ -149,19 +149,17 @@ class TestServer(compute_fakes.TestComputev2):
if include_bfv:
attrs = copy.deepcopy(self.attrs)
attrs['image'] = ''
bfv_server = compute_fakes.FakeServer.create_one_server(
bfv_server = compute_fakes.create_one_server(
attrs=attrs, methods=self.methods
)
servers.append(bfv_server)
# This is the return value for utils.find_resource()
self.servers_mock.get = compute_fakes.FakeServer.get_servers(
servers, 0
)
self.servers_mock.get = compute_fakes.get_servers(servers, 0)
return servers
def setup_sdk_servers_mock(self, count):
servers = compute_fakes.FakeServer.create_sdk_servers(
servers = compute_fakes.create_sdk_servers(
attrs=self.attrs,
methods=self.methods,
count=count,
@ -213,7 +211,7 @@ class TestServerAddFixedIP(TestServer):
sm_mock.return_value = False
servers = self.setup_sdk_servers_mock(count=1)
network = compute_fakes.FakeNetwork.create_one_network()
network = compute_fakes.create_one_network()
with mock.patch.object(
self.app.client_manager,
@ -244,7 +242,7 @@ class TestServerAddFixedIP(TestServer):
sm_mock.return_value = False
servers = self.setup_sdk_servers_mock(count=1)
network = compute_fakes.FakeNetwork.create_one_network()
network = compute_fakes.create_one_network()
with mock.patch.object(
self.app.client_manager,
@ -277,7 +275,7 @@ class TestServerAddFixedIP(TestServer):
sm_mock.return_value = False
servers = self.setup_sdk_servers_mock(count=1)
network = compute_fakes.FakeNetwork.create_one_network()
network = compute_fakes.create_one_network()
with mock.patch.object(
self.app.client_manager,
@ -312,7 +310,7 @@ class TestServerAddFixedIP(TestServer):
sm_mock.side_effect = [False, True]
servers = self.setup_sdk_servers_mock(count=1)
network = compute_fakes.FakeNetwork.create_one_network()
network = compute_fakes.create_one_network()
with mock.patch.object(
self.app.client_manager,
@ -347,7 +345,7 @@ class TestServerAddFixedIP(TestServer):
sm_mock.side_effect = [True, False]
servers = self.setup_sdk_servers_mock(count=1)
network = compute_fakes.FakeNetwork.create_one_network()
network = compute_fakes.create_one_network()
interface = compute_fakes.create_one_server_interface()
self.sdk_client.create_server_interface.return_value = interface
@ -393,7 +391,7 @@ class TestServerAddFixedIP(TestServer):
sm_mock.side_effect = [True, True]
servers = self.setup_sdk_servers_mock(count=1)
network = compute_fakes.FakeNetwork.create_one_network()
network = compute_fakes.create_one_network()
interface = compute_fakes.create_one_server_interface()
self.sdk_client.create_server_interface.return_value = interface
@ -449,7 +447,7 @@ class TestServerAddFixedIP(TestServer):
sm_mock.side_effect = [True, True, True]
servers = self.setup_sdk_servers_mock(count=1)
network = compute_fakes.FakeNetwork.create_one_network()
network = compute_fakes.create_one_network()
interface = compute_fakes.create_one_server_interface()
self.sdk_client.create_server_interface.return_value = interface
@ -516,7 +514,7 @@ class TestServerAddFloatingIPCompute(compute_fakes.TestComputev2):
self.cmd = server.AddFloatingIP(self.app, None)
def test_server_add_floating_ip_default(self, fip_mock):
_floating_ip = compute_fakes.FakeFloatingIP.create_one_floating_ip()
_floating_ip = compute_fakes.create_one_floating_ip()
arglist = [
'server1',
_floating_ip['ip'],
@ -536,7 +534,7 @@ class TestServerAddFloatingIPCompute(compute_fakes.TestComputev2):
)
def test_server_add_floating_ip_fixed(self, fip_mock):
_floating_ip = compute_fakes.FakeFloatingIP.create_one_floating_ip()
_floating_ip = compute_fakes.create_one_floating_ip()
arglist = [
'--fixed-ip-address',
_floating_ip['fixed_ip'],
@ -574,7 +572,7 @@ class TestServerAddFloatingIPNetwork(
self.cmd = server.AddFloatingIP(self.app, self.namespace)
def test_server_add_floating_ip(self):
_server = compute_fakes.FakeServer.create_one_server()
_server = compute_fakes.create_one_server()
self.servers_mock.get.return_value = _server
_port = network_fakes.create_one_port()
_floating_ip = network_fakes.FakeFloatingIP.create_one_floating_ip()
@ -606,7 +604,7 @@ class TestServerAddFloatingIPNetwork(
self.network.update_ip.assert_called_once_with(_floating_ip, **attrs)
def test_server_add_floating_ip_no_ports(self):
server = compute_fakes.FakeServer.create_one_server()
server = compute_fakes.create_one_server()
floating_ip = network_fakes.FakeFloatingIP.create_one_floating_ip()
self.servers_mock.get.return_value = server
@ -639,7 +637,7 @@ class TestServerAddFloatingIPNetwork(
)
def test_server_add_floating_ip_no_external_gateway(self, success=False):
_server = compute_fakes.FakeServer.create_one_server()
_server = compute_fakes.create_one_server()
self.servers_mock.get.return_value = _server
_port = network_fakes.create_one_port()
_floating_ip = network_fakes.FakeFloatingIP.create_one_floating_ip()
@ -697,7 +695,7 @@ class TestServerAddFloatingIPNetwork(
self.test_server_add_floating_ip_no_external_gateway(success=True)
def test_server_add_floating_ip_with_fixed_ip(self):
_server = compute_fakes.FakeServer.create_one_server()
_server = compute_fakes.create_one_server()
self.servers_mock.get.return_value = _server
_port = network_fakes.create_one_port()
_floating_ip = network_fakes.FakeFloatingIP.create_one_floating_ip()
@ -737,7 +735,7 @@ class TestServerAddFloatingIPNetwork(
self.network.update_ip.assert_called_once_with(_floating_ip, **attrs)
def test_server_add_floating_ip_with_fixed_ip_no_port_found(self):
_server = compute_fakes.FakeServer.create_one_server()
_server = compute_fakes.create_one_server()
self.servers_mock.get.return_value = _server
_port = network_fakes.create_one_port()
_floating_ip = network_fakes.FakeFloatingIP.create_one_floating_ip()
@ -1340,16 +1338,14 @@ class TestServerAddSecurityGroup(TestServer):
def setUp(self):
super(TestServerAddSecurityGroup, self).setUp()
self.security_group = (
compute_fakes.FakeSecurityGroup.create_one_security_group()
)
self.security_group = compute_fakes.create_one_security_group()
attrs = {'security_groups': [{'name': self.security_group['id']}]}
methods = {
'add_security_group': None,
}
self.server = compute_fakes.FakeServer.create_one_server(
self.server = compute_fakes.create_one_server(
attrs=attrs, methods=methods
)
# This is the return value for utils.find_resource() for server
@ -1410,9 +1406,7 @@ class TestServerCreate(TestServer):
attrs = {
'networks': {},
}
self.new_server = compute_fakes.FakeServer.create_one_server(
attrs=attrs
)
self.new_server = compute_fakes.create_one_server(attrs=attrs)
# This is the return value for utils.find_resource().
# This is for testing --wait option.
@ -1424,7 +1418,7 @@ class TestServerCreate(TestServer):
self.find_image_mock.return_value = self.image
self.get_image_mock.return_value = self.image
self.flavor = compute_fakes.FakeFlavor.create_one_flavor()
self.flavor = compute_fakes.create_one_flavor()
self.flavors_mock.get.return_value = self.flavor
self.volume = volume_fakes.create_one_volume()
@ -4616,7 +4610,7 @@ class TestServerDelete(TestServer):
@mock.patch.object(common_utils, 'find_resource')
def test_server_delete_with_all_projects(self, mock_find_resource):
servers = self.setup_servers_mock(count=1)
mock_find_resource.side_effect = compute_fakes.FakeServer.get_servers(
mock_find_resource.side_effect = compute_fakes.get_servers(
servers,
0,
)
@ -4778,7 +4772,7 @@ class _TestServerList(TestServer):
self.find_image_mock.return_value = self.image
self.get_image_mock.return_value = self.image
self.flavor = compute_fakes.FakeFlavor.create_one_flavor()
self.flavor = compute_fakes.create_one_flavor()
self.sdk_client.find_flavor.return_value = self.flavor
self.attrs['flavor'] = {'original_name': self.flavor.name}
@ -5650,7 +5644,7 @@ class TestServerLock(TestServer):
def setUp(self):
super().setUp()
self.server = compute_fakes.FakeServer.create_one_sdk_server()
self.server = compute_fakes.create_one_sdk_server()
self.app.client_manager.sdk_connection = mock.Mock()
self.app.client_manager.sdk_connection.compute = mock.Mock()
@ -5698,7 +5692,7 @@ class TestServerLock(TestServer):
@mock.patch.object(sdk_utils, 'supports_microversion')
def test_server_lock_with_reason_multi_servers(self, sm_mock):
sm_mock.return_value = True
server2 = compute_fakes.FakeServer.create_one_sdk_server()
server2 = compute_fakes.create_one_sdk_server()
arglist = [
self.server.id,
server2.id,
@ -5721,7 +5715,7 @@ class TestServerLock(TestServer):
@mock.patch.object(sdk_utils, 'supports_microversion')
def test_server_lock_with_reason_pre_v273(self, sm_mock):
sm_mock.return_value = False
server = compute_fakes.FakeServer.create_one_sdk_server()
server = compute_fakes.create_one_sdk_server()
arglist = [
server.id,
'--reason',
@ -5751,9 +5745,7 @@ class TestServerMigrate(TestServer):
'migrate': None,
'live_migrate': None,
}
self.server = compute_fakes.FakeServer.create_one_server(
methods=methods
)
self.server = compute_fakes.create_one_server(methods=methods)
# This is the return value for utils.find_resource()
self.servers_mock.get.return_value = self.server
@ -6246,14 +6238,14 @@ class TestServerRebuild(TestServer):
'networks': {},
'adminPass': 'passw0rd',
}
new_server = compute_fakes.FakeServer.create_one_server(attrs=attrs)
new_server = compute_fakes.create_one_server(attrs=attrs)
# Fake the server to be rebuilt. The IDs of them should be the same.
attrs['id'] = new_server.id
methods = {
'rebuild': new_server,
}
self.server = compute_fakes.FakeServer.create_one_server(
self.server = compute_fakes.create_one_server(
attrs=attrs, methods=methods
)
@ -6272,7 +6264,7 @@ class TestServerRebuild(TestServer):
'networks': {},
'adminPass': 'passw0rd',
}
new_server = compute_fakes.FakeServer.create_one_server(attrs=attrs)
new_server = compute_fakes.create_one_server(attrs=attrs)
self.server.rebuild.return_value = new_server
arglist = [self.server.id, '--image', image_name]
@ -6833,14 +6825,14 @@ class TestServerRebuildVolumeBacked(TestServer):
'networks': {},
'adminPass': 'passw0rd',
}
new_server = compute_fakes.FakeServer.create_one_server(attrs=attrs)
new_server = compute_fakes.create_one_server(attrs=attrs)
# Fake the server to be rebuilt. The IDs of them should be the same.
attrs['id'] = new_server.id
methods = {
'rebuild': new_server,
}
self.server = compute_fakes.FakeServer.create_one_server(
self.server = compute_fakes.create_one_server(
attrs=attrs, methods=methods
)
@ -6933,14 +6925,14 @@ class TestEvacuateServer(TestServer):
'networks': {},
'adminPass': 'passw0rd',
}
new_server = compute_fakes.FakeServer.create_one_server(attrs=attrs)
new_server = compute_fakes.create_one_server(attrs=attrs)
# Fake the server to be rebuilt. The IDs of them should be the same.
attrs['id'] = new_server.id
methods = {
'evacuate': new_server,
}
self.server = compute_fakes.FakeServer.create_one_server(
self.server = compute_fakes.create_one_server(
attrs=attrs, methods=methods
)
@ -7123,7 +7115,7 @@ class TestServerRescue(TestServer):
self.image = image_fakes.create_one_image()
self.get_image_mock.return_value = self.image
new_server = compute_fakes.FakeServer.create_one_server()
new_server = compute_fakes.create_one_server()
attrs = {
'id': new_server.id,
'image': {
@ -7135,7 +7127,7 @@ class TestServerRescue(TestServer):
methods = {
'rescue': new_server,
}
self.server = compute_fakes.FakeServer.create_one_server(
self.server = compute_fakes.create_one_server(
attrs=attrs,
methods=methods,
)
@ -7212,7 +7204,7 @@ class TestServerRemoveFloatingIPCompute(compute_fakes.TestComputev2):
self.cmd = server.RemoveFloatingIP(self.app, None)
def test_server_remove_floating_ip(self, fip_mock):
_floating_ip = compute_fakes.FakeFloatingIP.create_one_floating_ip()
_floating_ip = compute_fakes.create_one_floating_ip()
arglist = [
'server1',
@ -7244,7 +7236,7 @@ class TestServerRemoveFloatingIPNetwork(network_fakes.TestNetworkV2):
self.cmd = server.RemoveFloatingIP(self.app, self.namespace)
def test_server_remove_floating_ip_default(self):
_server = compute_fakes.FakeServer.create_one_server()
_server = compute_fakes.create_one_server()
_floating_ip = network_fakes.FakeFloatingIP.create_one_floating_ip()
self.network.find_ip = mock.Mock(return_value=_floating_ip)
arglist = [
@ -7377,16 +7369,14 @@ class TestServerRemoveSecurityGroup(TestServer):
def setUp(self):
super(TestServerRemoveSecurityGroup, self).setUp()
self.security_group = (
compute_fakes.FakeSecurityGroup.create_one_security_group()
)
self.security_group = compute_fakes.create_one_security_group()
attrs = {'security_groups': [{'name': self.security_group['id']}]}
methods = {
'remove_security_group': None,
}
self.server = compute_fakes.FakeServer.create_one_server(
self.server = compute_fakes.create_one_server(
attrs=attrs, methods=methods
)
# This is the return value for utils.find_resource() for server
@ -7418,7 +7408,7 @@ class TestServerResize(TestServer):
def setUp(self):
super(TestServerResize, self).setUp()
self.server = compute_fakes.FakeServer.create_one_server()
self.server = compute_fakes.create_one_server()
# This is the return value for utils.find_resource()
self.servers_mock.get.return_value = self.server
@ -7428,9 +7418,7 @@ class TestServerResize(TestServer):
self.servers_mock.revert_resize.return_value = None
# This is the return value for utils.find_resource()
self.flavors_get_return_value = (
compute_fakes.FakeFlavor.create_one_flavor()
)
self.flavors_get_return_value = compute_fakes.create_one_flavor()
self.flavors_mock.get.return_value = self.flavors_get_return_value
# Get the command object to test
@ -7620,9 +7608,7 @@ class TestServerResizeConfirm(TestServer):
methods = {
'confirm_resize': None,
}
self.server = compute_fakes.FakeServer.create_one_server(
methods=methods
)
self.server = compute_fakes.create_one_server(methods=methods)
# This is the return value for utils.find_resource()
self.servers_mock.get.return_value = self.server
@ -7655,9 +7641,7 @@ class TestServerMigrateConfirm(TestServer):
methods = {
'confirm_resize': None,
}
self.server = compute_fakes.FakeServer.create_one_server(
methods=methods
)
self.server = compute_fakes.create_one_server(methods=methods)
# This is the return value for utils.find_resource()
self.servers_mock.get.return_value = self.server
@ -7696,9 +7680,7 @@ class TestServerConfirmMigration(TestServerResizeConfirm):
methods = {
'confirm_resize': None,
}
self.server = compute_fakes.FakeServer.create_one_server(
methods=methods
)
self.server = compute_fakes.create_one_server(methods=methods)
# This is the return value for utils.find_resource()
self.servers_mock.get.return_value = self.server
@ -7730,9 +7712,7 @@ class TestServerResizeRevert(TestServer):
methods = {
'revert_resize': None,
}
self.server = compute_fakes.FakeServer.create_one_server(
methods=methods
)
self.server = compute_fakes.create_one_server(methods=methods)
# This is the return value for utils.find_resource()
self.servers_mock.get.return_value = self.server
@ -7765,9 +7745,7 @@ class TestServerMigrateRevert(TestServer):
methods = {
'revert_resize': None,
}
self.server = compute_fakes.FakeServer.create_one_server(
methods=methods
)
self.server = compute_fakes.create_one_server(methods=methods)
# This is the return value for utils.find_resource()
self.servers_mock.get.return_value = self.server
@ -7806,9 +7784,7 @@ class TestServerRevertMigration(TestServer):
methods = {
'revert_resize': None,
}
self.server = compute_fakes.FakeServer.create_one_server(
methods=methods
)
self.server = compute_fakes.create_one_server(methods=methods)
# This is the return value for utils.find_resource()
self.servers_mock.get.return_value = self.server
@ -8143,7 +8119,7 @@ class TestServerShelve(TestServer):
def setUp(self):
super().setUp()
self.server = compute_fakes.FakeServer.create_one_sdk_server(
self.server = compute_fakes.create_one_sdk_server(
attrs={'status': 'ACTIVE'},
)
@ -8261,7 +8237,7 @@ class TestServerShow(TestServer):
super(TestServerShow, self).setUp()
self.image = image_fakes.create_one_image()
self.flavor = compute_fakes.FakeFlavor.create_one_flavor()
self.flavor = compute_fakes.create_one_flavor()
self.topology = {
'nodes': [{'vcpu_set': [0, 1]}, {'vcpu_set': [2, 3]}],
'pagesize_kb': None,
@ -8276,7 +8252,7 @@ class TestServerShow(TestServer):
server_method = {
'fetch_topology': self.topology,
}
self.server = compute_fakes.FakeServer.create_one_server(
self.server = compute_fakes.create_one_server(
attrs=server_info, methods=server_method
)
@ -8450,7 +8426,7 @@ class TestServerSsh(TestServer):
],
},
}
self.server = compute_fakes.FakeServer.create_one_server(
self.server = compute_fakes.create_one_server(
attrs=self.attrs,
methods=self.methods,
)
@ -8799,7 +8775,7 @@ class TestServerUnshelve(TestServer):
def setUp(self):
super().setUp()
self.server = compute_fakes.FakeServer.create_one_sdk_server(
self.server = compute_fakes.create_one_sdk_server(
attrs={'status': 'SHELVED'},
)
@ -9115,7 +9091,7 @@ class TestServerGeneral(TestServer):
# - The second time, return image info.
# - The third time, return flavor info.
_image = image_fakes.create_one_image()
_flavor = compute_fakes.FakeFlavor.create_one_flavor()
_flavor = compute_fakes.create_one_flavor()
server_info = {
'image': {u'id': _image.id},
'flavor': {u'id': _flavor.id},
@ -9125,7 +9101,7 @@ class TestServerGeneral(TestServer):
'properties': '',
'volumes_attached': [{"id": "6344fe9d-ef20-45b2-91a6"}],
}
_server = compute_fakes.FakeServer.create_one_server(attrs=server_info)
_server = compute_fakes.create_one_server(attrs=server_info)
find_resource.side_effect = [_server, _flavor]
self.get_image_mock.return_value = _image

4
openstackclient/tests/unit/compute/v2/test_server_backup.py

@ -42,14 +42,14 @@ class TestServerBackup(compute_fakes.TestComputev2):
self.methods = {}
def setup_servers_mock(self, count):
servers = compute_fakes.FakeServer.create_sdk_servers(
servers = compute_fakes.create_sdk_servers(
attrs=self.attrs,
methods=self.methods,
count=count,
)
# This is the return value for compute_client.find_server()
self.sdk_client.find_server = compute_fakes.FakeServer.get_servers(
self.sdk_client.find_server = compute_fakes.get_servers(
servers,
0,
)

2
openstackclient/tests/unit/compute/v2/test_server_event.py

@ -24,7 +24,7 @@ from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
class TestServerEvent(compute_fakes.TestComputev2):
fake_server = compute_fakes.FakeServer.create_one_server()
fake_server = compute_fakes.create_one_server()
def setUp(self):
super(TestServerEvent, self).setUp()

4
openstackclient/tests/unit/compute/v2/test_server_image.py

@ -41,14 +41,14 @@ class TestServerImage(compute_fakes.TestComputev2):
self.methods = {}
def setup_servers_mock(self, count):
servers = compute_fakes.FakeServer.create_sdk_servers(
servers = compute_fakes.create_sdk_servers(
attrs=self.attrs,
methods=self.methods,
count=count,
)
# This is the return value for compute_client.find_server()
self.sdk_client.find_server = compute_fakes.FakeServer.get_servers(
self.sdk_client.find_server = compute_fakes.get_servers(
servers,
0,
)

8
openstackclient/tests/unit/compute/v2/test_server_migration.py

@ -91,7 +91,7 @@ class TestListMigration(TestServerMigration):
self._set_mock_microversion('2.1')
self.server = compute_fakes.FakeServer.create_one_sdk_server()
self.server = compute_fakes.create_one_sdk_server()
self.sdk_client.find_server.return_value = self.server
self.migrations = compute_fakes.create_migrations(count=3)
@ -724,7 +724,7 @@ class TestServerMigrationShow(TestServerMigration):
def setUp(self):
super().setUp()
self.server = compute_fakes.FakeServer.create_one_sdk_server()
self.server = compute_fakes.create_one_sdk_server()
self.sdk_client.find_server.return_value = self.server
self.server_migration = compute_fakes.create_one_server_migration()
@ -924,7 +924,7 @@ class TestServerMigrationAbort(TestServerMigration):
def setUp(self):
super().setUp()
self.server = compute_fakes.FakeServer.create_one_sdk_server()
self.server = compute_fakes.create_one_sdk_server()
# Return value for utils.find_resource for server.
self.sdk_client.find_server.return_value = self.server
@ -1037,7 +1037,7 @@ class TestServerMigrationForceComplete(TestServerMigration):
def setUp(self):
super().setUp()
self.server = compute_fakes.FakeServer.create_one_sdk_server()
self.server = compute_fakes.create_one_sdk_server()
# Return value for utils.find_resource for server.
self.sdk_client.find_server.return_value = self.server

4
openstackclient/tests/unit/compute/v2/test_server_volume.py

@ -37,7 +37,7 @@ class TestServerVolumeList(TestServerVolume):
def setUp(self):
super().setUp()
self.server = compute_fakes.FakeServer.create_one_sdk_server()
self.server = compute_fakes.create_one_sdk_server()
self.volume_attachments = compute_fakes.create_volume_attachments()
self.compute_client.find_server.return_value = self.server
@ -240,7 +240,7 @@ class TestServerVolumeUpdate(TestServerVolume):
def setUp(self):
super().setUp()
self.server = compute_fakes.FakeServer.create_one_sdk_server()
self.server = compute_fakes.create_one_sdk_server()
self.compute_client.find_server.return_value = self.server
self.volume = volume_fakes.create_one_sdk_volume()

6
openstackclient/tests/unit/compute/v2/test_service.py

@ -34,7 +34,7 @@ class TestService(compute_fakes.TestComputev2):
class TestServiceDelete(TestService):
services = compute_fakes.FakeService.create_services(count=2)
services = compute_fakes.create_services(count=2)
def setUp(self):
super(TestServiceDelete, self).setUp()
@ -107,7 +107,7 @@ class TestServiceDelete(TestService):
class TestServiceList(TestService):
service = compute_fakes.FakeService.create_one_service()
service = compute_fakes.create_one_service()
columns = (
'ID',
@ -241,7 +241,7 @@ class TestServiceSet(TestService):
def setUp(self):
super(TestServiceSet, self).setUp()
self.service = compute_fakes.FakeService.create_one_service()
self.service = compute_fakes.create_one_service()
self.sdk_client.enable_service.return_value = self.service
self.sdk_client.disable_service.return_value = self.service

6
openstackclient/tests/unit/compute/v2/test_usage.py

@ -33,7 +33,7 @@ class TestUsage(compute_fakes.TestComputev2):
class TestUsageList(TestUsage):
project = identity_fakes.FakeProject.create_one_project()
# Return value of self.usage_mock.list().
usages = compute_fakes.FakeUsage.create_usages(
usages = compute_fakes.create_usages(
attrs={'project_id': project.name}, count=1
)
@ -128,9 +128,7 @@ class TestUsageList(TestUsage):
class TestUsageShow(TestUsage):
project = identity_fakes.FakeProject.create_one_project()
# Return value of self.usage_mock.list().
usage = compute_fakes.FakeUsage.create_one_usage(
attrs={'project_id': project.name}
)
usage = compute_fakes.create_one_usage(attrs={'project_id': project.name})
columns = (
'Project',

8
openstackclient/tests/unit/network/v2/test_floating_ip_compute.py

@ -35,7 +35,7 @@ class TestFloatingIPCompute(compute_fakes.TestComputev2):
@mock.patch('openstackclient.api.compute_v2.APIv2.floating_ip_create')
class TestCreateFloatingIPCompute(TestFloatingIPCompute):
# The floating ip to be deleted.
_floating_ip = compute_fakes.FakeFloatingIP.create_one_floating_ip()
_floating_ip = compute_fakes.create_one_floating_ip()
columns = (
'fixed_ip',
@ -95,7 +95,7 @@ class TestCreateFloatingIPCompute(TestFloatingIPCompute):
@mock.patch('openstackclient.api.compute_v2.APIv2.floating_ip_delete')
class TestDeleteFloatingIPCompute(TestFloatingIPCompute):
# The floating ips to be deleted.
_floating_ips = compute_fakes.FakeFloatingIP.create_floating_ips(count=2)
_floating_ips = compute_fakes.create_floating_ips(count=2)
def setUp(self):
super(TestDeleteFloatingIPCompute, self).setUp()
@ -171,7 +171,7 @@ class TestDeleteFloatingIPCompute(TestFloatingIPCompute):
@mock.patch('openstackclient.api.compute_v2.APIv2.floating_ip_list')
class TestListFloatingIPCompute(TestFloatingIPCompute):
# The floating ips to be list up
_floating_ips = compute_fakes.FakeFloatingIP.create_floating_ips(count=3)
_floating_ips = compute_fakes.create_floating_ips(count=3)
columns = (
'ID',
@ -217,7 +217,7 @@ class TestListFloatingIPCompute(TestFloatingIPCompute):
@mock.patch('openstackclient.api.compute_v2.APIv2.floating_ip_find')
class TestShowFloatingIPCompute(TestFloatingIPCompute):
# The floating ip to display.
_floating_ip = compute_fakes.FakeFloatingIP.create_one_floating_ip()
_floating_ip = compute_fakes.create_one_floating_ip()
columns = (
'fixed_ip',

4
openstackclient/tests/unit/network/v2/test_floating_ip_pool_compute.py

@ -31,9 +31,7 @@ class TestFloatingIPPoolCompute(compute_fakes.TestComputev2):
@mock.patch('openstackclient.api.compute_v2.APIv2.floating_ip_pool_list')
class TestListFloatingIPPoolCompute(TestFloatingIPPoolCompute):
# The floating ip pools to list up
_floating_ip_pools = (
compute_fakes.FakeFloatingIPPool.create_floating_ip_pools(count=3)
)
_floating_ip_pools = compute_fakes.create_floating_ip_pools(count=3)
columns = ('Name',)

10
openstackclient/tests/unit/network/v2/test_network_compute.py

@ -34,7 +34,7 @@ class TestNetworkCompute(compute_fakes.TestComputev2):
@mock.patch('openstackclient.api.compute_v2.APIv2.network_create')
class TestCreateNetworkCompute(TestNetworkCompute):
# The network to create.
_network = compute_fakes.FakeNetwork.create_one_network()
_network = compute_fakes.create_one_network()
columns = (
'bridge',
@ -179,10 +179,10 @@ class TestDeleteNetworkCompute(TestNetworkCompute):
self.app.client_manager.network_endpoint_enabled = False
# The networks to delete
self._networks = compute_fakes.FakeNetwork.create_networks(count=3)
self._networks = compute_fakes.create_networks(count=3)
# Return value of utils.find_resource()
self.compute.api.network_find = compute_fakes.FakeNetwork.get_networks(
self.compute.api.network_find = compute_fakes.get_networks(
networks=self._networks
)
@ -254,7 +254,7 @@ class TestDeleteNetworkCompute(TestNetworkCompute):
@mock.patch('openstackclient.api.compute_v2.APIv2.network_list')
class TestListNetworkCompute(TestNetworkCompute):
# The networks going to be listed up.
_networks = compute_fakes.FakeNetwork.create_networks(count=3)
_networks = compute_fakes.create_networks(count=3)
columns = (
'ID',
@ -299,7 +299,7 @@ class TestListNetworkCompute(TestNetworkCompute):
@mock.patch('openstackclient.api.compute_v2.APIv2.network_find')
class TestShowNetworkCompute(TestNetworkCompute):
# The network to show.
_network = compute_fakes.FakeNetwork.create_one_network()
_network = compute_fakes.create_one_network()
columns = (
'bridge',

2
openstackclient/tests/unit/network/v2/test_port.py

@ -1113,7 +1113,7 @@ class TestListPort(TestPort):
@mock.patch.object(utils, 'find_resource')
def test_port_list_with_server_option(self, mock_find):
fake_server = compute_fakes.FakeServer.create_one_server()
fake_server = compute_fakes.create_one_server()
mock_find.return_value = fake_server
arglist = [

28
openstackclient/tests/unit/network/v2/test_security_group_compute.py

@ -36,9 +36,7 @@ class TestCreateSecurityGroupCompute(TestSecurityGroupCompute):
domain = identity_fakes.FakeDomain.create_one_domain()
# The security group to be shown.
_security_group = (
compute_fakes.FakeSecurityGroup.create_one_security_group()
)
_security_group = compute_fakes.create_one_security_group()
columns = (
'description',
@ -114,7 +112,7 @@ class TestCreateSecurityGroupCompute(TestSecurityGroupCompute):
@mock.patch('openstackclient.api.compute_v2.APIv2.security_group_delete')
class TestDeleteSecurityGroupCompute(TestSecurityGroupCompute):
# The security groups to be deleted.
_security_groups = compute_fakes.FakeSecurityGroup.create_security_groups()
_security_groups = compute_fakes.create_security_groups()
def setUp(self):
super(TestDeleteSecurityGroupCompute, self).setUp()
@ -122,9 +120,7 @@ class TestDeleteSecurityGroupCompute(TestSecurityGroupCompute):
self.app.client_manager.network_endpoint_enabled = False
self.compute.api.security_group_find = (
compute_fakes.FakeSecurityGroup.get_security_groups(
self._security_groups
)
compute_fakes.get_security_groups(self._security_groups)
)
# Get the command object to test
@ -198,9 +194,7 @@ class TestDeleteSecurityGroupCompute(TestSecurityGroupCompute):
@mock.patch('openstackclient.api.compute_v2.APIv2.security_group_list')
class TestListSecurityGroupCompute(TestSecurityGroupCompute):
# The security group to be listed.
_security_groups = compute_fakes.FakeSecurityGroup.create_security_groups(
count=3
)
_security_groups = compute_fakes.create_security_groups(count=3)
columns = (
'ID',
@ -278,9 +272,7 @@ class TestListSecurityGroupCompute(TestSecurityGroupCompute):
@mock.patch('openstackclient.api.compute_v2.APIv2.security_group_set')
class TestSetSecurityGroupCompute(TestSecurityGroupCompute):
# The security group to be set.
_security_group = (
compute_fakes.FakeSecurityGroup.create_one_security_group()
)
_security_group = compute_fakes.create_one_security_group()
def setUp(self):
super(TestSetSecurityGroupCompute, self).setUp()
@ -347,15 +339,11 @@ class TestSetSecurityGroupCompute(TestSecurityGroupCompute):
@mock.patch('openstackclient.api.compute_v2.APIv2.security_group_find')
class TestShowSecurityGroupCompute(TestSecurityGroupCompute):
# The security group rule to be shown with the group.
_security_group_rule = (
compute_fakes.FakeSecurityGroupRule.create_one_security_group_rule()
)
_security_group_rule = compute_fakes.create_one_security_group_rule()
# The security group to be shown.
_security_group = (
compute_fakes.FakeSecurityGroup.create_one_security_group(
attrs={'rules': [_security_group_rule]}
)
_security_group = compute_fakes.create_one_security_group(
attrs={'rules': [_security_group_rule]}
)
columns = (

60
openstackclient/tests/unit/network/v2/test_security_group_rule_compute.py

@ -40,15 +40,11 @@ class TestCreateSecurityGroupRuleCompute(TestSecurityGroupRuleCompute):
_security_group_rule = None
# The security group that will contain the rule created.
_security_group = (
compute_fakes.FakeSecurityGroup.create_one_security_group()
)
_security_group = compute_fakes.create_one_security_group()
def _setup_security_group_rule(self, attrs=None):
self._security_group_rule = (
compute_fakes.FakeSecurityGroupRule.create_one_security_group_rule(
attrs
)
compute_fakes.create_one_security_group_rule(attrs)
)
(
expected_columns,
@ -311,11 +307,7 @@ class TestCreateSecurityGroupRuleCompute(TestSecurityGroupRuleCompute):
@mock.patch('openstackclient.api.compute_v2.APIv2.security_group_rule_delete')
class TestDeleteSecurityGroupRuleCompute(TestSecurityGroupRuleCompute):
# The security group rule to be deleted.
_security_group_rules = (
compute_fakes.FakeSecurityGroupRule.create_security_group_rules(
count=2
)
)
_security_group_rules = compute_fakes.create_security_group_rules(count=2)
def setUp(self):
super(TestDeleteSecurityGroupRuleCompute, self).setUp()
@ -383,33 +375,27 @@ class TestDeleteSecurityGroupRuleCompute(TestSecurityGroupRuleCompute):
class TestListSecurityGroupRuleCompute(TestSecurityGroupRuleCompute):
# The security group to hold the rules.
_security_group = (
compute_fakes.FakeSecurityGroup.create_one_security_group()
)
_security_group = compute_fakes.create_one_security_group()
# The security group rule to be listed.
_security_group_rule_tcp = (
compute_fakes.FakeSecurityGroupRule.create_one_security_group_rule(
{
'ip_protocol': 'tcp',
'ethertype': 'IPv4',
'from_port': 80,
'to_port': 80,
'group': {'name': _security_group['name']},
}
)
_security_group_rule_tcp = compute_fakes.create_one_security_group_rule(
{
'ip_protocol': 'tcp',
'ethertype': 'IPv4',
'from_port': 80,
'to_port': 80,
'group': {'name': _security_group['name']},
}
)
_security_group_rule_icmp = (
compute_fakes.FakeSecurityGroupRule.create_one_security_group_rule(
{
'ip_protocol': 'icmp',
'ethertype': 'IPv4',
'from_port': -1,
'to_port': -1,
'ip_range': {'cidr': '10.0.2.0/24'},
'group': {'name': _security_group['name']},
}
)
_security_group_rule_icmp = compute_fakes.create_one_security_group_rule(
{
'ip_protocol': 'icmp',
'ethertype': 'IPv4',
'from_port': -1,
'to_port': -1,
'ip_range': {'cidr': '10.0.2.0/24'},
'group': {'name': _security_group['name']},
}
)
_security_group['rules'] = [
_security_group_rule_tcp,
@ -525,9 +511,7 @@ class TestListSecurityGroupRuleCompute(TestSecurityGroupRuleCompute):
class TestShowSecurityGroupRuleCompute(TestSecurityGroupRuleCompute):
# The security group rule to be shown.
_security_group_rule = (
compute_fakes.FakeSecurityGroupRule.create_one_security_group_rule()
)
_security_group_rule = compute_fakes.create_one_security_group_rule()
columns, data = security_group_rule._format_security_group_rule_show(
_security_group_rule

2
openstackclient/tests/unit/volume/v3/test_volume_attachment.py

@ -41,7 +41,7 @@ class TestVolumeAttachment(volume_fakes.TestVolume):
class TestVolumeAttachmentCreate(TestVolumeAttachment):
volume = volume_fakes.create_one_volume()
server = compute_fakes.FakeServer.create_one_server()
server = compute_fakes.create_one_server()
volume_attachment = volume_fakes.create_one_volume_attachment(
attrs={'instance': server.id, 'volume_id': volume.id},
)