tests: Use consistent shortcut to fake compute client
This removes the need for a number of base test case subclasses. We use 'compute_client' rather than 'client' to avoid conflicts with clients for other services. Change-Id: I430214cd79eca481bd8d8c53bf97eaede6766eb4 Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
This commit is contained in:
Stephen Finucane
parent
98fb1678bc
commit
187a454ec0
@ -1575,8 +1575,8 @@ class CreateServer(command.ShowOne):
|
||||
if parsed_args.description:
|
||||
if compute_client.api_version < api_versions.APIVersion("2.19"):
|
||||
msg = _(
|
||||
"Description is not supported for "
|
||||
"--os-compute-api-version less than 2.19"
|
||||
'--os-compute-api-version 2.19 or greater is '
|
||||
'required to support the --description option'
|
||||
)
|
||||
raise exceptions.CommandError(msg)
|
||||
|
||||
@ -4958,8 +4958,8 @@ class UnsetServer(command.Command):
|
||||
if parsed_args.description:
|
||||
if compute_client.api_version < api_versions.APIVersion("2.19"):
|
||||
msg = _(
|
||||
"Description is not supported for "
|
||||
"--os-compute-api-version less than 2.19"
|
||||
'--os-compute-api-version 2.19 or greater is '
|
||||
'required to support the --description option'
|
||||
)
|
||||
raise exceptions.CommandError(msg)
|
||||
compute_client.servers.update(
|
||||
|
||||
@ -87,8 +87,10 @@ class TestAvailabilityZone(
|
||||
super().setUp()
|
||||
|
||||
self.app.client_manager.sdk_connection.compute = mock.Mock()
|
||||
self.compute_client = self.app.client_manager.sdk_connection.compute
|
||||
self.compute_client.availability_zones = mock.Mock()
|
||||
self.compute_sdk_client = (
|
||||
self.app.client_manager.sdk_connection.compute
|
||||
)
|
||||
self.compute_sdk_client.availability_zones = mock.Mock()
|
||||
|
||||
|
||||
class TestAvailabilityZoneList(TestAvailabilityZone):
|
||||
@ -109,7 +111,9 @@ class TestAvailabilityZoneList(TestAvailabilityZone):
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
|
||||
self.compute_client.availability_zones.return_value = self.compute_azs
|
||||
self.compute_sdk_client.availability_zones.return_value = (
|
||||
self.compute_azs
|
||||
)
|
||||
self.volume_sdk_client.availability_zones.return_value = (
|
||||
self.volume_azs
|
||||
)
|
||||
@ -128,7 +132,9 @@ class TestAvailabilityZoneList(TestAvailabilityZone):
|
||||
# containing the data to be listed.
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.compute_client.availability_zones.assert_called_with(details=True)
|
||||
self.compute_sdk_client.availability_zones.assert_called_with(
|
||||
details=True
|
||||
)
|
||||
self.volume_sdk_client.availability_zones.assert_called_with()
|
||||
self.network_client.availability_zones.assert_called_with()
|
||||
|
||||
@ -156,7 +162,9 @@ class TestAvailabilityZoneList(TestAvailabilityZone):
|
||||
# containing the data to be listed.
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.compute_client.availability_zones.assert_called_with(details=True)
|
||||
self.compute_sdk_client.availability_zones.assert_called_with(
|
||||
details=True
|
||||
)
|
||||
self.volume_sdk_client.availability_zones.assert_called_with()
|
||||
self.network_client.availability_zones.assert_called_with()
|
||||
|
||||
@ -190,7 +198,9 @@ class TestAvailabilityZoneList(TestAvailabilityZone):
|
||||
# containing the data to be listed.
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.compute_client.availability_zones.assert_called_with(details=True)
|
||||
self.compute_sdk_client.availability_zones.assert_called_with(
|
||||
details=True
|
||||
)
|
||||
self.volume_sdk_client.availability_zones.assert_not_called()
|
||||
self.network_client.availability_zones.assert_not_called()
|
||||
|
||||
@ -214,7 +224,7 @@ class TestAvailabilityZoneList(TestAvailabilityZone):
|
||||
# containing the data to be listed.
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.compute_client.availability_zones.assert_not_called()
|
||||
self.compute_sdk_client.availability_zones.assert_not_called()
|
||||
self.volume_sdk_client.availability_zones.assert_called_with()
|
||||
self.network_client.availability_zones.assert_not_called()
|
||||
|
||||
@ -238,7 +248,7 @@ class TestAvailabilityZoneList(TestAvailabilityZone):
|
||||
# containing the data to be listed.
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.compute_client.availability_zones.assert_not_called()
|
||||
self.compute_sdk_client.availability_zones.assert_not_called()
|
||||
self.volume_sdk_client.availability_zones.assert_not_called()
|
||||
self.network_client.availability_zones.assert_called_with()
|
||||
|
||||
|
||||
@ -27,10 +27,10 @@ class TestComputeLimits(compute_fakes.TestComputev2):
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
self.app.client_manager.volume_endpoint_enabled = False
|
||||
self.compute = self.app.client_manager.compute
|
||||
self.compute_client = self.app.client_manager.compute
|
||||
|
||||
self.fake_limits = compute_fakes.FakeLimits()
|
||||
self.compute.limits.get.return_value = self.fake_limits
|
||||
self.compute_client.limits.get.return_value = self.fake_limits
|
||||
|
||||
def test_compute_show_absolute(self):
|
||||
arglist = ['--absolute']
|
||||
|
||||
@ -48,11 +48,10 @@ class TestQuota(compute_fakes.TestComputev2):
|
||||
self.projects_mock.reset_mock()
|
||||
self.projects_mock.get.return_value = self.projects[0]
|
||||
|
||||
self.compute_quotas_mock = self.app.client_manager.compute.quotas
|
||||
self.compute_client = self.app.client_manager.compute
|
||||
self.compute_quotas_mock = self.compute_client.quotas
|
||||
self.compute_quotas_mock.reset_mock()
|
||||
self.compute_quotas_class_mock = (
|
||||
self.app.client_manager.compute.quota_classes
|
||||
)
|
||||
self.compute_quotas_class_mock = self.compute_client.quota_classes
|
||||
self.compute_quotas_class_mock.reset_mock()
|
||||
|
||||
self.volume_quotas_mock = self.volume_client.quotas
|
||||
@ -125,8 +124,7 @@ class TestQuotaList(TestQuota):
|
||||
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(
|
||||
self.compute_client.quotas.defaults = mock.Mock(
|
||||
side_effect=self.compute_default_quotas,
|
||||
)
|
||||
|
||||
@ -221,7 +219,7 @@ class TestQuotaList(TestQuota):
|
||||
detailed_quota
|
||||
)
|
||||
|
||||
self.compute.quotas.get = mock.Mock(return_value=detailed_quota)
|
||||
self.compute_client.quotas.get = mock.Mock(return_value=detailed_quota)
|
||||
|
||||
arglist = [
|
||||
'--detail',
|
||||
@ -305,7 +303,7 @@ class TestQuotaList(TestQuota):
|
||||
|
||||
def test_quota_list_compute(self):
|
||||
# Two projects with non-default quotas
|
||||
self.compute.quotas.get = mock.Mock(
|
||||
self.compute_client.quotas.get = mock.Mock(
|
||||
side_effect=self.compute_quotas,
|
||||
)
|
||||
|
||||
@ -326,7 +324,7 @@ class TestQuotaList(TestQuota):
|
||||
|
||||
def test_quota_list_compute_default(self):
|
||||
# One of the projects is at defaults
|
||||
self.compute.quotas.get = mock.Mock(
|
||||
self.compute_client.quotas.get = mock.Mock(
|
||||
side_effect=[
|
||||
self.compute_quotas[0],
|
||||
compute_fakes.create_one_default_comp_quota(),
|
||||
@ -350,7 +348,7 @@ class TestQuotaList(TestQuota):
|
||||
|
||||
def test_quota_list_compute_no_project_not_found(self):
|
||||
# Make one of the projects disappear
|
||||
self.compute.quotas.get = mock.Mock(
|
||||
self.compute_client.quotas.get = mock.Mock(
|
||||
side_effect=[
|
||||
self.compute_quotas[0],
|
||||
exceptions.NotFound("NotFound"),
|
||||
@ -374,7 +372,7 @@ class TestQuotaList(TestQuota):
|
||||
|
||||
def test_quota_list_compute_no_project_4xx(self):
|
||||
# Make one of the projects disappear
|
||||
self.compute.quotas.get = mock.Mock(
|
||||
self.compute_client.quotas.get = mock.Mock(
|
||||
side_effect=[
|
||||
self.compute_quotas[0],
|
||||
exceptions.BadRequest("Bad request"),
|
||||
@ -398,7 +396,7 @@ class TestQuotaList(TestQuota):
|
||||
|
||||
def test_quota_list_compute_no_project_5xx(self):
|
||||
# Make one of the projects disappear
|
||||
self.compute.quotas.get = mock.Mock(
|
||||
self.compute_client.quotas.get = mock.Mock(
|
||||
side_effect=[
|
||||
self.compute_quotas[0],
|
||||
exceptions.HTTPNotImplemented("Not implemented??"),
|
||||
@ -421,7 +419,7 @@ class TestQuotaList(TestQuota):
|
||||
|
||||
def test_quota_list_compute_by_project(self):
|
||||
# Two projects with non-default quotas
|
||||
self.compute.quotas.get = mock.Mock(
|
||||
self.compute_client.quotas.get = mock.Mock(
|
||||
side_effect=self.compute_quotas,
|
||||
)
|
||||
|
||||
|
||||
@ -161,8 +161,9 @@ class TestComputev2(
|
||||
endpoint=fakes.AUTH_URL,
|
||||
token=fakes.AUTH_TOKEN,
|
||||
)
|
||||
self.compute_client = self.app.client_manager.compute
|
||||
|
||||
self.app.client_manager.compute.api = compute_v2.APIv2(
|
||||
self.compute_client.api = compute_v2.APIv2(
|
||||
session=self.app.client_manager.session,
|
||||
endpoint=fakes.AUTH_URL,
|
||||
)
|
||||
|
||||
@ -51,7 +51,7 @@ class TestAgent(compute_fakes.TestComputev2):
|
||||
def setUp(self):
|
||||
super(TestAgent, self).setUp()
|
||||
|
||||
self.agents_mock = self.app.client_manager.compute.agents
|
||||
self.agents_mock = self.compute_client.agents
|
||||
self.agents_mock.reset_mock()
|
||||
|
||||
|
||||
|
||||
@ -60,23 +60,27 @@ class TestAggregate(compute_fakes.TestComputev2):
|
||||
|
||||
# Get a shortcut to the AggregateManager Mock
|
||||
self.app.client_manager.sdk_connection.compute = mock.Mock()
|
||||
self.sdk_client = self.app.client_manager.sdk_connection.compute
|
||||
self.sdk_client.aggregates = mock.Mock()
|
||||
self.sdk_client.find_aggregate = mock.Mock()
|
||||
self.sdk_client.create_aggregate = mock.Mock()
|
||||
self.sdk_client.update_aggregate = mock.Mock()
|
||||
self.sdk_client.update_aggregate = mock.Mock()
|
||||
self.sdk_client.set_aggregate_metadata = mock.Mock()
|
||||
self.sdk_client.add_host_to_aggregate = mock.Mock()
|
||||
self.sdk_client.remove_host_from_aggregate = mock.Mock()
|
||||
self.compute_sdk_client = (
|
||||
self.app.client_manager.sdk_connection.compute
|
||||
)
|
||||
self.compute_sdk_client.aggregates = mock.Mock()
|
||||
self.compute_sdk_client.find_aggregate = mock.Mock()
|
||||
self.compute_sdk_client.create_aggregate = mock.Mock()
|
||||
self.compute_sdk_client.update_aggregate = mock.Mock()
|
||||
self.compute_sdk_client.update_aggregate = mock.Mock()
|
||||
self.compute_sdk_client.set_aggregate_metadata = mock.Mock()
|
||||
self.compute_sdk_client.add_host_to_aggregate = mock.Mock()
|
||||
self.compute_sdk_client.remove_host_from_aggregate = mock.Mock()
|
||||
|
||||
|
||||
class TestAggregateAddHost(TestAggregate):
|
||||
def setUp(self):
|
||||
super(TestAggregateAddHost, self).setUp()
|
||||
|
||||
self.sdk_client.find_aggregate.return_value = self.fake_ag
|
||||
self.sdk_client.add_host_to_aggregate.return_value = self.fake_ag
|
||||
self.compute_sdk_client.find_aggregate.return_value = self.fake_ag
|
||||
self.compute_sdk_client.add_host_to_aggregate.return_value = (
|
||||
self.fake_ag
|
||||
)
|
||||
self.cmd = aggregate.AddAggregateHost(self.app, None)
|
||||
|
||||
def test_aggregate_add_host(self):
|
||||
@ -90,10 +94,10 @@ class TestAggregateAddHost(TestAggregate):
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.find_aggregate.assert_called_once_with(
|
||||
self.compute_sdk_client.find_aggregate.assert_called_once_with(
|
||||
parsed_args.aggregate, ignore_missing=False
|
||||
)
|
||||
self.sdk_client.add_host_to_aggregate.assert_called_once_with(
|
||||
self.compute_sdk_client.add_host_to_aggregate.assert_called_once_with(
|
||||
self.fake_ag.id, parsed_args.host
|
||||
)
|
||||
self.assertEqual(self.columns, columns)
|
||||
@ -104,8 +108,10 @@ class TestAggregateCreate(TestAggregate):
|
||||
def setUp(self):
|
||||
super(TestAggregateCreate, self).setUp()
|
||||
|
||||
self.sdk_client.create_aggregate.return_value = self.fake_ag
|
||||
self.sdk_client.set_aggregate_metadata.return_value = self.fake_ag
|
||||
self.compute_sdk_client.create_aggregate.return_value = self.fake_ag
|
||||
self.compute_sdk_client.set_aggregate_metadata.return_value = (
|
||||
self.fake_ag
|
||||
)
|
||||
self.cmd = aggregate.CreateAggregate(self.app, None)
|
||||
|
||||
def test_aggregate_create(self):
|
||||
@ -117,7 +123,7 @@ class TestAggregateCreate(TestAggregate):
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.create_aggregate.assert_called_once_with(
|
||||
self.compute_sdk_client.create_aggregate.assert_called_once_with(
|
||||
name=parsed_args.name
|
||||
)
|
||||
self.assertEqual(self.columns, columns)
|
||||
@ -136,7 +142,7 @@ class TestAggregateCreate(TestAggregate):
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.create_aggregate.assert_called_once_with(
|
||||
self.compute_sdk_client.create_aggregate.assert_called_once_with(
|
||||
name=parsed_args.name, availability_zone=parsed_args.zone
|
||||
)
|
||||
self.assertEqual(self.columns, columns)
|
||||
@ -156,10 +162,10 @@ class TestAggregateCreate(TestAggregate):
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.create_aggregate.assert_called_once_with(
|
||||
self.compute_sdk_client.create_aggregate.assert_called_once_with(
|
||||
name=parsed_args.name
|
||||
)
|
||||
self.sdk_client.set_aggregate_metadata.assert_called_once_with(
|
||||
self.compute_sdk_client.set_aggregate_metadata.assert_called_once_with(
|
||||
self.fake_ag.id, parsed_args.properties
|
||||
)
|
||||
self.assertEqual(self.columns, columns)
|
||||
@ -172,7 +178,7 @@ class TestAggregateDelete(TestAggregate):
|
||||
def setUp(self):
|
||||
super(TestAggregateDelete, self).setUp()
|
||||
|
||||
self.sdk_client.find_aggregate = compute_fakes.get_aggregates(
|
||||
self.compute_sdk_client.find_aggregate = compute_fakes.get_aggregates(
|
||||
self.fake_ags
|
||||
)
|
||||
self.cmd = aggregate.DeleteAggregate(self.app, None)
|
||||
@ -184,10 +190,10 @@ class TestAggregateDelete(TestAggregate):
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.find_aggregate.assert_called_once_with(
|
||||
self.compute_sdk_client.find_aggregate.assert_called_once_with(
|
||||
self.fake_ags[0].id, ignore_missing=False
|
||||
)
|
||||
self.sdk_client.delete_aggregate.assert_called_once_with(
|
||||
self.compute_sdk_client.delete_aggregate.assert_called_once_with(
|
||||
self.fake_ags[0].id, ignore_missing=False
|
||||
)
|
||||
|
||||
@ -205,8 +211,8 @@ class TestAggregateDelete(TestAggregate):
|
||||
calls = []
|
||||
for a in self.fake_ags:
|
||||
calls.append(call(a.id, ignore_missing=False))
|
||||
self.sdk_client.find_aggregate.assert_has_calls(calls)
|
||||
self.sdk_client.delete_aggregate.assert_has_calls(calls)
|
||||
self.compute_sdk_client.find_aggregate.assert_has_calls(calls)
|
||||
self.compute_sdk_client.delete_aggregate.assert_has_calls(calls)
|
||||
|
||||
def test_delete_multiple_agggregates_with_exception(self):
|
||||
arglist = [
|
||||
@ -219,7 +225,7 @@ class TestAggregateDelete(TestAggregate):
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.sdk_client.find_aggregate.side_effect = [
|
||||
self.compute_sdk_client.find_aggregate.side_effect = [
|
||||
self.fake_ags[0],
|
||||
sdk_exceptions.NotFoundException,
|
||||
]
|
||||
@ -232,8 +238,8 @@ class TestAggregateDelete(TestAggregate):
|
||||
calls = []
|
||||
for a in arglist:
|
||||
calls.append(call(a, ignore_missing=False))
|
||||
self.sdk_client.find_aggregate.assert_has_calls(calls)
|
||||
self.sdk_client.delete_aggregate.assert_called_with(
|
||||
self.compute_sdk_client.find_aggregate.assert_has_calls(calls)
|
||||
self.compute_sdk_client.delete_aggregate.assert_called_with(
|
||||
self.fake_ags[0].id, ignore_missing=False
|
||||
)
|
||||
|
||||
@ -280,7 +286,7 @@ class TestAggregateList(TestAggregate):
|
||||
def setUp(self):
|
||||
super(TestAggregateList, self).setUp()
|
||||
|
||||
self.sdk_client.aggregates.return_value = [self.fake_ag]
|
||||
self.compute_sdk_client.aggregates.return_value = [self.fake_ag]
|
||||
self.cmd = aggregate.ListAggregate(self.app, None)
|
||||
|
||||
def test_aggregate_list(self):
|
||||
@ -308,8 +314,10 @@ class TestAggregateRemoveHost(TestAggregate):
|
||||
def setUp(self):
|
||||
super(TestAggregateRemoveHost, self).setUp()
|
||||
|
||||
self.sdk_client.find_aggregate.return_value = self.fake_ag
|
||||
self.sdk_client.remove_host_from_aggregate.return_value = self.fake_ag
|
||||
self.compute_sdk_client.find_aggregate.return_value = self.fake_ag
|
||||
self.compute_sdk_client.remove_host_from_aggregate.return_value = (
|
||||
self.fake_ag
|
||||
)
|
||||
self.cmd = aggregate.RemoveAggregateHost(self.app, None)
|
||||
|
||||
def test_aggregate_remove_host(self):
|
||||
@ -323,10 +331,10 @@ class TestAggregateRemoveHost(TestAggregate):
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.find_aggregate.assert_called_once_with(
|
||||
self.compute_sdk_client.find_aggregate.assert_called_once_with(
|
||||
parsed_args.aggregate, ignore_missing=False
|
||||
)
|
||||
self.sdk_client.remove_host_from_aggregate.assert_called_once_with(
|
||||
self.compute_sdk_client.remove_host_from_aggregate.assert_called_once_with(
|
||||
self.fake_ag.id, parsed_args.host
|
||||
)
|
||||
self.assertEqual(self.columns, columns)
|
||||
@ -337,7 +345,7 @@ class TestAggregateSet(TestAggregate):
|
||||
def setUp(self):
|
||||
super(TestAggregateSet, self).setUp()
|
||||
|
||||
self.sdk_client.find_aggregate.return_value = self.fake_ag
|
||||
self.compute_sdk_client.find_aggregate.return_value = self.fake_ag
|
||||
self.cmd = aggregate.SetAggregate(self.app, None)
|
||||
|
||||
def test_aggregate_set_no_option(self):
|
||||
@ -350,11 +358,11 @@ class TestAggregateSet(TestAggregate):
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.find_aggregate.assert_called_once_with(
|
||||
self.compute_sdk_client.find_aggregate.assert_called_once_with(
|
||||
parsed_args.aggregate, ignore_missing=False
|
||||
)
|
||||
self.assertNotCalled(self.sdk_client.update_aggregate)
|
||||
self.assertNotCalled(self.sdk_client.set_aggregate_metadata)
|
||||
self.assertNotCalled(self.compute_sdk_client.update_aggregate)
|
||||
self.assertNotCalled(self.compute_sdk_client.set_aggregate_metadata)
|
||||
self.assertIsNone(result)
|
||||
|
||||
def test_aggregate_set_with_name(self):
|
||||
@ -370,13 +378,13 @@ class TestAggregateSet(TestAggregate):
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.find_aggregate.assert_called_once_with(
|
||||
self.compute_sdk_client.find_aggregate.assert_called_once_with(
|
||||
parsed_args.aggregate, ignore_missing=False
|
||||
)
|
||||
self.sdk_client.update_aggregate.assert_called_once_with(
|
||||
self.compute_sdk_client.update_aggregate.assert_called_once_with(
|
||||
self.fake_ag.id, name=parsed_args.name
|
||||
)
|
||||
self.assertNotCalled(self.sdk_client.set_aggregate_metadata)
|
||||
self.assertNotCalled(self.compute_sdk_client.set_aggregate_metadata)
|
||||
self.assertIsNone(result)
|
||||
|
||||
def test_aggregate_set_with_zone(self):
|
||||
@ -392,13 +400,13 @@ class TestAggregateSet(TestAggregate):
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.find_aggregate.assert_called_once_with(
|
||||
self.compute_sdk_client.find_aggregate.assert_called_once_with(
|
||||
parsed_args.aggregate, ignore_missing=False
|
||||
)
|
||||
self.sdk_client.update_aggregate.assert_called_once_with(
|
||||
self.compute_sdk_client.update_aggregate.assert_called_once_with(
|
||||
self.fake_ag.id, availability_zone=parsed_args.zone
|
||||
)
|
||||
self.assertNotCalled(self.sdk_client.set_aggregate_metadata)
|
||||
self.assertNotCalled(self.compute_sdk_client.set_aggregate_metadata)
|
||||
self.assertIsNone(result)
|
||||
|
||||
def test_aggregate_set_with_property(self):
|
||||
@ -416,11 +424,11 @@ class TestAggregateSet(TestAggregate):
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.find_aggregate.assert_called_once_with(
|
||||
self.compute_sdk_client.find_aggregate.assert_called_once_with(
|
||||
parsed_args.aggregate, ignore_missing=False
|
||||
)
|
||||
self.assertNotCalled(self.sdk_client.update_aggregate)
|
||||
self.sdk_client.set_aggregate_metadata.assert_called_once_with(
|
||||
self.assertNotCalled(self.compute_sdk_client.update_aggregate)
|
||||
self.compute_sdk_client.set_aggregate_metadata.assert_called_once_with(
|
||||
self.fake_ag.id, parsed_args.properties
|
||||
)
|
||||
self.assertIsNone(result)
|
||||
@ -439,11 +447,11 @@ class TestAggregateSet(TestAggregate):
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.find_aggregate.assert_called_once_with(
|
||||
self.compute_sdk_client.find_aggregate.assert_called_once_with(
|
||||
parsed_args.aggregate, ignore_missing=False
|
||||
)
|
||||
self.assertNotCalled(self.sdk_client.update_aggregate)
|
||||
self.sdk_client.set_aggregate_metadata.assert_called_once_with(
|
||||
self.assertNotCalled(self.compute_sdk_client.update_aggregate)
|
||||
self.compute_sdk_client.set_aggregate_metadata.assert_called_once_with(
|
||||
self.fake_ag.id, {'key1': None, 'key2': 'value2'}
|
||||
)
|
||||
self.assertIsNone(result)
|
||||
@ -459,11 +467,11 @@ class TestAggregateSet(TestAggregate):
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.find_aggregate.assert_called_once_with(
|
||||
self.compute_sdk_client.find_aggregate.assert_called_once_with(
|
||||
parsed_args.aggregate, ignore_missing=False
|
||||
)
|
||||
self.assertNotCalled(self.sdk_client.update_aggregate)
|
||||
self.sdk_client.set_aggregate_metadata.assert_called_once_with(
|
||||
self.assertNotCalled(self.compute_sdk_client.update_aggregate)
|
||||
self.compute_sdk_client.set_aggregate_metadata.assert_called_once_with(
|
||||
self.fake_ag.id, {'key1': None}
|
||||
)
|
||||
self.assertIsNone(result)
|
||||
@ -482,13 +490,13 @@ class TestAggregateSet(TestAggregate):
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.find_aggregate.assert_called_once_with(
|
||||
self.compute_sdk_client.find_aggregate.assert_called_once_with(
|
||||
parsed_args.aggregate, ignore_missing=False
|
||||
)
|
||||
self.sdk_client.update_aggregate.assert_called_once_with(
|
||||
self.compute_sdk_client.update_aggregate.assert_called_once_with(
|
||||
self.fake_ag.id, availability_zone=parsed_args.zone
|
||||
)
|
||||
self.sdk_client.set_aggregate_metadata.assert_called_once_with(
|
||||
self.compute_sdk_client.set_aggregate_metadata.assert_called_once_with(
|
||||
self.fake_ag.id, {'key1': None}
|
||||
)
|
||||
self.assertIsNone(result)
|
||||
@ -524,7 +532,7 @@ class TestAggregateShow(TestAggregate):
|
||||
def setUp(self):
|
||||
super(TestAggregateShow, self).setUp()
|
||||
|
||||
self.sdk_client.find_aggregate.return_value = self.fake_ag
|
||||
self.compute_sdk_client.find_aggregate.return_value = self.fake_ag
|
||||
self.cmd = aggregate.ShowAggregate(self.app, None)
|
||||
|
||||
def test_aggregate_show(self):
|
||||
@ -536,7 +544,7 @@ class TestAggregateShow(TestAggregate):
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.find_aggregate.assert_called_once_with(
|
||||
self.compute_sdk_client.find_aggregate.assert_called_once_with(
|
||||
parsed_args.aggregate, ignore_missing=False
|
||||
)
|
||||
|
||||
@ -548,7 +556,7 @@ class TestAggregateUnset(TestAggregate):
|
||||
def setUp(self):
|
||||
super(TestAggregateUnset, self).setUp()
|
||||
|
||||
self.sdk_client.find_aggregate.return_value = self.fake_ag
|
||||
self.compute_sdk_client.find_aggregate.return_value = self.fake_ag
|
||||
self.cmd = aggregate.UnsetAggregate(self.app, None)
|
||||
|
||||
def test_aggregate_unset(self):
|
||||
@ -564,7 +572,7 @@ class TestAggregateUnset(TestAggregate):
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.set_aggregate_metadata.assert_called_once_with(
|
||||
self.compute_sdk_client.set_aggregate_metadata.assert_called_once_with(
|
||||
self.fake_ag.id, {'unset_key': None}
|
||||
)
|
||||
self.assertIsNone(result)
|
||||
@ -584,7 +592,7 @@ class TestAggregateUnset(TestAggregate):
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.set_aggregate_metadata.assert_called_once_with(
|
||||
self.compute_sdk_client.set_aggregate_metadata.assert_called_once_with(
|
||||
self.fake_ag.id, {'unset_key1': None, 'unset_key2': None}
|
||||
)
|
||||
self.assertIsNone(result)
|
||||
@ -599,7 +607,7 @@ class TestAggregateUnset(TestAggregate):
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
self.assertNotCalled(self.sdk_client.set_aggregate_metadata)
|
||||
self.assertNotCalled(self.compute_sdk_client.set_aggregate_metadata)
|
||||
self.assertIsNone(result)
|
||||
|
||||
|
||||
@ -609,7 +617,7 @@ class TestAggregateCacheImage(TestAggregate):
|
||||
def setUp(self):
|
||||
super(TestAggregateCacheImage, self).setUp()
|
||||
|
||||
self.sdk_client.find_aggregate.return_value = self.fake_ag
|
||||
self.compute_sdk_client.find_aggregate.return_value = self.fake_ag
|
||||
self.find_image_mock = mock.Mock(side_effect=self.images)
|
||||
self.app.client_manager.sdk_connection.image.find_image = (
|
||||
self.find_image_mock
|
||||
@ -638,10 +646,10 @@ class TestAggregateCacheImage(TestAggregate):
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.find_aggregate.assert_called_once_with(
|
||||
self.compute_sdk_client.find_aggregate.assert_called_once_with(
|
||||
parsed_args.aggregate, ignore_missing=False
|
||||
)
|
||||
self.sdk_client.aggregate_precache_images.assert_called_once_with(
|
||||
self.compute_sdk_client.aggregate_precache_images.assert_called_once_with(
|
||||
self.fake_ag.id, [self.images[0].id]
|
||||
)
|
||||
|
||||
@ -658,9 +666,9 @@ class TestAggregateCacheImage(TestAggregate):
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.find_aggregate.assert_called_once_with(
|
||||
self.compute_sdk_client.find_aggregate.assert_called_once_with(
|
||||
parsed_args.aggregate, ignore_missing=False
|
||||
)
|
||||
self.sdk_client.aggregate_precache_images.assert_called_once_with(
|
||||
self.compute_sdk_client.aggregate_precache_images.assert_called_once_with(
|
||||
self.fake_ag.id, [self.images[0].id, self.images[1].id]
|
||||
)
|
||||
|
||||
@ -26,9 +26,11 @@ class TestConsole(compute_fakes.TestComputev2):
|
||||
|
||||
# SDK mock
|
||||
self.app.client_manager.sdk_connection.compute = mock.Mock()
|
||||
self.sdk_client = self.app.client_manager.sdk_connection.compute
|
||||
self.sdk_client.find_server = mock.Mock()
|
||||
self.sdk_client.get_server_console_output = mock.Mock()
|
||||
self.compute_sdk_client = (
|
||||
self.app.client_manager.sdk_connection.compute
|
||||
)
|
||||
self.compute_sdk_client.find_server = mock.Mock()
|
||||
self.compute_sdk_client.get_server_console_output = mock.Mock()
|
||||
|
||||
|
||||
class TestConsoleLog(TestConsole):
|
||||
@ -37,7 +39,7 @@ class TestConsoleLog(TestConsole):
|
||||
def setUp(self):
|
||||
super(TestConsoleLog, self).setUp()
|
||||
|
||||
self.sdk_client.find_server.return_value = self._server
|
||||
self.compute_sdk_client.find_server.return_value = self._server
|
||||
|
||||
self.cmd = console.ShowConsoleLog(self.app, None)
|
||||
|
||||
@ -58,13 +60,13 @@ class TestConsoleLog(TestConsole):
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
output = {'output': '1st line\n2nd line\n'}
|
||||
self.sdk_client.get_server_console_output.return_value = output
|
||||
self.compute_sdk_client.get_server_console_output.return_value = output
|
||||
self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.find_server.assert_called_with(
|
||||
self.compute_sdk_client.find_server.assert_called_with(
|
||||
name_or_id='fake_server', ignore_missing=False
|
||||
)
|
||||
self.sdk_client.get_server_console_output.assert_called_with(
|
||||
self.compute_sdk_client.get_server_console_output.assert_called_with(
|
||||
self._server.id, length=None
|
||||
)
|
||||
stdout = self.app.stdout.content
|
||||
@ -76,13 +78,13 @@ class TestConsoleLog(TestConsole):
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
output = {'output': '1st line\n2nd line'}
|
||||
self.sdk_client.get_server_console_output.return_value = output
|
||||
self.compute_sdk_client.get_server_console_output.return_value = output
|
||||
self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.find_server.assert_called_with(
|
||||
self.compute_sdk_client.find_server.assert_called_with(
|
||||
name_or_id='fake_server', ignore_missing=False
|
||||
)
|
||||
self.sdk_client.get_server_console_output.assert_called_with(
|
||||
self.compute_sdk_client.get_server_console_output.assert_called_with(
|
||||
self._server.id, length=15
|
||||
)
|
||||
|
||||
@ -92,13 +94,13 @@ class TestConsoleUrlShow(TestConsole):
|
||||
|
||||
def setUp(self):
|
||||
super(TestConsoleUrlShow, self).setUp()
|
||||
self.sdk_client.find_server.return_value = self._server
|
||||
self.compute_sdk_client.find_server.return_value = self._server
|
||||
fake_console_data = {
|
||||
'url': 'http://localhost',
|
||||
'protocol': 'fake_protocol',
|
||||
'type': 'fake_type',
|
||||
}
|
||||
self.sdk_client.create_console = mock.Mock(
|
||||
self.compute_sdk_client.create_console = mock.Mock(
|
||||
return_value=fake_console_data
|
||||
)
|
||||
|
||||
@ -125,7 +127,7 @@ class TestConsoleUrlShow(TestConsole):
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.create_console.assert_called_once_with(
|
||||
self.compute_sdk_client.create_console.assert_called_once_with(
|
||||
self._server.id, console_type='novnc'
|
||||
)
|
||||
self.assertEqual(self.columns, columns)
|
||||
@ -142,7 +144,7 @@ class TestConsoleUrlShow(TestConsole):
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.create_console.assert_called_once_with(
|
||||
self.compute_sdk_client.create_console.assert_called_once_with(
|
||||
self._server.id, console_type='novnc'
|
||||
)
|
||||
self.assertEqual(self.columns, columns)
|
||||
@ -159,7 +161,7 @@ class TestConsoleUrlShow(TestConsole):
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.create_console.assert_called_once_with(
|
||||
self.compute_sdk_client.create_console.assert_called_once_with(
|
||||
self._server.id, console_type='xvpvnc'
|
||||
)
|
||||
self.assertEqual(self.columns, columns)
|
||||
@ -176,7 +178,7 @@ class TestConsoleUrlShow(TestConsole):
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.create_console.assert_called_once_with(
|
||||
self.compute_sdk_client.create_console.assert_called_once_with(
|
||||
self._server.id, console_type='spice-html5'
|
||||
)
|
||||
self.assertEqual(self.columns, columns)
|
||||
@ -193,7 +195,7 @@ class TestConsoleUrlShow(TestConsole):
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.create_console.assert_called_once_with(
|
||||
self.compute_sdk_client.create_console.assert_called_once_with(
|
||||
self._server.id, console_type='rdp-html5'
|
||||
)
|
||||
self.assertEqual(self.columns, columns)
|
||||
@ -210,7 +212,7 @@ class TestConsoleUrlShow(TestConsole):
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.create_console.assert_called_once_with(
|
||||
self.compute_sdk_client.create_console.assert_called_once_with(
|
||||
self._server.id, console_type='serial'
|
||||
)
|
||||
self.assertEqual(self.columns, columns)
|
||||
@ -227,7 +229,7 @@ class TestConsoleUrlShow(TestConsole):
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.create_console.assert_called_once_with(
|
||||
self.compute_sdk_client.create_console.assert_called_once_with(
|
||||
self._server.id, console_type='webmks'
|
||||
)
|
||||
self.assertEqual(self.columns, columns)
|
||||
|
||||
@ -32,16 +32,22 @@ class TestFlavor(compute_fakes.TestComputev2):
|
||||
|
||||
# SDK mock
|
||||
self.app.client_manager.sdk_connection.compute = mock.Mock()
|
||||
self.sdk_client = self.app.client_manager.sdk_connection.compute
|
||||
self.sdk_client.flavors = mock.Mock()
|
||||
self.sdk_client.find_flavor = mock.Mock()
|
||||
self.sdk_client.delete_flavor = mock.Mock()
|
||||
self.sdk_client.update_flavor = mock.Mock()
|
||||
self.sdk_client.flavor_add_tenant_access = mock.Mock()
|
||||
self.sdk_client.flavor_remove_tenant_access = mock.Mock()
|
||||
self.sdk_client.create_flavor_extra_specs = mock.Mock()
|
||||
self.sdk_client.update_flavor_extra_specs_property = mock.Mock()
|
||||
self.sdk_client.delete_flavor_extra_specs_property = mock.Mock()
|
||||
self.compute_sdk_client = (
|
||||
self.app.client_manager.sdk_connection.compute
|
||||
)
|
||||
self.compute_sdk_client.flavors = mock.Mock()
|
||||
self.compute_sdk_client.find_flavor = mock.Mock()
|
||||
self.compute_sdk_client.delete_flavor = mock.Mock()
|
||||
self.compute_sdk_client.update_flavor = mock.Mock()
|
||||
self.compute_sdk_client.flavor_add_tenant_access = mock.Mock()
|
||||
self.compute_sdk_client.flavor_remove_tenant_access = mock.Mock()
|
||||
self.compute_sdk_client.create_flavor_extra_specs = mock.Mock()
|
||||
self.compute_sdk_client.update_flavor_extra_specs_property = (
|
||||
mock.Mock()
|
||||
)
|
||||
self.compute_sdk_client.delete_flavor_extra_specs_property = (
|
||||
mock.Mock()
|
||||
)
|
||||
|
||||
self.projects_mock = self.app.client_manager.identity.projects
|
||||
self.projects_mock.reset_mock()
|
||||
@ -100,7 +106,7 @@ class TestFlavorCreate(TestFlavor):
|
||||
|
||||
# Return a project
|
||||
self.projects_mock.get.return_value = self.project
|
||||
self.sdk_client.create_flavor.return_value = self.flavor
|
||||
self.compute_sdk_client.create_flavor.return_value = self.flavor
|
||||
self.cmd = flavor.CreateFlavor(self.app, None)
|
||||
|
||||
def test_flavor_create_default_options(self):
|
||||
@ -123,7 +129,9 @@ class TestFlavorCreate(TestFlavor):
|
||||
}
|
||||
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.create_flavor.assert_called_once_with(**default_args)
|
||||
self.compute_sdk_client.create_flavor.assert_called_once_with(
|
||||
**default_args
|
||||
)
|
||||
|
||||
self.assertEqual(self.columns, columns)
|
||||
self.assertCountEqual(self.data, data)
|
||||
@ -190,8 +198,8 @@ class TestFlavorCreate(TestFlavor):
|
||||
# convert expected data tuple to list to be able to modify it
|
||||
cmp_data = list(self.data)
|
||||
cmp_data[7] = format_columns.DictColumn(props)
|
||||
self.sdk_client.create_flavor.return_value = create_flavor
|
||||
self.sdk_client.create_flavor_extra_specs.return_value = (
|
||||
self.compute_sdk_client.create_flavor.return_value = create_flavor
|
||||
self.compute_sdk_client.create_flavor_extra_specs.return_value = (
|
||||
expected_flavor
|
||||
)
|
||||
|
||||
@ -199,11 +207,13 @@ class TestFlavorCreate(TestFlavor):
|
||||
sdk_utils, 'supports_microversion', return_value=True
|
||||
):
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.create_flavor.assert_called_once_with(**args)
|
||||
self.sdk_client.create_flavor_extra_specs.assert_called_once_with(
|
||||
self.compute_sdk_client.create_flavor.assert_called_once_with(
|
||||
**args
|
||||
)
|
||||
self.compute_sdk_client.create_flavor_extra_specs.assert_called_once_with(
|
||||
create_flavor, props
|
||||
)
|
||||
self.sdk_client.get_flavor_access.assert_not_called()
|
||||
self.compute_sdk_client.get_flavor_access.assert_not_called()
|
||||
|
||||
self.assertEqual(self.columns, columns)
|
||||
self.assertCountEqual(tuple(cmp_data), data)
|
||||
@ -276,8 +286,8 @@ class TestFlavorCreate(TestFlavor):
|
||||
# convert expected data tuple to list to be able to modify it
|
||||
cmp_data = list(self.data_private)
|
||||
cmp_data[7] = format_columns.DictColumn(props)
|
||||
self.sdk_client.create_flavor.return_value = create_flavor
|
||||
self.sdk_client.create_flavor_extra_specs.return_value = (
|
||||
self.compute_sdk_client.create_flavor.return_value = create_flavor
|
||||
self.compute_sdk_client.create_flavor_extra_specs.return_value = (
|
||||
expected_flavor
|
||||
)
|
||||
|
||||
@ -285,12 +295,12 @@ class TestFlavorCreate(TestFlavor):
|
||||
sdk_utils, 'supports_microversion', return_value=True
|
||||
):
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.create_flavor.assert_called_once_with(**args)
|
||||
self.sdk_client.flavor_add_tenant_access.assert_called_with(
|
||||
self.compute_sdk_client.create_flavor.assert_called_once_with(**args)
|
||||
self.compute_sdk_client.flavor_add_tenant_access.assert_called_with(
|
||||
self.flavor.id,
|
||||
self.project.id,
|
||||
)
|
||||
self.sdk_client.create_flavor_extra_specs.assert_called_with(
|
||||
self.compute_sdk_client.create_flavor_extra_specs.assert_called_with(
|
||||
create_flavor, props
|
||||
)
|
||||
self.assertEqual(self.columns, columns)
|
||||
@ -375,7 +385,7 @@ class TestFlavorCreate(TestFlavor):
|
||||
'description': 'fake description',
|
||||
}
|
||||
|
||||
self.sdk_client.create_flavor.assert_called_once_with(**args)
|
||||
self.compute_sdk_client.create_flavor.assert_called_once_with(**args)
|
||||
|
||||
self.assertEqual(self.columns, columns)
|
||||
self.assertCountEqual(self.data_private, data)
|
||||
@ -414,7 +424,7 @@ class TestFlavorDelete(TestFlavor):
|
||||
def setUp(self):
|
||||
super(TestFlavorDelete, self).setUp()
|
||||
|
||||
self.sdk_client.delete_flavor.return_value = None
|
||||
self.compute_sdk_client.delete_flavor.return_value = None
|
||||
|
||||
self.cmd = flavor.DeleteFlavor(self.app, None)
|
||||
|
||||
@ -425,14 +435,16 @@ class TestFlavorDelete(TestFlavor):
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.sdk_client.find_flavor.return_value = self.flavors[0]
|
||||
self.compute_sdk_client.find_flavor.return_value = self.flavors[0]
|
||||
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.find_flavor.assert_called_with(
|
||||
self.compute_sdk_client.find_flavor.assert_called_with(
|
||||
self.flavors[0].id, ignore_missing=False
|
||||
)
|
||||
self.sdk_client.delete_flavor.assert_called_with(self.flavors[0].id)
|
||||
self.compute_sdk_client.delete_flavor.assert_called_with(
|
||||
self.flavors[0].id
|
||||
)
|
||||
self.assertIsNone(result)
|
||||
|
||||
def test_delete_multiple_flavors(self):
|
||||
@ -445,7 +457,7 @@ class TestFlavorDelete(TestFlavor):
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.sdk_client.find_flavor.side_effect = self.flavors
|
||||
self.compute_sdk_client.find_flavor.side_effect = self.flavors
|
||||
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
|
||||
@ -453,8 +465,8 @@ class TestFlavorDelete(TestFlavor):
|
||||
mock.call(i.id, ignore_missing=False) for i in self.flavors
|
||||
]
|
||||
delete_calls = [mock.call(i.id) for i in self.flavors]
|
||||
self.sdk_client.find_flavor.assert_has_calls(find_calls)
|
||||
self.sdk_client.delete_flavor.assert_has_calls(delete_calls)
|
||||
self.compute_sdk_client.find_flavor.assert_has_calls(find_calls)
|
||||
self.compute_sdk_client.delete_flavor.assert_has_calls(delete_calls)
|
||||
self.assertIsNone(result)
|
||||
|
||||
def test_multi_flavors_delete_with_exception(self):
|
||||
@ -465,7 +477,7 @@ class TestFlavorDelete(TestFlavor):
|
||||
verifylist = [('flavor', [self.flavors[0].id, 'unexist_flavor'])]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.sdk_client.find_flavor.side_effect = [
|
||||
self.compute_sdk_client.find_flavor.side_effect = [
|
||||
self.flavors[0],
|
||||
sdk_exceptions.ResourceNotFound,
|
||||
]
|
||||
@ -481,8 +493,8 @@ class TestFlavorDelete(TestFlavor):
|
||||
mock.call('unexist_flavor', ignore_missing=False),
|
||||
]
|
||||
delete_calls = [mock.call(self.flavors[0].id)]
|
||||
self.sdk_client.find_flavor.assert_has_calls(find_calls)
|
||||
self.sdk_client.delete_flavor.assert_has_calls(delete_calls)
|
||||
self.compute_sdk_client.find_flavor.assert_has_calls(find_calls)
|
||||
self.compute_sdk_client.delete_flavor.assert_has_calls(delete_calls)
|
||||
|
||||
|
||||
class TestFlavorList(TestFlavor):
|
||||
@ -528,7 +540,7 @@ class TestFlavorList(TestFlavor):
|
||||
[],
|
||||
]
|
||||
|
||||
self.sdk_client.flavors = self.api_mock
|
||||
self.compute_sdk_client.flavors = self.api_mock
|
||||
|
||||
# Get the command object to test
|
||||
self.cmd = flavor.ListFlavor(self.app, None)
|
||||
@ -553,8 +565,8 @@ class TestFlavorList(TestFlavor):
|
||||
'is_public': True,
|
||||
}
|
||||
|
||||
self.sdk_client.flavors.assert_called_with(**kwargs)
|
||||
self.sdk_client.fetch_flavor_extra_specs.assert_not_called()
|
||||
self.compute_sdk_client.flavors.assert_called_with(**kwargs)
|
||||
self.compute_sdk_client.fetch_flavor_extra_specs.assert_not_called()
|
||||
|
||||
self.assertEqual(self.columns, columns)
|
||||
self.assertEqual(self.data, tuple(data))
|
||||
@ -579,8 +591,8 @@ class TestFlavorList(TestFlavor):
|
||||
'is_public': None,
|
||||
}
|
||||
|
||||
self.sdk_client.flavors.assert_called_with(**kwargs)
|
||||
self.sdk_client.fetch_flavor_extra_specs.assert_not_called()
|
||||
self.compute_sdk_client.flavors.assert_called_with(**kwargs)
|
||||
self.compute_sdk_client.fetch_flavor_extra_specs.assert_not_called()
|
||||
|
||||
self.assertEqual(self.columns, columns)
|
||||
self.assertEqual(self.data, tuple(data))
|
||||
@ -605,8 +617,8 @@ class TestFlavorList(TestFlavor):
|
||||
'is_public': False,
|
||||
}
|
||||
|
||||
self.sdk_client.flavors.assert_called_with(**kwargs)
|
||||
self.sdk_client.fetch_flavor_extra_specs.assert_not_called()
|
||||
self.compute_sdk_client.flavors.assert_called_with(**kwargs)
|
||||
self.compute_sdk_client.fetch_flavor_extra_specs.assert_not_called()
|
||||
|
||||
self.assertEqual(self.columns, columns)
|
||||
self.assertEqual(self.data, tuple(data))
|
||||
@ -631,8 +643,8 @@ class TestFlavorList(TestFlavor):
|
||||
'is_public': True,
|
||||
}
|
||||
|
||||
self.sdk_client.flavors.assert_called_with(**kwargs)
|
||||
self.sdk_client.fetch_flavor_extra_specs.assert_not_called()
|
||||
self.compute_sdk_client.flavors.assert_called_with(**kwargs)
|
||||
self.compute_sdk_client.fetch_flavor_extra_specs.assert_not_called()
|
||||
|
||||
self.assertEqual(self.columns, columns)
|
||||
self.assertEqual(self.data, tuple(data))
|
||||
@ -657,8 +669,8 @@ class TestFlavorList(TestFlavor):
|
||||
'is_public': True,
|
||||
}
|
||||
|
||||
self.sdk_client.flavors.assert_called_with(**kwargs)
|
||||
self.sdk_client.fetch_flavor_extra_specs.assert_not_called()
|
||||
self.compute_sdk_client.flavors.assert_called_with(**kwargs)
|
||||
self.compute_sdk_client.fetch_flavor_extra_specs.assert_not_called()
|
||||
|
||||
self.assertEqual(self.columns_long, columns)
|
||||
self.assertCountEqual(self.data_long, tuple(data))
|
||||
@ -690,8 +702,10 @@ class TestFlavorList(TestFlavor):
|
||||
[],
|
||||
]
|
||||
|
||||
self.sdk_client.flavors = self.api_mock
|
||||
self.sdk_client.fetch_flavor_extra_specs = mock.Mock(return_value=None)
|
||||
self.compute_sdk_client.flavors = self.api_mock
|
||||
self.compute_sdk_client.fetch_flavor_extra_specs = mock.Mock(
|
||||
return_value=None
|
||||
)
|
||||
|
||||
arglist = [
|
||||
'--long',
|
||||
@ -712,8 +726,8 @@ class TestFlavorList(TestFlavor):
|
||||
'is_public': True,
|
||||
}
|
||||
|
||||
self.sdk_client.flavors.assert_called_with(**kwargs)
|
||||
self.sdk_client.fetch_flavor_extra_specs.assert_called_once_with(
|
||||
self.compute_sdk_client.flavors.assert_called_with(**kwargs)
|
||||
self.compute_sdk_client.fetch_flavor_extra_specs.assert_called_once_with(
|
||||
flavor
|
||||
)
|
||||
|
||||
@ -746,15 +760,15 @@ class TestFlavorList(TestFlavor):
|
||||
'min_ram': 2048,
|
||||
}
|
||||
|
||||
self.sdk_client.flavors.assert_called_with(**kwargs)
|
||||
self.sdk_client.fetch_flavor_extra_specs.assert_not_called()
|
||||
self.compute_sdk_client.flavors.assert_called_with(**kwargs)
|
||||
self.compute_sdk_client.fetch_flavor_extra_specs.assert_not_called()
|
||||
|
||||
self.assertEqual(self.columns, columns)
|
||||
self.assertEqual(tuple(self.data), tuple(data))
|
||||
|
||||
|
||||
class TestFlavorSet(TestFlavor):
|
||||
# Return value of self.sdk_client.find_flavor().
|
||||
# Return value of self.compute_sdk_client.find_flavor().
|
||||
flavor = compute_fakes.create_one_flavor(
|
||||
attrs={'os-flavor-access:is_public': False}
|
||||
)
|
||||
@ -763,7 +777,7 @@ class TestFlavorSet(TestFlavor):
|
||||
def setUp(self):
|
||||
super(TestFlavorSet, self).setUp()
|
||||
|
||||
self.sdk_client.find_flavor.return_value = self.flavor
|
||||
self.compute_sdk_client.find_flavor.return_value = self.flavor
|
||||
# Return a project
|
||||
self.projects_mock.get.return_value = self.project
|
||||
self.cmd = flavor.SetFlavor(self.app, None)
|
||||
@ -777,10 +791,10 @@ class TestFlavorSet(TestFlavor):
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.find_flavor.assert_called_with(
|
||||
self.compute_sdk_client.find_flavor.assert_called_with(
|
||||
parsed_args.flavor, get_extra_specs=True, ignore_missing=False
|
||||
)
|
||||
self.sdk_client.create_flavor_extra_specs.assert_called_with(
|
||||
self.compute_sdk_client.create_flavor_extra_specs.assert_called_with(
|
||||
self.flavor.id, {'FOO': '"B A R"'}
|
||||
)
|
||||
self.assertIsNone(result)
|
||||
@ -791,10 +805,10 @@ class TestFlavorSet(TestFlavor):
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.find_flavor.assert_called_with(
|
||||
self.compute_sdk_client.find_flavor.assert_called_with(
|
||||
parsed_args.flavor, get_extra_specs=True, ignore_missing=False
|
||||
)
|
||||
self.sdk_client.delete_flavor_extra_specs_property.assert_called_with(
|
||||
self.compute_sdk_client.delete_flavor_extra_specs_property.assert_called_with(
|
||||
self.flavor.id, 'property'
|
||||
)
|
||||
self.assertIsNone(result)
|
||||
@ -813,14 +827,14 @@ class TestFlavorSet(TestFlavor):
|
||||
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.find_flavor.assert_called_with(
|
||||
self.compute_sdk_client.find_flavor.assert_called_with(
|
||||
parsed_args.flavor, get_extra_specs=True, ignore_missing=False
|
||||
)
|
||||
self.sdk_client.flavor_add_tenant_access.assert_called_with(
|
||||
self.compute_sdk_client.flavor_add_tenant_access.assert_called_with(
|
||||
self.flavor.id,
|
||||
self.project.id,
|
||||
)
|
||||
self.sdk_client.create_flavor_extra_specs.assert_not_called()
|
||||
self.compute_sdk_client.create_flavor_extra_specs.assert_not_called()
|
||||
self.assertIsNone(result)
|
||||
|
||||
def test_flavor_set_no_project(self):
|
||||
@ -857,7 +871,7 @@ class TestFlavorSet(TestFlavor):
|
||||
)
|
||||
|
||||
def test_flavor_set_with_unexist_flavor(self):
|
||||
self.sdk_client.find_flavor.side_effect = [
|
||||
self.compute_sdk_client.find_flavor.side_effect = [
|
||||
sdk_exceptions.ResourceNotFound()
|
||||
]
|
||||
|
||||
@ -886,10 +900,10 @@ class TestFlavorSet(TestFlavor):
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.find_flavor.assert_called_with(
|
||||
self.compute_sdk_client.find_flavor.assert_called_with(
|
||||
parsed_args.flavor, get_extra_specs=True, ignore_missing=False
|
||||
)
|
||||
self.sdk_client.flavor_add_tenant_access.assert_not_called()
|
||||
self.compute_sdk_client.flavor_add_tenant_access.assert_not_called()
|
||||
self.assertIsNone(result)
|
||||
|
||||
def test_flavor_set_description_api_newer(self):
|
||||
@ -903,12 +917,12 @@ class TestFlavorSet(TestFlavor):
|
||||
('flavor', self.flavor.id),
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
self.app.client_manager.compute.api_version = 2.55
|
||||
|
||||
with mock.patch.object(
|
||||
sdk_utils, 'supports_microversion', return_value=True
|
||||
):
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.update_flavor.assert_called_with(
|
||||
self.compute_sdk_client.update_flavor.assert_called_with(
|
||||
flavor=self.flavor.id, description='description'
|
||||
)
|
||||
self.assertIsNone(result)
|
||||
@ -924,7 +938,7 @@ class TestFlavorSet(TestFlavor):
|
||||
('flavor', self.flavor.id),
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
self.app.client_manager.compute.api_version = 2.54
|
||||
|
||||
with mock.patch.object(
|
||||
sdk_utils, 'supports_microversion', return_value=False
|
||||
):
|
||||
@ -943,13 +957,12 @@ class TestFlavorSet(TestFlavor):
|
||||
('flavor', self.flavor.name),
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
self.app.client_manager.compute.api_version = 2.55
|
||||
|
||||
with mock.patch.object(
|
||||
sdk_utils, 'supports_microversion', return_value=True
|
||||
):
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.update_flavor.assert_called_with(
|
||||
self.compute_sdk_client.update_flavor.assert_called_with(
|
||||
flavor=self.flavor.id, description='description'
|
||||
)
|
||||
self.assertIsNone(result)
|
||||
@ -965,7 +978,6 @@ class TestFlavorSet(TestFlavor):
|
||||
('flavor', self.flavor.name),
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
self.app.client_manager.compute.api_version = 2.54
|
||||
|
||||
with mock.patch.object(
|
||||
sdk_utils, 'supports_microversion', return_value=False
|
||||
@ -976,7 +988,7 @@ class TestFlavorSet(TestFlavor):
|
||||
|
||||
|
||||
class TestFlavorShow(TestFlavor):
|
||||
# Return value of self.sdk_client.find_flavor().
|
||||
# Return value of self.compute_sdk_client.find_flavor().
|
||||
flavor_access = compute_fakes.create_one_flavor_access()
|
||||
flavor = compute_fakes.create_one_flavor()
|
||||
|
||||
@ -1016,8 +1028,10 @@ class TestFlavorShow(TestFlavor):
|
||||
super(TestFlavorShow, self).setUp()
|
||||
|
||||
# Return value of _find_resource()
|
||||
self.sdk_client.find_flavor.return_value = self.flavor
|
||||
self.sdk_client.get_flavor_access.return_value = [self.flavor_access]
|
||||
self.compute_sdk_client.find_flavor.return_value = self.flavor
|
||||
self.compute_sdk_client.get_flavor_access.return_value = [
|
||||
self.flavor_access
|
||||
]
|
||||
self.cmd = flavor.ShowFlavor(self.app, None)
|
||||
|
||||
def test_show_no_options(self):
|
||||
@ -1054,7 +1068,7 @@ class TestFlavorShow(TestFlavor):
|
||||
'os-flavor-access:is_public': False,
|
||||
}
|
||||
)
|
||||
self.sdk_client.find_flavor.return_value = private_flavor
|
||||
self.compute_sdk_client.find_flavor.return_value = private_flavor
|
||||
|
||||
arglist = [
|
||||
private_flavor.name,
|
||||
@ -1083,7 +1097,7 @@ class TestFlavorShow(TestFlavor):
|
||||
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.get_flavor_access.assert_called_with(
|
||||
self.compute_sdk_client.get_flavor_access.assert_called_with(
|
||||
flavor=private_flavor.id
|
||||
)
|
||||
self.assertEqual(self.columns, columns)
|
||||
@ -1091,7 +1105,7 @@ class TestFlavorShow(TestFlavor):
|
||||
|
||||
|
||||
class TestFlavorUnset(TestFlavor):
|
||||
# Return value of self.sdk_client.find_flavor().
|
||||
# Return value of self.compute_sdk_client.find_flavor().
|
||||
flavor = compute_fakes.create_one_flavor(
|
||||
attrs={'os-flavor-access:is_public': False}
|
||||
)
|
||||
@ -1100,12 +1114,14 @@ class TestFlavorUnset(TestFlavor):
|
||||
def setUp(self):
|
||||
super(TestFlavorUnset, self).setUp()
|
||||
|
||||
self.sdk_client.find_flavor.return_value = self.flavor
|
||||
self.compute_sdk_client.find_flavor.return_value = self.flavor
|
||||
# Return a project
|
||||
self.projects_mock.get.return_value = self.project
|
||||
self.cmd = flavor.UnsetFlavor(self.app, None)
|
||||
|
||||
self.mock_shortcut = self.sdk_client.delete_flavor_extra_specs_property
|
||||
self.mock_shortcut = (
|
||||
self.compute_sdk_client.delete_flavor_extra_specs_property
|
||||
)
|
||||
|
||||
def test_flavor_unset_property(self):
|
||||
arglist = ['--property', 'property', 'baremetal']
|
||||
@ -1116,11 +1132,11 @@ class TestFlavorUnset(TestFlavor):
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.find_flavor.assert_called_with(
|
||||
self.compute_sdk_client.find_flavor.assert_called_with(
|
||||
parsed_args.flavor, get_extra_specs=True, ignore_missing=False
|
||||
)
|
||||
self.mock_shortcut.assert_called_with(self.flavor.id, 'property')
|
||||
self.sdk_client.flavor_remove_tenant_access.assert_not_called()
|
||||
self.compute_sdk_client.flavor_remove_tenant_access.assert_not_called()
|
||||
self.assertIsNone(result)
|
||||
|
||||
def test_flavor_unset_properties(self):
|
||||
@ -1138,7 +1154,7 @@ class TestFlavorUnset(TestFlavor):
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.find_flavor.assert_called_with(
|
||||
self.compute_sdk_client.find_flavor.assert_called_with(
|
||||
parsed_args.flavor, get_extra_specs=True, ignore_missing=False
|
||||
)
|
||||
calls = [
|
||||
@ -1153,7 +1169,7 @@ class TestFlavorUnset(TestFlavor):
|
||||
AssertionError, self.mock_shortcut.assert_has_calls, calls
|
||||
)
|
||||
|
||||
self.sdk_client.flavor_remove_tenant_access.assert_not_called()
|
||||
self.compute_sdk_client.flavor_remove_tenant_access.assert_not_called()
|
||||
|
||||
def test_flavor_unset_project(self):
|
||||
arglist = [
|
||||
@ -1170,14 +1186,14 @@ class TestFlavorUnset(TestFlavor):
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
self.assertIsNone(result)
|
||||
|
||||
self.sdk_client.find_flavor.assert_called_with(
|
||||
self.compute_sdk_client.find_flavor.assert_called_with(
|
||||
parsed_args.flavor, get_extra_specs=True, ignore_missing=False
|
||||
)
|
||||
self.sdk_client.flavor_remove_tenant_access.assert_called_with(
|
||||
self.compute_sdk_client.flavor_remove_tenant_access.assert_called_with(
|
||||
self.flavor.id,
|
||||
self.project.id,
|
||||
)
|
||||
self.sdk_client.delete_flavor_extra_specs_proerty.assert_not_called()
|
||||
self.compute_sdk_client.delete_flavor_extra_specs_proerty.assert_not_called()
|
||||
self.assertIsNone(result)
|
||||
|
||||
def test_flavor_unset_no_project(self):
|
||||
@ -1214,7 +1230,7 @@ class TestFlavorUnset(TestFlavor):
|
||||
)
|
||||
|
||||
def test_flavor_unset_with_unexist_flavor(self):
|
||||
self.sdk_client.find_flavor.side_effect = [
|
||||
self.compute_sdk_client.find_flavor.side_effect = [
|
||||
sdk_exceptions.ResourceNotFound
|
||||
]
|
||||
|
||||
@ -1244,4 +1260,4 @@ class TestFlavorUnset(TestFlavor):
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
self.assertIsNone(result)
|
||||
|
||||
self.sdk_client.flavor_remove_tenant_access.assert_not_called()
|
||||
self.compute_sdk_client.flavor_remove_tenant_access.assert_not_called()
|
||||
|
||||
@ -27,8 +27,10 @@ class TestHost(compute_fakes.TestComputev2):
|
||||
|
||||
# Get a shortcut to the compute client
|
||||
self.app.client_manager.sdk_connection.compute = mock.Mock()
|
||||
self.sdk_client = self.app.client_manager.sdk_connection.compute
|
||||
self.sdk_client.get = mock.Mock()
|
||||
self.compute_sdk_client = (
|
||||
self.app.client_manager.sdk_connection.compute
|
||||
)
|
||||
self.compute_sdk_client.get = mock.Mock()
|
||||
|
||||
|
||||
@mock.patch('openstackclient.api.compute_v2.APIv2.host_list')
|
||||
@ -38,7 +40,7 @@ class TestHostList(TestHost):
|
||||
def setUp(self):
|
||||
super(TestHostList, self).setUp()
|
||||
|
||||
self.sdk_client.get.return_value = fakes.FakeResponse(
|
||||
self.compute_sdk_client.get.return_value = fakes.FakeResponse(
|
||||
data={'hosts': [self._host]}
|
||||
)
|
||||
|
||||
@ -63,7 +65,9 @@ class TestHostList(TestHost):
|
||||
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.get.assert_called_with('/os-hosts', microversion='2.1')
|
||||
self.compute_sdk_client.get.assert_called_with(
|
||||
'/os-hosts', microversion='2.1'
|
||||
)
|
||||
self.assertEqual(self.columns, columns)
|
||||
self.assertEqual(self.data, list(data))
|
||||
|
||||
@ -81,7 +85,9 @@ class TestHostList(TestHost):
|
||||
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.get.assert_called_with('/os-hosts', microversion='2.1')
|
||||
self.compute_sdk_client.get.assert_called_with(
|
||||
'/os-hosts', microversion='2.1'
|
||||
)
|
||||
self.assertEqual(self.columns, columns)
|
||||
self.assertEqual(self.data, list(data))
|
||||
|
||||
@ -153,7 +159,7 @@ class TestHostShow(TestHost):
|
||||
}
|
||||
}
|
||||
|
||||
self.sdk_client.get.return_value = fakes.FakeResponse(
|
||||
self.compute_sdk_client.get.return_value = fakes.FakeResponse(
|
||||
data={'host': [output_data]}
|
||||
)
|
||||
|
||||
@ -204,7 +210,7 @@ class TestHostShow(TestHost):
|
||||
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.get.assert_called_with(
|
||||
self.compute_sdk_client.get.assert_called_with(
|
||||
'/os-hosts/' + self._host['host_name'], microversion='2.1'
|
||||
)
|
||||
self.assertEqual(self.columns, columns)
|
||||
|
||||
@ -30,8 +30,10 @@ class TestHypervisor(compute_fakes.TestComputev2):
|
||||
super().setUp()
|
||||
|
||||
# Create and get a shortcut to the compute client mock
|
||||
self.sdk_client = self.app.client_manager.sdk_connection.compute
|
||||
self.sdk_client.reset_mock()
|
||||
self.compute_sdk_client = (
|
||||
self.app.client_manager.sdk_connection.compute
|
||||
)
|
||||
self.compute_sdk_client.reset_mock()
|
||||
|
||||
|
||||
class TestHypervisorList(TestHypervisor):
|
||||
@ -40,7 +42,7 @@ class TestHypervisorList(TestHypervisor):
|
||||
|
||||
# Fake hypervisors to be listed up
|
||||
self.hypervisors = compute_fakes.create_hypervisors()
|
||||
self.sdk_client.hypervisors.return_value = self.hypervisors
|
||||
self.compute_sdk_client.hypervisors.return_value = self.hypervisors
|
||||
|
||||
self.columns = (
|
||||
"ID",
|
||||
@ -114,7 +116,7 @@ class TestHypervisorList(TestHypervisor):
|
||||
# containing the data to be listed.
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.hypervisors.assert_called_with(details=True)
|
||||
self.compute_sdk_client.hypervisors.assert_called_with(details=True)
|
||||
self.assertEqual(self.columns, columns)
|
||||
self.assertEqual(self.data, tuple(data))
|
||||
|
||||
@ -129,7 +131,9 @@ class TestHypervisorList(TestHypervisor):
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
# Fake the return value of search()
|
||||
self.sdk_client.hypervisors.return_value = [self.hypervisors[0]]
|
||||
self.compute_sdk_client.hypervisors.return_value = [
|
||||
self.hypervisors[0]
|
||||
]
|
||||
|
||||
self.data = (
|
||||
(
|
||||
@ -146,7 +150,7 @@ class TestHypervisorList(TestHypervisor):
|
||||
# containing the data to be listed.
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.hypervisors.assert_called_with(
|
||||
self.compute_sdk_client.hypervisors.assert_called_with(
|
||||
hypervisor_hostname_pattern=self.hypervisors[0].name, details=True
|
||||
)
|
||||
self.assertEqual(self.columns, columns)
|
||||
@ -163,7 +167,9 @@ class TestHypervisorList(TestHypervisor):
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
# Fake exception raised from search()
|
||||
self.sdk_client.hypervisors.side_effect = exceptions.NotFound(None)
|
||||
self.compute_sdk_client.hypervisors.side_effect = exceptions.NotFound(
|
||||
None
|
||||
)
|
||||
|
||||
self.assertRaises(
|
||||
exceptions.NotFound, self.cmd.take_action, parsed_args
|
||||
@ -211,7 +217,7 @@ class TestHypervisorList(TestHypervisor):
|
||||
# containing the data to be listed.
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.hypervisors.assert_called_with(details=True)
|
||||
self.compute_sdk_client.hypervisors.assert_called_with(details=True)
|
||||
self.assertEqual(self.columns_long, columns)
|
||||
self.assertEqual(self.data_long, tuple(data))
|
||||
|
||||
@ -228,7 +234,9 @@ class TestHypervisorList(TestHypervisor):
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.hypervisors.assert_called_with(limit=1, details=True)
|
||||
self.compute_sdk_client.hypervisors.assert_called_with(
|
||||
limit=1, details=True
|
||||
)
|
||||
|
||||
@mock.patch.object(sdk_utils, 'supports_microversion', return_value=False)
|
||||
def test_hypervisor_list_with_limit_pre_v233(self, sm_mock):
|
||||
@ -262,7 +270,7 @@ class TestHypervisorList(TestHypervisor):
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.hypervisors.assert_called_with(
|
||||
self.compute_sdk_client.hypervisors.assert_called_with(
|
||||
marker='test_hyp', details=True
|
||||
)
|
||||
|
||||
@ -303,10 +311,10 @@ class TestHypervisorShow(TestHypervisor):
|
||||
)
|
||||
|
||||
# Return value of compute_client.find_hypervisor
|
||||
self.sdk_client.find_hypervisor.return_value = self.hypervisor
|
||||
self.compute_sdk_client.find_hypervisor.return_value = self.hypervisor
|
||||
|
||||
# Return value of compute_client.aggregates()
|
||||
self.sdk_client.aggregates.return_value = []
|
||||
self.compute_sdk_client.aggregates.return_value = []
|
||||
|
||||
# Return value of compute_client.get_hypervisor_uptime()
|
||||
uptime_info = {
|
||||
@ -316,7 +324,9 @@ class TestHypervisorShow(TestHypervisor):
|
||||
'hypervisor_hostname': self.hypervisor.name,
|
||||
'uptime': uptime_string,
|
||||
}
|
||||
self.sdk_client.get_hypervisor_uptime.return_value = uptime_info
|
||||
self.compute_sdk_client.get_hypervisor_uptime.return_value = (
|
||||
uptime_info
|
||||
)
|
||||
|
||||
self.columns_v288 = (
|
||||
'aggregates',
|
||||
@ -457,7 +467,7 @@ class TestHypervisorShow(TestHypervisor):
|
||||
# before microversion 2.28, nova returned a stringified version of this
|
||||
# field
|
||||
self.hypervisor.cpu_info = json.dumps(self.hypervisor.cpu_info)
|
||||
self.sdk_client.find_hypervisor.return_value = self.hypervisor
|
||||
self.compute_sdk_client.find_hypervisor.return_value = self.hypervisor
|
||||
|
||||
arglist = [
|
||||
self.hypervisor.name,
|
||||
@ -487,7 +497,7 @@ class TestHypervisorShow(TestHypervisor):
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.sdk_client.get_hypervisor_uptime.side_effect = (
|
||||
self.compute_sdk_client.get_hypervisor_uptime.side_effect = (
|
||||
nova_exceptions.HTTPNotImplemented(501)
|
||||
)
|
||||
|
||||
|
||||
@ -25,8 +25,10 @@ class TestHypervisorStats(compute_fakes.TestComputev2):
|
||||
|
||||
# Get a shortcut to the compute client hypervisors mock
|
||||
self.app.client_manager.sdk_connection.compute = mock.Mock()
|
||||
self.sdk_client = self.app.client_manager.sdk_connection.compute
|
||||
self.sdk_client.get = mock.Mock()
|
||||
self.compute_sdk_client = (
|
||||
self.app.client_manager.sdk_connection.compute
|
||||
)
|
||||
self.compute_sdk_client.get = mock.Mock()
|
||||
|
||||
|
||||
# Not in fakes.py because hypervisor stats has been deprecated
|
||||
@ -70,7 +72,7 @@ class TestHypervisorStatsShow(TestHypervisorStats):
|
||||
def setUp(self):
|
||||
super(TestHypervisorStatsShow, self).setUp()
|
||||
|
||||
self.sdk_client.get.return_value = fakes.FakeResponse(
|
||||
self.compute_sdk_client.get.return_value = fakes.FakeResponse(
|
||||
data={'hypervisor_statistics': self._stats}
|
||||
)
|
||||
|
||||
|
||||
@ -11,14 +11,12 @@
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
#
|
||||
|
||||
import copy
|
||||
from unittest import mock
|
||||
from unittest.mock import call
|
||||
import uuid
|
||||
|
||||
from novaclient import api_versions
|
||||
from openstack import utils as sdk_utils
|
||||
from osc_lib import exceptions
|
||||
|
||||
@ -43,11 +41,13 @@ class TestKeypair(compute_fakes.TestComputev2):
|
||||
)
|
||||
|
||||
self.app.client_manager.sdk_connection.compute = mock.Mock()
|
||||
self.sdk_client = self.app.client_manager.sdk_connection.compute
|
||||
self.sdk_client.keypairs = mock.Mock()
|
||||
self.sdk_client.create_keypair = mock.Mock()
|
||||
self.sdk_client.delete_keypair = mock.Mock()
|
||||
self.sdk_client.find_keypair = mock.Mock()
|
||||
self.compute_sdk_client = (
|
||||
self.app.client_manager.sdk_connection.compute
|
||||
)
|
||||
self.compute_sdk_client.keypairs = mock.Mock()
|
||||
self.compute_sdk_client.create_keypair = mock.Mock()
|
||||
self.compute_sdk_client.delete_keypair = mock.Mock()
|
||||
self.compute_sdk_client.find_keypair = mock.Mock()
|
||||
|
||||
|
||||
class TestKeypairCreate(TestKeypair):
|
||||
@ -78,7 +78,7 @@ class TestKeypairCreate(TestKeypair):
|
||||
# Get the command object to test
|
||||
self.cmd = keypair.CreateKeypair(self.app, None)
|
||||
|
||||
self.sdk_client.create_keypair.return_value = self.keypair
|
||||
self.compute_sdk_client.create_keypair.return_value = self.keypair
|
||||
|
||||
@mock.patch.object(
|
||||
keypair,
|
||||
@ -96,7 +96,7 @@ class TestKeypairCreate(TestKeypair):
|
||||
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.create_keypair.assert_called_with(
|
||||
self.compute_sdk_client.create_keypair.assert_called_with(
|
||||
name=self.keypair.name,
|
||||
public_key=mock_generate.return_value.public_key,
|
||||
)
|
||||
@ -134,7 +134,7 @@ class TestKeypairCreate(TestKeypair):
|
||||
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.create_keypair.assert_called_with(
|
||||
self.compute_sdk_client.create_keypair.assert_called_with(
|
||||
name=self.keypair.name,
|
||||
public_key=self.keypair.public_key,
|
||||
)
|
||||
@ -167,7 +167,7 @@ class TestKeypairCreate(TestKeypair):
|
||||
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.create_keypair.assert_called_with(
|
||||
self.compute_sdk_client.create_keypair.assert_called_with(
|
||||
name=self.keypair.name,
|
||||
public_key=mock_generate.return_value.public_key,
|
||||
)
|
||||
@ -183,7 +183,7 @@ class TestKeypairCreate(TestKeypair):
|
||||
@mock.patch.object(sdk_utils, 'supports_microversion', return_value=True)
|
||||
def test_keypair_create_with_key_type(self, sm_mock):
|
||||
for key_type in ['x509', 'ssh']:
|
||||
self.sdk_client.create_keypair.return_value = self.keypair
|
||||
self.compute_sdk_client.create_keypair.return_value = self.keypair
|
||||
|
||||
self.data = (
|
||||
self.keypair.created_at,
|
||||
@ -214,7 +214,7 @@ class TestKeypairCreate(TestKeypair):
|
||||
m_file.read.return_value = 'dummy'
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.create_keypair.assert_called_with(
|
||||
self.compute_sdk_client.create_keypair.assert_called_with(
|
||||
name=self.keypair.name,
|
||||
public_key=self.keypair.public_key,
|
||||
key_type=key_type,
|
||||
@ -273,7 +273,7 @@ class TestKeypairCreate(TestKeypair):
|
||||
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.create_keypair.assert_called_with(
|
||||
self.compute_sdk_client.create_keypair.assert_called_with(
|
||||
name=self.keypair.name,
|
||||
user_id=identity_fakes.user_id,
|
||||
public_key=mock_generate.return_value.public_key,
|
||||
@ -322,7 +322,7 @@ class TestKeypairDelete(TestKeypair):
|
||||
ret = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.assertIsNone(ret)
|
||||
self.sdk_client.delete_keypair.assert_called_with(
|
||||
self.compute_sdk_client.delete_keypair.assert_called_with(
|
||||
self.keypairs[0].name, ignore_missing=False
|
||||
)
|
||||
|
||||
@ -340,7 +340,7 @@ class TestKeypairDelete(TestKeypair):
|
||||
calls = []
|
||||
for k in self.keypairs:
|
||||
calls.append(call(k.name, ignore_missing=False))
|
||||
self.sdk_client.delete_keypair.assert_has_calls(calls)
|
||||
self.compute_sdk_client.delete_keypair.assert_has_calls(calls)
|
||||
self.assertIsNone(result)
|
||||
|
||||
def test_delete_multiple_keypairs_with_exception(self):
|
||||
@ -354,7 +354,7 @@ class TestKeypairDelete(TestKeypair):
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.sdk_client.delete_keypair.side_effect = [
|
||||
self.compute_sdk_client.delete_keypair.side_effect = [
|
||||
None,
|
||||
exceptions.CommandError,
|
||||
]
|
||||
@ -367,7 +367,7 @@ class TestKeypairDelete(TestKeypair):
|
||||
calls = []
|
||||
for k in arglist:
|
||||
calls.append(call(k, ignore_missing=False))
|
||||
self.sdk_client.delete_keypair.assert_has_calls(calls)
|
||||
self.compute_sdk_client.delete_keypair.assert_has_calls(calls)
|
||||
|
||||
@mock.patch.object(sdk_utils, 'supports_microversion', return_value=True)
|
||||
def test_keypair_delete_with_user(self, sm_mock):
|
||||
@ -381,7 +381,7 @@ class TestKeypairDelete(TestKeypair):
|
||||
ret = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.assertIsNone(ret)
|
||||
self.sdk_client.delete_keypair.assert_called_with(
|
||||
self.compute_sdk_client.delete_keypair.assert_called_with(
|
||||
self.keypairs[0].name,
|
||||
user_id=identity_fakes.user_id,
|
||||
ignore_missing=False,
|
||||
@ -389,10 +389,6 @@ class TestKeypairDelete(TestKeypair):
|
||||
|
||||
@mock.patch.object(sdk_utils, 'supports_microversion', return_value=False)
|
||||
def test_keypair_delete_with_user_pre_v210(self, sm_mock):
|
||||
self.app.client_manager.compute.api_version = api_versions.APIVersion(
|
||||
'2.9'
|
||||
)
|
||||
|
||||
arglist = ['--user', identity_fakes.user_name, self.keypairs[0].name]
|
||||
verifylist = [
|
||||
('user', identity_fakes.user_name),
|
||||
@ -409,13 +405,13 @@ class TestKeypairDelete(TestKeypair):
|
||||
|
||||
|
||||
class TestKeypairList(TestKeypair):
|
||||
# Return value of self.sdk_client.keypairs().
|
||||
# Return value of self.compute_sdk_client.keypairs().
|
||||
keypairs = compute_fakes.create_keypairs(count=1)
|
||||
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
|
||||
self.sdk_client.keypairs.return_value = self.keypairs
|
||||
self.compute_sdk_client.keypairs.return_value = self.keypairs
|
||||
|
||||
# Get the command object to test
|
||||
self.cmd = keypair.ListKeypair(self.app, None)
|
||||
@ -434,7 +430,7 @@ class TestKeypairList(TestKeypair):
|
||||
|
||||
# Set expected values
|
||||
|
||||
self.sdk_client.keypairs.assert_called_with()
|
||||
self.compute_sdk_client.keypairs.assert_called_with()
|
||||
|
||||
self.assertEqual(('Name', 'Fingerprint'), columns)
|
||||
self.assertEqual(
|
||||
@ -456,7 +452,7 @@ class TestKeypairList(TestKeypair):
|
||||
|
||||
# Set expected values
|
||||
|
||||
self.sdk_client.keypairs.assert_called_with()
|
||||
self.compute_sdk_client.keypairs.assert_called_with()
|
||||
|
||||
self.assertEqual(('Name', 'Fingerprint', 'Type'), columns)
|
||||
self.assertEqual(
|
||||
@ -492,7 +488,7 @@ class TestKeypairList(TestKeypair):
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
users_mock.get.assert_called_with(identity_fakes.user_name)
|
||||
self.sdk_client.keypairs.assert_called_with(
|
||||
self.compute_sdk_client.keypairs.assert_called_with(
|
||||
user_id=identity_fakes.user_id,
|
||||
)
|
||||
|
||||
@ -554,7 +550,7 @@ class TestKeypairList(TestKeypair):
|
||||
|
||||
projects_mock.get.assert_called_with(identity_fakes.project_name)
|
||||
users_mock.list.assert_called_with(tenant_id=identity_fakes.project_id)
|
||||
self.sdk_client.keypairs.assert_called_with(
|
||||
self.compute_sdk_client.keypairs.assert_called_with(
|
||||
user_id=identity_fakes.user_id,
|
||||
)
|
||||
|
||||
@ -614,7 +610,7 @@ class TestKeypairList(TestKeypair):
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.keypairs.assert_called_with(limit=1)
|
||||
self.compute_sdk_client.keypairs.assert_called_with(limit=1)
|
||||
|
||||
@mock.patch.object(
|
||||
sdk_utils, 'supports_microversion', new=mock.Mock(return_value=False)
|
||||
@ -652,7 +648,7 @@ class TestKeypairList(TestKeypair):
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.keypairs.assert_called_with(marker='test_kp')
|
||||
self.compute_sdk_client.keypairs.assert_called_with(marker='test_kp')
|
||||
|
||||
@mock.patch.object(
|
||||
sdk_utils, 'supports_microversion', new=mock.Mock(return_value=False)
|
||||
@ -708,7 +704,7 @@ class TestKeypairShow(TestKeypair):
|
||||
|
||||
def test_keypair_show(self):
|
||||
self.keypair = compute_fakes.create_one_keypair()
|
||||
self.sdk_client.find_keypair.return_value = self.keypair
|
||||
self.compute_sdk_client.find_keypair.return_value = self.keypair
|
||||
|
||||
self.data = (
|
||||
self.keypair.created_at,
|
||||
@ -727,7 +723,7 @@ class TestKeypairShow(TestKeypair):
|
||||
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.find_keypair.assert_called_with(
|
||||
self.compute_sdk_client.find_keypair.assert_called_with(
|
||||
self.keypair.name, ignore_missing=False
|
||||
)
|
||||
|
||||
@ -736,7 +732,7 @@ class TestKeypairShow(TestKeypair):
|
||||
|
||||
def test_keypair_show_public(self):
|
||||
self.keypair = compute_fakes.create_one_keypair()
|
||||
self.sdk_client.find_keypair.return_value = self.keypair
|
||||
self.compute_sdk_client.find_keypair.return_value = self.keypair
|
||||
|
||||
arglist = ['--public-key', self.keypair.name]
|
||||
verifylist = [('public_key', True), ('name', self.keypair.name)]
|
||||
@ -751,7 +747,7 @@ class TestKeypairShow(TestKeypair):
|
||||
@mock.patch.object(sdk_utils, 'supports_microversion', return_value=True)
|
||||
def test_keypair_show_with_user(self, sm_mock):
|
||||
self.keypair = compute_fakes.create_one_keypair()
|
||||
self.sdk_client.find_keypair.return_value = self.keypair
|
||||
self.compute_sdk_client.find_keypair.return_value = self.keypair
|
||||
|
||||
self.data = (
|
||||
self.keypair.created_at,
|
||||
@ -778,7 +774,7 @@ class TestKeypairShow(TestKeypair):
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.users_mock.get.assert_called_with(identity_fakes.user_name)
|
||||
self.sdk_client.find_keypair.assert_called_with(
|
||||
self.compute_sdk_client.find_keypair.assert_called_with(
|
||||
self.keypair.name,
|
||||
ignore_missing=False,
|
||||
user_id=identity_fakes.user_id,
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -28,7 +28,9 @@ class TestServerBackup(compute_fakes.TestComputev2):
|
||||
|
||||
# Get a shortcut to the compute client ServerManager Mock
|
||||
self.app.client_manager.sdk_connection.compute = mock.Mock()
|
||||
self.sdk_client = self.app.client_manager.sdk_connection.compute
|
||||
self.compute_sdk_client = (
|
||||
self.app.client_manager.sdk_connection.compute
|
||||
)
|
||||
|
||||
# Set object attributes to be tested. Could be overwritten in subclass.
|
||||
self.attrs = {}
|
||||
@ -40,7 +42,7 @@ class TestServerBackup(compute_fakes.TestComputev2):
|
||||
)
|
||||
|
||||
# This is the return value for compute_client.find_server()
|
||||
self.sdk_client.find_server = compute_fakes.get_servers(
|
||||
self.compute_sdk_client.find_server = compute_fakes.get_servers(
|
||||
servers,
|
||||
0,
|
||||
)
|
||||
@ -121,7 +123,7 @@ class TestServerBackupCreate(TestServerBackup):
|
||||
# data to be shown.
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.backup_server.assert_called_with(
|
||||
self.compute_sdk_client.backup_server.assert_called_with(
|
||||
servers[0].id,
|
||||
servers[0].name,
|
||||
'',
|
||||
@ -157,7 +159,7 @@ class TestServerBackupCreate(TestServerBackup):
|
||||
# data to be shown.
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.backup_server.assert_called_with(
|
||||
self.compute_sdk_client.backup_server.assert_called_with(
|
||||
servers[0].id,
|
||||
'image',
|
||||
'daily',
|
||||
@ -197,7 +199,7 @@ class TestServerBackupCreate(TestServerBackup):
|
||||
parsed_args,
|
||||
)
|
||||
|
||||
self.sdk_client.backup_server.assert_called_with(
|
||||
self.compute_sdk_client.backup_server.assert_called_with(
|
||||
servers[0].id,
|
||||
'image',
|
||||
'daily',
|
||||
@ -238,7 +240,7 @@ class TestServerBackupCreate(TestServerBackup):
|
||||
# data to be shown.
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.backup_server.assert_called_with(
|
||||
self.compute_sdk_client.backup_server.assert_called_with(
|
||||
servers[0].id,
|
||||
'image',
|
||||
'daily',
|
||||
|
||||
@ -30,11 +30,13 @@ class TestServerEvent(compute_fakes.TestComputev2):
|
||||
super(TestServerEvent, self).setUp()
|
||||
|
||||
self.app.client_manager.sdk_connection.compute = mock.Mock()
|
||||
self.sdk_client = self.app.client_manager.sdk_connection.compute
|
||||
self.sdk_client.find_server = mock.Mock()
|
||||
self.sdk_client.server_actions = mock.Mock()
|
||||
self.sdk_client.get_server_action = mock.Mock()
|
||||
self.sdk_client.reset_mock()
|
||||
self.compute_sdk_client = (
|
||||
self.app.client_manager.sdk_connection.compute
|
||||
)
|
||||
self.compute_sdk_client.find_server = mock.Mock()
|
||||
self.compute_sdk_client.server_actions = mock.Mock()
|
||||
self.compute_sdk_client.get_server_action = mock.Mock()
|
||||
self.compute_sdk_client.reset_mock()
|
||||
|
||||
patcher = mock.patch.object(
|
||||
sdk_utils, 'supports_microversion', return_value=True
|
||||
@ -42,7 +44,7 @@ class TestServerEvent(compute_fakes.TestComputev2):
|
||||
self.addCleanup(patcher.stop)
|
||||
self.supports_microversion_mock = patcher.start()
|
||||
self._set_mock_microversion(
|
||||
self.app.client_manager.compute.api_version.get_string()
|
||||
self.compute_client.api_version.get_string()
|
||||
)
|
||||
|
||||
def _set_mock_microversion(self, mock_v):
|
||||
@ -97,8 +99,8 @@ class TestListServerEvent(TestServerEvent):
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
|
||||
self.sdk_client.find_server.return_value = self.fake_server
|
||||
self.sdk_client.server_actions.return_value = [
|
||||
self.compute_sdk_client.find_server.return_value = self.fake_server
|
||||
self.compute_sdk_client.server_actions.return_value = [
|
||||
self.fake_event,
|
||||
]
|
||||
|
||||
@ -116,11 +118,13 @@ class TestListServerEvent(TestServerEvent):
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.find_server.assert_called_with(
|
||||
self.compute_sdk_client.find_server.assert_called_with(
|
||||
self.fake_server.name,
|
||||
ignore_missing=False,
|
||||
)
|
||||
self.sdk_client.server_actions.assert_called_with(self.fake_server.id)
|
||||
self.compute_sdk_client.server_actions.assert_called_with(
|
||||
self.fake_server.id
|
||||
)
|
||||
|
||||
self.assertEqual(self.columns, columns)
|
||||
self.assertEqual(self.data, tuple(data))
|
||||
@ -138,11 +142,13 @@ class TestListServerEvent(TestServerEvent):
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.find_server.assert_called_with(
|
||||
self.compute_sdk_client.find_server.assert_called_with(
|
||||
self.fake_server.name,
|
||||
ignore_missing=False,
|
||||
)
|
||||
self.sdk_client.server_actions.assert_called_with(self.fake_server.id)
|
||||
self.compute_sdk_client.server_actions.assert_called_with(
|
||||
self.fake_server.id
|
||||
)
|
||||
|
||||
self.assertEqual(self.long_columns, columns)
|
||||
self.assertEqual(self.long_data, tuple(data))
|
||||
@ -163,11 +169,11 @@ class TestListServerEvent(TestServerEvent):
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.find_server.assert_called_with(
|
||||
self.compute_sdk_client.find_server.assert_called_with(
|
||||
self.fake_server.name,
|
||||
ignore_missing=False,
|
||||
)
|
||||
self.sdk_client.server_actions.assert_called_with(
|
||||
self.compute_sdk_client.server_actions.assert_called_with(
|
||||
self.fake_server.id,
|
||||
changes_since='2016-03-04T06:27:59Z',
|
||||
)
|
||||
@ -243,11 +249,11 @@ class TestListServerEvent(TestServerEvent):
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.find_server.assert_called_with(
|
||||
self.compute_sdk_client.find_server.assert_called_with(
|
||||
self.fake_server.name,
|
||||
ignore_missing=False,
|
||||
)
|
||||
self.sdk_client.server_actions.assert_called_with(
|
||||
self.compute_sdk_client.server_actions.assert_called_with(
|
||||
self.fake_server.id,
|
||||
changes_before='2016-03-04T06:27:59Z',
|
||||
)
|
||||
@ -319,7 +325,7 @@ class TestListServerEvent(TestServerEvent):
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.server_actions.assert_called_with(
|
||||
self.compute_sdk_client.server_actions.assert_called_with(
|
||||
self.fake_server.id,
|
||||
limit=1,
|
||||
paginated=False,
|
||||
@ -366,7 +372,7 @@ class TestListServerEvent(TestServerEvent):
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.server_actions.assert_called_with(
|
||||
self.compute_sdk_client.server_actions.assert_called_with(
|
||||
self.fake_server.id,
|
||||
marker='test_event',
|
||||
)
|
||||
@ -420,8 +426,10 @@ class TestShowServerEvent(TestServerEvent):
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
|
||||
self.sdk_client.find_server.return_value = self.fake_server
|
||||
self.sdk_client.get_server_action.return_value = self.fake_event
|
||||
self.compute_sdk_client.find_server.return_value = self.fake_server
|
||||
self.compute_sdk_client.get_server_action.return_value = (
|
||||
self.fake_event
|
||||
)
|
||||
|
||||
self.cmd = server_event.ShowServerEvent(self.app, None)
|
||||
|
||||
@ -438,11 +446,11 @@ class TestShowServerEvent(TestServerEvent):
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.find_server.assert_called_with(
|
||||
self.compute_sdk_client.find_server.assert_called_with(
|
||||
self.fake_server.name,
|
||||
ignore_missing=False,
|
||||
)
|
||||
self.sdk_client.get_server_action.assert_called_with(
|
||||
self.compute_sdk_client.get_server_action.assert_called_with(
|
||||
self.fake_event.request_id,
|
||||
self.fake_server.id,
|
||||
)
|
||||
|
||||
@ -51,15 +51,17 @@ class TestServerGroup(compute_fakes.TestComputev2):
|
||||
super().setUp()
|
||||
|
||||
# Create and get a shortcut to the compute client mock
|
||||
self.sdk_client = self.app.client_manager.sdk_connection.compute
|
||||
self.sdk_client.reset_mock()
|
||||
self.compute_sdk_client = (
|
||||
self.app.client_manager.sdk_connection.compute
|
||||
)
|
||||
self.compute_sdk_client.reset_mock()
|
||||
|
||||
|
||||
class TestServerGroupCreate(TestServerGroup):
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
|
||||
self.sdk_client.create_server_group.return_value = (
|
||||
self.compute_sdk_client.create_server_group.return_value = (
|
||||
self.fake_server_group
|
||||
)
|
||||
self.cmd = server_group.CreateServerGroup(self.app, None)
|
||||
@ -77,7 +79,7 @@ class TestServerGroupCreate(TestServerGroup):
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.create_server_group.assert_called_once_with(
|
||||
self.compute_sdk_client.create_server_group.assert_called_once_with(
|
||||
name=parsed_args.name,
|
||||
policy=parsed_args.policy,
|
||||
)
|
||||
@ -98,7 +100,7 @@ class TestServerGroupCreate(TestServerGroup):
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.create_server_group.assert_called_once_with(
|
||||
self.compute_sdk_client.create_server_group.assert_called_once_with(
|
||||
name=parsed_args.name,
|
||||
policy=parsed_args.policy,
|
||||
)
|
||||
@ -141,7 +143,7 @@ class TestServerGroupCreate(TestServerGroup):
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.create_server_group.assert_called_once_with(
|
||||
self.compute_sdk_client.create_server_group.assert_called_once_with(
|
||||
name=parsed_args.name,
|
||||
policy=parsed_args.policy,
|
||||
rules=parsed_args.rules,
|
||||
@ -180,7 +182,9 @@ class TestServerGroupDelete(TestServerGroup):
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
|
||||
self.sdk_client.find_server_group.return_value = self.fake_server_group
|
||||
self.compute_sdk_client.find_server_group.return_value = (
|
||||
self.fake_server_group
|
||||
)
|
||||
self.cmd = server_group.DeleteServerGroup(self.app, None)
|
||||
|
||||
def test_server_group_delete(self):
|
||||
@ -192,10 +196,10 @@ class TestServerGroupDelete(TestServerGroup):
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.find_server_group.assert_called_once_with(
|
||||
self.compute_sdk_client.find_server_group.assert_called_once_with(
|
||||
'affinity_group'
|
||||
)
|
||||
self.sdk_client.delete_server_group.assert_called_once_with(
|
||||
self.compute_sdk_client.delete_server_group.assert_called_once_with(
|
||||
self.fake_server_group.id
|
||||
)
|
||||
self.assertIsNone(result)
|
||||
@ -207,15 +211,21 @@ class TestServerGroupDelete(TestServerGroup):
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.find_server_group.assert_any_call('affinity_group')
|
||||
self.sdk_client.find_server_group.assert_any_call(
|
||||
self.compute_sdk_client.find_server_group.assert_any_call(
|
||||
'affinity_group'
|
||||
)
|
||||
self.compute_sdk_client.find_server_group.assert_any_call(
|
||||
'anti_affinity_group'
|
||||
)
|
||||
self.sdk_client.delete_server_group.assert_called_with(
|
||||
self.compute_sdk_client.delete_server_group.assert_called_with(
|
||||
self.fake_server_group.id
|
||||
)
|
||||
self.assertEqual(2, self.sdk_client.find_server_group.call_count)
|
||||
self.assertEqual(2, self.sdk_client.delete_server_group.call_count)
|
||||
self.assertEqual(
|
||||
2, self.compute_sdk_client.find_server_group.call_count
|
||||
)
|
||||
self.assertEqual(
|
||||
2, self.compute_sdk_client.delete_server_group.call_count
|
||||
)
|
||||
self.assertIsNone(result)
|
||||
|
||||
def test_server_group_delete_no_input(self):
|
||||
@ -236,7 +246,7 @@ class TestServerGroupDelete(TestServerGroup):
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.sdk_client.find_server_group.side_effect = [
|
||||
self.compute_sdk_client.find_server_group.side_effect = [
|
||||
self.fake_server_group,
|
||||
exceptions.CommandError,
|
||||
]
|
||||
@ -246,12 +256,16 @@ class TestServerGroupDelete(TestServerGroup):
|
||||
except exceptions.CommandError as e:
|
||||
self.assertEqual('1 of 2 server groups failed to delete.', str(e))
|
||||
|
||||
self.sdk_client.find_server_group.assert_any_call('affinity_group')
|
||||
self.sdk_client.find_server_group.assert_any_call(
|
||||
self.compute_sdk_client.find_server_group.assert_any_call(
|
||||
'affinity_group'
|
||||
)
|
||||
self.compute_sdk_client.find_server_group.assert_any_call(
|
||||
'anti_affinity_group'
|
||||
)
|
||||
self.assertEqual(2, self.sdk_client.find_server_group.call_count)
|
||||
self.sdk_client.delete_server_group.assert_called_once_with(
|
||||
self.assertEqual(
|
||||
2, self.compute_sdk_client.find_server_group.call_count
|
||||
)
|
||||
self.compute_sdk_client.delete_server_group.assert_called_once_with(
|
||||
self.fake_server_group.id
|
||||
)
|
||||
|
||||
@ -336,7 +350,9 @@ class TestServerGroupList(TestServerGroup):
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
|
||||
self.sdk_client.server_groups.return_value = [self.fake_server_group]
|
||||
self.compute_sdk_client.server_groups.return_value = [
|
||||
self.fake_server_group
|
||||
]
|
||||
self.cmd = server_group.ListServerGroup(self.app, None)
|
||||
|
||||
@mock.patch.object(sdk_utils, 'supports_microversion', return_value=False)
|
||||
@ -351,7 +367,7 @@ class TestServerGroupList(TestServerGroup):
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.server_groups.assert_called_once_with()
|
||||
self.compute_sdk_client.server_groups.assert_called_once_with()
|
||||
|
||||
self.assertCountEqual(self.list_columns, columns)
|
||||
self.assertCountEqual(self.list_data, tuple(data))
|
||||
@ -370,7 +386,7 @@ class TestServerGroupList(TestServerGroup):
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.server_groups.assert_called_once_with(
|
||||
self.compute_sdk_client.server_groups.assert_called_once_with(
|
||||
all_projects=True
|
||||
)
|
||||
|
||||
@ -393,7 +409,7 @@ class TestServerGroupList(TestServerGroup):
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.server_groups.assert_called_once_with(limit=1)
|
||||
self.compute_sdk_client.server_groups.assert_called_once_with(limit=1)
|
||||
|
||||
@mock.patch.object(sdk_utils, 'supports_microversion', return_value=True)
|
||||
def test_server_group_list_with_offset(self, sm_mock):
|
||||
@ -411,7 +427,7 @@ class TestServerGroupList(TestServerGroup):
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.server_groups.assert_called_once_with(offset=5)
|
||||
self.compute_sdk_client.server_groups.assert_called_once_with(offset=5)
|
||||
|
||||
@mock.patch.object(sdk_utils, 'supports_microversion', return_value=True)
|
||||
def test_server_group_list_v264(self, sm_mock):
|
||||
@ -422,7 +438,7 @@ class TestServerGroupList(TestServerGroup):
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.server_groups.assert_called_once_with()
|
||||
self.compute_sdk_client.server_groups.assert_called_once_with()
|
||||
|
||||
self.assertCountEqual(self.list_columns_v264, columns)
|
||||
self.assertCountEqual(self.list_data_v264, tuple(data))
|
||||
@ -439,7 +455,7 @@ class TestServerGroupList(TestServerGroup):
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.server_groups.assert_called_once_with(
|
||||
self.compute_sdk_client.server_groups.assert_called_once_with(
|
||||
all_projects=True
|
||||
)
|
||||
|
||||
@ -451,7 +467,9 @@ class TestServerGroupShow(TestServerGroup):
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
|
||||
self.sdk_client.find_server_group.return_value = self.fake_server_group
|
||||
self.compute_sdk_client.find_server_group.return_value = (
|
||||
self.fake_server_group
|
||||
)
|
||||
self.cmd = server_group.ShowServerGroup(self.app, None)
|
||||
|
||||
@mock.patch.object(sdk_utils, 'supports_microversion', return_value=True)
|
||||
|
||||
@ -27,7 +27,9 @@ class TestServerImage(compute_fakes.TestComputev2):
|
||||
|
||||
# Get a shortcut to the compute client ServerManager Mock
|
||||
self.app.client_manager.sdk_connection.compute = mock.Mock()
|
||||
self.sdk_client = self.app.client_manager.sdk_connection.compute
|
||||
self.compute_sdk_client = (
|
||||
self.app.client_manager.sdk_connection.compute
|
||||
)
|
||||
|
||||
# Set object attributes to be tested. Could be overwritten in subclass.
|
||||
self.attrs = {}
|
||||
@ -39,7 +41,7 @@ class TestServerImage(compute_fakes.TestComputev2):
|
||||
)
|
||||
|
||||
# This is the return value for compute_client.find_server()
|
||||
self.sdk_client.find_server = compute_fakes.get_servers(
|
||||
self.compute_sdk_client.find_server = compute_fakes.get_servers(
|
||||
servers,
|
||||
0,
|
||||
)
|
||||
@ -96,7 +98,7 @@ class TestServerImageCreate(TestServerImage):
|
||||
)
|
||||
|
||||
self.image_client.find_image = mock.Mock(side_effect=images)
|
||||
self.sdk_client.create_server_image = mock.Mock(
|
||||
self.compute_sdk_client.create_server_image = mock.Mock(
|
||||
return_value=images[0],
|
||||
)
|
||||
return images
|
||||
@ -118,7 +120,7 @@ class TestServerImageCreate(TestServerImage):
|
||||
# data to be shown.
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.create_server_image.assert_called_with(
|
||||
self.compute_sdk_client.create_server_image.assert_called_with(
|
||||
servers[0].id,
|
||||
servers[0].name,
|
||||
None,
|
||||
@ -150,7 +152,7 @@ class TestServerImageCreate(TestServerImage):
|
||||
# data to be shown.
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.create_server_image.assert_called_with(
|
||||
self.compute_sdk_client.create_server_image.assert_called_with(
|
||||
servers[0].id,
|
||||
'img-nam',
|
||||
{'key': 'value'},
|
||||
@ -180,7 +182,7 @@ class TestServerImageCreate(TestServerImage):
|
||||
parsed_args,
|
||||
)
|
||||
|
||||
self.sdk_client.create_server_image.assert_called_with(
|
||||
self.compute_sdk_client.create_server_image.assert_called_with(
|
||||
servers[0].id,
|
||||
servers[0].name,
|
||||
None,
|
||||
@ -210,7 +212,7 @@ class TestServerImageCreate(TestServerImage):
|
||||
# data to be shown.
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.create_server_image.assert_called_with(
|
||||
self.compute_sdk_client.create_server_image.assert_called_with(
|
||||
servers[0].id,
|
||||
servers[0].name,
|
||||
None,
|
||||
|
||||
@ -27,17 +27,17 @@ class TestServerMigration(compute_fakes.TestComputev2):
|
||||
super().setUp()
|
||||
|
||||
# Get a shortcut to the compute client ServerManager Mock
|
||||
self.servers_mock = self.app.client_manager.compute.servers
|
||||
self.servers_mock = self.compute_client.servers
|
||||
self.servers_mock.reset_mock()
|
||||
|
||||
# Get a shortcut to the compute client ServerMigrationsManager Mock
|
||||
self.server_migrations_mock = (
|
||||
self.app.client_manager.compute.server_migrations
|
||||
)
|
||||
self.server_migrations_mock = self.compute_client.server_migrations
|
||||
self.server_migrations_mock.reset_mock()
|
||||
|
||||
self.app.client_manager.sdk_connection.compute = mock.Mock()
|
||||
self.sdk_client = self.app.client_manager.sdk_connection.compute
|
||||
self.compute_sdk_client = (
|
||||
self.app.client_manager.sdk_connection.compute
|
||||
)
|
||||
|
||||
patcher = mock.patch.object(
|
||||
sdk_utils, 'supports_microversion', return_value=True
|
||||
@ -91,10 +91,10 @@ class TestListMigration(TestServerMigration):
|
||||
self._set_mock_microversion('2.1')
|
||||
|
||||
self.server = compute_fakes.create_one_sdk_server()
|
||||
self.sdk_client.find_server.return_value = self.server
|
||||
self.compute_sdk_client.find_server.return_value = self.server
|
||||
|
||||
self.migrations = compute_fakes.create_migrations(count=3)
|
||||
self.sdk_client.migrations.return_value = self.migrations
|
||||
self.compute_sdk_client.migrations.return_value = self.migrations
|
||||
|
||||
self.data = (
|
||||
common_utils.get_item_properties(s, self.MIGRATION_FIELDS)
|
||||
@ -114,7 +114,7 @@ class TestListMigration(TestServerMigration):
|
||||
# Set expected values
|
||||
kwargs = {}
|
||||
|
||||
self.sdk_client.migrations.assert_called_with(**kwargs)
|
||||
self.compute_sdk_client.migrations.assert_called_with(**kwargs)
|
||||
|
||||
self.assertEqual(self.MIGRATION_COLUMNS, columns)
|
||||
self.assertEqual(tuple(self.data), tuple(data))
|
||||
@ -146,8 +146,8 @@ class TestListMigration(TestServerMigration):
|
||||
'migration_type': 'migration',
|
||||
}
|
||||
|
||||
self.sdk_client.find_server.assert_called_with('server1')
|
||||
self.sdk_client.migrations.assert_called_with(**kwargs)
|
||||
self.compute_sdk_client.find_server.assert_called_with('server1')
|
||||
self.compute_sdk_client.migrations.assert_called_with(**kwargs)
|
||||
|
||||
self.assertEqual(self.MIGRATION_COLUMNS, columns)
|
||||
self.assertEqual(tuple(self.data), tuple(data))
|
||||
@ -205,7 +205,7 @@ class TestListMigrationV223(TestListMigration):
|
||||
'status': 'migrating',
|
||||
}
|
||||
|
||||
self.sdk_client.migrations.assert_called_with(**kwargs)
|
||||
self.compute_sdk_client.migrations.assert_called_with(**kwargs)
|
||||
|
||||
self.assertEqual(self.MIGRATION_COLUMNS, columns)
|
||||
self.assertEqual(tuple(self.data), tuple(data))
|
||||
@ -283,7 +283,7 @@ class TestListMigrationV259(TestListMigration):
|
||||
'changes_since': '2019-08-09T08:03:25Z',
|
||||
}
|
||||
|
||||
self.sdk_client.migrations.assert_called_with(**kwargs)
|
||||
self.compute_sdk_client.migrations.assert_called_with(**kwargs)
|
||||
|
||||
self.assertEqual(self.MIGRATION_COLUMNS, columns)
|
||||
self.assertEqual(tuple(self.data), tuple(data))
|
||||
@ -409,7 +409,7 @@ class TestListMigrationV266(TestListMigration):
|
||||
'changes_before': '2019-08-09T08:03:25Z',
|
||||
}
|
||||
|
||||
self.sdk_client.migrations.assert_called_with(**kwargs)
|
||||
self.compute_sdk_client.migrations.assert_called_with(**kwargs)
|
||||
|
||||
self.assertEqual(self.MIGRATION_COLUMNS, columns)
|
||||
self.assertEqual(tuple(self.data), tuple(data))
|
||||
@ -527,7 +527,7 @@ class TestListMigrationV280(TestListMigration):
|
||||
'changes_before': "2019-08-09T08:03:25Z",
|
||||
}
|
||||
|
||||
self.sdk_client.migrations.assert_called_with(**kwargs)
|
||||
self.compute_sdk_client.migrations.assert_called_with(**kwargs)
|
||||
|
||||
self.MIGRATION_COLUMNS.insert(
|
||||
len(self.MIGRATION_COLUMNS) - 2, "Project"
|
||||
@ -603,7 +603,7 @@ class TestListMigrationV280(TestListMigration):
|
||||
'changes_before': "2019-08-09T08:03:25Z",
|
||||
}
|
||||
|
||||
self.sdk_client.migrations.assert_called_with(**kwargs)
|
||||
self.compute_sdk_client.migrations.assert_called_with(**kwargs)
|
||||
|
||||
self.MIGRATION_COLUMNS.insert(len(self.MIGRATION_COLUMNS) - 2, "User")
|
||||
self.MIGRATION_FIELDS.insert(len(self.MIGRATION_FIELDS) - 2, "user_id")
|
||||
@ -674,7 +674,7 @@ class TestListMigrationV280(TestListMigration):
|
||||
'changes_before': "2019-08-09T08:03:25Z",
|
||||
}
|
||||
|
||||
self.sdk_client.migrations.assert_called_with(**kwargs)
|
||||
self.compute_sdk_client.migrations.assert_called_with(**kwargs)
|
||||
|
||||
self.MIGRATION_COLUMNS.insert(
|
||||
len(self.MIGRATION_COLUMNS) - 2, "Project"
|
||||
@ -724,13 +724,13 @@ class TestServerMigrationShow(TestServerMigration):
|
||||
super().setUp()
|
||||
|
||||
self.server = compute_fakes.create_one_sdk_server()
|
||||
self.sdk_client.find_server.return_value = self.server
|
||||
self.compute_sdk_client.find_server.return_value = self.server
|
||||
|
||||
self.server_migration = compute_fakes.create_one_server_migration()
|
||||
self.sdk_client.get_server_migration.return_value = (
|
||||
self.compute_sdk_client.get_server_migration.return_value = (
|
||||
self.server_migration
|
||||
)
|
||||
self.sdk_client.server_migrations.return_value = iter(
|
||||
self.compute_sdk_client.server_migrations.return_value = iter(
|
||||
[self.server_migration]
|
||||
)
|
||||
|
||||
@ -788,10 +788,10 @@ class TestServerMigrationShow(TestServerMigration):
|
||||
self.assertEqual(self.columns, columns)
|
||||
self.assertEqual(self.data, data)
|
||||
|
||||
self.sdk_client.find_server.assert_called_with(
|
||||
self.compute_sdk_client.find_server.assert_called_with(
|
||||
self.server.id, ignore_missing=False
|
||||
)
|
||||
self.sdk_client.get_server_migration.assert_called_with(
|
||||
self.compute_sdk_client.get_server_migration.assert_called_with(
|
||||
self.server.id, '2', ignore_missing=False
|
||||
)
|
||||
|
||||
@ -840,7 +840,7 @@ class TestServerMigrationShow(TestServerMigration):
|
||||
def test_server_migration_show_by_uuid(self):
|
||||
self._set_mock_microversion('2.59')
|
||||
|
||||
self.sdk_client.server_migrations.return_value = iter(
|
||||
self.compute_sdk_client.server_migrations.return_value = iter(
|
||||
[self.server_migration]
|
||||
)
|
||||
|
||||
@ -859,15 +859,17 @@ class TestServerMigrationShow(TestServerMigration):
|
||||
self.assertEqual(self.columns, columns)
|
||||
self.assertEqual(self.data, data)
|
||||
|
||||
self.sdk_client.find_server.assert_called_with(
|
||||
self.compute_sdk_client.find_server.assert_called_with(
|
||||
self.server.id, ignore_missing=False
|
||||
)
|
||||
self.sdk_client.server_migrations.assert_called_with(self.server.id)
|
||||
self.sdk_client.get_server_migration.assert_not_called()
|
||||
self.compute_sdk_client.server_migrations.assert_called_with(
|
||||
self.server.id
|
||||
)
|
||||
self.compute_sdk_client.get_server_migration.assert_not_called()
|
||||
|
||||
def test_server_migration_show_by_uuid_no_matches(self):
|
||||
self._set_mock_microversion('2.59')
|
||||
self.sdk_client.server_migrations.return_value = iter([])
|
||||
self.compute_sdk_client.server_migrations.return_value = iter([])
|
||||
|
||||
arglist = [
|
||||
self.server.id,
|
||||
@ -926,7 +928,7 @@ class TestServerMigrationAbort(TestServerMigration):
|
||||
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
|
||||
self.compute_sdk_client.find_server.return_value = self.server
|
||||
|
||||
# Get the command object to test
|
||||
self.cmd = server_migration.AbortMigration(self.app, None)
|
||||
@ -943,10 +945,10 @@ class TestServerMigrationAbort(TestServerMigration):
|
||||
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.find_server.assert_called_with(
|
||||
self.compute_sdk_client.find_server.assert_called_with(
|
||||
self.server.id, ignore_missing=False
|
||||
)
|
||||
self.sdk_client.abort_server_migration.assert_called_with(
|
||||
self.compute_sdk_client.abort_server_migration.assert_called_with(
|
||||
'2', self.server.id, ignore_missing=False
|
||||
)
|
||||
self.assertIsNone(result)
|
||||
@ -972,7 +974,7 @@ class TestServerMigrationAbort(TestServerMigration):
|
||||
self._set_mock_microversion('2.59')
|
||||
|
||||
self.server_migration = compute_fakes.create_one_server_migration()
|
||||
self.sdk_client.server_migrations.return_value = iter(
|
||||
self.compute_sdk_client.server_migrations.return_value = iter(
|
||||
[self.server_migration]
|
||||
)
|
||||
|
||||
@ -985,11 +987,13 @@ class TestServerMigrationAbort(TestServerMigration):
|
||||
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.find_server.assert_called_with(
|
||||
self.compute_sdk_client.find_server.assert_called_with(
|
||||
self.server.id, ignore_missing=False
|
||||
)
|
||||
self.sdk_client.server_migrations.assert_called_with(self.server.id)
|
||||
self.sdk_client.abort_server_migration.assert_called_with(
|
||||
self.compute_sdk_client.server_migrations.assert_called_with(
|
||||
self.server.id
|
||||
)
|
||||
self.compute_sdk_client.abort_server_migration.assert_called_with(
|
||||
self.server_migration.id, self.server.id, ignore_missing=False
|
||||
)
|
||||
self.assertIsNone(result)
|
||||
@ -997,7 +1001,7 @@ class TestServerMigrationAbort(TestServerMigration):
|
||||
def test_server_migration_abort_by_uuid_no_matches(self):
|
||||
self._set_mock_microversion('2.59')
|
||||
|
||||
self.sdk_client.server_migrations.return_value = iter([])
|
||||
self.compute_sdk_client.server_migrations.return_value = iter([])
|
||||
|
||||
arglist = [
|
||||
self.server.id,
|
||||
@ -1039,7 +1043,7 @@ class TestServerMigrationForceComplete(TestServerMigration):
|
||||
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
|
||||
self.compute_sdk_client.find_server.return_value = self.server
|
||||
|
||||
# Get the command object to test
|
||||
self.cmd = server_migration.ForceCompleteMigration(self.app, None)
|
||||
@ -1056,10 +1060,10 @@ class TestServerMigrationForceComplete(TestServerMigration):
|
||||
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.find_server.assert_called_with(
|
||||
self.compute_sdk_client.find_server.assert_called_with(
|
||||
self.server.id, ignore_missing=False
|
||||
)
|
||||
self.sdk_client.force_complete_server_migration.assert_called_with(
|
||||
self.compute_sdk_client.force_complete_server_migration.assert_called_with(
|
||||
'2', self.server.id
|
||||
)
|
||||
self.assertIsNone(result)
|
||||
@ -1085,7 +1089,7 @@ class TestServerMigrationForceComplete(TestServerMigration):
|
||||
self._set_mock_microversion('2.59')
|
||||
|
||||
self.server_migration = compute_fakes.create_one_server_migration()
|
||||
self.sdk_client.server_migrations.return_value = iter(
|
||||
self.compute_sdk_client.server_migrations.return_value = iter(
|
||||
[self.server_migration]
|
||||
)
|
||||
|
||||
@ -1098,11 +1102,13 @@ class TestServerMigrationForceComplete(TestServerMigration):
|
||||
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.find_server.assert_called_with(
|
||||
self.compute_sdk_client.find_server.assert_called_with(
|
||||
self.server.id, ignore_missing=False
|
||||
)
|
||||
self.sdk_client.server_migrations.assert_called_with(self.server.id)
|
||||
self.sdk_client.force_complete_server_migration.assert_called_with(
|
||||
self.compute_sdk_client.server_migrations.assert_called_with(
|
||||
self.server.id
|
||||
)
|
||||
self.compute_sdk_client.force_complete_server_migration.assert_called_with(
|
||||
self.server_migration.id, self.server.id
|
||||
)
|
||||
self.assertIsNone(result)
|
||||
@ -1110,7 +1116,7 @@ class TestServerMigrationForceComplete(TestServerMigration):
|
||||
def test_server_migration_force_complete_by_uuid_no_matches(self):
|
||||
self._set_mock_microversion('2.59')
|
||||
|
||||
self.sdk_client.server_migrations.return_value = iter([])
|
||||
self.compute_sdk_client.server_migrations.return_value = iter([])
|
||||
|
||||
arglist = [
|
||||
self.server.id,
|
||||
|
||||
@ -9,11 +9,9 @@
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
#
|
||||
|
||||
from unittest import mock
|
||||
|
||||
from novaclient import api_versions
|
||||
from openstack import utils as sdk_utils
|
||||
from osc_lib import exceptions
|
||||
|
||||
@ -27,7 +25,9 @@ class TestServerVolume(compute_fakes.TestComputev2):
|
||||
super().setUp()
|
||||
|
||||
self.app.client_manager.sdk_connection.compute = mock.Mock()
|
||||
self.compute_client = self.app.client_manager.sdk_connection.compute
|
||||
self.compute_sdk_client = (
|
||||
self.app.client_manager.sdk_connection.compute
|
||||
)
|
||||
|
||||
|
||||
class TestServerVolumeList(TestServerVolume):
|
||||
@ -37,8 +37,8 @@ class TestServerVolumeList(TestServerVolume):
|
||||
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
|
||||
self.compute_client.volume_attachments.return_value = (
|
||||
self.compute_sdk_client.find_server.return_value = self.server
|
||||
self.compute_sdk_client.volume_attachments.return_value = (
|
||||
self.volume_attachments
|
||||
)
|
||||
|
||||
@ -47,9 +47,6 @@ class TestServerVolumeList(TestServerVolume):
|
||||
|
||||
@mock.patch.object(sdk_utils, 'supports_microversion')
|
||||
def test_server_volume_list(self, sm_mock):
|
||||
self.app.client_manager.compute.api_version = api_versions.APIVersion(
|
||||
'2.1'
|
||||
)
|
||||
sm_mock.side_effect = [False, False, False, False]
|
||||
|
||||
arglist = [
|
||||
@ -80,7 +77,7 @@ class TestServerVolumeList(TestServerVolume):
|
||||
),
|
||||
tuple(data),
|
||||
)
|
||||
self.compute_client.volume_attachments.assert_called_once_with(
|
||||
self.compute_sdk_client.volume_attachments.assert_called_once_with(
|
||||
self.server,
|
||||
)
|
||||
|
||||
@ -127,7 +124,7 @@ class TestServerVolumeList(TestServerVolume):
|
||||
),
|
||||
tuple(data),
|
||||
)
|
||||
self.compute_client.volume_attachments.assert_called_once_with(
|
||||
self.compute_sdk_client.volume_attachments.assert_called_once_with(
|
||||
self.server,
|
||||
)
|
||||
|
||||
@ -176,7 +173,7 @@ class TestServerVolumeList(TestServerVolume):
|
||||
),
|
||||
tuple(data),
|
||||
)
|
||||
self.compute_client.volume_attachments.assert_called_once_with(
|
||||
self.compute_sdk_client.volume_attachments.assert_called_once_with(
|
||||
self.server,
|
||||
)
|
||||
|
||||
@ -228,7 +225,7 @@ class TestServerVolumeList(TestServerVolume):
|
||||
),
|
||||
tuple(data),
|
||||
)
|
||||
self.compute_client.volume_attachments.assert_called_once_with(
|
||||
self.compute_sdk_client.volume_attachments.assert_called_once_with(
|
||||
self.server,
|
||||
)
|
||||
|
||||
@ -238,7 +235,7 @@ class TestServerVolumeUpdate(TestServerVolume):
|
||||
super().setUp()
|
||||
|
||||
self.server = compute_fakes.create_one_sdk_server()
|
||||
self.compute_client.find_server.return_value = self.server
|
||||
self.compute_sdk_client.find_server.return_value = self.server
|
||||
|
||||
self.volume = volume_fakes.create_one_sdk_volume()
|
||||
self.volume_sdk_client.find_volume.return_value = self.volume
|
||||
@ -261,7 +258,7 @@ class TestServerVolumeUpdate(TestServerVolume):
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
|
||||
# This is a no-op
|
||||
self.compute_client.update_volume_attachment.assert_not_called()
|
||||
self.compute_sdk_client.update_volume_attachment.assert_not_called()
|
||||
self.assertIsNone(result)
|
||||
|
||||
@mock.patch.object(sdk_utils, 'supports_microversion')
|
||||
@ -282,7 +279,7 @@ class TestServerVolumeUpdate(TestServerVolume):
|
||||
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.compute_client.update_volume_attachment.assert_called_once_with(
|
||||
self.compute_sdk_client.update_volume_attachment.assert_called_once_with(
|
||||
self.server,
|
||||
self.volume,
|
||||
delete_on_termination=True,
|
||||
@ -307,7 +304,7 @@ class TestServerVolumeUpdate(TestServerVolume):
|
||||
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.compute_client.update_volume_attachment.assert_called_once_with(
|
||||
self.compute_sdk_client.update_volume_attachment.assert_called_once_with(
|
||||
self.server, self.volume, delete_on_termination=False
|
||||
)
|
||||
self.assertIsNone(result)
|
||||
@ -336,7 +333,7 @@ class TestServerVolumeUpdate(TestServerVolume):
|
||||
self.cmd.take_action,
|
||||
parsed_args,
|
||||
)
|
||||
self.compute_client.update_volume_attachment.assert_not_called()
|
||||
self.compute_sdk_client.update_volume_attachment.assert_not_called()
|
||||
|
||||
@mock.patch.object(sdk_utils, 'supports_microversion')
|
||||
def test_server_volume_update_with_preserve_on_termination_pre_v285(
|
||||
@ -362,4 +359,4 @@ class TestServerVolumeUpdate(TestServerVolume):
|
||||
self.cmd.take_action,
|
||||
parsed_args,
|
||||
)
|
||||
self.compute_client.update_volume_attachment.assert_not_called()
|
||||
self.compute_sdk_client.update_volume_attachment.assert_not_called()
|
||||
|
||||
@ -11,12 +11,10 @@
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
#
|
||||
|
||||
from unittest import mock
|
||||
from unittest.mock import call
|
||||
|
||||
from novaclient import api_versions
|
||||
from openstack import utils as sdk_utils
|
||||
from osc_lib import exceptions
|
||||
|
||||
@ -29,7 +27,9 @@ class TestService(compute_fakes.TestComputev2):
|
||||
super(TestService, self).setUp()
|
||||
|
||||
self.app.client_manager.sdk_connection.compute = mock.Mock()
|
||||
self.sdk_client = self.app.client_manager.sdk_connection.compute
|
||||
self.compute_sdk_client = (
|
||||
self.app.client_manager.sdk_connection.compute
|
||||
)
|
||||
|
||||
|
||||
class TestServiceDelete(TestService):
|
||||
@ -38,7 +38,7 @@ class TestServiceDelete(TestService):
|
||||
def setUp(self):
|
||||
super(TestServiceDelete, self).setUp()
|
||||
|
||||
self.sdk_client.delete_service.return_value = None
|
||||
self.compute_sdk_client.delete_service.return_value = None
|
||||
|
||||
# Get the command object to test
|
||||
self.cmd = service.DeleteService(self.app, None)
|
||||
@ -54,7 +54,7 @@ class TestServiceDelete(TestService):
|
||||
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.delete_service.assert_called_with(
|
||||
self.compute_sdk_client.delete_service.assert_called_with(
|
||||
self.services[0].binary, ignore_missing=False
|
||||
)
|
||||
self.assertIsNone(result)
|
||||
@ -73,7 +73,7 @@ class TestServiceDelete(TestService):
|
||||
calls = []
|
||||
for s in self.services:
|
||||
calls.append(call(s.binary, ignore_missing=False))
|
||||
self.sdk_client.delete_service.assert_has_calls(calls)
|
||||
self.compute_sdk_client.delete_service.assert_has_calls(calls)
|
||||
self.assertIsNone(result)
|
||||
|
||||
def test_multi_services_delete_with_exception(self):
|
||||
@ -85,7 +85,7 @@ class TestServiceDelete(TestService):
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
delete_mock_result = [None, exceptions.CommandError]
|
||||
self.sdk_client.delete_service = mock.Mock(
|
||||
self.compute_sdk_client.delete_service = mock.Mock(
|
||||
side_effect=delete_mock_result
|
||||
)
|
||||
|
||||
@ -97,10 +97,10 @@ class TestServiceDelete(TestService):
|
||||
'1 of 2 compute services failed to delete.', str(e)
|
||||
)
|
||||
|
||||
self.sdk_client.delete_service.assert_any_call(
|
||||
self.compute_sdk_client.delete_service.assert_any_call(
|
||||
self.services[0].binary, ignore_missing=False
|
||||
)
|
||||
self.sdk_client.delete_service.assert_any_call(
|
||||
self.compute_sdk_client.delete_service.assert_any_call(
|
||||
'unexist_service', ignore_missing=False
|
||||
)
|
||||
|
||||
@ -135,7 +135,7 @@ class TestServiceList(TestService):
|
||||
def setUp(self):
|
||||
super(TestServiceList, self).setUp()
|
||||
|
||||
self.sdk_client.services.return_value = [self.service]
|
||||
self.compute_sdk_client.services.return_value = [self.service]
|
||||
|
||||
# Get the command object to test
|
||||
self.cmd = service.ListService(self.app, None)
|
||||
@ -158,7 +158,7 @@ class TestServiceList(TestService):
|
||||
# containing the data to be listed.
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.services.assert_called_with(
|
||||
self.compute_sdk_client.services.assert_called_with(
|
||||
host=self.service.host,
|
||||
binary=self.service.binary,
|
||||
)
|
||||
@ -189,7 +189,7 @@ class TestServiceList(TestService):
|
||||
# containing the data to be listed.
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.services.assert_called_with(
|
||||
self.compute_sdk_client.services.assert_called_with(
|
||||
host=self.service.host,
|
||||
binary=self.service.binary,
|
||||
)
|
||||
@ -214,16 +214,13 @@ class TestServiceList(TestService):
|
||||
('long', True),
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
self.app.client_manager.compute.api_version = api_versions.APIVersion(
|
||||
'2.11'
|
||||
)
|
||||
|
||||
# In base command class Lister in cliff, abstract method take_action()
|
||||
# returns a tuple containing the column names and an iterable
|
||||
# containing the data to be listed.
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.services.assert_called_with(
|
||||
self.compute_sdk_client.services.assert_called_with(
|
||||
host=self.service.host,
|
||||
binary=self.service.binary,
|
||||
)
|
||||
@ -242,8 +239,8 @@ class TestServiceSet(TestService):
|
||||
|
||||
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
|
||||
self.compute_sdk_client.enable_service.return_value = self.service
|
||||
self.compute_sdk_client.disable_service.return_value = self.service
|
||||
|
||||
self.cmd = service.SetService(self.app, None)
|
||||
|
||||
@ -261,8 +258,8 @@ class TestServiceSet(TestService):
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.enable_service.assert_not_called()
|
||||
self.sdk_client.disable_service.assert_not_called()
|
||||
self.compute_sdk_client.enable_service.assert_not_called()
|
||||
self.compute_sdk_client.disable_service.assert_not_called()
|
||||
self.assertIsNone(result)
|
||||
|
||||
@mock.patch.object(sdk_utils, 'supports_microversion')
|
||||
@ -282,7 +279,7 @@ class TestServiceSet(TestService):
|
||||
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.enable_service.assert_called_with(
|
||||
self.compute_sdk_client.enable_service.assert_called_with(
|
||||
None, self.service.host, self.service.binary
|
||||
)
|
||||
self.assertIsNone(result)
|
||||
@ -304,7 +301,7 @@ class TestServiceSet(TestService):
|
||||
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.disable_service.assert_called_with(
|
||||
self.compute_sdk_client.disable_service.assert_called_with(
|
||||
None, self.service.host, self.service.binary, None
|
||||
)
|
||||
self.assertIsNone(result)
|
||||
@ -330,7 +327,7 @@ class TestServiceSet(TestService):
|
||||
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.disable_service.assert_called_with(
|
||||
self.compute_sdk_client.disable_service.assert_called_with(
|
||||
None, self.service.host, self.service.binary, reason
|
||||
)
|
||||
self.assertIsNone(result)
|
||||
@ -404,11 +401,11 @@ class TestServiceSet(TestService):
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.update_service_forced_down.assert_called_once_with(
|
||||
self.compute_sdk_client.update_service_forced_down.assert_called_once_with(
|
||||
None, self.service.host, self.service.binary, False
|
||||
)
|
||||
self.assertNotCalled(self.sdk_client.enable_service)
|
||||
self.assertNotCalled(self.sdk_client.disable_service)
|
||||
self.assertNotCalled(self.compute_sdk_client.enable_service)
|
||||
self.assertNotCalled(self.compute_sdk_client.disable_service)
|
||||
self.assertIsNone(result)
|
||||
|
||||
@mock.patch.object(sdk_utils, 'supports_microversion')
|
||||
@ -426,11 +423,11 @@ class TestServiceSet(TestService):
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.update_service_forced_down.assert_called_once_with(
|
||||
self.compute_sdk_client.update_service_forced_down.assert_called_once_with(
|
||||
None, self.service.host, self.service.binary, True
|
||||
)
|
||||
self.assertNotCalled(self.sdk_client.enable_service)
|
||||
self.assertNotCalled(self.sdk_client.disable_service)
|
||||
self.assertNotCalled(self.compute_sdk_client.enable_service)
|
||||
self.assertNotCalled(self.compute_sdk_client.disable_service)
|
||||
self.assertIsNone(result)
|
||||
|
||||
@mock.patch.object(sdk_utils, 'supports_microversion')
|
||||
@ -450,10 +447,10 @@ class TestServiceSet(TestService):
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.enable_service.assert_called_once_with(
|
||||
self.compute_sdk_client.enable_service.assert_called_once_with(
|
||||
None, self.service.host, self.service.binary
|
||||
)
|
||||
self.sdk_client.update_service_forced_down.assert_called_once_with(
|
||||
self.compute_sdk_client.update_service_forced_down.assert_called_once_with(
|
||||
None, self.service.host, self.service.binary, True
|
||||
)
|
||||
self.assertIsNone(result)
|
||||
@ -476,12 +473,12 @@ class TestServiceSet(TestService):
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
with mock.patch.object(
|
||||
self.sdk_client, 'enable_service', side_effect=Exception()
|
||||
self.compute_sdk_client, 'enable_service', side_effect=Exception()
|
||||
):
|
||||
self.assertRaises(
|
||||
exceptions.CommandError, self.cmd.take_action, parsed_args
|
||||
)
|
||||
self.sdk_client.update_service_forced_down.assert_called_once_with(
|
||||
self.compute_sdk_client.update_service_forced_down.assert_called_once_with(
|
||||
None, self.service.host, self.service.binary, True
|
||||
)
|
||||
|
||||
@ -504,12 +501,14 @@ class TestServiceSet(TestService):
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
service_id = '339478d0-0b95-4a94-be63-d5be05dfeb1c'
|
||||
self.sdk_client.services.return_value = [mock.Mock(id=service_id)]
|
||||
self.compute_sdk_client.services.return_value = [
|
||||
mock.Mock(id=service_id)
|
||||
]
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.disable_service.assert_called_once_with(
|
||||
self.compute_sdk_client.disable_service.assert_called_once_with(
|
||||
service_id, self.service.host, self.service.binary, None
|
||||
)
|
||||
self.sdk_client.update_service_forced_down.assert_called_once_with(
|
||||
self.compute_sdk_client.update_service_forced_down.assert_called_once_with(
|
||||
service_id, self.service.host, self.service.binary, True
|
||||
)
|
||||
self.assertIsNone(result)
|
||||
@ -535,9 +534,11 @@ class TestServiceSet(TestService):
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
service_id = '339478d0-0b95-4a94-be63-d5be05dfeb1c'
|
||||
self.sdk_client.services.return_value = [mock.Mock(id=service_id)]
|
||||
self.compute_sdk_client.services.return_value = [
|
||||
mock.Mock(id=service_id)
|
||||
]
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.disable_service.assert_called_once_with(
|
||||
self.compute_sdk_client.disable_service.assert_called_once_with(
|
||||
service_id, self.service.host, self.service.binary, reason
|
||||
)
|
||||
self.assertIsNone(result)
|
||||
@ -561,23 +562,25 @@ class TestServiceSet(TestService):
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
service_id = '339478d0-0b95-4a94-be63-d5be05dfeb1c'
|
||||
self.sdk_client.services.return_value = [mock.Mock(id=service_id)]
|
||||
self.compute_sdk_client.services.return_value = [
|
||||
mock.Mock(id=service_id)
|
||||
]
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
self.sdk_client.enable_service.assert_called_once_with(
|
||||
self.compute_sdk_client.enable_service.assert_called_once_with(
|
||||
service_id, self.service.host, self.service.binary
|
||||
)
|
||||
self.sdk_client.update_service_forced_down.assert_called_once_with(
|
||||
self.compute_sdk_client.update_service_forced_down.assert_called_once_with(
|
||||
service_id, self.service.host, self.service.binary, False
|
||||
)
|
||||
self.assertIsNone(result)
|
||||
|
||||
def test_service_set_find_service_by_host_and_binary_no_results(self):
|
||||
# Tests that no compute services are found by host and binary.
|
||||
self.sdk_client.services.return_value = []
|
||||
self.compute_sdk_client.services.return_value = []
|
||||
ex = self.assertRaises(
|
||||
exceptions.CommandError,
|
||||
self.cmd._find_service_by_host_and_binary,
|
||||
self.sdk_client,
|
||||
self.compute_sdk_client,
|
||||
'fake-host',
|
||||
'nova-compute',
|
||||
)
|
||||
@ -589,11 +592,14 @@ class TestServiceSet(TestService):
|
||||
|
||||
def test_service_set_find_service_by_host_and_binary_many_results(self):
|
||||
# Tests that more than one compute service is found by host and binary.
|
||||
self.sdk_client.services.return_value = [mock.Mock(), mock.Mock()]
|
||||
self.compute_sdk_client.services.return_value = [
|
||||
mock.Mock(),
|
||||
mock.Mock(),
|
||||
]
|
||||
ex = self.assertRaises(
|
||||
exceptions.CommandError,
|
||||
self.cmd._find_service_by_host_and_binary,
|
||||
self.sdk_client,
|
||||
self.compute_sdk_client,
|
||||
'fake-host',
|
||||
'nova-compute',
|
||||
)
|
||||
|
||||
@ -23,7 +23,9 @@ class TestUsage(compute_fakes.TestComputev2):
|
||||
super(TestUsage, self).setUp()
|
||||
|
||||
self.app.client_manager.sdk_connection.compute = mock.Mock()
|
||||
self.sdk_client = self.app.client_manager.sdk_connection.compute
|
||||
self.compute_sdk_client = (
|
||||
self.app.client_manager.sdk_connection.compute
|
||||
)
|
||||
|
||||
self.projects_mock = self.app.client_manager.identity.projects
|
||||
self.projects_mock.reset_mock()
|
||||
@ -57,7 +59,7 @@ class TestUsageList(TestUsage):
|
||||
def setUp(self):
|
||||
super(TestUsageList, self).setUp()
|
||||
|
||||
self.sdk_client.usages.return_value = self.usages
|
||||
self.compute_sdk_client.usages.return_value = self.usages
|
||||
|
||||
self.projects_mock.list.return_value = [self.project]
|
||||
# Get the command object to test
|
||||
@ -96,7 +98,7 @@ class TestUsageList(TestUsage):
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.projects_mock.list.assert_called_with()
|
||||
self.sdk_client.usages.assert_called_with(
|
||||
self.compute_sdk_client.usages.assert_called_with(
|
||||
start='2016-11-11T00:00:00',
|
||||
end='2016-12-20T00:00:00',
|
||||
detailed=True,
|
||||
@ -117,7 +119,7 @@ class TestUsageList(TestUsage):
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.projects_mock.list.assert_called_with()
|
||||
self.sdk_client.usages.assert_has_calls(
|
||||
self.compute_sdk_client.usages.assert_has_calls(
|
||||
[mock.call(start=mock.ANY, end=mock.ANY, detailed=True)]
|
||||
)
|
||||
self.assertCountEqual(self.columns, columns)
|
||||
@ -148,7 +150,7 @@ class TestUsageShow(TestUsage):
|
||||
def setUp(self):
|
||||
super(TestUsageShow, self).setUp()
|
||||
|
||||
self.sdk_client.get_usage.return_value = self.usage
|
||||
self.compute_sdk_client.get_usage.return_value = self.usage
|
||||
|
||||
self.projects_mock.get.return_value = self.project
|
||||
# Get the command object to test
|
||||
@ -191,7 +193,7 @@ class TestUsageShow(TestUsage):
|
||||
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.sdk_client.get_usage.assert_called_with(
|
||||
self.compute_sdk_client.get_usage.assert_called_with(
|
||||
project=self.project.id,
|
||||
start='2016-11-11T00:00:00',
|
||||
end='2016-12-20T00:00:00',
|
||||
|
||||
@ -138,8 +138,8 @@ class TestNetworkAndCompute(utils.TestCommand):
|
||||
)
|
||||
|
||||
self.app.client_manager.compute = mock.Mock()
|
||||
self.compute = self.app.client_manager.compute
|
||||
self.compute.compute_action = mock.Mock(
|
||||
self.compute_client = self.app.client_manager.compute
|
||||
self.compute_client.compute_action = mock.Mock(
|
||||
return_value='take_action_compute'
|
||||
)
|
||||
|
||||
@ -161,7 +161,7 @@ class TestNetworkAndCompute(utils.TestCommand):
|
||||
self.app.client_manager.network_endpoint_enabled = False
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
result = self.cmd.take_action(parsed_args)
|
||||
self.compute.compute_action.assert_called_with(parsed_args)
|
||||
self.compute_client.compute_action.assert_called_with(parsed_args)
|
||||
self.assertEqual('take_action_compute', result)
|
||||
|
||||
|
||||
|
||||
@ -29,7 +29,7 @@ class TestFloatingIPCompute(compute_fakes.TestComputev2):
|
||||
super(TestFloatingIPCompute, self).setUp()
|
||||
|
||||
# Get a shortcut to the compute client
|
||||
self.compute = self.app.client_manager.compute
|
||||
self.compute_client = self.app.client_manager.compute
|
||||
|
||||
|
||||
@mock.patch('openstackclient.api.compute_v2.APIv2.floating_ip_create')
|
||||
@ -58,7 +58,7 @@ class TestCreateFloatingIPCompute(TestFloatingIPCompute):
|
||||
|
||||
self.app.client_manager.network_endpoint_enabled = False
|
||||
|
||||
# self.compute.floating_ips.create.return_value = self.floating_ip
|
||||
# self.compute_client.floating_ips.create.return_value = self.floating_ip
|
||||
|
||||
# Get the command object to test
|
||||
self.cmd = fip.CreateFloatingIP(self.app, None)
|
||||
|
||||
@ -25,7 +25,7 @@ class TestFloatingIPPoolCompute(compute_fakes.TestComputev2):
|
||||
super(TestFloatingIPPoolCompute, self).setUp()
|
||||
|
||||
# Get a shortcut to the compute client
|
||||
self.compute = self.app.client_manager.compute
|
||||
self.compute_client = self.app.client_manager.compute
|
||||
|
||||
|
||||
@mock.patch('openstackclient.api.compute_v2.APIv2.floating_ip_pool_list')
|
||||
|
||||
@ -28,7 +28,7 @@ class TestNetworkCompute(compute_fakes.TestComputev2):
|
||||
super(TestNetworkCompute, self).setUp()
|
||||
|
||||
# Get a shortcut to the compute client
|
||||
self.compute = self.app.client_manager.compute
|
||||
self.compute_client = self.app.client_manager.compute
|
||||
|
||||
|
||||
@mock.patch('openstackclient.api.compute_v2.APIv2.network_create')
|
||||
@ -182,7 +182,7 @@ class TestDeleteNetworkCompute(TestNetworkCompute):
|
||||
self._networks = compute_fakes.create_networks(count=3)
|
||||
|
||||
# Return value of utils.find_resource()
|
||||
self.compute.api.network_find = compute_fakes.get_networks(
|
||||
self.compute_client.api.network_find = compute_fakes.get_networks(
|
||||
networks=self._networks
|
||||
)
|
||||
|
||||
|
||||
@ -1200,8 +1200,6 @@ class TestListPort(TestPort):
|
||||
def setUp(self):
|
||||
super(TestListPort, self).setUp()
|
||||
|
||||
# Get the command object to test
|
||||
self.cmd = port.ListPort(self.app, self.namespace)
|
||||
self.network_client.ports = mock.Mock(return_value=self._ports)
|
||||
fake_router = network_fakes.FakeRouter.create_one_router(
|
||||
{
|
||||
@ -1215,7 +1213,12 @@ class TestListPort(TestPort):
|
||||
)
|
||||
self.network_client.find_router = mock.Mock(return_value=fake_router)
|
||||
self.network_client.find_network = mock.Mock(return_value=fake_network)
|
||||
|
||||
self.app.client_manager.compute = mock.Mock()
|
||||
self.compute_client = self.app.client_manager.compute
|
||||
|
||||
# Get the command object to test
|
||||
self.cmd = port.ListPort(self.app, self.namespace)
|
||||
|
||||
def test_port_list_no_options(self):
|
||||
arglist = []
|
||||
|
||||
@ -27,7 +27,7 @@ class TestSecurityGroupCompute(compute_fakes.TestComputev2):
|
||||
super(TestSecurityGroupCompute, self).setUp()
|
||||
|
||||
# Get a shortcut to the compute client
|
||||
self.compute = self.app.client_manager.compute
|
||||
self.compute_client = self.app.client_manager.compute
|
||||
|
||||
|
||||
@mock.patch('openstackclient.api.compute_v2.APIv2.security_group_create')
|
||||
@ -119,7 +119,7 @@ class TestDeleteSecurityGroupCompute(TestSecurityGroupCompute):
|
||||
|
||||
self.app.client_manager.network_endpoint_enabled = False
|
||||
|
||||
self.compute.api.security_group_find = (
|
||||
self.compute_client.api.security_group_find = (
|
||||
compute_fakes.get_security_groups(self._security_groups)
|
||||
)
|
||||
|
||||
@ -279,7 +279,7 @@ class TestSetSecurityGroupCompute(TestSecurityGroupCompute):
|
||||
|
||||
self.app.client_manager.network_endpoint_enabled = False
|
||||
|
||||
self.compute.api.security_group_find = mock.Mock(
|
||||
self.compute_client.api.security_group_find = mock.Mock(
|
||||
return_value=self._security_group
|
||||
)
|
||||
|
||||
|
||||
@ -28,7 +28,7 @@ class TestSecurityGroupRuleCompute(compute_fakes.TestComputev2):
|
||||
super(TestSecurityGroupRuleCompute, self).setUp()
|
||||
|
||||
# Get a shortcut to the network client
|
||||
self.compute = self.app.client_manager.compute
|
||||
self.compute_client = self.app.client_manager.compute
|
||||
|
||||
|
||||
@mock.patch('openstackclient.api.compute_v2.APIv2.security_group_rule_create')
|
||||
@ -59,7 +59,7 @@ class TestCreateSecurityGroupRuleCompute(TestSecurityGroupRuleCompute):
|
||||
|
||||
self.app.client_manager.network_endpoint_enabled = False
|
||||
|
||||
self.compute.api.security_group_find = mock.Mock(
|
||||
self.compute_client.api.security_group_find = mock.Mock(
|
||||
return_value=self._security_group,
|
||||
)
|
||||
|
||||
@ -168,7 +168,7 @@ class TestCreateSecurityGroupRuleCompute(TestSecurityGroupRuleCompute):
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
# TODO(dtroyer): save this for the security group rule changes
|
||||
# self.compute.api.security_group_rule_create.assert_called_once_with(
|
||||
# self.compute_client.api.security_group_rule_create.assert_called_once_with(
|
||||
sgr_mock.assert_called_once_with(
|
||||
security_group_id=self._security_group['id'],
|
||||
ip_protocol=self._security_group_rule['ip_protocol'],
|
||||
@ -212,7 +212,7 @@ class TestCreateSecurityGroupRuleCompute(TestSecurityGroupRuleCompute):
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
# TODO(dtroyer): save this for the security group rule changes
|
||||
# self.compute.api.security_group_rule_create.assert_called_once_with(
|
||||
# self.compute_client.api.security_group_rule_create.assert_called_once_with(
|
||||
sgr_mock.assert_called_once_with(
|
||||
security_group_id=self._security_group['id'],
|
||||
ip_protocol=self._security_group_rule['ip_protocol'],
|
||||
@ -251,7 +251,7 @@ class TestCreateSecurityGroupRuleCompute(TestSecurityGroupRuleCompute):
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
# TODO(dtroyer): save this for the security group rule changes
|
||||
# self.compute.api.security_group_rule_create.assert_called_once_with(
|
||||
# self.compute_client.api.security_group_rule_create.assert_called_once_with(
|
||||
sgr_mock.assert_called_once_with(
|
||||
security_group_id=self._security_group['id'],
|
||||
ip_protocol=self._security_group_rule['ip_protocol'],
|
||||
@ -291,7 +291,7 @@ class TestCreateSecurityGroupRuleCompute(TestSecurityGroupRuleCompute):
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
# TODO(dtroyer): save this for the security group rule changes
|
||||
# self.compute.api.security_group_rule_create.assert_called_once_with(
|
||||
# self.compute_client.api.security_group_rule_create.assert_called_once_with(
|
||||
sgr_mock.assert_called_once_with(
|
||||
security_group_id=self._security_group['id'],
|
||||
ip_protocol=self._security_group_rule['ip_protocol'],
|
||||
@ -440,10 +440,10 @@ class TestListSecurityGroupRuleCompute(TestSecurityGroupRuleCompute):
|
||||
|
||||
self.app.client_manager.network_endpoint_enabled = False
|
||||
|
||||
self.compute.api.security_group_find = mock.Mock(
|
||||
self.compute_client.api.security_group_find = mock.Mock(
|
||||
return_value=self._security_group,
|
||||
)
|
||||
self.compute.api.security_group_list = mock.Mock(
|
||||
self.compute_client.api.security_group_list = mock.Mock(
|
||||
return_value=[self._security_group],
|
||||
)
|
||||
|
||||
@ -454,7 +454,7 @@ class TestListSecurityGroupRuleCompute(TestSecurityGroupRuleCompute):
|
||||
parsed_args = self.check_parser(self.cmd, [], [])
|
||||
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
self.compute.api.security_group_list.assert_called_once_with(
|
||||
self.compute_client.api.security_group_list.assert_called_once_with(
|
||||
search_opts={'all_tenants': False}
|
||||
)
|
||||
self.assertEqual(self.expected_columns_no_group, columns)
|
||||
@ -470,7 +470,7 @@ class TestListSecurityGroupRuleCompute(TestSecurityGroupRuleCompute):
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
self.compute.api.security_group_find.assert_called_once_with(
|
||||
self.compute_client.api.security_group_find.assert_called_once_with(
|
||||
self._security_group['id']
|
||||
)
|
||||
self.assertEqual(self.expected_columns_with_group, columns)
|
||||
@ -486,7 +486,7 @@ class TestListSecurityGroupRuleCompute(TestSecurityGroupRuleCompute):
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
self.compute.api.security_group_list.assert_called_once_with(
|
||||
self.compute_client.api.security_group_list.assert_called_once_with(
|
||||
search_opts={'all_tenants': True}
|
||||
)
|
||||
self.assertEqual(self.expected_columns_no_group, columns)
|
||||
@ -502,7 +502,7 @@ class TestListSecurityGroupRuleCompute(TestSecurityGroupRuleCompute):
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
self.compute.api.security_group_list.assert_called_once_with(
|
||||
self.compute_client.api.security_group_list.assert_called_once_with(
|
||||
search_opts={'all_tenants': False}
|
||||
)
|
||||
self.assertEqual(self.expected_columns_no_group, columns)
|
||||
@ -525,7 +525,7 @@ class TestShowSecurityGroupRuleCompute(TestSecurityGroupRuleCompute):
|
||||
# Build a security group fake customized for this test.
|
||||
security_group_rules = [self._security_group_rule]
|
||||
security_group = {'rules': security_group_rules}
|
||||
self.compute.api.security_group_list = mock.Mock(
|
||||
self.compute_client.api.security_group_list = mock.Mock(
|
||||
return_value=[security_group],
|
||||
)
|
||||
|
||||
@ -548,6 +548,6 @@ class TestShowSecurityGroupRuleCompute(TestSecurityGroupRuleCompute):
|
||||
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.compute.api.security_group_list.assert_called_once_with()
|
||||
self.compute_client.api.security_group_list.assert_called_once_with()
|
||||
self.assertEqual(self.columns, columns)
|
||||
self.assertEqual(self.data, data)
|
||||
|
||||
@ -89,10 +89,12 @@ class TestVolume(FakeClientMixin, utils.TestCommand):
|
||||
self.app.client_manager.identity = identity_fakes.FakeIdentityv3Client(
|
||||
endpoint=fakes.AUTH_URL, token=fakes.AUTH_TOKEN
|
||||
)
|
||||
|
||||
self.app.client_manager.compute = compute_fakes.FakeComputev2Client(
|
||||
endpoint=fakes.AUTH_URL,
|
||||
token=fakes.AUTH_TOKEN,
|
||||
)
|
||||
self.compute_client = self.app.client_manager.compute
|
||||
|
||||
|
||||
# TODO(stephenfin): Check if the responses are actually the same
|
||||
|
||||
@ -33,7 +33,8 @@ class TestVolumeAttachment(volume_fakes.TestVolume):
|
||||
self.projects_mock = self.app.client_manager.identity.projects
|
||||
self.projects_mock.reset_mock()
|
||||
|
||||
self.servers_mock = self.app.client_manager.compute.servers
|
||||
self.compute_client = self.app.client_manager.compute
|
||||
self.servers_mock = self.compute_client.servers
|
||||
self.servers_mock.reset_mock()
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user