python-openstackclient 8.3.0__py3-none-any.whl → 10.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 (292) hide show
  1. openstackclient/__init__.py +2 -6
  2. openstackclient/api/api.py +41 -23
  3. openstackclient/api/compute_v2.py +44 -25
  4. openstackclient/api/object_store_v1.py +75 -97
  5. openstackclient/api/volume_v2.py +2 -1
  6. openstackclient/api/volume_v3.py +2 -1
  7. openstackclient/common/availability_zone.py +58 -42
  8. openstackclient/common/clientmanager.py +56 -29
  9. openstackclient/common/configuration.py +10 -3
  10. openstackclient/common/envvars.py +2 -2
  11. openstackclient/common/extension.py +14 -5
  12. openstackclient/common/limits.py +10 -5
  13. openstackclient/common/module.py +14 -6
  14. openstackclient/common/pagination.py +8 -2
  15. openstackclient/common/progressbar.py +7 -6
  16. openstackclient/common/project_cleanup.py +13 -7
  17. openstackclient/common/quota.py +126 -114
  18. openstackclient/common/versions.py +8 -2
  19. openstackclient/compute/client.py +7 -3
  20. openstackclient/compute/v2/agent.py +17 -10
  21. openstackclient/compute/v2/aggregate.py +36 -22
  22. openstackclient/compute/v2/console.py +14 -8
  23. openstackclient/compute/v2/console_connection.py +11 -3
  24. openstackclient/compute/v2/flavor.py +39 -21
  25. openstackclient/compute/v2/host.py +14 -6
  26. openstackclient/compute/v2/hypervisor.py +14 -5
  27. openstackclient/compute/v2/hypervisor_stats.py +10 -2
  28. openstackclient/compute/v2/keypair.py +29 -14
  29. openstackclient/compute/v2/server.py +251 -171
  30. openstackclient/compute/v2/server_backup.py +10 -4
  31. openstackclient/compute/v2/server_event.py +21 -12
  32. openstackclient/compute/v2/server_group.py +21 -11
  33. openstackclient/compute/v2/server_image.py +19 -10
  34. openstackclient/compute/v2/server_migration.py +24 -10
  35. openstackclient/compute/v2/server_share.py +274 -0
  36. openstackclient/compute/v2/server_volume.py +10 -4
  37. openstackclient/compute/v2/service.py +14 -7
  38. openstackclient/compute/v2/usage.py +26 -21
  39. openstackclient/identity/client.py +8 -3
  40. openstackclient/identity/common.py +103 -41
  41. openstackclient/identity/v2_0/catalog.py +14 -7
  42. openstackclient/identity/v2_0/ec2creds.py +21 -10
  43. openstackclient/identity/v2_0/endpoint.py +23 -11
  44. openstackclient/identity/v2_0/project.py +25 -14
  45. openstackclient/identity/v2_0/role.py +28 -14
  46. openstackclient/identity/v2_0/role_assignment.py +9 -3
  47. openstackclient/identity/v2_0/service.py +26 -12
  48. openstackclient/identity/v2_0/token.py +12 -5
  49. openstackclient/identity/v2_0/user.py +26 -15
  50. openstackclient/identity/v3/access_rule.py +26 -12
  51. openstackclient/identity/v3/application_credential.py +59 -24
  52. openstackclient/identity/v3/catalog.py +14 -7
  53. openstackclient/identity/v3/consumer.py +22 -11
  54. openstackclient/identity/v3/credential.py +36 -16
  55. openstackclient/identity/v3/domain.py +37 -18
  56. openstackclient/identity/v3/ec2creds.py +25 -12
  57. openstackclient/identity/v3/endpoint.py +42 -20
  58. openstackclient/identity/v3/endpoint_group.py +28 -17
  59. openstackclient/identity/v3/federation_protocol.py +71 -50
  60. openstackclient/identity/v3/group.py +55 -32
  61. openstackclient/identity/v3/identity_provider.py +92 -57
  62. openstackclient/identity/v3/implied_role.py +21 -9
  63. openstackclient/identity/v3/limit.py +115 -92
  64. openstackclient/identity/v3/mapping.py +26 -13
  65. openstackclient/identity/v3/policy.py +23 -12
  66. openstackclient/identity/v3/project.py +211 -122
  67. openstackclient/identity/v3/region.py +36 -16
  68. openstackclient/identity/v3/registered_limit.py +116 -109
  69. openstackclient/identity/v3/role.py +61 -31
  70. openstackclient/identity/v3/role_assignment.py +23 -6
  71. openstackclient/identity/v3/service.py +36 -16
  72. openstackclient/identity/v3/service_provider.py +37 -15
  73. openstackclient/identity/v3/tag.py +23 -17
  74. openstackclient/identity/v3/token.py +30 -14
  75. openstackclient/identity/v3/trust.py +32 -14
  76. openstackclient/identity/v3/unscoped_saml.py +10 -2
  77. openstackclient/identity/v3/user.py +49 -26
  78. openstackclient/image/client.py +7 -3
  79. openstackclient/image/v1/image.py +33 -26
  80. openstackclient/image/v2/cache.py +14 -9
  81. openstackclient/image/v2/image.py +76 -49
  82. openstackclient/image/v2/info.py +7 -1
  83. openstackclient/image/v2/metadef_namespaces.py +109 -13
  84. openstackclient/image/v2/metadef_objects.py +28 -15
  85. openstackclient/image/v2/metadef_properties.py +24 -13
  86. openstackclient/image/v2/metadef_resource_type_association.py +14 -7
  87. openstackclient/image/v2/metadef_resource_types.py +7 -1
  88. openstackclient/image/v2/task.py +15 -6
  89. openstackclient/locale/tr_TR/LC_MESSAGES/openstackclient.po +7 -192
  90. openstackclient/network/client.py +7 -2
  91. openstackclient/network/common.py +16 -241
  92. openstackclient/network/utils.py +36 -22
  93. openstackclient/network/v2/address_group.py +27 -16
  94. openstackclient/network/v2/address_scope.py +24 -13
  95. openstackclient/network/v2/bgpvpn/bgpvpn.py +463 -0
  96. openstackclient/network/v2/bgpvpn/constants.py +30 -0
  97. openstackclient/network/v2/bgpvpn/network_association.py +214 -0
  98. openstackclient/network/v2/bgpvpn/port_association.py +490 -0
  99. openstackclient/network/v2/bgpvpn/router_association.py +288 -0
  100. openstackclient/network/v2/default_security_group_rule.py +19 -10
  101. openstackclient/network/v2/floating_ip.py +110 -159
  102. openstackclient/network/v2/floating_ip_port_forwarding.py +30 -18
  103. openstackclient/network/v2/fwaas/__init__.py +0 -0
  104. openstackclient/network/v2/fwaas/group.py +466 -0
  105. openstackclient/network/v2/fwaas/policy.py +518 -0
  106. openstackclient/network/v2/fwaas/rule.py +574 -0
  107. openstackclient/network/v2/ip_availability.py +13 -5
  108. openstackclient/network/v2/l3_conntrack_helper.py +22 -13
  109. openstackclient/network/v2/local_ip.py +24 -13
  110. openstackclient/network/v2/local_ip_association.py +14 -7
  111. openstackclient/network/v2/ndp_proxy.py +20 -11
  112. openstackclient/network/v2/network.py +129 -196
  113. openstackclient/network/v2/network_agent.py +46 -25
  114. openstackclient/network/v2/network_auto_allocated_topology.py +22 -11
  115. openstackclient/network/v2/network_flavor.py +27 -16
  116. openstackclient/network/v2/network_flavor_profile.py +23 -12
  117. openstackclient/network/v2/network_meter.py +21 -10
  118. openstackclient/network/v2/network_meter_rule.py +21 -11
  119. openstackclient/network/v2/network_qos_policy.py +25 -15
  120. openstackclient/network/v2/network_qos_rule.py +32 -17
  121. openstackclient/network/v2/network_qos_rule_type.py +13 -5
  122. openstackclient/network/v2/network_rbac.py +23 -12
  123. openstackclient/network/v2/network_segment.py +20 -11
  124. openstackclient/network/v2/network_segment_range.py +56 -29
  125. openstackclient/network/v2/network_service_provider.py +7 -1
  126. openstackclient/network/v2/network_trunk.py +38 -22
  127. openstackclient/network/v2/port.py +54 -29
  128. openstackclient/network/v2/router.py +75 -52
  129. openstackclient/network/v2/security_group.py +87 -157
  130. openstackclient/network/v2/security_group_rule.py +100 -280
  131. openstackclient/network/v2/subnet.py +49 -28
  132. openstackclient/network/v2/subnet_pool.py +30 -17
  133. openstackclient/network/v2/taas/tap_flow.py +22 -11
  134. openstackclient/network/v2/taas/tap_mirror.py +22 -11
  135. openstackclient/network/v2/taas/tap_service.py +23 -12
  136. openstackclient/object/client.py +7 -2
  137. openstackclient/object/v1/account.py +13 -6
  138. openstackclient/object/v1/container.py +25 -15
  139. openstackclient/object/v1/object.py +25 -15
  140. openstackclient/py.typed +0 -0
  141. openstackclient/shell.py +46 -10
  142. openstackclient/tests/functional/base.py +55 -20
  143. openstackclient/tests/functional/common/test_extension.py +4 -0
  144. openstackclient/tests/functional/common/test_quota.py +3 -1
  145. openstackclient/tests/functional/compute/v2/common.py +14 -13
  146. openstackclient/tests/functional/compute/v2/test_flavor.py +3 -1
  147. openstackclient/tests/functional/compute/v2/test_server.py +3 -0
  148. openstackclient/tests/functional/identity/v2/common.py +10 -6
  149. openstackclient/tests/functional/identity/v2/test_role.py +4 -4
  150. openstackclient/tests/functional/identity/v3/common.py +25 -19
  151. openstackclient/tests/functional/identity/v3/test_group.py +20 -20
  152. openstackclient/tests/functional/identity/v3/test_idp.py +3 -1
  153. openstackclient/tests/functional/identity/v3/test_limit.py +47 -0
  154. openstackclient/tests/functional/identity/v3/test_project.py +10 -10
  155. openstackclient/tests/functional/identity/v3/test_role.py +18 -18
  156. openstackclient/tests/functional/identity/v3/test_role_assignment.py +12 -12
  157. openstackclient/tests/functional/identity/v3/test_user.py +8 -8
  158. openstackclient/tests/functional/image/base.py +1 -6
  159. openstackclient/tests/functional/image/v2/test_metadef_objects.py +69 -0
  160. openstackclient/tests/functional/network/v2/common.py +5 -2
  161. openstackclient/tests/functional/network/v2/test_floating_ip.py +10 -4
  162. openstackclient/tests/functional/network/v2/test_ip_availability.py +4 -0
  163. openstackclient/tests/functional/network/v2/test_network_meter_rule.py +3 -2
  164. openstackclient/tests/functional/network/v2/test_network_segment.py +5 -0
  165. openstackclient/tests/functional/network/v2/test_subnet.py +13 -9
  166. openstackclient/tests/functional/object/v1/common.py +4 -0
  167. openstackclient/tests/functional/volume/v2/common.py +4 -0
  168. openstackclient/tests/functional/volume/v2/test_volume_snapshot.py +27 -11
  169. openstackclient/tests/functional/volume/v2/test_volume_type.py +2 -2
  170. openstackclient/tests/functional/volume/v3/common.py +4 -0
  171. openstackclient/tests/functional/volume/v3/test_volume_snapshot.py +56 -138
  172. openstackclient/tests/functional/volume/v3/test_volume_type.py +2 -2
  173. openstackclient/tests/unit/common/test_availability_zone.py +35 -49
  174. openstackclient/tests/unit/common/test_extension.py +2 -2
  175. openstackclient/tests/unit/common/test_module.py +12 -7
  176. openstackclient/tests/unit/common/test_project_cleanup.py +3 -1
  177. openstackclient/tests/unit/common/test_quota.py +62 -23
  178. openstackclient/tests/unit/compute/v2/fakes.py +25 -0
  179. openstackclient/tests/unit/compute/v2/test_flavor.py +28 -2
  180. openstackclient/tests/unit/compute/v2/test_keypair.py +6 -6
  181. openstackclient/tests/unit/compute/v2/test_server.py +17 -104
  182. openstackclient/tests/unit/compute/v2/test_server_share.py +287 -0
  183. openstackclient/tests/unit/identity/v3/fakes.py +3 -0
  184. openstackclient/tests/unit/identity/v3/test_group.py +4 -14
  185. openstackclient/tests/unit/identity/v3/test_identity_provider.py +303 -299
  186. openstackclient/tests/unit/identity/v3/test_limit.py +197 -145
  187. openstackclient/tests/unit/identity/v3/test_project.py +831 -512
  188. openstackclient/tests/unit/identity/v3/test_protocol.py +97 -88
  189. openstackclient/tests/unit/identity/v3/test_registered_limit.py +355 -220
  190. openstackclient/tests/unit/identity/v3/test_user.py +4 -4
  191. openstackclient/tests/unit/image/v2/test_image.py +16 -16
  192. openstackclient/tests/unit/image/v2/test_metadef_namespaces.py +105 -6
  193. openstackclient/tests/unit/network/test_common.py +0 -155
  194. openstackclient/tests/unit/network/v2/bgpvpn/__init__.py +0 -0
  195. openstackclient/tests/unit/network/v2/bgpvpn/fakes.py +179 -0
  196. openstackclient/tests/unit/network/v2/bgpvpn/test_bgpvpn.py +584 -0
  197. openstackclient/tests/unit/network/v2/bgpvpn/test_network_association.py +285 -0
  198. openstackclient/tests/unit/network/v2/bgpvpn/test_port_association.py +384 -0
  199. openstackclient/tests/unit/network/v2/bgpvpn/test_router_association.py +297 -0
  200. openstackclient/tests/unit/network/v2/fwaas/__init__.py +0 -0
  201. openstackclient/tests/unit/network/v2/fwaas/test_group.py +897 -0
  202. openstackclient/tests/unit/network/v2/fwaas/test_policy.py +869 -0
  203. openstackclient/tests/unit/network/v2/fwaas/test_rule.py +980 -0
  204. openstackclient/tests/unit/network/v2/taas/{test_osc_tap_flow.py → test_tap_flow.py} +18 -25
  205. openstackclient/tests/unit/network/v2/taas/{test_osc_tap_mirror.py → test_tap_mirror.py} +19 -29
  206. openstackclient/tests/unit/network/v2/taas/{test_osc_tap_service.py → test_tap_service.py} +19 -29
  207. openstackclient/tests/unit/network/v2/test_address_group.py +2 -2
  208. openstackclient/tests/unit/network/v2/{test_floating_ip_network.py → test_floating_ip.py} +3 -2
  209. openstackclient/tests/unit/network/v2/test_floating_ip_port_forwarding.py +13 -13
  210. openstackclient/tests/unit/network/v2/test_network_agent.py +8 -4
  211. openstackclient/tests/unit/network/v2/test_network_auto_allocated_topology.py +3 -3
  212. openstackclient/tests/unit/network/v2/test_network_flavor.py +2 -2
  213. openstackclient/tests/unit/network/v2/test_network_qos_policy.py +1 -1
  214. openstackclient/tests/unit/network/v2/test_network_qos_rule.py +2 -2
  215. openstackclient/tests/unit/network/v2/test_network_rbac.py +1 -1
  216. openstackclient/tests/unit/network/v2/test_network_segment.py +1 -1
  217. openstackclient/tests/unit/network/v2/test_network_segment_range.py +7 -10
  218. openstackclient/tests/unit/network/v2/test_network_trunk.py +1 -1
  219. openstackclient/tests/unit/network/v2/test_router.py +8 -9
  220. openstackclient/tests/unit/network/v2/{test_security_group_network.py → test_security_group.py} +1 -20
  221. openstackclient/tests/unit/network/v2/{test_security_group_rule_network.py → test_security_group_rule.py} +7 -41
  222. openstackclient/tests/unit/network/v2/test_subnet.py +2 -1
  223. openstackclient/tests/unit/network/v2/test_subnet_pool.py +2 -1
  224. openstackclient/tests/unit/object/v1/fakes.py +8 -7
  225. openstackclient/tests/unit/object/v1/test_container.py +65 -101
  226. openstackclient/tests/unit/object/v1/test_container_all.py +8 -1
  227. openstackclient/tests/unit/object/v1/test_object.py +44 -84
  228. openstackclient/tests/unit/object/v1/test_object_all.py +8 -1
  229. openstackclient/tests/unit/test_hacking.py +108 -0
  230. openstackclient/tests/unit/volume/v2/fakes.py +1 -0
  231. openstackclient/tests/unit/volume/v2/test_consistency_group.py +8 -2
  232. openstackclient/tests/unit/volume/v2/test_volume.py +7 -6
  233. openstackclient/tests/unit/volume/v2/test_volume_backup.py +1 -5
  234. openstackclient/tests/unit/volume/v2/test_volume_snapshot.py +2 -1
  235. openstackclient/tests/unit/volume/v2/test_volume_type.py +2 -4
  236. openstackclient/tests/unit/volume/v3/fakes.py +1 -0
  237. openstackclient/tests/unit/volume/v3/test_volume.py +94 -15
  238. openstackclient/tests/unit/volume/v3/test_volume_attachment.py +1 -1
  239. openstackclient/tests/unit/volume/v3/test_volume_backup.py +1 -5
  240. openstackclient/tests/unit/volume/v3/test_volume_snapshot.py +55 -1
  241. openstackclient/tests/unit/volume/v3/test_volume_type.py +2 -4
  242. openstackclient/volume/client.py +7 -3
  243. openstackclient/volume/v2/backup_record.py +15 -6
  244. openstackclient/volume/v2/consistency_group.py +37 -25
  245. openstackclient/volume/v2/consistency_group_snapshot.py +27 -12
  246. openstackclient/volume/v2/qos_specs.py +30 -19
  247. openstackclient/volume/v2/service.py +17 -6
  248. openstackclient/volume/v2/volume.py +69 -34
  249. openstackclient/volume/v2/volume_backend.py +19 -6
  250. openstackclient/volume/v2/volume_backup.py +48 -22
  251. openstackclient/volume/v2/volume_host.py +6 -4
  252. openstackclient/volume/v2/volume_snapshot.py +52 -26
  253. openstackclient/volume/v2/volume_transfer_request.py +33 -15
  254. openstackclient/volume/v2/volume_type.py +46 -27
  255. openstackclient/volume/v3/block_storage_cleanup.py +11 -3
  256. openstackclient/volume/v3/block_storage_cluster.py +19 -7
  257. openstackclient/volume/v3/block_storage_log_level.py +15 -6
  258. openstackclient/volume/v3/block_storage_manage.py +10 -4
  259. openstackclient/volume/v3/block_storage_resource_filter.py +17 -5
  260. openstackclient/volume/v3/service.py +16 -6
  261. openstackclient/volume/v3/volume.py +103 -46
  262. openstackclient/volume/v3/volume_attachment.py +43 -21
  263. openstackclient/volume/v3/volume_backup.py +55 -26
  264. openstackclient/volume/v3/volume_group.py +23 -13
  265. openstackclient/volume/v3/volume_group_snapshot.py +32 -13
  266. openstackclient/volume/v3/volume_group_type.py +26 -13
  267. openstackclient/volume/v3/volume_message.py +15 -7
  268. openstackclient/volume/v3/volume_snapshot.py +71 -34
  269. openstackclient/volume/v3/volume_transfer_request.py +33 -15
  270. openstackclient/volume/v3/volume_type.py +45 -27
  271. {python_openstackclient-8.3.0.dist-info → python_openstackclient-10.0.0.dist-info}/METADATA +6 -6
  272. {python_openstackclient-8.3.0.dist-info → python_openstackclient-10.0.0.dist-info}/RECORD +279 -267
  273. {python_openstackclient-8.3.0.dist-info → python_openstackclient-10.0.0.dist-info}/WHEEL +1 -1
  274. {python_openstackclient-8.3.0.dist-info → python_openstackclient-10.0.0.dist-info}/entry_points.txt +53 -1
  275. {python_openstackclient-8.3.0.dist-info → python_openstackclient-10.0.0.dist-info}/licenses/AUTHORS +9 -0
  276. python_openstackclient-10.0.0.dist-info/pbr.json +1 -0
  277. openstackclient/api/image_v1.py +0 -69
  278. openstackclient/api/image_v2.py +0 -79
  279. openstackclient/network/v2/floating_ip_pool.py +0 -38
  280. openstackclient/tests/functional/image/v1/test_image.py +0 -97
  281. openstackclient/tests/unit/api/test_image_v1.py +0 -96
  282. openstackclient/tests/unit/api/test_image_v2.py +0 -96
  283. openstackclient/tests/unit/network/v2/test_floating_ip_compute.py +0 -248
  284. openstackclient/tests/unit/network/v2/test_floating_ip_pool_compute.py +0 -49
  285. openstackclient/tests/unit/network/v2/test_floating_ip_pool_network.py +0 -39
  286. openstackclient/tests/unit/network/v2/test_network_compute.py +0 -404
  287. openstackclient/tests/unit/network/v2/test_security_group_compute.py +0 -392
  288. openstackclient/tests/unit/network/v2/test_security_group_rule_compute.py +0 -555
  289. python_openstackclient-8.3.0.dist-info/pbr.json +0 -1
  290. /openstackclient/{tests/functional/image/v1 → network/v2/bgpvpn}/__init__.py +0 -0
  291. {python_openstackclient-8.3.0.dist-info → python_openstackclient-10.0.0.dist-info}/licenses/LICENSE +0 -0
  292. {python_openstackclient-8.3.0.dist-info → python_openstackclient-10.0.0.dist-info}/top_level.txt +0 -0
openstackclient/tests/unit/identity/v3/test_protocol.py CHANGED
@@ -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)