python-openstackclient 6.6.1__py3-none-any.whl → 7.1.0__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- openstackclient/api/api.py +4 -4
- openstackclient/api/compute_v2.py +352 -638
- openstackclient/api/image_v1.py +1 -1
- openstackclient/api/object_store_v1.py +3 -4
- openstackclient/common/availability_zone.py +1 -1
- openstackclient/common/clientmanager.py +24 -20
- openstackclient/common/configuration.py +1 -1
- openstackclient/common/extension.py +1 -1
- openstackclient/common/limits.py +67 -34
- openstackclient/common/module.py +3 -3
- openstackclient/common/progressbar.py +2 -2
- openstackclient/common/project_cleanup.py +5 -2
- openstackclient/common/quota.py +299 -423
- openstackclient/common/versions.py +1 -1
- openstackclient/compute/client.py +7 -116
- openstackclient/compute/v2/agent.py +75 -49
- openstackclient/compute/v2/aggregate.py +38 -32
- openstackclient/compute/v2/console.py +2 -2
- openstackclient/compute/v2/flavor.py +6 -6
- openstackclient/compute/v2/host.py +38 -33
- openstackclient/compute/v2/hypervisor.py +9 -6
- openstackclient/compute/v2/keypair.py +7 -8
- openstackclient/compute/v2/server.py +479 -396
- openstackclient/compute/v2/server_backup.py +1 -1
- openstackclient/compute/v2/server_group.py +4 -4
- openstackclient/compute/v2/server_image.py +1 -1
- openstackclient/compute/v2/server_migration.py +3 -4
- openstackclient/compute/v2/service.py +4 -4
- openstackclient/compute/v2/usage.py +3 -3
- openstackclient/identity/common.py +34 -0
- openstackclient/identity/v2_0/catalog.py +2 -2
- openstackclient/identity/v2_0/ec2creds.py +4 -4
- openstackclient/identity/v2_0/endpoint.py +4 -4
- openstackclient/identity/v2_0/project.py +6 -6
- openstackclient/identity/v2_0/role.py +5 -5
- openstackclient/identity/v2_0/role_assignment.py +1 -1
- openstackclient/identity/v2_0/service.py +4 -4
- openstackclient/identity/v2_0/token.py +2 -2
- openstackclient/identity/v2_0/user.py +7 -7
- openstackclient/identity/v3/access_rule.py +3 -3
- openstackclient/identity/v3/application_credential.py +125 -43
- openstackclient/identity/v3/catalog.py +2 -2
- openstackclient/identity/v3/consumer.py +4 -4
- openstackclient/identity/v3/credential.py +5 -5
- openstackclient/identity/v3/domain.py +5 -5
- openstackclient/identity/v3/ec2creds.py +4 -4
- openstackclient/identity/v3/endpoint.py +7 -7
- openstackclient/identity/v3/endpoint_group.py +8 -10
- openstackclient/identity/v3/federation_protocol.py +5 -5
- openstackclient/identity/v3/group.py +8 -8
- openstackclient/identity/v3/identity_provider.py +5 -5
- openstackclient/identity/v3/implied_role.py +3 -3
- openstackclient/identity/v3/limit.py +5 -5
- openstackclient/identity/v3/mapping.py +5 -5
- openstackclient/identity/v3/policy.py +5 -5
- openstackclient/identity/v3/project.py +5 -5
- openstackclient/identity/v3/region.py +5 -5
- openstackclient/identity/v3/registered_limit.py +5 -5
- openstackclient/identity/v3/role.py +7 -7
- openstackclient/identity/v3/role_assignment.py +92 -140
- openstackclient/identity/v3/service.py +64 -34
- openstackclient/identity/v3/service_provider.py +4 -4
- openstackclient/identity/v3/tag.py +2 -2
- openstackclient/identity/v3/token.py +5 -5
- openstackclient/identity/v3/trust.py +3 -3
- openstackclient/identity/v3/user.py +144 -80
- openstackclient/image/client.py +4 -4
- openstackclient/image/v1/image.py +8 -9
- openstackclient/image/v2/cache.py +12 -10
- openstackclient/image/v2/metadef_objects.py +44 -0
- openstackclient/image/v2/metadef_resource_type_association.py +189 -0
- openstackclient/image/v2/task.py +1 -1
- openstackclient/network/common.py +6 -5
- openstackclient/network/utils.py +2 -2
- openstackclient/network/v2/address_group.py +6 -6
- openstackclient/network/v2/address_scope.py +5 -5
- openstackclient/network/v2/default_security_group_rule.py +1 -1
- openstackclient/network/v2/floating_ip.py +8 -10
- openstackclient/network/v2/floating_ip_pool.py +6 -15
- openstackclient/network/v2/floating_ip_port_forwarding.py +5 -13
- openstackclient/network/v2/ip_availability.py +2 -2
- openstackclient/network/v2/l3_conntrack_helper.py +5 -5
- openstackclient/network/v2/network.py +8 -8
- openstackclient/network/v2/network_agent.py +8 -8
- openstackclient/network/v2/network_auto_allocated_topology.py +2 -2
- openstackclient/network/v2/network_flavor.py +6 -8
- openstackclient/network/v2/network_flavor_profile.py +4 -4
- openstackclient/network/v2/network_meter.py +3 -3
- openstackclient/network/v2/network_meter_rule.py +3 -3
- openstackclient/network/v2/network_qos_policy.py +5 -5
- openstackclient/network/v2/network_qos_rule.py +9 -9
- openstackclient/network/v2/network_qos_rule_type.py +1 -1
- openstackclient/network/v2/network_rbac.py +5 -5
- openstackclient/network/v2/network_segment.py +5 -5
- openstackclient/network/v2/network_segment_range.py +7 -7
- openstackclient/network/v2/network_trunk.py +7 -7
- openstackclient/network/v2/port.py +26 -12
- openstackclient/network/v2/router.py +403 -54
- openstackclient/network/v2/security_group.py +18 -14
- openstackclient/network/v2/security_group_rule.py +18 -15
- openstackclient/network/v2/subnet.py +15 -8
- openstackclient/network/v2/subnet_pool.py +6 -6
- openstackclient/object/v1/account.py +2 -2
- openstackclient/object/v1/container.py +7 -7
- openstackclient/object/v1/object.py +7 -7
- openstackclient/releasenotes/notes/volume-backup-created-at-list-b49ec893ae1f6b0d.yaml +4 -0
- openstackclient/shell.py +4 -6
- openstackclient/tests/functional/base.py +1 -1
- openstackclient/tests/functional/common/test_extension.py +1 -1
- openstackclient/tests/functional/common/test_help.py +2 -2
- openstackclient/tests/functional/common/test_module.py +1 -1
- openstackclient/tests/functional/common/test_quota.py +43 -61
- openstackclient/tests/functional/compute/v2/common.py +2 -2
- openstackclient/tests/functional/compute/v2/test_flavor.py +2 -2
- openstackclient/tests/functional/compute/v2/test_keypair.py +1 -1
- openstackclient/tests/functional/compute/v2/test_server.py +5 -5
- openstackclient/tests/functional/compute/v2/test_server_event.py +1 -1
- openstackclient/tests/functional/identity/v2/common.py +3 -3
- openstackclient/tests/functional/identity/v3/common.py +12 -4
- openstackclient/tests/functional/identity/v3/test_application_credential.py +6 -12
- openstackclient/tests/functional/identity/v3/test_domain.py +1 -3
- openstackclient/tests/functional/identity/v3/test_endpoint.py +1 -1
- openstackclient/tests/functional/identity/v3/test_idp.py +1 -1
- openstackclient/tests/functional/identity/v3/test_region.py +1 -3
- openstackclient/tests/functional/identity/v3/test_role.py +2 -2
- openstackclient/tests/functional/identity/v3/test_role_assignment.py +210 -0
- openstackclient/tests/functional/identity/v3/test_service.py +1 -3
- openstackclient/tests/functional/identity/v3/test_service_provider.py +1 -3
- openstackclient/tests/functional/image/base.py +1 -1
- openstackclient/tests/functional/image/v2/test_image.py +1 -1
- openstackclient/tests/functional/image/v2/test_info.py +1 -1
- openstackclient/tests/functional/network/v2/common.py +4 -6
- openstackclient/tests/functional/network/v2/test_network.py +5 -3
- openstackclient/tests/functional/network/v2/test_network_agent.py +7 -5
- openstackclient/tests/functional/network/v2/test_network_qos_rule.py +4 -4
- openstackclient/tests/functional/network/v2/test_port.py +11 -7
- openstackclient/tests/functional/network/v2/test_router.py +2 -2
- openstackclient/tests/functional/object/v1/common.py +1 -1
- openstackclient/tests/functional/object/v1/test_container.py +3 -3
- openstackclient/tests/functional/object/v1/test_object.py +9 -13
- openstackclient/tests/functional/volume/base.py +1 -1
- openstackclient/tests/functional/volume/v1/test_service.py +1 -1
- openstackclient/tests/functional/volume/v1/test_snapshot.py +2 -2
- openstackclient/tests/functional/volume/v1/test_transfer_request.py +2 -2
- openstackclient/tests/functional/volume/v1/test_volume_type.py +1 -1
- openstackclient/tests/functional/volume/v2/test_service.py +2 -2
- openstackclient/tests/functional/volume/v2/test_volume_backup.py +2 -2
- openstackclient/tests/functional/volume/v2/test_volume_snapshot.py +2 -2
- openstackclient/tests/functional/volume/v2/test_volume_type.py +1 -1
- openstackclient/tests/functional/volume/v3/test_volume_snapshot.py +2 -2
- openstackclient/tests/functional/volume/v3/test_volume_type.py +1 -1
- openstackclient/tests/unit/api/fakes.py +1 -1
- openstackclient/tests/unit/api/test_api.py +2 -2
- openstackclient/tests/unit/api/test_compute_v2.py +522 -707
- openstackclient/tests/unit/api/test_image_v1.py +1 -1
- openstackclient/tests/unit/api/test_image_v2.py +1 -1
- openstackclient/tests/unit/api/test_object_store_v1.py +4 -4
- openstackclient/tests/unit/common/test_limits.py +73 -35
- openstackclient/tests/unit/common/test_logs.py +2 -2
- openstackclient/tests/unit/common/test_module.py +4 -2
- openstackclient/tests/unit/common/test_project_cleanup.py +31 -6
- openstackclient/tests/unit/common/test_quota.py +490 -630
- openstackclient/tests/unit/compute/v2/fakes.py +37 -286
- openstackclient/tests/unit/compute/v2/test_agent.py +189 -147
- openstackclient/tests/unit/compute/v2/test_aggregate.py +87 -57
- openstackclient/tests/unit/compute/v2/test_console.py +4 -5
- openstackclient/tests/unit/compute/v2/test_flavor.py +59 -68
- openstackclient/tests/unit/compute/v2/test_host.py +83 -54
- openstackclient/tests/unit/compute/v2/test_hypervisor.py +57 -34
- openstackclient/tests/unit/compute/v2/test_hypervisor_stats.py +2 -2
- openstackclient/tests/unit/compute/v2/test_keypair.py +65 -50
- openstackclient/tests/unit/compute/v2/test_server.py +2850 -2453
- openstackclient/tests/unit/compute/v2/test_server_backup.py +1 -1
- openstackclient/tests/unit/compute/v2/test_server_event.py +14 -39
- openstackclient/tests/unit/compute/v2/test_server_group.py +28 -29
- openstackclient/tests/unit/compute/v2/test_server_migration.py +43 -68
- openstackclient/tests/unit/compute/v2/test_server_volume.py +17 -34
- openstackclient/tests/unit/compute/v2/test_service.py +34 -52
- openstackclient/tests/unit/compute/v2/test_usage.py +4 -4
- openstackclient/tests/unit/fakes.py +12 -12
- openstackclient/tests/unit/identity/v2_0/fakes.py +27 -10
- openstackclient/tests/unit/identity/v2_0/test_catalog.py +3 -3
- openstackclient/tests/unit/identity/v2_0/test_endpoint.py +7 -7
- openstackclient/tests/unit/identity/v2_0/test_project.py +8 -8
- openstackclient/tests/unit/identity/v2_0/test_role.py +10 -10
- openstackclient/tests/unit/identity/v2_0/test_role_assignment.py +4 -4
- openstackclient/tests/unit/identity/v2_0/test_service.py +6 -6
- openstackclient/tests/unit/identity/v2_0/test_token.py +4 -4
- openstackclient/tests/unit/identity/v2_0/test_user.py +8 -8
- openstackclient/tests/unit/identity/v3/fakes.py +59 -20
- openstackclient/tests/unit/identity/v3/test_access_rule.py +5 -5
- openstackclient/tests/unit/identity/v3/test_application_credential.py +207 -230
- openstackclient/tests/unit/identity/v3/test_catalog.py +3 -3
- openstackclient/tests/unit/identity/v3/test_consumer.py +7 -8
- openstackclient/tests/unit/identity/v3/test_credential.py +9 -9
- openstackclient/tests/unit/identity/v3/test_domain.py +8 -8
- openstackclient/tests/unit/identity/v3/test_endpoint.py +13 -13
- openstackclient/tests/unit/identity/v3/test_endpoint_group.py +12 -14
- openstackclient/tests/unit/identity/v3/test_group.py +12 -12
- openstackclient/tests/unit/identity/v3/test_identity_provider.py +8 -8
- openstackclient/tests/unit/identity/v3/test_implied_role.py +5 -5
- openstackclient/tests/unit/identity/v3/test_limit.py +7 -7
- openstackclient/tests/unit/identity/v3/test_mappings.py +7 -7
- openstackclient/tests/unit/identity/v3/test_oauth.py +5 -5
- openstackclient/tests/unit/identity/v3/test_project.py +16 -16
- openstackclient/tests/unit/identity/v3/test_protocol.py +7 -7
- openstackclient/tests/unit/identity/v3/test_region.py +7 -7
- openstackclient/tests/unit/identity/v3/test_registered_limit.py +12 -13
- openstackclient/tests/unit/identity/v3/test_role.py +13 -13
- openstackclient/tests/unit/identity/v3/test_role_assignment.py +410 -331
- openstackclient/tests/unit/identity/v3/test_service.py +90 -94
- openstackclient/tests/unit/identity/v3/test_service_provider.py +7 -7
- openstackclient/tests/unit/identity/v3/test_token.py +4 -4
- openstackclient/tests/unit/identity/v3/test_trust.py +9 -9
- openstackclient/tests/unit/identity/v3/test_unscoped_saml.py +4 -4
- openstackclient/tests/unit/identity/v3/test_user.py +299 -327
- openstackclient/tests/unit/image/v1/test_image.py +6 -6
- openstackclient/tests/unit/image/v2/fakes.py +46 -9
- openstackclient/tests/unit/image/v2/test_cache.py +2 -2
- openstackclient/tests/unit/image/v2/test_image.py +3 -3
- openstackclient/tests/unit/image/v2/test_metadef_objects.py +62 -0
- openstackclient/tests/unit/image/v2/test_metadef_resource_type_association.py +131 -0
- openstackclient/tests/unit/integ/base.py +1 -1
- openstackclient/tests/unit/integ/cli/test_project.py +4 -4
- openstackclient/tests/unit/integ/cli/test_shell.py +7 -7
- openstackclient/tests/unit/network/test_common.py +12 -21
- openstackclient/tests/unit/network/v2/fakes.py +64 -130
- openstackclient/tests/unit/network/v2/test_address_group.py +15 -15
- openstackclient/tests/unit/network/v2/test_address_scope.py +13 -13
- openstackclient/tests/unit/network/v2/test_default_security_group_rule.py +49 -27
- openstackclient/tests/unit/network/v2/test_floating_ip_compute.py +40 -38
- openstackclient/tests/unit/network/v2/test_floating_ip_network.py +15 -15
- openstackclient/tests/unit/network/v2/test_floating_ip_pool_compute.py +4 -7
- openstackclient/tests/unit/network/v2/test_floating_ip_pool_network.py +3 -5
- openstackclient/tests/unit/network/v2/test_floating_ip_port_forwarding.py +11 -11
- openstackclient/tests/unit/network/v2/test_ip_availability.py +6 -6
- openstackclient/tests/unit/network/v2/test_l3_conntrack_helper.py +11 -21
- openstackclient/tests/unit/network/v2/test_local_ip.py +7 -7
- openstackclient/tests/unit/network/v2/test_local_ip_association.py +3 -5
- openstackclient/tests/unit/network/v2/test_ndp_proxy.py +13 -13
- openstackclient/tests/unit/network/v2/test_network.py +23 -28
- openstackclient/tests/unit/network/v2/test_network_agent.py +17 -21
- openstackclient/tests/unit/network/v2/test_network_auto_allocated_topology.py +8 -8
- openstackclient/tests/unit/network/v2/test_network_compute.py +66 -65
- openstackclient/tests/unit/network/v2/test_network_flavor.py +17 -19
- openstackclient/tests/unit/network/v2/test_network_flavor_profile.py +13 -13
- openstackclient/tests/unit/network/v2/test_network_meter.py +11 -11
- openstackclient/tests/unit/network/v2/test_network_meter_rule.py +11 -11
- openstackclient/tests/unit/network/v2/test_network_qos_policy.py +11 -21
- openstackclient/tests/unit/network/v2/test_network_qos_rule.py +51 -77
- openstackclient/tests/unit/network/v2/test_network_qos_rule_type.py +5 -9
- openstackclient/tests/unit/network/v2/test_network_rbac.py +12 -12
- openstackclient/tests/unit/network/v2/test_network_segment.py +11 -15
- openstackclient/tests/unit/network/v2/test_network_segment_range.py +11 -13
- openstackclient/tests/unit/network/v2/test_network_service_provider.py +3 -5
- openstackclient/tests/unit/network/v2/test_network_trunk.py +11 -11
- openstackclient/tests/unit/network/v2/test_port.py +22 -25
- openstackclient/tests/unit/network/v2/test_router.py +721 -51
- openstackclient/tests/unit/network/v2/test_security_group_compute.py +65 -49
- openstackclient/tests/unit/network/v2/test_security_group_network.py +15 -15
- openstackclient/tests/unit/network/v2/test_security_group_rule_compute.py +57 -45
- openstackclient/tests/unit/network/v2/test_security_group_rule_network.py +11 -19
- openstackclient/tests/unit/network/v2/test_subnet.py +29 -25
- openstackclient/tests/unit/network/v2/test_subnet_pool.py +15 -15
- openstackclient/tests/unit/object/v1/fakes.py +1 -1
- openstackclient/tests/unit/object/v1/test_container.py +5 -5
- openstackclient/tests/unit/object/v1/test_container_all.py +6 -6
- openstackclient/tests/unit/object/v1/test_object.py +3 -3
- openstackclient/tests/unit/object/v1/test_object_all.py +5 -5
- openstackclient/tests/unit/test_shell.py +5 -5
- openstackclient/tests/unit/utils.py +4 -1
- openstackclient/tests/unit/volume/test_find_resource.py +2 -2
- openstackclient/tests/unit/volume/v1/fakes.py +5 -6
- openstackclient/tests/unit/volume/v1/test_volume.py +5 -4
- openstackclient/tests/unit/volume/v2/fakes.py +39 -259
- openstackclient/tests/unit/volume/v2/test_consistency_group_snapshot.py +5 -5
- openstackclient/tests/unit/volume/v2/test_qos_specs.py +9 -9
- openstackclient/tests/unit/volume/v2/test_volume.py +21 -87
- openstackclient/tests/unit/volume/v2/test_volume_backup.py +10 -368
- openstackclient/tests/unit/volume/v2/test_volume_snapshot.py +1 -1
- openstackclient/tests/unit/volume/v2/test_volume_transfer_request.py +0 -44
- openstackclient/tests/unit/volume/v2/test_volume_type.py +6 -87
- openstackclient/tests/unit/volume/v3/fakes.py +505 -22
- openstackclient/tests/unit/volume/v3/test_block_storage_cleanup.py +2 -3
- openstackclient/tests/unit/volume/v3/test_block_storage_cluster.py +10 -11
- openstackclient/tests/unit/volume/v3/test_block_storage_log_level.py +10 -6
- openstackclient/tests/unit/volume/v3/test_block_storage_manage.py +25 -17
- openstackclient/tests/unit/volume/v3/test_block_storage_resource_filter.py +6 -32
- openstackclient/tests/unit/volume/v3/test_service.py +271 -0
- openstackclient/tests/unit/volume/v3/test_volume.py +2177 -33
- openstackclient/tests/unit/volume/v3/test_volume_attachment.py +48 -52
- openstackclient/tests/unit/volume/v3/test_volume_backup.py +892 -0
- openstackclient/tests/unit/volume/v3/test_volume_group.py +19 -20
- openstackclient/tests/unit/volume/v3/test_volume_group_snapshot.py +14 -34
- openstackclient/tests/unit/volume/v3/test_volume_group_type.py +13 -16
- openstackclient/tests/unit/volume/v3/test_volume_message.py +10 -11
- openstackclient/tests/unit/volume/v3/test_volume_snapshot.py +161 -0
- openstackclient/tests/unit/volume/v3/test_volume_transfer_request.py +425 -0
- openstackclient/tests/unit/volume/v3/test_volume_type.py +1109 -0
- openstackclient/volume/v1/qos_specs.py +7 -7
- openstackclient/volume/v1/service.py +2 -2
- openstackclient/volume/v1/volume.py +12 -12
- openstackclient/volume/v1/volume_backup.py +7 -7
- openstackclient/volume/v1/volume_snapshot.py +8 -8
- openstackclient/volume/v1/volume_transfer_request.py +5 -5
- openstackclient/volume/v1/volume_type.py +7 -7
- openstackclient/volume/v2/backup_record.py +2 -2
- openstackclient/volume/v2/consistency_group.py +7 -9
- openstackclient/volume/v2/consistency_group_snapshot.py +4 -12
- openstackclient/volume/v2/qos_specs.py +7 -7
- openstackclient/volume/v2/service.py +2 -2
- openstackclient/volume/v2/volume.py +80 -80
- openstackclient/volume/v2/volume_backend.py +2 -2
- openstackclient/volume/v2/volume_backup.py +9 -217
- openstackclient/volume/v2/volume_host.py +2 -2
- openstackclient/volume/v2/volume_snapshot.py +8 -8
- openstackclient/volume/v2/volume_transfer_request.py +5 -37
- openstackclient/volume/v2/volume_type.py +7 -89
- openstackclient/volume/v3/service.py +56 -0
- openstackclient/volume/v3/volume.py +971 -0
- openstackclient/volume/v3/volume_attachment.py +31 -29
- openstackclient/volume/v3/volume_backup.py +670 -0
- openstackclient/volume/v3/volume_message.py +1 -1
- openstackclient/volume/v3/volume_snapshot.py +97 -0
- openstackclient/volume/v3/volume_transfer_request.py +233 -0
- openstackclient/volume/v3/volume_type.py +967 -0
- {python_openstackclient-6.6.1.dist-info → python_openstackclient-7.1.0.dist-info}/AUTHORS +6 -0
- {python_openstackclient-6.6.1.dist-info → python_openstackclient-7.1.0.dist-info}/METADATA +4 -4
- python_openstackclient-7.1.0.dist-info/RECORD +503 -0
- {python_openstackclient-6.6.1.dist-info → python_openstackclient-7.1.0.dist-info}/entry_points.txt +33 -27
- python_openstackclient-7.1.0.dist-info/pbr.json +1 -0
- python_openstackclient-6.6.1.dist-info/RECORD +0 -489
- python_openstackclient-6.6.1.dist-info/pbr.json +0 -1
- {python_openstackclient-6.6.1.dist-info → python_openstackclient-7.1.0.dist-info}/LICENSE +0 -0
- {python_openstackclient-6.6.1.dist-info → python_openstackclient-7.1.0.dist-info}/WHEEL +0 -0
- {python_openstackclient-6.6.1.dist-info → python_openstackclient-7.1.0.dist-info}/top_level.txt +0 -0
|
@@ -19,15 +19,14 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
|
|
|
19
19
|
|
|
20
20
|
class TestOAuth1(identity_fakes.TestOAuth1):
|
|
21
21
|
def setUp(self):
|
|
22
|
-
super(
|
|
23
|
-
|
|
24
|
-
self.consumers_mock = identity_client.oauth1.consumers
|
|
22
|
+
super().setUp()
|
|
23
|
+
self.consumers_mock = self.identity_client.oauth1.consumers
|
|
25
24
|
self.consumers_mock.reset_mock()
|
|
26
25
|
|
|
27
26
|
|
|
28
27
|
class TestConsumerCreate(TestOAuth1):
|
|
29
28
|
def setUp(self):
|
|
30
|
-
super(
|
|
29
|
+
super().setUp()
|
|
31
30
|
|
|
32
31
|
self.consumers_mock.create.return_value = fakes.FakeResource(
|
|
33
32
|
None,
|
|
@@ -64,7 +63,7 @@ class TestConsumerCreate(TestOAuth1):
|
|
|
64
63
|
|
|
65
64
|
class TestConsumerDelete(TestOAuth1):
|
|
66
65
|
def setUp(self):
|
|
67
|
-
super(
|
|
66
|
+
super().setUp()
|
|
68
67
|
|
|
69
68
|
# This is the return value for utils.find_resource()
|
|
70
69
|
self.consumers_mock.get.return_value = fakes.FakeResource(
|
|
@@ -95,7 +94,7 @@ class TestConsumerDelete(TestOAuth1):
|
|
|
95
94
|
|
|
96
95
|
class TestConsumerList(TestOAuth1):
|
|
97
96
|
def setUp(self):
|
|
98
|
-
super(
|
|
97
|
+
super().setUp()
|
|
99
98
|
|
|
100
99
|
self.consumers_mock.get.return_value = fakes.FakeResource(
|
|
101
100
|
None,
|
|
@@ -137,7 +136,7 @@ class TestConsumerList(TestOAuth1):
|
|
|
137
136
|
|
|
138
137
|
class TestConsumerSet(TestOAuth1):
|
|
139
138
|
def setUp(self):
|
|
140
|
-
super(
|
|
139
|
+
super().setUp()
|
|
141
140
|
|
|
142
141
|
self.consumers_mock.get.return_value = fakes.FakeResource(
|
|
143
142
|
None,
|
|
@@ -180,7 +179,7 @@ class TestConsumerSet(TestOAuth1):
|
|
|
180
179
|
|
|
181
180
|
class TestConsumerShow(TestOAuth1):
|
|
182
181
|
def setUp(self):
|
|
183
|
-
super(
|
|
182
|
+
super().setUp()
|
|
184
183
|
|
|
185
184
|
consumer_no_secret = copy.deepcopy(identity_fakes.OAUTH_CONSUMER)
|
|
186
185
|
del consumer_no_secret['secret']
|
|
@@ -22,18 +22,18 @@ from openstackclient.tests.unit import utils
|
|
|
22
22
|
|
|
23
23
|
class TestCredential(identity_fakes.TestIdentityv3):
|
|
24
24
|
def setUp(self):
|
|
25
|
-
super(
|
|
25
|
+
super().setUp()
|
|
26
26
|
|
|
27
27
|
# Get a shortcut to the CredentialManager Mock
|
|
28
|
-
self.credentials_mock = self.
|
|
28
|
+
self.credentials_mock = self.identity_client.credentials
|
|
29
29
|
self.credentials_mock.reset_mock()
|
|
30
30
|
|
|
31
31
|
# Get a shortcut to the UserManager Mock
|
|
32
|
-
self.users_mock = self.
|
|
32
|
+
self.users_mock = self.identity_client.users
|
|
33
33
|
self.users_mock.reset_mock()
|
|
34
34
|
|
|
35
35
|
# Get a shortcut to the ProjectManager Mock
|
|
36
|
-
self.projects_mock = self.
|
|
36
|
+
self.projects_mock = self.identity_client.projects
|
|
37
37
|
self.projects_mock.reset_mock()
|
|
38
38
|
|
|
39
39
|
|
|
@@ -49,7 +49,7 @@ class TestCredentialCreate(TestCredential):
|
|
|
49
49
|
)
|
|
50
50
|
|
|
51
51
|
def setUp(self):
|
|
52
|
-
super(
|
|
52
|
+
super().setUp()
|
|
53
53
|
|
|
54
54
|
self.credential = identity_fakes.FakeCredential.create_one_credential(
|
|
55
55
|
attrs={'user_id': self.user.id, 'project_id': self.project.id}
|
|
@@ -126,7 +126,7 @@ class TestCredentialDelete(TestCredential):
|
|
|
126
126
|
credentials = identity_fakes.FakeCredential.create_credentials(count=2)
|
|
127
127
|
|
|
128
128
|
def setUp(self):
|
|
129
|
-
super(
|
|
129
|
+
super().setUp()
|
|
130
130
|
|
|
131
131
|
self.credentials_mock.delete.return_value = None
|
|
132
132
|
|
|
@@ -206,7 +206,7 @@ class TestCredentialList(TestCredential):
|
|
|
206
206
|
)
|
|
207
207
|
|
|
208
208
|
def setUp(self):
|
|
209
|
-
super(
|
|
209
|
+
super().setUp()
|
|
210
210
|
|
|
211
211
|
self.user = identity_fakes.FakeUser.create_one_user()
|
|
212
212
|
self.users_mock.get.return_value = self.user
|
|
@@ -257,7 +257,7 @@ class TestCredentialSet(TestCredential):
|
|
|
257
257
|
credential = identity_fakes.FakeCredential.create_one_credential()
|
|
258
258
|
|
|
259
259
|
def setUp(self):
|
|
260
|
-
super(
|
|
260
|
+
super().setUp()
|
|
261
261
|
self.cmd = credential.SetCredential(self.app, None)
|
|
262
262
|
|
|
263
263
|
def test_credential_set_no_options(self):
|
|
@@ -353,7 +353,7 @@ class TestCredentialShow(TestCredential):
|
|
|
353
353
|
)
|
|
354
354
|
|
|
355
355
|
def setUp(self):
|
|
356
|
-
super(
|
|
356
|
+
super().setUp()
|
|
357
357
|
|
|
358
358
|
self.credential = identity_fakes.FakeCredential.create_one_credential()
|
|
359
359
|
self.credentials_mock.get.return_value = self.credential
|
|
@@ -16,10 +16,10 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
|
|
|
16
16
|
|
|
17
17
|
class TestDomain(identity_fakes.TestIdentityv3):
|
|
18
18
|
def setUp(self):
|
|
19
|
-
super(
|
|
19
|
+
super().setUp()
|
|
20
20
|
|
|
21
21
|
# Get a shortcut to the DomainManager Mock
|
|
22
|
-
self.domains_mock = self.
|
|
22
|
+
self.domains_mock = self.identity_client.domains
|
|
23
23
|
self.domains_mock.reset_mock()
|
|
24
24
|
|
|
25
25
|
|
|
@@ -27,7 +27,7 @@ class TestDomainCreate(TestDomain):
|
|
|
27
27
|
columns = ('description', 'enabled', 'id', 'name', 'tags')
|
|
28
28
|
|
|
29
29
|
def setUp(self):
|
|
30
|
-
super(
|
|
30
|
+
super().setUp()
|
|
31
31
|
|
|
32
32
|
self.domain = identity_fakes.FakeDomain.create_one_domain()
|
|
33
33
|
self.domains_mock.create.return_value = self.domain
|
|
@@ -214,7 +214,7 @@ class TestDomainDelete(TestDomain):
|
|
|
214
214
|
domain = identity_fakes.FakeDomain.create_one_domain()
|
|
215
215
|
|
|
216
216
|
def setUp(self):
|
|
217
|
-
super(
|
|
217
|
+
super().setUp()
|
|
218
218
|
|
|
219
219
|
# This is the return value for utils.find_resource()
|
|
220
220
|
self.domains_mock.get.return_value = self.domain
|
|
@@ -244,7 +244,7 @@ class TestDomainList(TestDomain):
|
|
|
244
244
|
domain = identity_fakes.FakeDomain.create_one_domain()
|
|
245
245
|
|
|
246
246
|
def setUp(self):
|
|
247
|
-
super(
|
|
247
|
+
super().setUp()
|
|
248
248
|
|
|
249
249
|
self.domains_mock.list.return_value = [self.domain]
|
|
250
250
|
|
|
@@ -329,7 +329,7 @@ class TestDomainSet(TestDomain):
|
|
|
329
329
|
domain = identity_fakes.FakeDomain.create_one_domain()
|
|
330
330
|
|
|
331
331
|
def setUp(self):
|
|
332
|
-
super(
|
|
332
|
+
super().setUp()
|
|
333
333
|
|
|
334
334
|
self.domains_mock.get.return_value = self.domain
|
|
335
335
|
|
|
@@ -478,7 +478,7 @@ class TestDomainSet(TestDomain):
|
|
|
478
478
|
|
|
479
479
|
class TestDomainShow(TestDomain):
|
|
480
480
|
def setUp(self):
|
|
481
|
-
super(
|
|
481
|
+
super().setUp()
|
|
482
482
|
|
|
483
483
|
self.domain = identity_fakes.FakeDomain.create_one_domain()
|
|
484
484
|
self.domains_mock.get.return_value = self.domain
|
|
@@ -493,7 +493,7 @@ class TestDomainShow(TestDomain):
|
|
|
493
493
|
('domain', self.domain.id),
|
|
494
494
|
]
|
|
495
495
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
496
|
-
self.
|
|
496
|
+
self.identity_client.tokens.get_token_data.return_value = {
|
|
497
497
|
'token': {'project': {'domain': {'id': 'd1', 'name': 'd1'}}}
|
|
498
498
|
}
|
|
499
499
|
|
|
@@ -16,24 +16,24 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
|
|
|
16
16
|
|
|
17
17
|
class TestEndpoint(identity_fakes.TestIdentityv3):
|
|
18
18
|
def setUp(self):
|
|
19
|
-
super(
|
|
19
|
+
super().setUp()
|
|
20
20
|
|
|
21
21
|
# Get a shortcut to the EndpointManager Mock
|
|
22
|
-
self.endpoints_mock = self.
|
|
22
|
+
self.endpoints_mock = self.identity_client.endpoints
|
|
23
23
|
self.endpoints_mock.reset_mock()
|
|
24
|
-
self.ep_filter_mock = self.
|
|
24
|
+
self.ep_filter_mock = self.identity_client.endpoint_filter
|
|
25
25
|
self.ep_filter_mock.reset_mock()
|
|
26
26
|
|
|
27
27
|
# Get a shortcut to the ServiceManager Mock
|
|
28
|
-
self.services_mock = self.
|
|
28
|
+
self.services_mock = self.identity_client.services
|
|
29
29
|
self.services_mock.reset_mock()
|
|
30
30
|
|
|
31
31
|
# Get a shortcut to the DomainManager Mock
|
|
32
|
-
self.domains_mock = self.
|
|
32
|
+
self.domains_mock = self.identity_client.domains
|
|
33
33
|
self.domains_mock.reset_mock()
|
|
34
34
|
|
|
35
35
|
# Get a shortcut to the ProjectManager Mock
|
|
36
|
-
self.projects_mock = self.
|
|
36
|
+
self.projects_mock = self.identity_client.projects
|
|
37
37
|
self.projects_mock.reset_mock()
|
|
38
38
|
|
|
39
39
|
|
|
@@ -52,7 +52,7 @@ class TestEndpointCreate(TestEndpoint):
|
|
|
52
52
|
)
|
|
53
53
|
|
|
54
54
|
def setUp(self):
|
|
55
|
-
super(
|
|
55
|
+
super().setUp()
|
|
56
56
|
|
|
57
57
|
self.endpoint = identity_fakes.FakeEndpoint.create_one_endpoint(
|
|
58
58
|
attrs={'service_id': self.service.id}
|
|
@@ -247,7 +247,7 @@ class TestEndpointDelete(TestEndpoint):
|
|
|
247
247
|
endpoint = identity_fakes.FakeEndpoint.create_one_endpoint()
|
|
248
248
|
|
|
249
249
|
def setUp(self):
|
|
250
|
-
super(
|
|
250
|
+
super().setUp()
|
|
251
251
|
|
|
252
252
|
# This is the return value for utils.find_resource(endpoint)
|
|
253
253
|
self.endpoints_mock.get.return_value = self.endpoint
|
|
@@ -290,7 +290,7 @@ class TestEndpointList(TestEndpoint):
|
|
|
290
290
|
)
|
|
291
291
|
|
|
292
292
|
def setUp(self):
|
|
293
|
-
super(
|
|
293
|
+
super().setUp()
|
|
294
294
|
|
|
295
295
|
self.endpoints_mock.list.return_value = [self.endpoint]
|
|
296
296
|
|
|
@@ -477,7 +477,7 @@ class TestEndpointSet(TestEndpoint):
|
|
|
477
477
|
)
|
|
478
478
|
|
|
479
479
|
def setUp(self):
|
|
480
|
-
super(
|
|
480
|
+
super().setUp()
|
|
481
481
|
|
|
482
482
|
# This is the return value for utils.find_resource(endpoint)
|
|
483
483
|
self.endpoints_mock.get.return_value = self.endpoint
|
|
@@ -659,7 +659,7 @@ class TestEndpointShow(TestEndpoint):
|
|
|
659
659
|
)
|
|
660
660
|
|
|
661
661
|
def setUp(self):
|
|
662
|
-
super(
|
|
662
|
+
super().setUp()
|
|
663
663
|
|
|
664
664
|
self.endpoints_mock.get.return_value = self.endpoint
|
|
665
665
|
|
|
@@ -785,7 +785,7 @@ class TestAddProjectToEndpoint(TestEndpoint):
|
|
|
785
785
|
)
|
|
786
786
|
|
|
787
787
|
def setUp(self):
|
|
788
|
-
super(
|
|
788
|
+
super().setUp()
|
|
789
789
|
|
|
790
790
|
# This is the return value for utils.find_resource()
|
|
791
791
|
self.endpoints_mock.get.return_value = self.endpoint
|
|
@@ -844,7 +844,7 @@ class TestRemoveProjectEndpoint(TestEndpoint):
|
|
|
844
844
|
)
|
|
845
845
|
|
|
846
846
|
def setUp(self):
|
|
847
|
-
super(
|
|
847
|
+
super().setUp()
|
|
848
848
|
|
|
849
849
|
# This is the return value for utils.find_resource()
|
|
850
850
|
self.endpoints_mock.get.return_value = self.endpoint
|
|
@@ -19,26 +19,24 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
|
|
|
19
19
|
|
|
20
20
|
class TestEndpointGroup(identity_fakes.TestIdentityv3):
|
|
21
21
|
def setUp(self):
|
|
22
|
-
super(
|
|
22
|
+
super().setUp()
|
|
23
23
|
|
|
24
24
|
# Get a shortcut to the EndpointManager Mock
|
|
25
|
-
self.endpoint_groups_mock =
|
|
26
|
-
self.app.client_manager.identity.endpoint_groups
|
|
27
|
-
)
|
|
25
|
+
self.endpoint_groups_mock = self.identity_client.endpoint_groups
|
|
28
26
|
self.endpoint_groups_mock.reset_mock()
|
|
29
|
-
self.epf_mock = self.
|
|
27
|
+
self.epf_mock = self.identity_client.endpoint_filter
|
|
30
28
|
self.epf_mock.reset_mock()
|
|
31
29
|
|
|
32
30
|
# Get a shortcut to the ServiceManager Mock
|
|
33
|
-
self.services_mock = self.
|
|
31
|
+
self.services_mock = self.identity_client.services
|
|
34
32
|
self.services_mock.reset_mock()
|
|
35
33
|
|
|
36
34
|
# Get a shortcut to the DomainManager Mock
|
|
37
|
-
self.domains_mock = self.
|
|
35
|
+
self.domains_mock = self.identity_client.domains
|
|
38
36
|
self.domains_mock.reset_mock()
|
|
39
37
|
|
|
40
38
|
# Get a shortcut to the ProjectManager Mock
|
|
41
|
-
self.projects_mock = self.
|
|
39
|
+
self.projects_mock = self.identity_client.projects
|
|
42
40
|
self.projects_mock.reset_mock()
|
|
43
41
|
|
|
44
42
|
|
|
@@ -51,7 +49,7 @@ class TestEndpointGroupCreate(TestEndpointGroup):
|
|
|
51
49
|
)
|
|
52
50
|
|
|
53
51
|
def setUp(self):
|
|
54
|
-
super(
|
|
52
|
+
super().setUp()
|
|
55
53
|
|
|
56
54
|
self.endpoint_group = (
|
|
57
55
|
identity_fakes.FakeEndpointGroup.create_one_endpointgroup(
|
|
@@ -112,7 +110,7 @@ class TestEndpointGroupDelete(TestEndpointGroup):
|
|
|
112
110
|
)
|
|
113
111
|
|
|
114
112
|
def setUp(self):
|
|
115
|
-
super(
|
|
113
|
+
super().setUp()
|
|
116
114
|
|
|
117
115
|
# This is the return value for utils.find_resource(endpoint)
|
|
118
116
|
self.endpoint_groups_mock.get.return_value = self.endpoint_group
|
|
@@ -152,7 +150,7 @@ class TestEndpointGroupList(TestEndpointGroup):
|
|
|
152
150
|
)
|
|
153
151
|
|
|
154
152
|
def setUp(self):
|
|
155
|
-
super(
|
|
153
|
+
super().setUp()
|
|
156
154
|
|
|
157
155
|
self.endpoint_groups_mock.list.return_value = [self.endpoint_group]
|
|
158
156
|
self.endpoint_groups_mock.get.return_value = self.endpoint_group
|
|
@@ -258,7 +256,7 @@ class TestEndpointGroupSet(TestEndpointGroup):
|
|
|
258
256
|
)
|
|
259
257
|
|
|
260
258
|
def setUp(self):
|
|
261
|
-
super(
|
|
259
|
+
super().setUp()
|
|
262
260
|
|
|
263
261
|
# This is the return value for utils.find_resource(endpoint)
|
|
264
262
|
self.endpoint_groups_mock.get.return_value = self.endpoint_group
|
|
@@ -373,7 +371,7 @@ class TestAddProjectToEndpointGroup(TestEndpointGroup):
|
|
|
373
371
|
)
|
|
374
372
|
|
|
375
373
|
def setUp(self):
|
|
376
|
-
super(
|
|
374
|
+
super().setUp()
|
|
377
375
|
|
|
378
376
|
# This is the return value for utils.find_resource()
|
|
379
377
|
self.endpoint_groups_mock.get.return_value = self.endpoint_group
|
|
@@ -434,7 +432,7 @@ class TestRemoveProjectEndpointGroup(TestEndpointGroup):
|
|
|
434
432
|
)
|
|
435
433
|
|
|
436
434
|
def setUp(self):
|
|
437
|
-
super(
|
|
435
|
+
super().setUp()
|
|
438
436
|
|
|
439
437
|
# This is the return value for utils.find_resource()
|
|
440
438
|
self.endpoint_groups_mock.get.return_value = self.endpoint_group
|
|
@@ -24,18 +24,18 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
|
|
|
24
24
|
|
|
25
25
|
class TestGroup(identity_fakes.TestIdentityv3):
|
|
26
26
|
def setUp(self):
|
|
27
|
-
super(
|
|
27
|
+
super().setUp()
|
|
28
28
|
|
|
29
29
|
# Get a shortcut to the DomainManager Mock
|
|
30
|
-
self.domains_mock = self.
|
|
30
|
+
self.domains_mock = self.identity_client.domains
|
|
31
31
|
self.domains_mock.reset_mock()
|
|
32
32
|
|
|
33
33
|
# Get a shortcut to the GroupManager Mock
|
|
34
|
-
self.groups_mock = self.
|
|
34
|
+
self.groups_mock = self.identity_client.groups
|
|
35
35
|
self.groups_mock.reset_mock()
|
|
36
36
|
|
|
37
37
|
# Get a shortcut to the UserManager Mock
|
|
38
|
-
self.users_mock = self.
|
|
38
|
+
self.users_mock = self.identity_client.users
|
|
39
39
|
self.users_mock.reset_mock()
|
|
40
40
|
|
|
41
41
|
|
|
@@ -44,7 +44,7 @@ class TestGroupAddUser(TestGroup):
|
|
|
44
44
|
users = identity_fakes.FakeUser.create_users(count=2)
|
|
45
45
|
|
|
46
46
|
def setUp(self):
|
|
47
|
-
super(
|
|
47
|
+
super().setUp()
|
|
48
48
|
|
|
49
49
|
self.groups_mock.get.return_value = self._group
|
|
50
50
|
self.users_mock.get = identity_fakes.FakeUser.get_users(self.users)
|
|
@@ -123,7 +123,7 @@ class TestGroupCheckUser(TestGroup):
|
|
|
123
123
|
user = identity_fakes.FakeUser.create_one_user()
|
|
124
124
|
|
|
125
125
|
def setUp(self):
|
|
126
|
-
super(
|
|
126
|
+
super().setUp()
|
|
127
127
|
|
|
128
128
|
self.groups_mock.get.return_value = self.group
|
|
129
129
|
self.users_mock.get.return_value = self.user
|
|
@@ -179,7 +179,7 @@ class TestGroupCreate(TestGroup):
|
|
|
179
179
|
)
|
|
180
180
|
|
|
181
181
|
def setUp(self):
|
|
182
|
-
super(
|
|
182
|
+
super().setUp()
|
|
183
183
|
self.group = identity_fakes.FakeGroup.create_one_group(
|
|
184
184
|
attrs={'domain_id': self.domain.id}
|
|
185
185
|
)
|
|
@@ -263,7 +263,7 @@ class TestGroupDelete(TestGroup):
|
|
|
263
263
|
)
|
|
264
264
|
|
|
265
265
|
def setUp(self):
|
|
266
|
-
super(
|
|
266
|
+
super().setUp()
|
|
267
267
|
|
|
268
268
|
self.groups_mock.get = identity_fakes.FakeGroup.get_groups(self.groups)
|
|
269
269
|
self.groups_mock.delete.return_value = None
|
|
@@ -368,7 +368,7 @@ class TestGroupList(TestGroup):
|
|
|
368
368
|
)
|
|
369
369
|
|
|
370
370
|
def setUp(self):
|
|
371
|
-
super(
|
|
371
|
+
super().setUp()
|
|
372
372
|
|
|
373
373
|
self.groups_mock.get.return_value = self.group
|
|
374
374
|
self.groups_mock.list.return_value = [self.group]
|
|
@@ -496,7 +496,7 @@ class TestGroupRemoveUser(TestGroup):
|
|
|
496
496
|
users = identity_fakes.FakeUser.create_users(count=2)
|
|
497
497
|
|
|
498
498
|
def setUp(self):
|
|
499
|
-
super(
|
|
499
|
+
super().setUp()
|
|
500
500
|
|
|
501
501
|
self.groups_mock.get.return_value = self._group
|
|
502
502
|
self.users_mock.get = identity_fakes.FakeUser.get_users(self.users)
|
|
@@ -577,7 +577,7 @@ class TestGroupSet(TestGroup):
|
|
|
577
577
|
)
|
|
578
578
|
|
|
579
579
|
def setUp(self):
|
|
580
|
-
super(
|
|
580
|
+
super().setUp()
|
|
581
581
|
|
|
582
582
|
self.groups_mock.get.return_value = self.group
|
|
583
583
|
self.domains_mock.get.return_value = self.domain
|
|
@@ -657,7 +657,7 @@ class TestGroupShow(TestGroup):
|
|
|
657
657
|
)
|
|
658
658
|
|
|
659
659
|
def setUp(self):
|
|
660
|
-
super(
|
|
660
|
+
super().setUp()
|
|
661
661
|
self.group = identity_fakes.FakeGroup.create_one_group(
|
|
662
662
|
attrs={'domain_id': self.domain.id}
|
|
663
663
|
)
|
|
@@ -25,15 +25,15 @@ from openstackclient.tests.unit import utils as test_utils
|
|
|
25
25
|
|
|
26
26
|
class TestIdentityProvider(identity_fakes.TestFederatedIdentity):
|
|
27
27
|
def setUp(self):
|
|
28
|
-
super(
|
|
28
|
+
super().setUp()
|
|
29
29
|
|
|
30
30
|
# Identity Provider mocks
|
|
31
|
-
federation_lib = self.
|
|
31
|
+
federation_lib = self.identity_client.federation
|
|
32
32
|
self.identity_providers_mock = federation_lib.identity_providers
|
|
33
33
|
self.identity_providers_mock.reset_mock()
|
|
34
34
|
|
|
35
35
|
# Domain mocks
|
|
36
|
-
self.domains_mock = self.
|
|
36
|
+
self.domains_mock = self.identity_client.domains
|
|
37
37
|
self.domains_mock.reset_mock()
|
|
38
38
|
self.domain = identity_fakes.FakeDomain.create_one_domain(
|
|
39
39
|
identity_fakes.DOMAIN
|
|
@@ -59,7 +59,7 @@ class TestIdentityProviderCreate(TestIdentityProvider):
|
|
|
59
59
|
)
|
|
60
60
|
|
|
61
61
|
def setUp(self):
|
|
62
|
-
super(
|
|
62
|
+
super().setUp()
|
|
63
63
|
|
|
64
64
|
copied_idp = copy.deepcopy(identity_fakes.IDENTITY_PROVIDER)
|
|
65
65
|
resource = fakes.FakeResource(None, copied_idp, loaded=True)
|
|
@@ -401,7 +401,7 @@ class TestIdentityProviderCreate(TestIdentityProvider):
|
|
|
401
401
|
|
|
402
402
|
class TestIdentityProviderDelete(TestIdentityProvider):
|
|
403
403
|
def setUp(self):
|
|
404
|
-
super(
|
|
404
|
+
super().setUp()
|
|
405
405
|
|
|
406
406
|
# This is the return value for utils.find_resource()
|
|
407
407
|
self.identity_providers_mock.get.return_value = fakes.FakeResource(
|
|
@@ -432,7 +432,7 @@ class TestIdentityProviderDelete(TestIdentityProvider):
|
|
|
432
432
|
|
|
433
433
|
class TestIdentityProviderList(TestIdentityProvider):
|
|
434
434
|
def setUp(self):
|
|
435
|
-
super(
|
|
435
|
+
super().setUp()
|
|
436
436
|
|
|
437
437
|
self.identity_providers_mock.get.return_value = fakes.FakeResource(
|
|
438
438
|
None,
|
|
@@ -540,7 +540,7 @@ class TestIdentityProviderSet(TestIdentityProvider):
|
|
|
540
540
|
)
|
|
541
541
|
|
|
542
542
|
def setUp(self):
|
|
543
|
-
super(
|
|
543
|
+
super().setUp()
|
|
544
544
|
self.cmd = identity_provider.SetIdentityProvider(self.app, None)
|
|
545
545
|
|
|
546
546
|
def test_identity_provider_set_description(self):
|
|
@@ -838,7 +838,7 @@ class TestIdentityProviderSet(TestIdentityProvider):
|
|
|
838
838
|
|
|
839
839
|
class TestIdentityProviderShow(TestIdentityProvider):
|
|
840
840
|
def setUp(self):
|
|
841
|
-
super(
|
|
841
|
+
super().setUp()
|
|
842
842
|
|
|
843
843
|
ret = fakes.FakeResource(
|
|
844
844
|
None,
|
|
@@ -22,9 +22,9 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
|
|
|
22
22
|
|
|
23
23
|
class TestRole(identity_fakes.TestIdentityv3):
|
|
24
24
|
def setUp(self):
|
|
25
|
-
super(
|
|
25
|
+
super().setUp()
|
|
26
26
|
|
|
27
|
-
identity_client = self.
|
|
27
|
+
identity_client = self.identity_client
|
|
28
28
|
|
|
29
29
|
# Get a shortcut to the UserManager Mock
|
|
30
30
|
self.users_mock = identity_client.users
|
|
@@ -56,7 +56,7 @@ class TestRole(identity_fakes.TestIdentityv3):
|
|
|
56
56
|
|
|
57
57
|
class TestImpliedRoleCreate(TestRole):
|
|
58
58
|
def setUp(self):
|
|
59
|
-
super(
|
|
59
|
+
super().setUp()
|
|
60
60
|
|
|
61
61
|
self.roles_mock.list.return_value = [
|
|
62
62
|
fakes.FakeResource(
|
|
@@ -116,7 +116,7 @@ class TestImpliedRoleCreate(TestRole):
|
|
|
116
116
|
|
|
117
117
|
class TestImpliedRoleDelete(TestRole):
|
|
118
118
|
def setUp(self):
|
|
119
|
-
super(
|
|
119
|
+
super().setUp()
|
|
120
120
|
|
|
121
121
|
self.roles_mock.list.return_value = [
|
|
122
122
|
fakes.FakeResource(
|
|
@@ -163,7 +163,7 @@ class TestImpliedRoleDelete(TestRole):
|
|
|
163
163
|
|
|
164
164
|
class TestImpliedRoleList(TestRole):
|
|
165
165
|
def setUp(self):
|
|
166
|
-
super(
|
|
166
|
+
super().setUp()
|
|
167
167
|
|
|
168
168
|
self.inference_rules_mock.list_inference_roles.return_value = (
|
|
169
169
|
identity_fakes.FakeImpliedRoleResponse.create_list()
|
|
@@ -22,9 +22,9 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
|
|
|
22
22
|
|
|
23
23
|
class TestLimit(identity_fakes.TestIdentityv3):
|
|
24
24
|
def setUp(self):
|
|
25
|
-
super(
|
|
25
|
+
super().setUp()
|
|
26
26
|
|
|
27
|
-
identity_manager = self.
|
|
27
|
+
identity_manager = self.identity_client
|
|
28
28
|
|
|
29
29
|
self.limit_mock = identity_manager.limits
|
|
30
30
|
|
|
@@ -40,7 +40,7 @@ class TestLimit(identity_fakes.TestIdentityv3):
|
|
|
40
40
|
|
|
41
41
|
class TestLimitCreate(TestLimit):
|
|
42
42
|
def setUp(self):
|
|
43
|
-
super(
|
|
43
|
+
super().setUp()
|
|
44
44
|
|
|
45
45
|
self.service = fakes.FakeResource(
|
|
46
46
|
None, copy.deepcopy(identity_fakes.SERVICE), loaded=True
|
|
@@ -181,7 +181,7 @@ class TestLimitCreate(TestLimit):
|
|
|
181
181
|
|
|
182
182
|
class TestLimitDelete(TestLimit):
|
|
183
183
|
def setUp(self):
|
|
184
|
-
super(
|
|
184
|
+
super().setUp()
|
|
185
185
|
self.cmd = limit.DeleteLimit(self.app, None)
|
|
186
186
|
|
|
187
187
|
def test_limit_delete(self):
|
|
@@ -213,7 +213,7 @@ class TestLimitDelete(TestLimit):
|
|
|
213
213
|
|
|
214
214
|
class TestLimitShow(TestLimit):
|
|
215
215
|
def setUp(self):
|
|
216
|
-
super(
|
|
216
|
+
super().setUp()
|
|
217
217
|
|
|
218
218
|
self.limit_mock.get.return_value = fakes.FakeResource(
|
|
219
219
|
None, copy.deepcopy(identity_fakes.LIMIT), loaded=True
|
|
@@ -254,7 +254,7 @@ class TestLimitShow(TestLimit):
|
|
|
254
254
|
|
|
255
255
|
class TestLimitSet(TestLimit):
|
|
256
256
|
def setUp(self):
|
|
257
|
-
super(
|
|
257
|
+
super().setUp()
|
|
258
258
|
self.cmd = limit.SetLimit(self.app, None)
|
|
259
259
|
|
|
260
260
|
def test_limit_set_description(self):
|
|
@@ -355,7 +355,7 @@ class TestLimitSet(TestLimit):
|
|
|
355
355
|
|
|
356
356
|
class TestLimitList(TestLimit):
|
|
357
357
|
def setUp(self):
|
|
358
|
-
super(
|
|
358
|
+
super().setUp()
|
|
359
359
|
|
|
360
360
|
self.limit_mock.list.return_value = [
|
|
361
361
|
fakes.FakeResource(
|
|
@@ -24,16 +24,16 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
|
|
|
24
24
|
|
|
25
25
|
class TestMapping(identity_fakes.TestFederatedIdentity):
|
|
26
26
|
def setUp(self):
|
|
27
|
-
super(
|
|
27
|
+
super().setUp()
|
|
28
28
|
|
|
29
|
-
federation_lib = self.
|
|
29
|
+
federation_lib = self.identity_client.federation
|
|
30
30
|
self.mapping_mock = federation_lib.mappings
|
|
31
31
|
self.mapping_mock.reset_mock()
|
|
32
32
|
|
|
33
33
|
|
|
34
34
|
class TestMappingCreate(TestMapping):
|
|
35
35
|
def setUp(self):
|
|
36
|
-
super(
|
|
36
|
+
super().setUp()
|
|
37
37
|
self.mapping_mock.create.return_value = fakes.FakeResource(
|
|
38
38
|
None, copy.deepcopy(identity_fakes.MAPPING_RESPONSE), loaded=True
|
|
39
39
|
)
|
|
@@ -75,7 +75,7 @@ class TestMappingCreate(TestMapping):
|
|
|
75
75
|
|
|
76
76
|
class TestMappingDelete(TestMapping):
|
|
77
77
|
def setUp(self):
|
|
78
|
-
super(
|
|
78
|
+
super().setUp()
|
|
79
79
|
self.mapping_mock.get.return_value = fakes.FakeResource(
|
|
80
80
|
None, copy.deepcopy(identity_fakes.MAPPING_RESPONSE), loaded=True
|
|
81
81
|
)
|
|
@@ -96,7 +96,7 @@ class TestMappingDelete(TestMapping):
|
|
|
96
96
|
|
|
97
97
|
class TestMappingList(TestMapping):
|
|
98
98
|
def setUp(self):
|
|
99
|
-
super(
|
|
99
|
+
super().setUp()
|
|
100
100
|
self.mapping_mock.get.return_value = fakes.FakeResource(
|
|
101
101
|
None, {'id': identity_fakes.mapping_id}, loaded=True
|
|
102
102
|
)
|
|
@@ -141,7 +141,7 @@ class TestMappingList(TestMapping):
|
|
|
141
141
|
|
|
142
142
|
class TestMappingSet(TestMapping):
|
|
143
143
|
def setUp(self):
|
|
144
|
-
super(
|
|
144
|
+
super().setUp()
|
|
145
145
|
|
|
146
146
|
self.mapping_mock.get.return_value = fakes.FakeResource(
|
|
147
147
|
None, copy.deepcopy(identity_fakes.MAPPING_RESPONSE), loaded=True
|
|
@@ -201,7 +201,7 @@ class TestMappingSet(TestMapping):
|
|
|
201
201
|
|
|
202
202
|
class TestMappingShow(TestMapping):
|
|
203
203
|
def setUp(self):
|
|
204
|
-
super(
|
|
204
|
+
super().setUp()
|
|
205
205
|
|
|
206
206
|
self.mapping_mock.get.return_value = fakes.FakeResource(
|
|
207
207
|
None, copy.deepcopy(identity_fakes.MAPPING_RESPONSE), loaded=True
|