python-openstackclient 6.3.0__py3-none-any.whl → 6.5.0__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- openstackclient/common/availability_zone.py +4 -4
- openstackclient/common/pagination.py +82 -0
- openstackclient/compute/v2/flavor.py +2 -16
- openstackclient/compute/v2/hypervisor.py +2 -21
- openstackclient/compute/v2/keypair.py +2 -9
- openstackclient/compute/v2/server.py +220 -131
- openstackclient/compute/v2/server_event.py +30 -19
- openstackclient/compute/v2/server_group.py +2 -23
- openstackclient/compute/v2/server_migration.py +2 -22
- openstackclient/compute/v2/usage.py +4 -6
- openstackclient/identity/v3/mapping.py +25 -3
- openstackclient/identity/v3/policy.py +3 -1
- openstackclient/image/v2/cache.py +218 -0
- openstackclient/image/v2/image.py +40 -17
- openstackclient/image/v2/metadef_namespaces.py +25 -21
- openstackclient/image/v2/metadef_objects.py +189 -0
- openstackclient/image/v2/metadef_properties.py +284 -0
- openstackclient/network/utils.py +100 -0
- openstackclient/network/v2/default_security_group_rule.py +418 -0
- openstackclient/network/v2/local_ip_association.py +1 -1
- openstackclient/network/v2/ndp_proxy.py +7 -3
- openstackclient/network/v2/network.py +2 -2
- openstackclient/network/v2/port.py +65 -19
- openstackclient/network/v2/security_group_rule.py +18 -111
- openstackclient/network/v2/subnet.py +1 -0
- openstackclient/object/v1/container.py +2 -12
- openstackclient/object/v1/object.py +2 -11
- openstackclient/tests/functional/base.py +13 -6
- openstackclient/tests/functional/identity/v3/test_role.py +11 -3
- openstackclient/tests/functional/network/v2/common.py +7 -1
- openstackclient/tests/functional/network/v2/test_address_group.py +2 -4
- openstackclient/tests/functional/network/v2/test_address_scope.py +0 -6
- openstackclient/tests/functional/network/v2/test_default_security_group_rule.py +67 -0
- openstackclient/tests/functional/network/v2/test_floating_ip.py +3 -6
- openstackclient/tests/functional/network/v2/test_ip_availability.py +3 -8
- openstackclient/tests/functional/network/v2/test_l3_conntrack_helper.py +3 -4
- openstackclient/tests/functional/network/v2/test_local_ip.py +2 -4
- openstackclient/tests/functional/network/v2/test_network.py +18 -17
- openstackclient/tests/functional/network/v2/test_network_agent.py +24 -21
- openstackclient/tests/functional/network/v2/test_network_flavor.py +0 -6
- openstackclient/tests/functional/network/v2/test_network_flavor_profile.py +0 -6
- openstackclient/tests/functional/network/v2/test_network_meter.py +6 -6
- openstackclient/tests/functional/network/v2/test_network_meter_rule.py +7 -8
- openstackclient/tests/functional/network/v2/test_network_ndp_proxy.py +1 -3
- openstackclient/tests/functional/network/v2/test_network_qos_policy.py +4 -4
- openstackclient/tests/functional/network/v2/test_network_qos_rule.py +16 -20
- openstackclient/tests/functional/network/v2/test_network_qos_rule_type.py +4 -4
- openstackclient/tests/functional/network/v2/test_network_rbac.py +1 -4
- openstackclient/tests/functional/network/v2/test_network_segment.py +7 -12
- openstackclient/tests/functional/network/v2/test_network_segment_range.py +3 -4
- openstackclient/tests/functional/network/v2/test_network_service_provider.py +2 -4
- openstackclient/tests/functional/network/v2/test_network_trunk.py +3 -3
- openstackclient/tests/functional/network/v2/test_port.py +2 -8
- openstackclient/tests/functional/network/v2/test_router.py +0 -6
- openstackclient/tests/functional/network/v2/test_security_group.py +1 -4
- openstackclient/tests/functional/network/v2/test_security_group_rule.py +1 -4
- openstackclient/tests/functional/network/v2/test_subnet.py +4 -22
- openstackclient/tests/functional/network/v2/test_subnet_pool.py +0 -6
- openstackclient/tests/unit/common/test_availability_zone.py +28 -30
- openstackclient/tests/unit/common/test_extension.py +1 -4
- openstackclient/tests/unit/common/test_limits.py +2 -4
- openstackclient/tests/unit/common/test_project_cleanup.py +3 -10
- openstackclient/tests/unit/common/test_quota.py +18 -24
- openstackclient/tests/unit/compute/v2/fakes.py +24 -11
- openstackclient/tests/unit/compute/v2/test_agent.py +1 -1
- openstackclient/tests/unit/compute/v2/test_aggregate.py +62 -72
- openstackclient/tests/unit/compute/v2/test_console.py +18 -30
- openstackclient/tests/unit/compute/v2/test_flavor.py +85 -89
- openstackclient/tests/unit/compute/v2/test_host.py +12 -19
- openstackclient/tests/unit/compute/v2/test_hypervisor.py +23 -25
- openstackclient/tests/unit/compute/v2/test_hypervisor_stats.py +2 -6
- openstackclient/tests/unit/compute/v2/test_keypair.py +25 -39
- openstackclient/tests/unit/compute/v2/test_server.py +316 -365
- openstackclient/tests/unit/compute/v2/test_server_backup.py +5 -17
- openstackclient/tests/unit/compute/v2/test_server_event.py +23 -25
- openstackclient/tests/unit/compute/v2/test_server_group.py +41 -33
- openstackclient/tests/unit/compute/v2/test_server_image.py +6 -18
- openstackclient/tests/unit/compute/v2/test_server_migration.py +45 -45
- openstackclient/tests/unit/compute/v2/test_server_volume.py +15 -31
- openstackclient/tests/unit/compute/v2/test_service.py +51 -56
- openstackclient/tests/unit/compute/v2/test_usage.py +10 -13
- openstackclient/tests/unit/fakes.py +4 -0
- openstackclient/tests/unit/identity/v3/test_mappings.py +9 -4
- openstackclient/tests/unit/identity/v3/test_trust.py +0 -2
- openstackclient/tests/unit/image/v1/fakes.py +2 -1
- openstackclient/tests/unit/image/v1/test_image.py +1 -1
- openstackclient/tests/unit/image/v2/fakes.py +82 -0
- openstackclient/tests/unit/image/v2/test_cache.py +214 -0
- openstackclient/tests/unit/image/v2/test_image.py +62 -4
- openstackclient/tests/unit/image/v2/test_metadef_namespaces.py +5 -19
- openstackclient/tests/unit/image/v2/test_metadef_objects.py +162 -0
- openstackclient/tests/unit/image/v2/test_metadef_properties.py +227 -0
- openstackclient/tests/unit/integ/cli/test_shell.py +0 -2
- openstackclient/tests/unit/network/test_common.py +3 -3
- openstackclient/tests/unit/network/v2/fakes.py +1 -0
- openstackclient/tests/unit/network/v2/test_default_security_group_rule.py +1133 -0
- openstackclient/tests/unit/network/v2/test_floating_ip_compute.py +5 -13
- openstackclient/tests/unit/network/v2/test_floating_ip_pool_compute.py +1 -9
- openstackclient/tests/unit/network/v2/test_network.py +33 -0
- openstackclient/tests/unit/network/v2/test_network_compute.py +5 -11
- openstackclient/tests/unit/network/v2/test_network_trunk.py +6 -8
- openstackclient/tests/unit/network/v2/test_port.py +83 -38
- openstackclient/tests/unit/network/v2/test_security_group_compute.py +7 -15
- openstackclient/tests/unit/network/v2/test_security_group_rule_compute.py +19 -27
- openstackclient/tests/unit/network/v2/test_security_group_rule_network.py +3 -6
- openstackclient/tests/unit/network/v2/test_subnet.py +92 -0
- openstackclient/tests/unit/network/v2/test_subnet_pool.py +11 -13
- openstackclient/tests/unit/test_shell.py +1 -7
- openstackclient/tests/unit/utils.py +10 -4
- openstackclient/tests/unit/volume/v1/fakes.py +7 -1
- openstackclient/tests/unit/volume/v1/test_qos_specs.py +2 -2
- openstackclient/tests/unit/volume/v1/test_service.py +1 -1
- openstackclient/tests/unit/volume/v1/test_transfer_request.py +2 -2
- openstackclient/tests/unit/volume/v1/test_type.py +2 -4
- openstackclient/tests/unit/volume/v1/test_volume.py +5 -7
- openstackclient/tests/unit/volume/v1/test_volume_backup.py +4 -4
- openstackclient/tests/unit/volume/v2/fakes.py +32 -12
- openstackclient/tests/unit/volume/v2/test_backup_record.py +1 -1
- openstackclient/tests/unit/volume/v2/test_consistency_group.py +4 -6
- openstackclient/tests/unit/volume/v2/test_consistency_group_snapshot.py +2 -4
- openstackclient/tests/unit/volume/v2/test_qos_specs.py +2 -2
- openstackclient/tests/unit/volume/v2/test_service.py +1 -1
- openstackclient/tests/unit/volume/v2/test_volume.py +78 -16
- openstackclient/tests/unit/volume/v2/test_volume_backend.py +10 -22
- openstackclient/tests/unit/volume/v2/test_volume_backup.py +76 -89
- openstackclient/tests/unit/volume/v2/test_volume_host.py +1 -1
- openstackclient/tests/unit/volume/v2/test_volume_snapshot.py +5 -7
- openstackclient/tests/unit/volume/v2/test_volume_transfer_request.py +4 -8
- openstackclient/tests/unit/volume/v2/test_volume_type.py +164 -24
- openstackclient/tests/unit/volume/v3/fakes.py +91 -15
- openstackclient/tests/unit/volume/v3/test_block_storage_cleanup.py +3 -7
- openstackclient/tests/unit/volume/v3/test_block_storage_cluster.py +11 -31
- openstackclient/tests/unit/volume/v3/test_block_storage_log_level.py +6 -16
- openstackclient/tests/unit/volume/v3/test_block_storage_manage.py +219 -157
- openstackclient/tests/unit/volume/v3/test_block_storage_resource_filter.py +32 -23
- openstackclient/tests/unit/volume/v3/test_volume.py +50 -48
- openstackclient/tests/unit/volume/v3/test_volume_attachment.py +17 -47
- openstackclient/tests/unit/volume/v3/test_volume_group.py +23 -65
- openstackclient/tests/unit/volume/v3/test_volume_group_snapshot.py +88 -77
- openstackclient/tests/unit/volume/v3/test_volume_group_type.py +14 -42
- openstackclient/tests/unit/volume/v3/test_volume_message.py +10 -28
- openstackclient/volume/v1/volume.py +2 -14
- openstackclient/volume/v2/volume.py +30 -15
- openstackclient/volume/v2/volume_backend.py +10 -18
- openstackclient/volume/v2/volume_backup.py +18 -15
- openstackclient/volume/v2/volume_snapshot.py +2 -12
- openstackclient/volume/v2/volume_type.py +211 -14
- openstackclient/volume/v3/block_storage_manage.py +72 -11
- openstackclient/volume/v3/block_storage_resource_filter.py +33 -11
- openstackclient/volume/v3/volume_attachment.py +2 -14
- openstackclient/volume/v3/volume_group_snapshot.py +27 -27
- openstackclient/volume/v3/volume_message.py +2 -13
- {python_openstackclient-6.3.0.dist-info → python_openstackclient-6.5.0.dist-info}/AUTHORS +11 -0
- {python_openstackclient-6.3.0.dist-info → python_openstackclient-6.5.0.dist-info}/METADATA +6 -5
- {python_openstackclient-6.3.0.dist-info → python_openstackclient-6.5.0.dist-info}/RECORD +160 -151
- {python_openstackclient-6.3.0.dist-info → python_openstackclient-6.5.0.dist-info}/entry_points.txt +23 -5
- python_openstackclient-6.5.0.dist-info/pbr.json +1 -0
- openstackclient/tests/unit/common/test_parseractions.py +0 -233
- python_openstackclient-6.3.0.dist-info/pbr.json +0 -1
- {python_openstackclient-6.3.0.dist-info → python_openstackclient-6.5.0.dist-info}/LICENSE +0 -0
- {python_openstackclient-6.3.0.dist-info → python_openstackclient-6.5.0.dist-info}/WHEEL +0 -0
- {python_openstackclient-6.3.0.dist-info → python_openstackclient-6.5.0.dist-info}/top_level.txt +0 -0
|
@@ -0,0 +1,227 @@
|
|
|
1
|
+
# Copyright 2023 Red Hat, Inc.
|
|
2
|
+
#
|
|
3
|
+
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
4
|
+
# not use this file except in compliance with the License. You may obtain
|
|
5
|
+
# a copy of the License at
|
|
6
|
+
#
|
|
7
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
|
8
|
+
#
|
|
9
|
+
# Unless required by applicable law or agreed to in writing, software
|
|
10
|
+
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
11
|
+
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
12
|
+
# License for the specific language governing permissions and limitations
|
|
13
|
+
# under the License.
|
|
14
|
+
|
|
15
|
+
from openstack import exceptions as sdk_exceptions
|
|
16
|
+
from osc_lib import exceptions
|
|
17
|
+
|
|
18
|
+
from openstackclient.image.v2 import metadef_properties
|
|
19
|
+
from openstackclient.tests.unit.image.v2 import fakes as image_fakes
|
|
20
|
+
from openstackclient.tests.unit import utils as tests_utils
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
class TestMetadefPropertyCreate(image_fakes.TestImagev2):
|
|
24
|
+
_metadef_namespace = image_fakes.create_one_metadef_namespace()
|
|
25
|
+
_metadef_property = image_fakes.create_one_metadef_property()
|
|
26
|
+
expected_columns = (
|
|
27
|
+
'name',
|
|
28
|
+
'title',
|
|
29
|
+
'type',
|
|
30
|
+
)
|
|
31
|
+
expected_data = (
|
|
32
|
+
_metadef_property.name,
|
|
33
|
+
_metadef_property.title,
|
|
34
|
+
_metadef_property.type,
|
|
35
|
+
)
|
|
36
|
+
|
|
37
|
+
def setUp(self):
|
|
38
|
+
super().setUp()
|
|
39
|
+
self.image_client.create_metadef_property.return_value = (
|
|
40
|
+
self._metadef_property
|
|
41
|
+
)
|
|
42
|
+
self.cmd = metadef_properties.CreateMetadefProperty(self.app, None)
|
|
43
|
+
|
|
44
|
+
def test_metadef_property_create_missing_arguments(self):
|
|
45
|
+
self.assertRaises(
|
|
46
|
+
tests_utils.ParserException, self.check_parser, self.cmd, [], []
|
|
47
|
+
)
|
|
48
|
+
|
|
49
|
+
def test_metadef_property_create(self):
|
|
50
|
+
arglist = [
|
|
51
|
+
'--name',
|
|
52
|
+
'cpu_cores',
|
|
53
|
+
'--schema',
|
|
54
|
+
'{}',
|
|
55
|
+
'--title',
|
|
56
|
+
'vCPU Cores',
|
|
57
|
+
'--type',
|
|
58
|
+
'integer',
|
|
59
|
+
self._metadef_namespace.namespace,
|
|
60
|
+
]
|
|
61
|
+
verifylist = []
|
|
62
|
+
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
63
|
+
|
|
64
|
+
columns, data = self.cmd.take_action(parsed_args)
|
|
65
|
+
|
|
66
|
+
self.assertEqual(self.expected_columns, columns)
|
|
67
|
+
self.assertEqual(self.expected_data, data)
|
|
68
|
+
|
|
69
|
+
def test_metadef_property_create_invalid_schema(self):
|
|
70
|
+
arglist = [
|
|
71
|
+
'--name',
|
|
72
|
+
'cpu_cores',
|
|
73
|
+
'--schema',
|
|
74
|
+
'{invalid}',
|
|
75
|
+
'--title',
|
|
76
|
+
'vCPU Cores',
|
|
77
|
+
'--type',
|
|
78
|
+
'integer',
|
|
79
|
+
self._metadef_namespace.namespace,
|
|
80
|
+
]
|
|
81
|
+
verifylist = []
|
|
82
|
+
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
83
|
+
|
|
84
|
+
self.assertRaises(
|
|
85
|
+
exceptions.CommandError, self.cmd.take_action, parsed_args
|
|
86
|
+
)
|
|
87
|
+
|
|
88
|
+
|
|
89
|
+
class TestMetadefPropertyDelete(image_fakes.TestImagev2):
|
|
90
|
+
def setUp(self):
|
|
91
|
+
super().setUp()
|
|
92
|
+
|
|
93
|
+
self.cmd = metadef_properties.DeleteMetadefProperty(self.app, None)
|
|
94
|
+
|
|
95
|
+
def test_metadef_property_delete(self):
|
|
96
|
+
arglist = ['namespace', 'property']
|
|
97
|
+
verifylist = []
|
|
98
|
+
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
99
|
+
|
|
100
|
+
result = self.cmd.take_action(parsed_args)
|
|
101
|
+
|
|
102
|
+
self.assertIsNone(result)
|
|
103
|
+
|
|
104
|
+
def test_metadef_property_delete_missing_arguments(self):
|
|
105
|
+
arglist = []
|
|
106
|
+
self.assertRaises(
|
|
107
|
+
tests_utils.ParserException,
|
|
108
|
+
self.check_parser,
|
|
109
|
+
self.cmd,
|
|
110
|
+
arglist,
|
|
111
|
+
[],
|
|
112
|
+
)
|
|
113
|
+
|
|
114
|
+
arglist = ['namespace']
|
|
115
|
+
self.assertRaises(
|
|
116
|
+
tests_utils.ParserException,
|
|
117
|
+
self.check_parser,
|
|
118
|
+
self.cmd,
|
|
119
|
+
arglist,
|
|
120
|
+
[],
|
|
121
|
+
)
|
|
122
|
+
|
|
123
|
+
def test_metadef_property_delete_exception(self):
|
|
124
|
+
arglist = ['namespace', 'property']
|
|
125
|
+
verifylist = []
|
|
126
|
+
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
127
|
+
|
|
128
|
+
self.image_client.delete_metadef_property.side_effect = (
|
|
129
|
+
sdk_exceptions.ResourceNotFound
|
|
130
|
+
)
|
|
131
|
+
|
|
132
|
+
self.assertRaises(
|
|
133
|
+
exceptions.CommandError, self.cmd.take_action, parsed_args
|
|
134
|
+
)
|
|
135
|
+
|
|
136
|
+
|
|
137
|
+
class TestMetadefPropertyList(image_fakes.TestImagev2):
|
|
138
|
+
_metadef_property = [image_fakes.create_one_metadef_property()]
|
|
139
|
+
|
|
140
|
+
columns = ['name', 'title', 'type']
|
|
141
|
+
|
|
142
|
+
def setUp(self):
|
|
143
|
+
super().setUp()
|
|
144
|
+
|
|
145
|
+
self.image_client.metadef_properties.side_effect = [
|
|
146
|
+
self._metadef_property,
|
|
147
|
+
[],
|
|
148
|
+
]
|
|
149
|
+
|
|
150
|
+
self.cmd = metadef_properties.ListMetadefProperties(self.app, None)
|
|
151
|
+
self.datalist = self._metadef_property
|
|
152
|
+
|
|
153
|
+
def test_metadef_property_list(self):
|
|
154
|
+
arglist = ['my-namespace']
|
|
155
|
+
parsed_args = self.check_parser(self.cmd, arglist, [])
|
|
156
|
+
|
|
157
|
+
columns, data = self.cmd.take_action(parsed_args)
|
|
158
|
+
|
|
159
|
+
self.assertEqual(self.columns, columns)
|
|
160
|
+
self.assertEqual(getattr(self.datalist[0], 'name'), next(data)[0])
|
|
161
|
+
|
|
162
|
+
|
|
163
|
+
class TestMetadefPropertySet(image_fakes.TestImagev2):
|
|
164
|
+
_metadef_property = image_fakes.create_one_metadef_property()
|
|
165
|
+
|
|
166
|
+
def setUp(self):
|
|
167
|
+
super().setUp()
|
|
168
|
+
|
|
169
|
+
self.cmd = metadef_properties.SetMetadefProperty(self.app, None)
|
|
170
|
+
self.image_client.get_metadef_property.return_value = (
|
|
171
|
+
self._metadef_property
|
|
172
|
+
)
|
|
173
|
+
|
|
174
|
+
def test_metadef_property_set(self):
|
|
175
|
+
arglist = ['--title', 'new title', 'namespace', 'property']
|
|
176
|
+
verifylist = []
|
|
177
|
+
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
178
|
+
result = self.cmd.take_action(parsed_args)
|
|
179
|
+
self.assertIsNone(result)
|
|
180
|
+
|
|
181
|
+
def test_metadef_property_set_invalid_schema(self):
|
|
182
|
+
arglist = [
|
|
183
|
+
'--title',
|
|
184
|
+
'new title',
|
|
185
|
+
'--schema',
|
|
186
|
+
'{invalid}',
|
|
187
|
+
'namespace',
|
|
188
|
+
'property',
|
|
189
|
+
]
|
|
190
|
+
verifylist = []
|
|
191
|
+
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
192
|
+
self.assertRaises(
|
|
193
|
+
exceptions.CommandError, self.cmd.take_action, parsed_args
|
|
194
|
+
)
|
|
195
|
+
|
|
196
|
+
|
|
197
|
+
class TestMetadefPropertyShow(image_fakes.TestImagev2):
|
|
198
|
+
_metadef_property = image_fakes.create_one_metadef_property()
|
|
199
|
+
|
|
200
|
+
expected_columns = (
|
|
201
|
+
'name',
|
|
202
|
+
'title',
|
|
203
|
+
'type',
|
|
204
|
+
)
|
|
205
|
+
expected_data = (
|
|
206
|
+
_metadef_property.name,
|
|
207
|
+
_metadef_property.title,
|
|
208
|
+
_metadef_property.type,
|
|
209
|
+
)
|
|
210
|
+
|
|
211
|
+
def setUp(self):
|
|
212
|
+
super().setUp()
|
|
213
|
+
|
|
214
|
+
self.image_client.get_metadef_property.return_value = (
|
|
215
|
+
self._metadef_property
|
|
216
|
+
)
|
|
217
|
+
|
|
218
|
+
self.cmd = metadef_properties.ShowMetadefProperty(self.app, None)
|
|
219
|
+
|
|
220
|
+
def test_metadef_property_show(self):
|
|
221
|
+
arglist = ['my-namespace', 'my-property']
|
|
222
|
+
verifylist = []
|
|
223
|
+
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
224
|
+
|
|
225
|
+
columns, data = self.cmd.take_action(parsed_args)
|
|
226
|
+
self.assertEqual(self.expected_columns, columns)
|
|
227
|
+
self.assertEqual(self.expected_data, data)
|
|
@@ -502,7 +502,6 @@ class TestIntegShellCliPrecedenceOCC(test_base.TestInteg):
|
|
|
502
502
|
)
|
|
503
503
|
|
|
504
504
|
# +env, -cli, +occ
|
|
505
|
-
print("auth_req: %s" % auth_req['auth'])
|
|
506
505
|
self.assertEqual(
|
|
507
506
|
test_shell.DEFAULT_USERNAME,
|
|
508
507
|
auth_req['auth']['identity']['password']['user']['name'],
|
|
@@ -559,7 +558,6 @@ class TestIntegShellCliPrecedenceOCC(test_base.TestInteg):
|
|
|
559
558
|
)
|
|
560
559
|
|
|
561
560
|
# +env, +cli, +occ
|
|
562
|
-
print("auth_req: %s" % auth_req['auth'])
|
|
563
561
|
self.assertEqual(
|
|
564
562
|
'zarquon',
|
|
565
563
|
auth_req['auth']['identity']['password']['user']['name'],
|
|
@@ -138,8 +138,8 @@ class TestNetworkAndCompute(utils.TestCommand):
|
|
|
138
138
|
)
|
|
139
139
|
|
|
140
140
|
self.app.client_manager.compute = mock.Mock()
|
|
141
|
-
self.
|
|
142
|
-
self.
|
|
141
|
+
self.compute_client = self.app.client_manager.compute
|
|
142
|
+
self.compute_client.compute_action = mock.Mock(
|
|
143
143
|
return_value='take_action_compute'
|
|
144
144
|
)
|
|
145
145
|
|
|
@@ -161,7 +161,7 @@ class TestNetworkAndCompute(utils.TestCommand):
|
|
|
161
161
|
self.app.client_manager.network_endpoint_enabled = False
|
|
162
162
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
163
163
|
result = self.cmd.take_action(parsed_args)
|
|
164
|
-
self.
|
|
164
|
+
self.compute_client.compute_action.assert_called_with(parsed_args)
|
|
165
165
|
self.assertEqual('take_action_compute', result)
|
|
166
166
|
|
|
167
167
|
|