python-openstackclient 8.2.0__py3-none-any.whl → 9.0.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.
Files changed (233) hide show
  1. openstackclient/api/object_store_v1.py +4 -1
  2. openstackclient/command.py +27 -0
  3. openstackclient/common/availability_zone.py +1 -1
  4. openstackclient/common/clientmanager.py +59 -21
  5. openstackclient/common/configuration.py +1 -1
  6. openstackclient/common/extension.py +1 -1
  7. openstackclient/common/limits.py +1 -1
  8. openstackclient/common/module.py +5 -3
  9. openstackclient/common/project_cleanup.py +10 -8
  10. openstackclient/common/quota.py +54 -23
  11. openstackclient/common/versions.py +1 -2
  12. openstackclient/compute/v2/agent.py +1 -1
  13. openstackclient/compute/v2/aggregate.py +6 -5
  14. openstackclient/compute/v2/console.py +5 -3
  15. openstackclient/compute/v2/console_connection.py +1 -1
  16. openstackclient/compute/v2/flavor.py +1 -1
  17. openstackclient/compute/v2/host.py +1 -1
  18. openstackclient/compute/v2/hypervisor.py +1 -1
  19. openstackclient/compute/v2/hypervisor_stats.py +1 -1
  20. openstackclient/compute/v2/keypair.py +1 -1
  21. openstackclient/compute/v2/server.py +78 -29
  22. openstackclient/compute/v2/server_backup.py +1 -1
  23. openstackclient/compute/v2/server_event.py +1 -1
  24. openstackclient/compute/v2/server_group.py +4 -2
  25. openstackclient/compute/v2/server_image.py +1 -1
  26. openstackclient/compute/v2/server_migration.py +1 -1
  27. openstackclient/compute/v2/server_volume.py +1 -1
  28. openstackclient/compute/v2/service.py +1 -1
  29. openstackclient/compute/v2/usage.py +6 -4
  30. openstackclient/identity/common.py +33 -1
  31. openstackclient/identity/v2_0/catalog.py +3 -2
  32. openstackclient/identity/v2_0/ec2creds.py +1 -1
  33. openstackclient/identity/v2_0/endpoint.py +1 -1
  34. openstackclient/identity/v2_0/project.py +17 -7
  35. openstackclient/identity/v2_0/role.py +1 -1
  36. openstackclient/identity/v2_0/role_assignment.py +3 -3
  37. openstackclient/identity/v2_0/service.py +4 -2
  38. openstackclient/identity/v2_0/token.py +1 -1
  39. openstackclient/identity/v2_0/user.py +2 -2
  40. openstackclient/identity/v3/access_rule.py +16 -4
  41. openstackclient/identity/v3/application_credential.py +30 -10
  42. openstackclient/identity/v3/catalog.py +3 -3
  43. openstackclient/identity/v3/consumer.py +1 -1
  44. openstackclient/identity/v3/credential.py +1 -1
  45. openstackclient/identity/v3/domain.py +10 -4
  46. openstackclient/identity/v3/ec2creds.py +1 -1
  47. openstackclient/identity/v3/endpoint.py +33 -12
  48. openstackclient/identity/v3/endpoint_group.py +1 -1
  49. openstackclient/identity/v3/federation_protocol.py +40 -41
  50. openstackclient/identity/v3/group.py +11 -5
  51. openstackclient/identity/v3/identity_provider.py +12 -10
  52. openstackclient/identity/v3/implied_role.py +1 -1
  53. openstackclient/identity/v3/limit.py +86 -85
  54. openstackclient/identity/v3/mapping.py +1 -1
  55. openstackclient/identity/v3/policy.py +1 -1
  56. openstackclient/identity/v3/project.py +191 -115
  57. openstackclient/identity/v3/region.py +1 -1
  58. openstackclient/identity/v3/registered_limit.py +97 -109
  59. openstackclient/identity/v3/role.py +20 -39
  60. openstackclient/identity/v3/role_assignment.py +12 -23
  61. openstackclient/identity/v3/service.py +1 -1
  62. openstackclient/identity/v3/service_provider.py +1 -1
  63. openstackclient/identity/v3/tag.py +1 -11
  64. openstackclient/identity/v3/token.py +3 -2
  65. openstackclient/identity/v3/trust.py +4 -2
  66. openstackclient/identity/v3/unscoped_saml.py +1 -1
  67. openstackclient/identity/v3/user.py +22 -13
  68. openstackclient/image/v1/image.py +19 -16
  69. openstackclient/image/v2/cache.py +1 -1
  70. openstackclient/image/v2/image.py +16 -12
  71. openstackclient/image/v2/info.py +1 -1
  72. openstackclient/image/v2/metadef_namespaces.py +1 -1
  73. openstackclient/image/v2/metadef_objects.py +1 -1
  74. openstackclient/image/v2/metadef_properties.py +3 -2
  75. openstackclient/image/v2/metadef_resource_type_association.py +1 -1
  76. openstackclient/image/v2/metadef_resource_types.py +1 -1
  77. openstackclient/image/v2/task.py +1 -1
  78. openstackclient/network/common.py +10 -9
  79. openstackclient/network/v2/address_group.py +4 -3
  80. openstackclient/network/v2/address_scope.py +8 -6
  81. openstackclient/network/v2/default_security_group_rule.py +9 -8
  82. openstackclient/network/v2/floating_ip.py +16 -9
  83. openstackclient/network/v2/floating_ip_port_forwarding.py +9 -6
  84. openstackclient/network/v2/ip_availability.py +7 -4
  85. openstackclient/network/v2/l3_conntrack_helper.py +11 -4
  86. openstackclient/network/v2/local_ip.py +13 -7
  87. openstackclient/network/v2/local_ip_association.py +7 -4
  88. openstackclient/network/v2/ndp_proxy.py +13 -6
  89. openstackclient/network/v2/network.py +33 -16
  90. openstackclient/network/v2/network_agent.py +5 -5
  91. openstackclient/network/v2/network_auto_allocated_topology.py +1 -1
  92. openstackclient/network/v2/network_flavor.py +1 -1
  93. openstackclient/network/v2/network_flavor_profile.py +1 -1
  94. openstackclient/network/v2/network_meter.py +1 -1
  95. openstackclient/network/v2/network_meter_rule.py +1 -1
  96. openstackclient/network/v2/network_qos_policy.py +7 -5
  97. openstackclient/network/v2/network_qos_rule.py +1 -1
  98. openstackclient/network/v2/network_qos_rule_type.py +1 -1
  99. openstackclient/network/v2/network_rbac.py +8 -5
  100. openstackclient/network/v2/network_segment.py +2 -2
  101. openstackclient/network/v2/network_segment_range.py +13 -6
  102. openstackclient/network/v2/network_service_provider.py +1 -1
  103. openstackclient/network/v2/network_trunk.py +65 -42
  104. openstackclient/network/v2/port.py +22 -20
  105. openstackclient/network/v2/router.py +19 -8
  106. openstackclient/network/v2/security_group.py +10 -6
  107. openstackclient/network/v2/security_group_rule.py +11 -5
  108. openstackclient/network/v2/subnet.py +17 -18
  109. openstackclient/network/v2/subnet_pool.py +11 -9
  110. openstackclient/network/v2/taas/__init__.py +0 -0
  111. openstackclient/network/v2/taas/tap_flow.py +245 -0
  112. openstackclient/network/v2/taas/tap_mirror.py +237 -0
  113. openstackclient/network/v2/taas/tap_service.py +211 -0
  114. openstackclient/object/v1/account.py +1 -1
  115. openstackclient/object/v1/container.py +1 -1
  116. openstackclient/object/v1/object.py +1 -1
  117. openstackclient/shell.py +18 -8
  118. openstackclient/tests/functional/identity/v3/test_catalog.py +42 -23
  119. openstackclient/tests/functional/identity/v3/test_limit.py +47 -0
  120. openstackclient/tests/functional/identity/v3/test_role_assignment.py +174 -0
  121. openstackclient/tests/functional/image/v2/test_cache.py +54 -0
  122. openstackclient/tests/functional/image/v2/test_metadef_objects.py +69 -0
  123. openstackclient/tests/functional/image/v2/test_metadef_resource_type.py +55 -0
  124. openstackclient/tests/functional/volume/v3/test_volume_snapshot.py +46 -132
  125. openstackclient/tests/unit/common/test_command.py +1 -1
  126. openstackclient/tests/unit/common/test_extension.py +2 -3
  127. openstackclient/tests/unit/common/test_module.py +14 -7
  128. openstackclient/tests/unit/common/test_quota.py +79 -0
  129. openstackclient/tests/unit/compute/v2/test_aggregate.py +5 -3
  130. openstackclient/tests/unit/compute/v2/test_console.py +1 -4
  131. openstackclient/tests/unit/compute/v2/test_flavor.py +1 -3
  132. openstackclient/tests/unit/compute/v2/test_hypervisor_stats.py +1 -9
  133. openstackclient/tests/unit/compute/v2/test_server.py +370 -38
  134. openstackclient/tests/unit/compute/v2/test_server_backup.py +1 -3
  135. openstackclient/tests/unit/compute/v2/test_service.py +1 -3
  136. openstackclient/tests/unit/fakes.py +35 -134
  137. openstackclient/tests/unit/identity/test_common.py +100 -0
  138. openstackclient/tests/unit/identity/v2_0/test_project.py +4 -4
  139. openstackclient/tests/unit/identity/v3/fakes.py +10 -2
  140. openstackclient/tests/unit/identity/v3/test_application_credential.py +3 -3
  141. openstackclient/tests/unit/identity/v3/test_domain.py +1 -1
  142. openstackclient/tests/unit/identity/v3/test_endpoint.py +1 -1
  143. openstackclient/tests/unit/identity/v3/test_group.py +4 -2
  144. openstackclient/tests/unit/identity/v3/test_identity_provider.py +10 -10
  145. openstackclient/tests/unit/identity/v3/test_limit.py +197 -145
  146. openstackclient/tests/unit/identity/v3/test_oauth.py +1 -1
  147. openstackclient/tests/unit/identity/v3/test_project.py +832 -513
  148. openstackclient/tests/unit/identity/v3/test_protocol.py +97 -88
  149. openstackclient/tests/unit/identity/v3/test_registered_limit.py +356 -221
  150. openstackclient/tests/unit/identity/v3/test_role.py +1 -82
  151. openstackclient/tests/unit/identity/v3/test_user.py +7 -51
  152. openstackclient/tests/unit/image/v2/test_image.py +116 -5
  153. openstackclient/tests/unit/network/test_common.py +9 -13
  154. openstackclient/tests/unit/network/v2/taas/__init__.py +0 -0
  155. openstackclient/tests/unit/network/v2/taas/test_osc_tap_flow.py +276 -0
  156. openstackclient/tests/unit/network/v2/taas/test_osc_tap_mirror.py +288 -0
  157. openstackclient/tests/unit/network/v2/taas/test_osc_tap_service.py +271 -0
  158. openstackclient/tests/unit/network/v2/test_address_group.py +19 -22
  159. openstackclient/tests/unit/network/v2/test_address_scope.py +10 -15
  160. openstackclient/tests/unit/network/v2/test_default_security_group_rule.py +38 -49
  161. openstackclient/tests/unit/network/v2/test_floating_ip_network.py +21 -27
  162. openstackclient/tests/unit/network/v2/test_floating_ip_port_forwarding.py +21 -18
  163. openstackclient/tests/unit/network/v2/test_ip_availability.py +6 -8
  164. openstackclient/tests/unit/network/v2/test_l3_conntrack_helper.py +6 -15
  165. openstackclient/tests/unit/network/v2/test_local_ip.py +12 -23
  166. openstackclient/tests/unit/network/v2/test_local_ip_association.py +13 -18
  167. openstackclient/tests/unit/network/v2/test_ndp_proxy.py +11 -21
  168. openstackclient/tests/unit/network/v2/test_network.py +41 -37
  169. openstackclient/tests/unit/network/v2/test_network_agent.py +13 -20
  170. openstackclient/tests/unit/network/v2/test_network_auto_allocated_topology.py +5 -8
  171. openstackclient/tests/unit/network/v2/test_network_flavor.py +14 -26
  172. openstackclient/tests/unit/network/v2/test_network_flavor_profile.py +14 -17
  173. openstackclient/tests/unit/network/v2/test_network_meter.py +7 -17
  174. openstackclient/tests/unit/network/v2/test_network_meter_rule.py +10 -20
  175. openstackclient/tests/unit/network/v2/test_network_qos_policy.py +7 -13
  176. openstackclient/tests/unit/network/v2/test_network_qos_rule.py +44 -54
  177. openstackclient/tests/unit/network/v2/test_network_qos_rule_type.py +2 -7
  178. openstackclient/tests/unit/network/v2/test_network_rbac.py +21 -36
  179. openstackclient/tests/unit/network/v2/test_network_segment.py +13 -29
  180. openstackclient/tests/unit/network/v2/test_network_segment_range.py +20 -19
  181. openstackclient/tests/unit/network/v2/test_network_service_provider.py +1 -4
  182. openstackclient/tests/unit/network/v2/test_network_trunk.py +52 -47
  183. openstackclient/tests/unit/network/v2/test_port.py +75 -86
  184. openstackclient/tests/unit/network/v2/test_router.py +104 -126
  185. openstackclient/tests/unit/network/v2/test_security_group_network.py +19 -26
  186. openstackclient/tests/unit/network/v2/test_security_group_rule_network.py +17 -18
  187. openstackclient/tests/unit/network/v2/test_subnet.py +35 -46
  188. openstackclient/tests/unit/network/v2/test_subnet_pool.py +21 -33
  189. openstackclient/tests/unit/volume/test_find_resource.py +4 -13
  190. openstackclient/tests/unit/volume/v2/test_consistency_group.py +8 -2
  191. openstackclient/tests/unit/volume/v2/test_volume.py +7 -6
  192. openstackclient/tests/unit/volume/v2/test_volume_backup.py +3 -1
  193. openstackclient/tests/unit/volume/v3/test_volume.py +38 -12
  194. openstackclient/tests/unit/volume/v3/test_volume_backup.py +9 -0
  195. openstackclient/volume/client.py +7 -17
  196. openstackclient/volume/v2/backup_record.py +1 -1
  197. openstackclient/volume/v2/consistency_group.py +9 -9
  198. openstackclient/volume/v2/consistency_group_snapshot.py +3 -3
  199. openstackclient/volume/v2/qos_specs.py +3 -3
  200. openstackclient/volume/v2/service.py +1 -1
  201. openstackclient/volume/v2/volume.py +14 -7
  202. openstackclient/volume/v2/volume_backend.py +1 -1
  203. openstackclient/volume/v2/volume_backup.py +7 -5
  204. openstackclient/volume/v2/volume_host.py +1 -2
  205. openstackclient/volume/v2/volume_snapshot.py +4 -4
  206. openstackclient/volume/v2/volume_transfer_request.py +3 -3
  207. openstackclient/volume/v2/volume_type.py +16 -11
  208. openstackclient/volume/v3/block_storage_cleanup.py +1 -1
  209. openstackclient/volume/v3/block_storage_cluster.py +1 -1
  210. openstackclient/volume/v3/block_storage_log_level.py +1 -1
  211. openstackclient/volume/v3/block_storage_manage.py +1 -1
  212. openstackclient/volume/v3/block_storage_resource_filter.py +1 -1
  213. openstackclient/volume/v3/service.py +1 -1
  214. openstackclient/volume/v3/volume.py +16 -9
  215. openstackclient/volume/v3/volume_attachment.py +6 -5
  216. openstackclient/volume/v3/volume_backup.py +20 -5
  217. openstackclient/volume/v3/volume_group.py +1 -1
  218. openstackclient/volume/v3/volume_group_snapshot.py +1 -1
  219. openstackclient/volume/v3/volume_group_type.py +1 -1
  220. openstackclient/volume/v3/volume_message.py +1 -1
  221. openstackclient/volume/v3/volume_snapshot.py +4 -4
  222. openstackclient/volume/v3/volume_transfer_request.py +3 -3
  223. openstackclient/volume/v3/volume_type.py +20 -14
  224. {python_openstackclient-8.2.0.dist-info → python_openstackclient-9.0.0.dist-info}/METADATA +15 -13
  225. {python_openstackclient-8.2.0.dist-info → python_openstackclient-9.0.0.dist-info}/RECORD +231 -219
  226. {python_openstackclient-8.2.0.dist-info → python_openstackclient-9.0.0.dist-info}/WHEEL +1 -1
  227. {python_openstackclient-8.2.0.dist-info → python_openstackclient-9.0.0.dist-info}/entry_points.txt +15 -0
  228. {python_openstackclient-8.2.0.dist-info → python_openstackclient-9.0.0.dist-info/licenses}/AUTHORS +15 -0
  229. python_openstackclient-9.0.0.dist-info/pbr.json +1 -0
  230. openstackclient/tests/unit/common/test_logs.py +0 -221
  231. python_openstackclient-8.2.0.dist-info/pbr.json +0 -1
  232. {python_openstackclient-8.2.0.dist-info → python_openstackclient-9.0.0.dist-info/licenses}/LICENSE +0 -0
  233. {python_openstackclient-8.2.0.dist-info → python_openstackclient-9.0.0.dist-info}/top_level.txt +0 -0
@@ -49,9 +49,10 @@ class TestCreateFlavorProfile(TestFlavorProfile):
49
49
 
50
50
  def setUp(self):
51
51
  super().setUp()
52
- self.network_client.create_service_profile = mock.Mock(
53
- return_value=self.new_flavor_profile
52
+ self.network_client.create_service_profile.return_value = (
53
+ self.new_flavor_profile
54
54
  )
55
+
55
56
  # Get the command object to test
56
57
  self.cmd = network_flavor_profile.CreateNetworkFlavorProfile(
57
58
  self.app, None
@@ -195,9 +196,8 @@ class TestDeleteFlavorProfile(TestFlavorProfile):
195
196
 
196
197
  def setUp(self):
197
198
  super().setUp()
198
- self.network_client.delete_service_profile = mock.Mock(
199
- return_value=None
200
- )
199
+ self.network_client.delete_service_profile.return_value = None
200
+
201
201
  self.network_client.find_service_profile = (
202
202
  network_fakes.get_service_profile(
203
203
  flavor_profile=self._network_flavor_profiles
@@ -266,9 +266,7 @@ class TestDeleteFlavorProfile(TestFlavorProfile):
266
266
  self._network_flavor_profiles[0],
267
267
  exceptions.CommandError,
268
268
  ]
269
- self.network_client.find_service_profile = mock.Mock(
270
- side_effect=find_mock_result
271
- )
269
+ self.network_client.find_service_profile.side_effect = find_mock_result
272
270
 
273
271
  try:
274
272
  self.cmd.take_action(parsed_args)
@@ -314,8 +312,8 @@ class TestListFlavorProfile(TestFlavorProfile):
314
312
 
315
313
  def setUp(self):
316
314
  super().setUp()
317
- self.network_client.service_profiles = mock.Mock(
318
- return_value=self._network_flavor_profiles
315
+ self.network_client.service_profiles.return_value = (
316
+ self._network_flavor_profiles
319
317
  )
320
318
 
321
319
  # Get the command object to test
@@ -355,8 +353,8 @@ class TestShowFlavorProfile(TestFlavorProfile):
355
353
 
356
354
  def setUp(self):
357
355
  super().setUp()
358
- self.network_client.find_service_profile = mock.Mock(
359
- return_value=self.network_flavor_profile
356
+ self.network_client.find_service_profile.return_value = (
357
+ self.network_flavor_profile
360
358
  )
361
359
 
362
360
  # Get the command object to test
@@ -388,11 +386,10 @@ class TestSetFlavorProfile(TestFlavorProfile):
388
386
 
389
387
  def setUp(self):
390
388
  super().setUp()
391
- self.network_client.update_service_profile = mock.Mock(
392
- return_value=None
393
- )
394
- self.network_client.find_service_profile = mock.Mock(
395
- return_value=self.network_flavor_profile
389
+ self.network_client.update_service_profile.return_value = None
390
+
391
+ self.network_client.find_service_profile.return_value = (
392
+ self.network_flavor_profile
396
393
  )
397
394
 
398
395
  # Get the command object to test
@@ -13,7 +13,6 @@
13
13
  # License for the specific language governing permissions and limitations
14
14
  # under the License.
15
15
 
16
- from unittest import mock
17
16
  from unittest.mock import call
18
17
 
19
18
  from osc_lib import exceptions
@@ -55,9 +54,8 @@ class TestCreateMeter(TestMeter):
55
54
 
56
55
  def setUp(self):
57
56
  super().setUp()
58
- self.network_client.create_metering_label = mock.Mock(
59
- return_value=self.new_meter
60
- )
57
+ self.network_client.create_metering_label.return_value = self.new_meter
58
+
61
59
  self.projects_mock.get.return_value = self.project
62
60
  self.cmd = network_meter.CreateMeter(self.app, None)
63
61
 
@@ -132,9 +130,7 @@ class TestDeleteMeter(TestMeter):
132
130
 
133
131
  self.meter_list = network_fakes.FakeNetworkMeter.create_meter(count=2)
134
132
 
135
- self.network_client.delete_metering_label = mock.Mock(
136
- return_value=None
137
- )
133
+ self.network_client.delete_metering_label.return_value = None
138
134
 
139
135
  self.network_client.find_metering_label = (
140
136
  network_fakes.FakeNetworkMeter.get_meter(meter=self.meter_list)
@@ -194,15 +190,13 @@ class TestDeleteMeter(TestMeter):
194
190
  exceptions.NotFound('404'),
195
191
  self.meter_list[1],
196
192
  ]
197
- self.network_client.find_meter = mock.Mock(side_effect=return_find)
193
+ self.network_client.find_metering_label.side_effect = return_find
198
194
 
199
195
  ret_delete = [
200
196
  None,
201
197
  exceptions.NotFound('404'),
202
198
  ]
203
- self.network_client.delete_metering_label = mock.Mock(
204
- side_effect=ret_delete
205
- )
199
+ self.network_client.delete_metering_label.side_effect = ret_delete
206
200
 
207
201
  self.assertRaises(
208
202
  exceptions.CommandError, self.cmd.take_action, parsed_args
@@ -240,9 +234,7 @@ class TestListMeter(TestMeter):
240
234
  def setUp(self):
241
235
  super().setUp()
242
236
 
243
- self.network_client.metering_labels = mock.Mock(
244
- return_value=self.meter_list
245
- )
237
+ self.network_client.metering_labels.return_value = self.meter_list
246
238
 
247
239
  self.cmd = network_meter.ListMeter(self.app, None)
248
240
 
@@ -282,9 +274,7 @@ class TestShowMeter(TestMeter):
282
274
 
283
275
  self.cmd = network_meter.ShowMeter(self.app, None)
284
276
 
285
- self.network_client.find_metering_label = mock.Mock(
286
- return_value=self.new_meter
287
- )
277
+ self.network_client.find_metering_label.return_value = self.new_meter
288
278
 
289
279
  def test_show_no_options(self):
290
280
  arglist = []
@@ -13,7 +13,6 @@
13
13
  # License for the specific language governing permissions and limitations
14
14
  # under the License.
15
15
 
16
- from unittest import mock
17
16
  from unittest.mock import call
18
17
 
19
18
  from osc_lib import exceptions
@@ -65,14 +64,13 @@ class TestCreateMeterRule(TestMeterRule):
65
64
  {'id': self.new_rule.metering_label_id}
66
65
  )
67
66
 
68
- self.network_client.create_metering_label_rule = mock.Mock(
69
- return_value=self.new_rule
67
+ self.network_client.create_metering_label_rule.return_value = (
68
+ self.new_rule
70
69
  )
70
+
71
71
  self.projects_mock.get.return_value = self.project
72
72
  self.cmd = network_meter_rule.CreateMeterRule(self.app, None)
73
- self.network_client.find_metering_label = mock.Mock(
74
- return_value=fake_meter
75
- )
73
+ self.network_client.find_metering_label.return_value = fake_meter
76
74
 
77
75
  def test_create_no_options(self):
78
76
  arglist = []
@@ -146,9 +144,7 @@ class TestDeleteMeterRule(TestMeterRule):
146
144
  self.rule_list = network_fakes.FakeNetworkMeterRule.create_meter_rule(
147
145
  count=2
148
146
  )
149
- self.network_client.delete_metering_label_rule = mock.Mock(
150
- return_value=None
151
- )
147
+ self.network_client.delete_metering_label_rule.return_value = None
152
148
 
153
149
  self.network_client.find_metering_label_rule = (
154
150
  network_fakes.FakeNetworkMeterRule.get_meter_rule(
@@ -210,17 +206,13 @@ class TestDeleteMeterRule(TestMeterRule):
210
206
  exceptions.NotFound('404'),
211
207
  self.rule_list[1],
212
208
  ]
213
- self.network_client.find_metering_label_rule = mock.Mock(
214
- side_effect=return_find
215
- )
209
+ self.network_client.find_metering_label_rule.side_effect = return_find
216
210
 
217
211
  ret_delete = [
218
212
  None,
219
213
  exceptions.NotFound('404'),
220
214
  ]
221
- self.network_client.delete_metering_label_rule = mock.Mock(
222
- side_effect=ret_delete
223
- )
215
+ self.network_client.delete_metering_label_rule.side_effect = ret_delete
224
216
 
225
217
  self.assertRaises(
226
218
  exceptions.CommandError, self.cmd.take_action, parsed_args
@@ -262,9 +254,7 @@ class TestListMeterRule(TestMeterRule):
262
254
  def setUp(self):
263
255
  super().setUp()
264
256
 
265
- self.network_client.metering_label_rules = mock.Mock(
266
- return_value=self.rule_list
267
- )
257
+ self.network_client.metering_label_rules.return_value = self.rule_list
268
258
 
269
259
  self.cmd = network_meter_rule.ListMeterRule(self.app, None)
270
260
 
@@ -311,8 +301,8 @@ class TestShowMeterRule(TestMeterRule):
311
301
 
312
302
  self.cmd = network_meter_rule.ShowMeterRule(self.app, None)
313
303
 
314
- self.network_client.find_metering_label_rule = mock.Mock(
315
- return_value=self.new_rule
304
+ self.network_client.find_metering_label_rule.return_value = (
305
+ self.new_rule
316
306
  )
317
307
 
318
308
  def test_show_no_options(self):
@@ -63,8 +63,8 @@ class TestCreateNetworkQosPolicy(TestQosPolicy):
63
63
 
64
64
  def setUp(self):
65
65
  super().setUp()
66
- self.network_client.create_qos_policy = mock.Mock(
67
- return_value=self.new_qos_policy
66
+ self.network_client.create_qos_policy.return_value = (
67
+ self.new_qos_policy
68
68
  )
69
69
 
70
70
  # Get the command object to test
@@ -163,7 +163,7 @@ class TestDeleteNetworkQosPolicy(TestQosPolicy):
163
163
 
164
164
  def setUp(self):
165
165
  super().setUp()
166
- self.network_client.delete_qos_policy = mock.Mock(return_value=None)
166
+ self.network_client.delete_qos_policy.return_value = None
167
167
  self.network_client.find_qos_policy = network_fakes.get_qos_policies(
168
168
  qos_policies=self._qos_policies
169
169
  )
@@ -264,9 +264,7 @@ class TestListNetworkQosPolicy(TestQosPolicy):
264
264
 
265
265
  def setUp(self):
266
266
  super().setUp()
267
- self.network_client.qos_policies = mock.Mock(
268
- return_value=self.qos_policies
269
- )
267
+ self.network_client.qos_policies.return_value = self.qos_policies
270
268
 
271
269
  # Get the command object to test
272
270
  self.cmd = network_qos_policy.ListNetworkQosPolicy(self.app, None)
@@ -344,10 +342,8 @@ class TestSetNetworkQosPolicy(TestQosPolicy):
344
342
 
345
343
  def setUp(self):
346
344
  super().setUp()
347
- self.network_client.update_qos_policy = mock.Mock(return_value=None)
348
- self.network_client.find_qos_policy = mock.Mock(
349
- return_value=self._qos_policy
350
- )
345
+ self.network_client.update_qos_policy.return_value = None
346
+ self.network_client.find_qos_policy.return_value = self._qos_policy
351
347
 
352
348
  # Get the command object to test
353
349
  self.cmd = network_qos_policy.SetNetworkQosPolicy(self.app, None)
@@ -447,9 +443,7 @@ class TestShowNetworkQosPolicy(TestQosPolicy):
447
443
 
448
444
  def setUp(self):
449
445
  super().setUp()
450
- self.network_client.find_qos_policy = mock.Mock(
451
- return_value=self._qos_policy
452
- )
446
+ self.network_client.find_qos_policy.return_value = self._qos_policy
453
447
 
454
448
  # Get the command object to test
455
449
  self.cmd = network_qos_policy.ShowNetworkQosPolicy(self.app, None)
@@ -56,9 +56,7 @@ class TestNetworkQosRule(network_fakes.TestNetworkV2):
56
56
  def setUp(self):
57
57
  super().setUp()
58
58
  self.qos_policy = network_fakes.create_one_qos_policy()
59
- self.network_client.find_qos_policy = mock.Mock(
60
- return_value=self.qos_policy
61
- )
59
+ self.network_client.find_qos_policy.return_value = self.qos_policy
62
60
 
63
61
 
64
62
  class TestCreateNetworkQosRuleMinimumBandwidth(TestNetworkQosRule):
@@ -87,8 +85,8 @@ class TestCreateNetworkQosRuleMinimumBandwidth(TestNetworkQosRule):
87
85
  self.new_rule.project_id,
88
86
  self.new_rule.type,
89
87
  )
90
- self.network_client.create_qos_minimum_bandwidth_rule = mock.Mock(
91
- return_value=self.new_rule
88
+ self.network_client.create_qos_minimum_bandwidth_rule.return_value = (
89
+ self.new_rule
92
90
  )
93
91
 
94
92
  # Get the command object to test
@@ -190,9 +188,7 @@ class TestCreateNetworkQosRuleMinimumPacketRate(TestNetworkQosRule):
190
188
  self.new_rule.project_id,
191
189
  self.new_rule.type,
192
190
  )
193
- self.network_client.create_qos_minimum_packet_rate_rule = mock.Mock(
194
- return_value=self.new_rule
195
- )
191
+ self.network_client.create_qos_minimum_packet_rate_rule.return_value = self.new_rule
196
192
 
197
193
  # Get the command object to test
198
194
  self.cmd = network_qos_rule.CreateNetworkQosRule(self.app, None)
@@ -291,8 +287,8 @@ class TestCreateNetworkQosRuleDSCPMarking(TestNetworkQosRule):
291
287
  self.new_rule.project_id,
292
288
  self.new_rule.type,
293
289
  )
294
- self.network_client.create_qos_dscp_marking_rule = mock.Mock(
295
- return_value=self.new_rule
290
+ self.network_client.create_qos_dscp_marking_rule.return_value = (
291
+ self.new_rule
296
292
  )
297
293
 
298
294
  # Get the command object to test
@@ -389,8 +385,8 @@ class TestCreateNetworkQosRuleBandwidtLimit(TestNetworkQosRule):
389
385
  self.new_rule.project_id,
390
386
  self.new_rule.type,
391
387
  )
392
- self.network_client.create_qos_bandwidth_limit_rule = mock.Mock(
393
- return_value=self.new_rule
388
+ self.network_client.create_qos_bandwidth_limit_rule.return_value = (
389
+ self.new_rule
394
390
  )
395
391
 
396
392
  # Get the command object to test
@@ -529,9 +525,10 @@ class TestDeleteNetworkQosRuleMinimumBandwidth(TestNetworkQosRule):
529
525
  }
530
526
  self.new_rule = network_fakes.create_one_qos_rule(attrs)
531
527
  self.qos_policy.rules = [self.new_rule]
532
- self.network_client.delete_qos_minimum_bandwidth_rule = mock.Mock(
533
- return_value=None
528
+ self.network_client.delete_qos_minimum_bandwidth_rule.return_value = (
529
+ None
534
530
  )
531
+
535
532
  self.network_client.find_qos_minimum_bandwidth_rule = (
536
533
  network_fakes.get_qos_rules(qos_rules=self.new_rule)
537
534
  )
@@ -592,9 +589,8 @@ class TestDeleteNetworkQosRuleMinimumPacketRate(TestNetworkQosRule):
592
589
  }
593
590
  self.new_rule = network_fakes.create_one_qos_rule(attrs)
594
591
  self.qos_policy.rules = [self.new_rule]
595
- self.network_client.delete_qos_minimum_packet_rate_rule = mock.Mock(
596
- return_value=None
597
- )
592
+ self.network_client.delete_qos_minimum_packet_rate_rule.return_value = None
593
+
598
594
  self.network_client.find_qos_minimum_packet_rate_rule = (
599
595
  network_fakes.get_qos_rules(qos_rules=self.new_rule)
600
596
  )
@@ -655,9 +651,8 @@ class TestDeleteNetworkQosRuleDSCPMarking(TestNetworkQosRule):
655
651
  }
656
652
  self.new_rule = network_fakes.create_one_qos_rule(attrs)
657
653
  self.qos_policy.rules = [self.new_rule]
658
- self.network_client.delete_qos_dscp_marking_rule = mock.Mock(
659
- return_value=None
660
- )
654
+ self.network_client.delete_qos_dscp_marking_rule.return_value = None
655
+
661
656
  self.network_client.find_qos_dscp_marking_rule = (
662
657
  network_fakes.get_qos_rules(qos_rules=self.new_rule)
663
658
  )
@@ -718,9 +713,8 @@ class TestDeleteNetworkQosRuleBandwidthLimit(TestNetworkQosRule):
718
713
  }
719
714
  self.new_rule = network_fakes.create_one_qos_rule(attrs)
720
715
  self.qos_policy.rules = [self.new_rule]
721
- self.network_client.delete_qos_bandwidth_limit_rule = mock.Mock(
722
- return_value=None
723
- )
716
+ self.network_client.delete_qos_bandwidth_limit_rule.return_value = None
717
+
724
718
  self.network_client.find_qos_bandwidth_limit_rule = (
725
719
  network_fakes.get_qos_rules(qos_rules=self.new_rule)
726
720
  )
@@ -781,16 +775,16 @@ class TestSetNetworkQosRuleMinimumBandwidth(TestNetworkQosRule):
781
775
  }
782
776
  self.new_rule = network_fakes.create_one_qos_rule(attrs)
783
777
  self.qos_policy.rules = [self.new_rule]
784
- self.network_client.update_qos_minimum_bandwidth_rule = mock.Mock(
785
- return_value=None
778
+ self.network_client.update_qos_minimum_bandwidth_rule.return_value = (
779
+ None
786
780
  )
787
- self.network_client.find_qos_minimum_bandwidth_rule = mock.Mock(
788
- return_value=self.new_rule
789
- )
790
- self.network_client.find_qos_policy = mock.Mock(
791
- return_value=self.qos_policy
781
+
782
+ self.network_client.find_qos_minimum_bandwidth_rule.return_value = (
783
+ self.new_rule
792
784
  )
793
785
 
786
+ self.network_client.find_qos_policy.return_value = self.qos_policy
787
+
794
788
  # Get the command object to test
795
789
  self.cmd = network_qos_rule.SetNetworkQosRule(self.app, None)
796
790
 
@@ -883,16 +877,14 @@ class TestSetNetworkQosRuleMinimumPacketRate(TestNetworkQosRule):
883
877
  }
884
878
  self.new_rule = network_fakes.create_one_qos_rule(attrs)
885
879
  self.qos_policy.rules = [self.new_rule]
886
- self.network_client.update_qos_minimum_packet_rate_rule = mock.Mock(
887
- return_value=None
888
- )
889
- self.network_client.find_qos_minimum_packet_rate_rule = mock.Mock(
890
- return_value=self.new_rule
891
- )
892
- self.network_client.find_qos_policy = mock.Mock(
893
- return_value=self.qos_policy
880
+ self.network_client.update_qos_minimum_packet_rate_rule.return_value = None
881
+
882
+ self.network_client.find_qos_minimum_packet_rate_rule.return_value = (
883
+ self.new_rule
894
884
  )
895
885
 
886
+ self.network_client.find_qos_policy.return_value = self.qos_policy
887
+
896
888
  # Get the command object to test
897
889
  self.cmd = network_qos_rule.SetNetworkQosRule(self.app, None)
898
890
 
@@ -985,16 +977,14 @@ class TestSetNetworkQosRuleDSCPMarking(TestNetworkQosRule):
985
977
  }
986
978
  self.new_rule = network_fakes.create_one_qos_rule(attrs)
987
979
  self.qos_policy.rules = [self.new_rule]
988
- self.network_client.update_qos_dscp_marking_rule = mock.Mock(
989
- return_value=None
990
- )
991
- self.network_client.find_qos_dscp_marking_rule = mock.Mock(
992
- return_value=self.new_rule
993
- )
994
- self.network_client.find_qos_policy = mock.Mock(
995
- return_value=self.qos_policy
980
+ self.network_client.update_qos_dscp_marking_rule.return_value = None
981
+
982
+ self.network_client.find_qos_dscp_marking_rule.return_value = (
983
+ self.new_rule
996
984
  )
997
985
 
986
+ self.network_client.find_qos_policy.return_value = self.qos_policy
987
+
998
988
  # Get the command object to test
999
989
  self.cmd = network_qos_rule.SetNetworkQosRule(self.app, None)
1000
990
 
@@ -1351,8 +1341,8 @@ class TestShowNetworkQosRuleMinimumBandwidth(TestNetworkQosRule):
1351
1341
  self.new_rule.type,
1352
1342
  )
1353
1343
 
1354
- self.network_client.get_qos_minimum_bandwidth_rule = mock.Mock(
1355
- return_value=self.new_rule
1344
+ self.network_client.get_qos_minimum_bandwidth_rule.return_value = (
1345
+ self.new_rule
1356
1346
  )
1357
1347
 
1358
1348
  # Get the command object to test
@@ -1415,8 +1405,8 @@ class TestShowNetworkQosRuleMinimumPacketRate(TestNetworkQosRule):
1415
1405
  self.new_rule.type,
1416
1406
  )
1417
1407
 
1418
- self.network_client.get_qos_minimum_packet_rate_rule = mock.Mock(
1419
- return_value=self.new_rule
1408
+ self.network_client.get_qos_minimum_packet_rate_rule.return_value = (
1409
+ self.new_rule
1420
1410
  )
1421
1411
 
1422
1412
  # Get the command object to test
@@ -1477,8 +1467,8 @@ class TestShowNetworkQosDSCPMarking(TestNetworkQosRule):
1477
1467
  self.new_rule.type,
1478
1468
  )
1479
1469
 
1480
- self.network_client.get_qos_dscp_marking_rule = mock.Mock(
1481
- return_value=self.new_rule
1470
+ self.network_client.get_qos_dscp_marking_rule.return_value = (
1471
+ self.new_rule
1482
1472
  )
1483
1473
 
1484
1474
  # Get the command object to test
@@ -1543,8 +1533,8 @@ class TestShowNetworkQosBandwidthLimit(TestNetworkQosRule):
1543
1533
  self.new_rule.type,
1544
1534
  )
1545
1535
 
1546
- self.network_client.get_qos_bandwidth_limit_rule = mock.Mock(
1547
- return_value=self.new_rule
1536
+ self.network_client.get_qos_bandwidth_limit_rule.return_value = (
1537
+ self.new_rule
1548
1538
  )
1549
1539
 
1550
1540
  # Get the command object to test
@@ -13,7 +13,6 @@
13
13
  # License for the specific language governing permissions and limitations
14
14
  # under the License.
15
15
 
16
- from unittest import mock
17
16
 
18
17
  from openstackclient.network.v2 import network_qos_rule_type as _qos_rule_type
19
18
  from openstackclient.tests.unit.network.v2 import fakes as network_fakes
@@ -35,9 +34,7 @@ class TestShowNetworkQosRuleType(TestNetworkQosRuleType):
35
34
 
36
35
  def setUp(self):
37
36
  super().setUp()
38
- self.network_client.get_qos_rule_type = mock.Mock(
39
- return_value=self.qos_rule_type
40
- )
37
+ self.network_client.get_qos_rule_type.return_value = self.qos_rule_type
41
38
 
42
39
  # Get the command object to test
43
40
  self.cmd = _qos_rule_type.ShowNetworkQosRuleType(self.app, None)
@@ -84,9 +81,7 @@ class TestListNetworkQosRuleType(TestNetworkQosRuleType):
84
81
 
85
82
  def setUp(self):
86
83
  super().setUp()
87
- self.network_client.qos_rule_types = mock.Mock(
88
- return_value=self.qos_rule_types
89
- )
84
+ self.network_client.qos_rule_types.return_value = self.qos_rule_types
90
85
 
91
86
  # Get the command object to test
92
87
  self.cmd = _qos_rule_type.ListNetworkQosRuleType(self.app, None)
@@ -11,7 +11,6 @@
11
11
  # under the License.
12
12
  #
13
13
 
14
- from unittest import mock
15
14
  from unittest.mock import call
16
15
 
17
16
  import ddt
@@ -72,27 +71,20 @@ class TestCreateNetworkRBAC(TestNetworkRBAC):
72
71
  # Get the command object to test
73
72
  self.cmd = network_rbac.CreateNetworkRBAC(self.app, None)
74
73
 
75
- self.network_client.create_rbac_policy = mock.Mock(
76
- return_value=self.rbac_policy
77
- )
78
- self.network_client.find_network = mock.Mock(
79
- return_value=self.network_object
80
- )
81
- self.network_client.find_qos_policy = mock.Mock(
82
- return_value=self.qos_object
83
- )
84
- self.network_client.find_security_group = mock.Mock(
85
- return_value=self.sg_object
86
- )
87
- self.network_client.find_address_scope = mock.Mock(
88
- return_value=self.as_object
89
- )
90
- self.network_client.find_subnet_pool = mock.Mock(
91
- return_value=self.snp_object
92
- )
93
- self.network_client.find_address_group = mock.Mock(
94
- return_value=self.ag_object
95
- )
74
+ self.network_client.create_rbac_policy.return_value = self.rbac_policy
75
+
76
+ self.network_client.find_network.return_value = self.network_object
77
+
78
+ self.network_client.find_qos_policy.return_value = self.qos_object
79
+
80
+ self.network_client.find_security_group.return_value = self.sg_object
81
+
82
+ self.network_client.find_address_scope.return_value = self.as_object
83
+
84
+ self.network_client.find_subnet_pool.return_value = self.snp_object
85
+
86
+ self.network_client.find_address_group.return_value = self.ag_object
87
+
96
88
  self.projects_mock.get.return_value = self.project
97
89
 
98
90
  def test_network_rbac_create_no_type(self):
@@ -343,7 +335,7 @@ class TestDeleteNetworkRBAC(TestNetworkRBAC):
343
335
 
344
336
  def setUp(self):
345
337
  super().setUp()
346
- self.network_client.delete_rbac_policy = mock.Mock(return_value=None)
338
+ self.network_client.delete_rbac_policy.return_value = None
347
339
  self.network_client.find_rbac_policy = network_fakes.get_network_rbacs(
348
340
  rbac_policies=self.rbac_policies
349
341
  )
@@ -400,9 +392,7 @@ class TestDeleteNetworkRBAC(TestNetworkRBAC):
400
392
  parsed_args = self.check_parser(self.cmd, arglist, verifylist)
401
393
 
402
394
  find_mock_result = [self.rbac_policies[0], exceptions.CommandError]
403
- self.network_client.find_rbac_policy = mock.Mock(
404
- side_effect=find_mock_result
405
- )
395
+ self.network_client.find_rbac_policy.side_effect = find_mock_result
406
396
 
407
397
  try:
408
398
  self.cmd.take_action(parsed_args)
@@ -462,9 +452,7 @@ class TestListNetworkRABC(TestNetworkRBAC):
462
452
  # Get the command object to test
463
453
  self.cmd = network_rbac.ListNetworkRBAC(self.app, None)
464
454
 
465
- self.network_client.rbac_policies = mock.Mock(
466
- return_value=self.rbac_policies
467
- )
455
+ self.network_client.rbac_policies.return_value = self.rbac_policies
468
456
 
469
457
  self.project = identity_fakes_v3.FakeProject.create_one_project()
470
458
  self.projects_mock.get.return_value = self.project
@@ -564,10 +552,9 @@ class TestSetNetworkRBAC(TestNetworkRBAC):
564
552
  # Get the command object to test
565
553
  self.cmd = network_rbac.SetNetworkRBAC(self.app, None)
566
554
 
567
- self.network_client.find_rbac_policy = mock.Mock(
568
- return_value=self.rbac_policy
569
- )
570
- self.network_client.update_rbac_policy = mock.Mock(return_value=None)
555
+ self.network_client.find_rbac_policy.return_value = self.rbac_policy
556
+
557
+ self.network_client.update_rbac_policy.return_value = None
571
558
  self.projects_mock.get.return_value = self.project
572
559
 
573
560
  def test_network_rbac_set_nothing(self):
@@ -639,9 +626,7 @@ class TestShowNetworkRBAC(TestNetworkRBAC):
639
626
  # Get the command object to test
640
627
  self.cmd = network_rbac.ShowNetworkRBAC(self.app, None)
641
628
 
642
- self.network_client.find_rbac_policy = mock.Mock(
643
- return_value=self.rbac_policy
644
- )
629
+ self.network_client.find_rbac_policy.return_value = self.rbac_policy
645
630
 
646
631
  def test_show_no_options(self):
647
632
  arglist = []