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
@@ -12,202 +12,211 @@
12
12
  # License for the specific language governing permissions and limitations
13
13
  # under the License.
14
14
 
15
- import copy
16
-
15
+ from openstack.identity.v3 import federation_protocol as _federation_protocol
16
+ from openstack.identity.v3 import mapping as _mapping
17
+ from openstack.test import fakes as sdk_fakes
17
18
  from openstackclient.identity.v3 import federation_protocol
18
- from openstackclient.tests.unit import fakes
19
19
  from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
20
20
 
21
21
 
22
- class TestProtocol(identity_fakes.TestFederatedIdentity):
23
- def setUp(self):
24
- super().setUp()
25
-
26
- federation_lib = self.identity_client.federation
27
- self.protocols_mock = federation_lib.protocols
28
- self.protocols_mock.reset_mock()
29
-
30
-
31
- class TestProtocolCreate(TestProtocol):
22
+ class TestProtocolCreate(identity_fakes.TestFederatedIdentity):
32
23
  def setUp(self):
33
24
  super().setUp()
34
25
 
35
- proto = copy.deepcopy(identity_fakes.PROTOCOL_OUTPUT)
36
- resource = fakes.FakeResource(None, proto, loaded=True)
37
- self.protocols_mock.create.return_value = resource
26
+ self.proto = sdk_fakes.generate_fake_resource(
27
+ _federation_protocol.FederationProtocol
28
+ )
29
+ self.identity_sdk_client.create_federation_protocol.return_value = (
30
+ self.proto
31
+ )
38
32
  self.cmd = federation_protocol.CreateProtocol(self.app, None)
39
33
 
40
34
  def test_create_protocol(self):
41
35
  argslist = [
42
- identity_fakes.protocol_id,
36
+ self.proto.name,
43
37
  '--identity-provider',
44
- identity_fakes.idp_id,
38
+ self.proto.idp_id,
45
39
  '--mapping',
46
- identity_fakes.mapping_id,
40
+ self.proto.mapping_id,
47
41
  ]
48
42
 
49
43
  verifylist = [
50
- ('federation_protocol', identity_fakes.protocol_id),
51
- ('identity_provider', identity_fakes.idp_id),
52
- ('mapping', identity_fakes.mapping_id),
44
+ ('federation_protocol', self.proto.name),
45
+ ('identity_provider', self.proto.idp_id),
46
+ ('mapping', self.proto.mapping_id),
53
47
  ]
54
48
  parsed_args = self.check_parser(self.cmd, argslist, verifylist)
55
49
  columns, data = self.cmd.take_action(parsed_args)
56
- self.protocols_mock.create.assert_called_with(
57
- protocol_id=identity_fakes.protocol_id,
58
- identity_provider=identity_fakes.idp_id,
59
- mapping=identity_fakes.mapping_id,
50
+ self.identity_sdk_client.create_federation_protocol.assert_called_with(
51
+ name=self.proto.id,
52
+ idp_id=self.proto.idp_id,
53
+ mapping_id=self.proto.mapping_id,
60
54
  )
61
55
 
62
56
  collist = ('id', 'identity_provider', 'mapping')
63
57
  self.assertEqual(collist, columns)
64
58
 
65
59
  datalist = (
66
- identity_fakes.protocol_id,
67
- identity_fakes.idp_id,
68
- identity_fakes.mapping_id,
60
+ self.proto.id,
61
+ self.proto.idp_id,
62
+ self.proto.mapping_id,
69
63
  )
70
64
  self.assertEqual(datalist, data)
71
65
 
72
66
 
73
- class TestProtocolDelete(TestProtocol):
67
+ class TestProtocolDelete(identity_fakes.TestFederatedIdentity):
74
68
  def setUp(self):
75
69
  super().setUp()
76
70
 
77
- # This is the return value for utils.find_resource()
78
- self.protocols_mock.get.return_value = fakes.FakeResource(
79
- None,
80
- copy.deepcopy(identity_fakes.PROTOCOL_OUTPUT),
81
- loaded=True,
71
+ self.proto = sdk_fakes.generate_fake_resource(
72
+ _federation_protocol.FederationProtocol
82
73
  )
83
-
84
- self.protocols_mock.delete.return_value = None
74
+ self.identity_sdk_client.delete_federation_protocol.return_value = None
85
75
  self.cmd = federation_protocol.DeleteProtocol(self.app, None)
86
76
 
87
- def test_delete_identity_provider(self):
77
+ def test_delete_protocol(self):
88
78
  arglist = [
89
79
  '--identity-provider',
90
- identity_fakes.idp_id,
91
- identity_fakes.protocol_id,
80
+ self.proto.idp_id,
81
+ self.proto.name,
92
82
  ]
93
83
  verifylist = [
94
- ('federation_protocol', [identity_fakes.protocol_id]),
95
- ('identity_provider', identity_fakes.idp_id),
84
+ ('federation_protocol', [self.proto.id]),
85
+ ('identity_provider', self.proto.idp_id),
96
86
  ]
97
87
  parsed_args = self.check_parser(self.cmd, arglist, verifylist)
98
88
 
99
89
  result = self.cmd.take_action(parsed_args)
100
90
 
101
- self.protocols_mock.delete.assert_called_with(
102
- identity_fakes.idp_id, identity_fakes.protocol_id
91
+ self.identity_sdk_client.delete_federation_protocol.assert_called_with(
92
+ idp_id=self.proto.idp_id,
93
+ protocol=self.proto.id,
94
+ ignore_missing=False,
103
95
  )
104
96
  self.assertIsNone(result)
105
97
 
106
98
 
107
- class TestProtocolList(TestProtocol):
99
+ class TestProtocolList(identity_fakes.TestFederatedIdentity):
108
100
  def setUp(self):
109
101
  super().setUp()
110
102
 
111
- self.protocols_mock.get.return_value = fakes.FakeResource(
112
- None, identity_fakes.PROTOCOL_ID_MAPPING, loaded=True
103
+ self.proto1 = sdk_fakes.generate_fake_resource(
104
+ _federation_protocol.FederationProtocol
113
105
  )
114
-
115
- self.protocols_mock.list.return_value = [
116
- fakes.FakeResource(
117
- None, identity_fakes.PROTOCOL_ID_MAPPING, loaded=True
118
- )
106
+ self.proto2 = sdk_fakes.generate_fake_resource(
107
+ _federation_protocol.FederationProtocol, idp_id=self.proto1
108
+ )
109
+ self.identity_sdk_client.federation_protocols.return_value = [
110
+ self.proto1,
111
+ self.proto2,
119
112
  ]
120
-
121
113
  self.cmd = federation_protocol.ListProtocols(self.app, None)
122
114
 
123
115
  def test_list_protocols(self):
124
- arglist = ['--identity-provider', identity_fakes.idp_id]
125
- verifylist = [('identity_provider', identity_fakes.idp_id)]
116
+ arglist = ['--identity-provider', self.proto1.idp_id]
117
+ verifylist = [('identity_provider', self.proto1.idp_id)]
126
118
 
127
119
  parsed_args = self.check_parser(self.cmd, arglist, verifylist)
128
120
  columns, data = self.cmd.take_action(parsed_args)
129
121
 
130
- self.protocols_mock.list.assert_called_with(identity_fakes.idp_id)
122
+ self.identity_sdk_client.federation_protocols.assert_called_with(
123
+ self.proto1.idp_id
124
+ )
131
125
 
126
+ self.assertEqual(columns, ('id', 'mapping'))
127
+ datalist = (
128
+ (
129
+ self.proto1.name,
130
+ self.proto1.mapping_id,
131
+ ),
132
+ (
133
+ self.proto2.name,
134
+ self.proto2.mapping_id,
135
+ ),
136
+ )
137
+ self.assertEqual(datalist, tuple(data))
132
138
 
133
- class TestProtocolSet(TestProtocol):
139
+
140
+ class TestProtocolSet(identity_fakes.TestFederatedIdentity):
134
141
  def setUp(self):
135
142
  super().setUp()
136
- self.protocols_mock.get.return_value = fakes.FakeResource(
137
- None, identity_fakes.PROTOCOL_OUTPUT, loaded=True
143
+ self.proto = sdk_fakes.generate_fake_resource(
144
+ _federation_protocol.FederationProtocol
138
145
  )
139
- self.protocols_mock.update.return_value = fakes.FakeResource(
140
- None, identity_fakes.PROTOCOL_OUTPUT_UPDATED, loaded=True
146
+ self.mapping = sdk_fakes.generate_fake_resource(_mapping.Mapping)
147
+ self.identity_sdk_client.update_federation_protocol.return_value = (
148
+ self.proto
141
149
  )
142
-
143
150
  self.cmd = federation_protocol.SetProtocol(self.app, None)
144
151
 
145
152
  def test_set_new_mapping(self):
146
153
  arglist = [
147
- identity_fakes.protocol_id,
154
+ self.proto.name,
148
155
  '--identity-provider',
149
- identity_fakes.idp_id,
156
+ self.proto.idp_id,
150
157
  '--mapping',
151
- identity_fakes.mapping_id,
158
+ self.mapping.name,
152
159
  ]
153
160
  verifylist = [
154
- ('identity_provider', identity_fakes.idp_id),
155
- ('federation_protocol', identity_fakes.protocol_id),
156
- ('mapping', identity_fakes.mapping_id),
161
+ ('identity_provider', self.proto.idp_id),
162
+ ('federation_protocol', self.proto.name),
163
+ ('mapping', self.mapping.name),
157
164
  ]
158
165
 
159
166
  parsed_args = self.check_parser(self.cmd, arglist, verifylist)
160
167
  columns, data = self.cmd.take_action(parsed_args)
161
168
 
162
- self.protocols_mock.update.assert_called_with(
163
- identity_fakes.idp_id,
164
- identity_fakes.protocol_id,
165
- identity_fakes.mapping_id,
169
+ self.identity_sdk_client.update_federation_protocol.assert_called_with(
170
+ idp_id=self.proto.idp_id,
171
+ name=self.proto.name,
172
+ mapping_id=self.mapping.id,
166
173
  )
167
174
 
168
175
  collist = ('id', 'identity_provider', 'mapping')
169
176
  self.assertEqual(collist, columns)
170
177
 
171
178
  datalist = (
172
- identity_fakes.protocol_id,
173
- identity_fakes.idp_id,
174
- identity_fakes.mapping_id_updated,
179
+ self.proto.name,
180
+ self.proto.idp_id,
181
+ self.proto.mapping_id,
175
182
  )
176
183
  self.assertEqual(datalist, data)
177
184
 
178
185
 
179
- class TestProtocolShow(TestProtocol):
186
+ class TestProtocolShow(identity_fakes.TestFederatedIdentity):
180
187
  def setUp(self):
181
188
  super().setUp()
182
- self.protocols_mock.get.return_value = fakes.FakeResource(
183
- None, identity_fakes.PROTOCOL_OUTPUT, loaded=False
189
+ self.proto = sdk_fakes.generate_fake_resource(
190
+ _federation_protocol.FederationProtocol
191
+ )
192
+ self.identity_sdk_client.get_federation_protocol.return_value = (
193
+ self.proto
184
194
  )
185
-
186
195
  self.cmd = federation_protocol.ShowProtocol(self.app, None)
187
196
 
188
197
  def test_show_protocol(self):
189
198
  arglist = [
190
- identity_fakes.protocol_id,
199
+ self.proto.name,
191
200
  '--identity-provider',
192
- identity_fakes.idp_id,
201
+ self.proto.idp_id,
193
202
  ]
194
203
  verifylist = [
195
- ('federation_protocol', identity_fakes.protocol_id),
196
- ('identity_provider', identity_fakes.idp_id),
204
+ ('federation_protocol', self.proto.name),
205
+ ('identity_provider', self.proto.idp_id),
197
206
  ]
198
207
  parsed_args = self.check_parser(self.cmd, arglist, verifylist)
199
208
 
200
209
  columns, data = self.cmd.take_action(parsed_args)
201
- self.protocols_mock.get.assert_called_with(
202
- identity_fakes.idp_id, identity_fakes.protocol_id
210
+ self.identity_sdk_client.get_federation_protocol.assert_called_with(
211
+ idp_id=self.proto.idp_id, protocol=self.proto.name
203
212
  )
204
213
 
205
214
  collist = ('id', 'identity_provider', 'mapping')
206
215
  self.assertEqual(collist, columns)
207
216
 
208
217
  datalist = (
209
- identity_fakes.protocol_id,
210
- identity_fakes.idp_id,
211
- identity_fakes.mapping_id,
218
+ self.proto.name,
219
+ self.proto.idp_id,
220
+ self.proto.mapping_id,
212
221
  )
213
222
  self.assertEqual(datalist, data)