From b04ae9f46bf4e45cb840739174dd999543caac58 Mon Sep 17 00:00:00 2001 From: Konstantin Babushkin Date: Sun, 24 Sep 2023 19:36:39 +0200 Subject: [PATCH] run object store integration tests --- ...sts.yml => integration_object_storage.yml} | 29 ++++++++++++++++--- .../v2/snapshots/create.php | 0 .../v2/snapshots/delete.php | 0 .../v2/snapshots/get.php | 0 .../v2/snapshots/get_metadata.php | 0 .../v2/snapshots/list.php | 0 .../v2/snapshots/list_detail.php | 0 .../v2/snapshots/merge_metadata.php | 0 .../v2/snapshots/reset_metadata.php | 0 .../v2/snapshots/update.php | 0 .../v2/volume_types/create.php | 0 .../v2/volume_types/delete.php | 0 .../v2/volume_types/get.php | 0 .../v2/volume_types/list.php | 0 .../v2/volume_types/update.php | 0 .../v2/volumes/create.php | 0 .../v2/volumes/create_from_image.php | 0 .../v2/volumes/create_from_snapshot.php | 0 .../v2/volumes/create_from_source_volume.php | 0 .../v2/volumes/delete.php | 0 .../v2/volumes/get.php | 0 .../v2/volumes/list.php | 0 .../v2/volumes/list_detail.php | 0 .../v2/volumes/update.php | 0 .../v2/flavors/create_flavor.php | 0 .../v2/flavors/delete_flavor.php | 0 .../v2/flavors/get_flavor.php | 0 .../v2/flavors/list_flavors.php | 0 .../v2/hypervisors/get_hypervisor.php | 0 .../get_hypervisors_statistics.php | 0 .../v2/hypervisors/list_hypervisors.php | 0 .../v2/images/create_server_image.php | 0 .../v2/images/delete_image.php | 0 .../v2/images/delete_image_metadata_item.php | 0 .../v2/images/get_image.php | 0 .../v2/images/list_images.php | 0 .../v2/images/reset_image_metadata.php | 0 .../v2/images/retrieve_image_metadata.php | 0 .../v2/keypairs/create_keypair.php | 0 .../v2/keypairs/delete_keypair.php | 0 .../v2/keypairs/get_keypair.php | 0 .../v2/keypairs/list_keypairs.php | 0 .../v2/limits/get_limits.php | 0 .../v2/servers/add_security_group.php | 0 .../v2/servers/attach_volume_attachment.php | 0 .../v2/servers/change_server_password.php | 0 .../v2/servers/confirm_server_resize.php | 0 .../servers/create_interface_attachment.php | 0 .../v2/servers/create_server.php | 0 .../servers/delete_interface_attachment.php | 0 .../v2/servers/delete_server.php | 0 .../servers/delete_server_metadata_item.php | 0 .../v2/servers/detach_volume_attachment.php | 0 .../v2/servers/get_interface_attachment.php | 0 .../v2/servers/get_server.php | 0 .../v2/servers/get_server_console_output.php | 0 .../v2/servers/get_server_metadata.php | 0 .../v2/servers/get_server_metadata_item.php | 0 .../v2/servers/get_server_rdp_console.php | 0 .../v2/servers/get_server_serial_console.php | 0 .../v2/servers/get_server_spice_console.php | 0 .../v2/servers/get_server_vnc_console.php | 0 .../v2/servers/list_security_groups.php | 0 .../v2/servers/list_server_addresses.php | 0 .../v2/servers/list_servers.php | 0 .../v2/servers/list_volume_attachments.php | 0 .../v2/servers/merge_server_metadata.php | 0 .../v2/servers/reboot_server.php | 0 .../v2/servers/rebuild_server.php | 0 .../v2/servers/remove_security_group.php | 0 .../v2/servers/rescue_server.php | 0 .../v2/servers/reset_server_metadata.php | 0 .../v2/servers/reset_server_state.php | 0 .../v2/servers/resize_server.php | 0 .../v2/servers/revert_server_resize.php | 0 .../v2/servers/start_server.php | 0 .../v2/servers/stop_server.php | 0 .../v2/servers/unrescue_server.php | 0 .../v2/servers/update_server.php | 0 .../v2/authentication.php | 0 .../v2/generate_token.php | 0 .../v3/credentials/add_cred.php | 0 .../v3/credentials/delete_cred.php | 0 .../v3/credentials/get_cred.php | 0 .../v3/credentials/list_creds.php | 0 .../v3/credentials/update_cred.php | 0 .../v3/domains/add_domain.php | 0 .../v3/domains/check_group_role.php | 0 .../v3/domains/check_user_role.php | 0 .../v3/domains/delete_domain.php | 0 .../v3/domains/grant_group_role.php | 0 .../v3/domains/grant_user_role.php | 0 .../v3/domains/list_domains.php | 0 .../v3/domains/list_group_roles.php | 0 .../v3/domains/list_user_roles.php | 0 .../v3/domains/revoke_group_role.php | 0 .../v3/domains/revoke_user_role.php | 0 .../v3/domains/show_domain.php | 0 .../v3/domains/update_domain.php | 0 .../v3/endpoints/add_endpoint.php | 0 .../v3/endpoints/delete_endpoint.php | 0 .../v3/endpoints/get_endpoint.php | 0 .../v3/endpoints/list_endpoints.php | 0 .../v3/endpoints/update_endpoint.php | 0 .../v3/groups/add_group.php | 0 .../v3/groups/add_user.php | 0 .../v3/groups/check_user_membership.php | 0 .../v3/groups/delete_group.php | 0 .../v3/groups/get_group.php | 0 .../v3/groups/list_groups.php | 0 .../v3/groups/list_users.php | 0 .../v3/groups/remove_user.php | 0 .../v3/groups/update_group.php | 0 .../v3/projects/add_project.php | 0 .../v3/projects/check_group_role.php | 0 .../v3/projects/check_user_role.php | 0 .../v3/projects/delete_project.php | 0 .../v3/projects/get_project.php | 0 .../v3/projects/grant_group_role.php | 0 .../v3/projects/grant_user_role.php | 0 .../v3/projects/list_group_roles.php | 0 .../v3/projects/list_projects.php | 0 .../v3/projects/list_user_roles.php | 0 .../v3/projects/revoke_group_role.php | 0 .../v3/projects/revoke_user_role.php | 0 .../v3/projects/update_project.php | 0 .../v3/roles/add_role.php | 0 .../v3/roles/list_assignments.php | 0 .../v3/roles/list_roles.php | 0 .../v3/services/add_service.php | 0 .../v3/services/delete_service.php | 0 .../v3/services/get_service.php | 0 .../v3/services/list_services.php | 0 .../v3/services/update_service.php | 0 .../v3/tokens/export_authentication_token.php | 0 .../v3/tokens/generate_token_from_id.php | 0 .../generate_token_scoped_to_project_id.php | 0 .../generate_token_scoped_to_project_name.php | 0 .../v3/tokens/generate_token_with_user_id.php | 0 .../tokens/generate_token_with_username.php | 0 .../v3/tokens/revoke_token.php | 0 .../use_cached_authentication_token.php | 0 .../v3/tokens/validate_token.php | 0 .../v3/users/add_user.php | 0 .../v3/users/delete_user.php | 0 .../v3/users/get_user.php | 0 .../v3/users/list_groups.php | 0 .../v3/users/list_projects.php | 0 .../v3/users/list_users.php | 0 .../v3/users/update_user.php | 0 .../{images => Images}/v2/images/create.php | 0 .../v2/images/deactivate.php | 0 .../{images => Images}/v2/images/delete.php | 0 .../v2/images/download_binary_data.php | 0 samples/{images => Images}/v2/images/get.php | 0 samples/{images => Images}/v2/images/list.php | 0 .../v2/images/reactivate.php | 0 .../{images => Images}/v2/images/update.php | 0 .../v2/images/upload_binary_data.php | 0 samples/{images => Images}/v2/members/add.php | 0 .../{images => Images}/v2/members/delete.php | 0 samples/{images => Images}/v2/members/get.php | 0 .../{images => Images}/v2/members/list.php | 0 .../v2/members/update_status.php | 0 .../v2/floatingIPs/create.php | 0 .../v2/floatingIPs/delete.php | 0 .../v2/floatingIPs/get.php | 0 .../v2/floatingIPs/list.php | 0 .../v2/floatingIPs/update.php | 0 .../v2/lbaas/healthmonitors/create.php | 0 .../v2/lbaas/healthmonitors/delete.php | 0 .../v2/lbaas/healthmonitors/get.php | 0 .../v2/lbaas/healthmonitors/list.php | 0 .../v2/lbaas/healthmonitors/update.php | 0 .../v2/lbaas/listeners/create.php | 0 .../v2/lbaas/listeners/delete.php | 0 .../v2/lbaas/listeners/get.php | 0 .../v2/lbaas/listeners/list.php | 0 .../v2/lbaas/listeners/update.php | 0 .../v2/lbaas/loadbalancers/add_listener.php | 0 .../v2/lbaas/loadbalancers/create.php | 0 .../v2/lbaas/loadbalancers/delete.php | 0 .../v2/lbaas/loadbalancers/get.php | 0 .../v2/lbaas/loadbalancers/get_stats.php | 0 .../v2/lbaas/loadbalancers/get_statuses.php | 0 .../v2/lbaas/loadbalancers/list.php | 0 .../v2/lbaas/loadbalancers/update.php | 0 .../v2/lbaas/pools/add-healthmonitor.php | 0 .../v2/lbaas/pools/add-member.php | 0 .../v2/lbaas/pools/create.php | 0 .../v2/lbaas/pools/delete-member.php | 0 .../v2/lbaas/pools/delete.php | 0 .../v2/lbaas/pools/get-member.php | 0 .../v2/lbaas/pools/get.php | 0 .../v2/lbaas/pools/list.php | 0 .../v2/lbaas/pools/update.php | 0 .../v2/networks/create.php | 0 .../v2/networks/create_batch.php | 0 .../v2/networks/delete.php | 0 .../v2/networks/get.php | 0 .../v2/networks/update.php | 0 .../v2/ports/create.php | 0 .../v2/ports/create_batch.php | 0 .../v2/ports/create_with_fixed_ips.php | 0 .../v2/ports/delete.php | 0 .../v2/ports/get.php | 0 .../v2/ports/list.php | 0 .../v2/ports/update.php | 0 .../v2/securityGroupRules/create.php | 0 .../v2/securityGroupRules/delete.php | 0 .../v2/securityGroupRules/get.php | 0 .../v2/securityGroupRules/list.php | 0 .../v2/securityGroups/create.php | 0 .../v2/securityGroups/delete.php | 0 .../v2/securityGroups/get.php | 0 .../v2/securityGroups/list.php | 0 .../v2/subnets/create.php | 0 .../v2/subnets/create_batch.php | 0 .../v2/subnets/create_with_gateway_ip.php | 0 .../v2/subnets/create_with_host_routes.php | 0 .../v2/subnets/delete.php | 0 .../v2/subnets/get.php | 0 .../v2/subnets/update.php | 0 .../v1/account/get.php | 0 .../v1/account/get_metadata.php | 0 .../v1/account/merge_metadata.php | 0 .../v1/account/reset_metadata.php | 0 .../v1/containers/create.php | 0 .../v1/containers/delete.php | 0 .../v1/containers/get.php | 0 .../v1/containers/get_metadata.php | 0 .../v1/containers/list.php | 0 .../v1/containers/merge_metadata.php | 0 .../v1/containers/reset_metadata.php | 0 .../v1/objects/check_exists.php | 0 .../v1/objects/copy.php | 0 .../v1/objects/create.php | 0 .../v1/objects/create_from_stream.php | 0 .../v1/objects/create_large_object.php | 0 .../v1/objects/delete.php | 0 .../v1/objects/download.php | 0 .../v1/objects/download_stream.php | 0 .../v1/objects/get.php | 0 .../v1/objects/get_metadata.php | 0 .../v1/objects/list.php | 0 .../v1/objects/merge_metadata.php | 0 .../v1/objects/reset_metadata.php | 0 tests/integration/Compute/v2/CoreTest.php | 16 +++++----- tests/integration/Runner.php | 4 +-- tests/integration/TestCase.php | 2 +- 250 files changed, 36 insertions(+), 15 deletions(-) rename .github/workflows/{object_storage_integration_tests.yml => integration_object_storage.yml} (62%) rename samples/{blockstorage => BlockStorage}/v2/snapshots/create.php (100%) rename samples/{blockstorage => BlockStorage}/v2/snapshots/delete.php (100%) rename samples/{blockstorage => BlockStorage}/v2/snapshots/get.php (100%) rename samples/{blockstorage => BlockStorage}/v2/snapshots/get_metadata.php (100%) rename samples/{blockstorage => BlockStorage}/v2/snapshots/list.php (100%) rename samples/{blockstorage => BlockStorage}/v2/snapshots/list_detail.php (100%) rename samples/{blockstorage => BlockStorage}/v2/snapshots/merge_metadata.php (100%) rename samples/{blockstorage => BlockStorage}/v2/snapshots/reset_metadata.php (100%) rename samples/{blockstorage => BlockStorage}/v2/snapshots/update.php (100%) rename samples/{blockstorage => BlockStorage}/v2/volume_types/create.php (100%) rename samples/{blockstorage => BlockStorage}/v2/volume_types/delete.php (100%) rename samples/{blockstorage => BlockStorage}/v2/volume_types/get.php (100%) rename samples/{blockstorage => BlockStorage}/v2/volume_types/list.php (100%) rename samples/{blockstorage => BlockStorage}/v2/volume_types/update.php (100%) rename samples/{blockstorage => BlockStorage}/v2/volumes/create.php (100%) rename samples/{blockstorage => BlockStorage}/v2/volumes/create_from_image.php (100%) rename samples/{blockstorage => BlockStorage}/v2/volumes/create_from_snapshot.php (100%) rename samples/{blockstorage => BlockStorage}/v2/volumes/create_from_source_volume.php (100%) rename samples/{blockstorage => BlockStorage}/v2/volumes/delete.php (100%) rename samples/{blockstorage => BlockStorage}/v2/volumes/get.php (100%) rename samples/{blockstorage => BlockStorage}/v2/volumes/list.php (100%) rename samples/{blockstorage => BlockStorage}/v2/volumes/list_detail.php (100%) rename samples/{blockstorage => BlockStorage}/v2/volumes/update.php (100%) rename samples/{compute => Compute}/v2/flavors/create_flavor.php (100%) rename samples/{compute => Compute}/v2/flavors/delete_flavor.php (100%) rename samples/{compute => Compute}/v2/flavors/get_flavor.php (100%) rename samples/{compute => Compute}/v2/flavors/list_flavors.php (100%) rename samples/{compute => Compute}/v2/hypervisors/get_hypervisor.php (100%) rename samples/{compute => Compute}/v2/hypervisors/get_hypervisors_statistics.php (100%) rename samples/{compute => Compute}/v2/hypervisors/list_hypervisors.php (100%) rename samples/{compute => Compute}/v2/images/create_server_image.php (100%) rename samples/{compute => Compute}/v2/images/delete_image.php (100%) rename samples/{compute => Compute}/v2/images/delete_image_metadata_item.php (100%) rename samples/{compute => Compute}/v2/images/get_image.php (100%) rename samples/{compute => Compute}/v2/images/list_images.php (100%) rename samples/{compute => Compute}/v2/images/reset_image_metadata.php (100%) rename samples/{compute => Compute}/v2/images/retrieve_image_metadata.php (100%) rename samples/{compute => Compute}/v2/keypairs/create_keypair.php (100%) rename samples/{compute => Compute}/v2/keypairs/delete_keypair.php (100%) rename samples/{compute => Compute}/v2/keypairs/get_keypair.php (100%) rename samples/{compute => Compute}/v2/keypairs/list_keypairs.php (100%) rename samples/{compute => Compute}/v2/limits/get_limits.php (100%) rename samples/{compute => Compute}/v2/servers/add_security_group.php (100%) rename samples/{compute => Compute}/v2/servers/attach_volume_attachment.php (100%) rename samples/{compute => Compute}/v2/servers/change_server_password.php (100%) rename samples/{compute => Compute}/v2/servers/confirm_server_resize.php (100%) rename samples/{compute => Compute}/v2/servers/create_interface_attachment.php (100%) rename samples/{compute => Compute}/v2/servers/create_server.php (100%) rename samples/{compute => Compute}/v2/servers/delete_interface_attachment.php (100%) rename samples/{compute => Compute}/v2/servers/delete_server.php (100%) rename samples/{compute => Compute}/v2/servers/delete_server_metadata_item.php (100%) rename samples/{compute => Compute}/v2/servers/detach_volume_attachment.php (100%) rename samples/{compute => Compute}/v2/servers/get_interface_attachment.php (100%) rename samples/{compute => Compute}/v2/servers/get_server.php (100%) rename samples/{compute => Compute}/v2/servers/get_server_console_output.php (100%) rename samples/{compute => Compute}/v2/servers/get_server_metadata.php (100%) rename samples/{compute => Compute}/v2/servers/get_server_metadata_item.php (100%) rename samples/{compute => Compute}/v2/servers/get_server_rdp_console.php (100%) rename samples/{compute => Compute}/v2/servers/get_server_serial_console.php (100%) rename samples/{compute => Compute}/v2/servers/get_server_spice_console.php (100%) rename samples/{compute => Compute}/v2/servers/get_server_vnc_console.php (100%) rename samples/{compute => Compute}/v2/servers/list_security_groups.php (100%) rename samples/{compute => Compute}/v2/servers/list_server_addresses.php (100%) rename samples/{compute => Compute}/v2/servers/list_servers.php (100%) rename samples/{compute => Compute}/v2/servers/list_volume_attachments.php (100%) rename samples/{compute => Compute}/v2/servers/merge_server_metadata.php (100%) rename samples/{compute => Compute}/v2/servers/reboot_server.php (100%) rename samples/{compute => Compute}/v2/servers/rebuild_server.php (100%) rename samples/{compute => Compute}/v2/servers/remove_security_group.php (100%) rename samples/{compute => Compute}/v2/servers/rescue_server.php (100%) rename samples/{compute => Compute}/v2/servers/reset_server_metadata.php (100%) rename samples/{compute => Compute}/v2/servers/reset_server_state.php (100%) rename samples/{compute => Compute}/v2/servers/resize_server.php (100%) rename samples/{compute => Compute}/v2/servers/revert_server_resize.php (100%) rename samples/{compute => Compute}/v2/servers/start_server.php (100%) rename samples/{compute => Compute}/v2/servers/stop_server.php (100%) rename samples/{compute => Compute}/v2/servers/unrescue_server.php (100%) rename samples/{compute => Compute}/v2/servers/update_server.php (100%) rename samples/{identity => Identity}/v2/authentication.php (100%) rename samples/{identity => Identity}/v2/generate_token.php (100%) rename samples/{identity => Identity}/v3/credentials/add_cred.php (100%) rename samples/{identity => Identity}/v3/credentials/delete_cred.php (100%) rename samples/{identity => Identity}/v3/credentials/get_cred.php (100%) rename samples/{identity => Identity}/v3/credentials/list_creds.php (100%) rename samples/{identity => Identity}/v3/credentials/update_cred.php (100%) rename samples/{identity => Identity}/v3/domains/add_domain.php (100%) rename samples/{identity => Identity}/v3/domains/check_group_role.php (100%) rename samples/{identity => Identity}/v3/domains/check_user_role.php (100%) rename samples/{identity => Identity}/v3/domains/delete_domain.php (100%) rename samples/{identity => Identity}/v3/domains/grant_group_role.php (100%) rename samples/{identity => Identity}/v3/domains/grant_user_role.php (100%) rename samples/{identity => Identity}/v3/domains/list_domains.php (100%) rename samples/{identity => Identity}/v3/domains/list_group_roles.php (100%) rename samples/{identity => Identity}/v3/domains/list_user_roles.php (100%) rename samples/{identity => Identity}/v3/domains/revoke_group_role.php (100%) rename samples/{identity => Identity}/v3/domains/revoke_user_role.php (100%) rename samples/{identity => Identity}/v3/domains/show_domain.php (100%) rename samples/{identity => Identity}/v3/domains/update_domain.php (100%) rename samples/{identity => Identity}/v3/endpoints/add_endpoint.php (100%) rename samples/{identity => Identity}/v3/endpoints/delete_endpoint.php (100%) rename samples/{identity => Identity}/v3/endpoints/get_endpoint.php (100%) rename samples/{identity => Identity}/v3/endpoints/list_endpoints.php (100%) rename samples/{identity => Identity}/v3/endpoints/update_endpoint.php (100%) rename samples/{identity => Identity}/v3/groups/add_group.php (100%) rename samples/{identity => Identity}/v3/groups/add_user.php (100%) rename samples/{identity => Identity}/v3/groups/check_user_membership.php (100%) rename samples/{identity => Identity}/v3/groups/delete_group.php (100%) rename samples/{identity => Identity}/v3/groups/get_group.php (100%) rename samples/{identity => Identity}/v3/groups/list_groups.php (100%) rename samples/{identity => Identity}/v3/groups/list_users.php (100%) rename samples/{identity => Identity}/v3/groups/remove_user.php (100%) rename samples/{identity => Identity}/v3/groups/update_group.php (100%) rename samples/{identity => Identity}/v3/projects/add_project.php (100%) rename samples/{identity => Identity}/v3/projects/check_group_role.php (100%) rename samples/{identity => Identity}/v3/projects/check_user_role.php (100%) rename samples/{identity => Identity}/v3/projects/delete_project.php (100%) rename samples/{identity => Identity}/v3/projects/get_project.php (100%) rename samples/{identity => Identity}/v3/projects/grant_group_role.php (100%) rename samples/{identity => Identity}/v3/projects/grant_user_role.php (100%) rename samples/{identity => Identity}/v3/projects/list_group_roles.php (100%) rename samples/{identity => Identity}/v3/projects/list_projects.php (100%) rename samples/{identity => Identity}/v3/projects/list_user_roles.php (100%) rename samples/{identity => Identity}/v3/projects/revoke_group_role.php (100%) rename samples/{identity => Identity}/v3/projects/revoke_user_role.php (100%) rename samples/{identity => Identity}/v3/projects/update_project.php (100%) rename samples/{identity => Identity}/v3/roles/add_role.php (100%) rename samples/{identity => Identity}/v3/roles/list_assignments.php (100%) rename samples/{identity => Identity}/v3/roles/list_roles.php (100%) rename samples/{identity => Identity}/v3/services/add_service.php (100%) rename samples/{identity => Identity}/v3/services/delete_service.php (100%) rename samples/{identity => Identity}/v3/services/get_service.php (100%) rename samples/{identity => Identity}/v3/services/list_services.php (100%) rename samples/{identity => Identity}/v3/services/update_service.php (100%) rename samples/{identity => Identity}/v3/tokens/export_authentication_token.php (100%) rename samples/{identity => Identity}/v3/tokens/generate_token_from_id.php (100%) rename samples/{identity => Identity}/v3/tokens/generate_token_scoped_to_project_id.php (100%) rename samples/{identity => Identity}/v3/tokens/generate_token_scoped_to_project_name.php (100%) rename samples/{identity => Identity}/v3/tokens/generate_token_with_user_id.php (100%) rename samples/{identity => Identity}/v3/tokens/generate_token_with_username.php (100%) rename samples/{identity => Identity}/v3/tokens/revoke_token.php (100%) rename samples/{identity => Identity}/v3/tokens/use_cached_authentication_token.php (100%) rename samples/{identity => Identity}/v3/tokens/validate_token.php (100%) rename samples/{identity => Identity}/v3/users/add_user.php (100%) rename samples/{identity => Identity}/v3/users/delete_user.php (100%) rename samples/{identity => Identity}/v3/users/get_user.php (100%) rename samples/{identity => Identity}/v3/users/list_groups.php (100%) rename samples/{identity => Identity}/v3/users/list_projects.php (100%) rename samples/{identity => Identity}/v3/users/list_users.php (100%) rename samples/{identity => Identity}/v3/users/update_user.php (100%) rename samples/{images => Images}/v2/images/create.php (100%) rename samples/{images => Images}/v2/images/deactivate.php (100%) rename samples/{images => Images}/v2/images/delete.php (100%) rename samples/{images => Images}/v2/images/download_binary_data.php (100%) rename samples/{images => Images}/v2/images/get.php (100%) rename samples/{images => Images}/v2/images/list.php (100%) rename samples/{images => Images}/v2/images/reactivate.php (100%) rename samples/{images => Images}/v2/images/update.php (100%) rename samples/{images => Images}/v2/images/upload_binary_data.php (100%) rename samples/{images => Images}/v2/members/add.php (100%) rename samples/{images => Images}/v2/members/delete.php (100%) rename samples/{images => Images}/v2/members/get.php (100%) rename samples/{images => Images}/v2/members/list.php (100%) rename samples/{images => Images}/v2/members/update_status.php (100%) rename samples/{networking => Networking}/v2/floatingIPs/create.php (100%) rename samples/{networking => Networking}/v2/floatingIPs/delete.php (100%) rename samples/{networking => Networking}/v2/floatingIPs/get.php (100%) rename samples/{networking => Networking}/v2/floatingIPs/list.php (100%) rename samples/{networking => Networking}/v2/floatingIPs/update.php (100%) rename samples/{networking => Networking}/v2/lbaas/healthmonitors/create.php (100%) rename samples/{networking => Networking}/v2/lbaas/healthmonitors/delete.php (100%) rename samples/{networking => Networking}/v2/lbaas/healthmonitors/get.php (100%) rename samples/{networking => Networking}/v2/lbaas/healthmonitors/list.php (100%) rename samples/{networking => Networking}/v2/lbaas/healthmonitors/update.php (100%) rename samples/{networking => Networking}/v2/lbaas/listeners/create.php (100%) rename samples/{networking => Networking}/v2/lbaas/listeners/delete.php (100%) rename samples/{networking => Networking}/v2/lbaas/listeners/get.php (100%) rename samples/{networking => Networking}/v2/lbaas/listeners/list.php (100%) rename samples/{networking => Networking}/v2/lbaas/listeners/update.php (100%) rename samples/{networking => Networking}/v2/lbaas/loadbalancers/add_listener.php (100%) rename samples/{networking => Networking}/v2/lbaas/loadbalancers/create.php (100%) rename samples/{networking => Networking}/v2/lbaas/loadbalancers/delete.php (100%) rename samples/{networking => Networking}/v2/lbaas/loadbalancers/get.php (100%) rename samples/{networking => Networking}/v2/lbaas/loadbalancers/get_stats.php (100%) rename samples/{networking => Networking}/v2/lbaas/loadbalancers/get_statuses.php (100%) rename samples/{networking => Networking}/v2/lbaas/loadbalancers/list.php (100%) rename samples/{networking => Networking}/v2/lbaas/loadbalancers/update.php (100%) rename samples/{networking => Networking}/v2/lbaas/pools/add-healthmonitor.php (100%) rename samples/{networking => Networking}/v2/lbaas/pools/add-member.php (100%) rename samples/{networking => Networking}/v2/lbaas/pools/create.php (100%) rename samples/{networking => Networking}/v2/lbaas/pools/delete-member.php (100%) rename samples/{networking => Networking}/v2/lbaas/pools/delete.php (100%) rename samples/{networking => Networking}/v2/lbaas/pools/get-member.php (100%) rename samples/{networking => Networking}/v2/lbaas/pools/get.php (100%) rename samples/{networking => Networking}/v2/lbaas/pools/list.php (100%) rename samples/{networking => Networking}/v2/lbaas/pools/update.php (100%) rename samples/{networking => Networking}/v2/networks/create.php (100%) rename samples/{networking => Networking}/v2/networks/create_batch.php (100%) rename samples/{networking => Networking}/v2/networks/delete.php (100%) rename samples/{networking => Networking}/v2/networks/get.php (100%) rename samples/{networking => Networking}/v2/networks/update.php (100%) rename samples/{networking => Networking}/v2/ports/create.php (100%) rename samples/{networking => Networking}/v2/ports/create_batch.php (100%) rename samples/{networking => Networking}/v2/ports/create_with_fixed_ips.php (100%) rename samples/{networking => Networking}/v2/ports/delete.php (100%) rename samples/{networking => Networking}/v2/ports/get.php (100%) rename samples/{networking => Networking}/v2/ports/list.php (100%) rename samples/{networking => Networking}/v2/ports/update.php (100%) rename samples/{networking => Networking}/v2/securityGroupRules/create.php (100%) rename samples/{networking => Networking}/v2/securityGroupRules/delete.php (100%) rename samples/{networking => Networking}/v2/securityGroupRules/get.php (100%) rename samples/{networking => Networking}/v2/securityGroupRules/list.php (100%) rename samples/{networking => Networking}/v2/securityGroups/create.php (100%) rename samples/{networking => Networking}/v2/securityGroups/delete.php (100%) rename samples/{networking => Networking}/v2/securityGroups/get.php (100%) rename samples/{networking => Networking}/v2/securityGroups/list.php (100%) rename samples/{networking => Networking}/v2/subnets/create.php (100%) rename samples/{networking => Networking}/v2/subnets/create_batch.php (100%) rename samples/{networking => Networking}/v2/subnets/create_with_gateway_ip.php (100%) rename samples/{networking => Networking}/v2/subnets/create_with_host_routes.php (100%) rename samples/{networking => Networking}/v2/subnets/delete.php (100%) rename samples/{networking => Networking}/v2/subnets/get.php (100%) rename samples/{networking => Networking}/v2/subnets/update.php (100%) rename samples/{objectstore => ObjectStore}/v1/account/get.php (100%) rename samples/{objectstore => ObjectStore}/v1/account/get_metadata.php (100%) rename samples/{objectstore => ObjectStore}/v1/account/merge_metadata.php (100%) rename samples/{objectstore => ObjectStore}/v1/account/reset_metadata.php (100%) rename samples/{objectstore => ObjectStore}/v1/containers/create.php (100%) rename samples/{objectstore => ObjectStore}/v1/containers/delete.php (100%) rename samples/{objectstore => ObjectStore}/v1/containers/get.php (100%) rename samples/{objectstore => ObjectStore}/v1/containers/get_metadata.php (100%) rename samples/{objectstore => ObjectStore}/v1/containers/list.php (100%) rename samples/{objectstore => ObjectStore}/v1/containers/merge_metadata.php (100%) rename samples/{objectstore => ObjectStore}/v1/containers/reset_metadata.php (100%) rename samples/{objectstore => ObjectStore}/v1/objects/check_exists.php (100%) rename samples/{objectstore => ObjectStore}/v1/objects/copy.php (100%) rename samples/{objectstore => ObjectStore}/v1/objects/create.php (100%) rename samples/{objectstore => ObjectStore}/v1/objects/create_from_stream.php (100%) rename samples/{objectstore => ObjectStore}/v1/objects/create_large_object.php (100%) rename samples/{objectstore => ObjectStore}/v1/objects/delete.php (100%) rename samples/{objectstore => ObjectStore}/v1/objects/download.php (100%) rename samples/{objectstore => ObjectStore}/v1/objects/download_stream.php (100%) rename samples/{objectstore => ObjectStore}/v1/objects/get.php (100%) rename samples/{objectstore => ObjectStore}/v1/objects/get_metadata.php (100%) rename samples/{objectstore => ObjectStore}/v1/objects/list.php (100%) rename samples/{objectstore => ObjectStore}/v1/objects/merge_metadata.php (100%) rename samples/{objectstore => ObjectStore}/v1/objects/reset_metadata.php (100%) diff --git a/.github/workflows/object_storage_integration_tests.yml b/.github/workflows/integration_object_storage.yml similarity index 62% rename from .github/workflows/object_storage_integration_tests.yml rename to .github/workflows/integration_object_storage.yml index e76b90d27..80524d6e9 100644 --- a/.github/workflows/object_storage_integration_tests.yml +++ b/.github/workflows/integration_object_storage.yml @@ -1,16 +1,17 @@ name: Run Object Storage Integration Tests on: - push: pull_request: + paths: + - '**ObjectStore**' jobs: tests: if: "!contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'ci skip')" strategy: fail-fast: false matrix: - openstack_version: ["stable/zed"] + openstack_version: [ "stable/zed" ] php_version: [ 8.1 ] - ubuntu_version: [20.04] + ubuntu_version: [ 20.04 ] runs-on: ubuntu-${{ matrix.ubuntu_version }} name: Deploy OpenStack ${{ matrix.name }} with Swift and run objectstorage integration tests with php ${{matrix.php_version}} steps: @@ -32,6 +33,11 @@ jobs: tools: composer:v2 coverage: none - run: composer install --prefer-dist --no-interaction --no-progress + - name: Restore devstack cache + uses: actions/cache@v2 + with: + path: /opt/stack/ + key: ${{ runner.os }}-oscache-${{ matrix.openstack_version }} - name: Deploy devstack uses: EmilienM/devstack-action@v0.11 with: @@ -43,6 +49,21 @@ jobs: [filter:versioned_writes] allow_object_versioning = true enabled_services: 's-account,s-container,s-object,s-proxy' - - name: execute integration tests + - name: Set env variables + run: | + { + echo OS_AUTH_URL="$(grep -oP -m 1 "(?<=auth_url: )(.*)\$" /etc/openstack/clouds.yaml)/v3" + echo OS_REGION=RegionOne + echo OS_REGION_NAME=RegionOne + echo OS_USER_ID=$(openstack --os-cloud=devstack-admin user show admin -f value -c id) + echo OS_USERNAME=admin + echo OS_PASSWORD=secret + echo OS_PROJECT_ID=$(openstack --os-cloud=devstack-admin project show admin -f value -c id) + echo OS_PROJECT_NAME=admin + echo OS_RESIZE_FLAVOR=2 + echo OS_FLAVOR=1 + echo OS_DOMAIN_ID=default + } >> "$GITHUB_ENV" + - name: Execute integration tests run: php ./tests/integration/run.php -s=ObjectStore diff --git a/samples/blockstorage/v2/snapshots/create.php b/samples/BlockStorage/v2/snapshots/create.php similarity index 100% rename from samples/blockstorage/v2/snapshots/create.php rename to samples/BlockStorage/v2/snapshots/create.php diff --git a/samples/blockstorage/v2/snapshots/delete.php b/samples/BlockStorage/v2/snapshots/delete.php similarity index 100% rename from samples/blockstorage/v2/snapshots/delete.php rename to samples/BlockStorage/v2/snapshots/delete.php diff --git a/samples/blockstorage/v2/snapshots/get.php b/samples/BlockStorage/v2/snapshots/get.php similarity index 100% rename from samples/blockstorage/v2/snapshots/get.php rename to samples/BlockStorage/v2/snapshots/get.php diff --git a/samples/blockstorage/v2/snapshots/get_metadata.php b/samples/BlockStorage/v2/snapshots/get_metadata.php similarity index 100% rename from samples/blockstorage/v2/snapshots/get_metadata.php rename to samples/BlockStorage/v2/snapshots/get_metadata.php diff --git a/samples/blockstorage/v2/snapshots/list.php b/samples/BlockStorage/v2/snapshots/list.php similarity index 100% rename from samples/blockstorage/v2/snapshots/list.php rename to samples/BlockStorage/v2/snapshots/list.php diff --git a/samples/blockstorage/v2/snapshots/list_detail.php b/samples/BlockStorage/v2/snapshots/list_detail.php similarity index 100% rename from samples/blockstorage/v2/snapshots/list_detail.php rename to samples/BlockStorage/v2/snapshots/list_detail.php diff --git a/samples/blockstorage/v2/snapshots/merge_metadata.php b/samples/BlockStorage/v2/snapshots/merge_metadata.php similarity index 100% rename from samples/blockstorage/v2/snapshots/merge_metadata.php rename to samples/BlockStorage/v2/snapshots/merge_metadata.php diff --git a/samples/blockstorage/v2/snapshots/reset_metadata.php b/samples/BlockStorage/v2/snapshots/reset_metadata.php similarity index 100% rename from samples/blockstorage/v2/snapshots/reset_metadata.php rename to samples/BlockStorage/v2/snapshots/reset_metadata.php diff --git a/samples/blockstorage/v2/snapshots/update.php b/samples/BlockStorage/v2/snapshots/update.php similarity index 100% rename from samples/blockstorage/v2/snapshots/update.php rename to samples/BlockStorage/v2/snapshots/update.php diff --git a/samples/blockstorage/v2/volume_types/create.php b/samples/BlockStorage/v2/volume_types/create.php similarity index 100% rename from samples/blockstorage/v2/volume_types/create.php rename to samples/BlockStorage/v2/volume_types/create.php diff --git a/samples/blockstorage/v2/volume_types/delete.php b/samples/BlockStorage/v2/volume_types/delete.php similarity index 100% rename from samples/blockstorage/v2/volume_types/delete.php rename to samples/BlockStorage/v2/volume_types/delete.php diff --git a/samples/blockstorage/v2/volume_types/get.php b/samples/BlockStorage/v2/volume_types/get.php similarity index 100% rename from samples/blockstorage/v2/volume_types/get.php rename to samples/BlockStorage/v2/volume_types/get.php diff --git a/samples/blockstorage/v2/volume_types/list.php b/samples/BlockStorage/v2/volume_types/list.php similarity index 100% rename from samples/blockstorage/v2/volume_types/list.php rename to samples/BlockStorage/v2/volume_types/list.php diff --git a/samples/blockstorage/v2/volume_types/update.php b/samples/BlockStorage/v2/volume_types/update.php similarity index 100% rename from samples/blockstorage/v2/volume_types/update.php rename to samples/BlockStorage/v2/volume_types/update.php diff --git a/samples/blockstorage/v2/volumes/create.php b/samples/BlockStorage/v2/volumes/create.php similarity index 100% rename from samples/blockstorage/v2/volumes/create.php rename to samples/BlockStorage/v2/volumes/create.php diff --git a/samples/blockstorage/v2/volumes/create_from_image.php b/samples/BlockStorage/v2/volumes/create_from_image.php similarity index 100% rename from samples/blockstorage/v2/volumes/create_from_image.php rename to samples/BlockStorage/v2/volumes/create_from_image.php diff --git a/samples/blockstorage/v2/volumes/create_from_snapshot.php b/samples/BlockStorage/v2/volumes/create_from_snapshot.php similarity index 100% rename from samples/blockstorage/v2/volumes/create_from_snapshot.php rename to samples/BlockStorage/v2/volumes/create_from_snapshot.php diff --git a/samples/blockstorage/v2/volumes/create_from_source_volume.php b/samples/BlockStorage/v2/volumes/create_from_source_volume.php similarity index 100% rename from samples/blockstorage/v2/volumes/create_from_source_volume.php rename to samples/BlockStorage/v2/volumes/create_from_source_volume.php diff --git a/samples/blockstorage/v2/volumes/delete.php b/samples/BlockStorage/v2/volumes/delete.php similarity index 100% rename from samples/blockstorage/v2/volumes/delete.php rename to samples/BlockStorage/v2/volumes/delete.php diff --git a/samples/blockstorage/v2/volumes/get.php b/samples/BlockStorage/v2/volumes/get.php similarity index 100% rename from samples/blockstorage/v2/volumes/get.php rename to samples/BlockStorage/v2/volumes/get.php diff --git a/samples/blockstorage/v2/volumes/list.php b/samples/BlockStorage/v2/volumes/list.php similarity index 100% rename from samples/blockstorage/v2/volumes/list.php rename to samples/BlockStorage/v2/volumes/list.php diff --git a/samples/blockstorage/v2/volumes/list_detail.php b/samples/BlockStorage/v2/volumes/list_detail.php similarity index 100% rename from samples/blockstorage/v2/volumes/list_detail.php rename to samples/BlockStorage/v2/volumes/list_detail.php diff --git a/samples/blockstorage/v2/volumes/update.php b/samples/BlockStorage/v2/volumes/update.php similarity index 100% rename from samples/blockstorage/v2/volumes/update.php rename to samples/BlockStorage/v2/volumes/update.php diff --git a/samples/compute/v2/flavors/create_flavor.php b/samples/Compute/v2/flavors/create_flavor.php similarity index 100% rename from samples/compute/v2/flavors/create_flavor.php rename to samples/Compute/v2/flavors/create_flavor.php diff --git a/samples/compute/v2/flavors/delete_flavor.php b/samples/Compute/v2/flavors/delete_flavor.php similarity index 100% rename from samples/compute/v2/flavors/delete_flavor.php rename to samples/Compute/v2/flavors/delete_flavor.php diff --git a/samples/compute/v2/flavors/get_flavor.php b/samples/Compute/v2/flavors/get_flavor.php similarity index 100% rename from samples/compute/v2/flavors/get_flavor.php rename to samples/Compute/v2/flavors/get_flavor.php diff --git a/samples/compute/v2/flavors/list_flavors.php b/samples/Compute/v2/flavors/list_flavors.php similarity index 100% rename from samples/compute/v2/flavors/list_flavors.php rename to samples/Compute/v2/flavors/list_flavors.php diff --git a/samples/compute/v2/hypervisors/get_hypervisor.php b/samples/Compute/v2/hypervisors/get_hypervisor.php similarity index 100% rename from samples/compute/v2/hypervisors/get_hypervisor.php rename to samples/Compute/v2/hypervisors/get_hypervisor.php diff --git a/samples/compute/v2/hypervisors/get_hypervisors_statistics.php b/samples/Compute/v2/hypervisors/get_hypervisors_statistics.php similarity index 100% rename from samples/compute/v2/hypervisors/get_hypervisors_statistics.php rename to samples/Compute/v2/hypervisors/get_hypervisors_statistics.php diff --git a/samples/compute/v2/hypervisors/list_hypervisors.php b/samples/Compute/v2/hypervisors/list_hypervisors.php similarity index 100% rename from samples/compute/v2/hypervisors/list_hypervisors.php rename to samples/Compute/v2/hypervisors/list_hypervisors.php diff --git a/samples/compute/v2/images/create_server_image.php b/samples/Compute/v2/images/create_server_image.php similarity index 100% rename from samples/compute/v2/images/create_server_image.php rename to samples/Compute/v2/images/create_server_image.php diff --git a/samples/compute/v2/images/delete_image.php b/samples/Compute/v2/images/delete_image.php similarity index 100% rename from samples/compute/v2/images/delete_image.php rename to samples/Compute/v2/images/delete_image.php diff --git a/samples/compute/v2/images/delete_image_metadata_item.php b/samples/Compute/v2/images/delete_image_metadata_item.php similarity index 100% rename from samples/compute/v2/images/delete_image_metadata_item.php rename to samples/Compute/v2/images/delete_image_metadata_item.php diff --git a/samples/compute/v2/images/get_image.php b/samples/Compute/v2/images/get_image.php similarity index 100% rename from samples/compute/v2/images/get_image.php rename to samples/Compute/v2/images/get_image.php diff --git a/samples/compute/v2/images/list_images.php b/samples/Compute/v2/images/list_images.php similarity index 100% rename from samples/compute/v2/images/list_images.php rename to samples/Compute/v2/images/list_images.php diff --git a/samples/compute/v2/images/reset_image_metadata.php b/samples/Compute/v2/images/reset_image_metadata.php similarity index 100% rename from samples/compute/v2/images/reset_image_metadata.php rename to samples/Compute/v2/images/reset_image_metadata.php diff --git a/samples/compute/v2/images/retrieve_image_metadata.php b/samples/Compute/v2/images/retrieve_image_metadata.php similarity index 100% rename from samples/compute/v2/images/retrieve_image_metadata.php rename to samples/Compute/v2/images/retrieve_image_metadata.php diff --git a/samples/compute/v2/keypairs/create_keypair.php b/samples/Compute/v2/keypairs/create_keypair.php similarity index 100% rename from samples/compute/v2/keypairs/create_keypair.php rename to samples/Compute/v2/keypairs/create_keypair.php diff --git a/samples/compute/v2/keypairs/delete_keypair.php b/samples/Compute/v2/keypairs/delete_keypair.php similarity index 100% rename from samples/compute/v2/keypairs/delete_keypair.php rename to samples/Compute/v2/keypairs/delete_keypair.php diff --git a/samples/compute/v2/keypairs/get_keypair.php b/samples/Compute/v2/keypairs/get_keypair.php similarity index 100% rename from samples/compute/v2/keypairs/get_keypair.php rename to samples/Compute/v2/keypairs/get_keypair.php diff --git a/samples/compute/v2/keypairs/list_keypairs.php b/samples/Compute/v2/keypairs/list_keypairs.php similarity index 100% rename from samples/compute/v2/keypairs/list_keypairs.php rename to samples/Compute/v2/keypairs/list_keypairs.php diff --git a/samples/compute/v2/limits/get_limits.php b/samples/Compute/v2/limits/get_limits.php similarity index 100% rename from samples/compute/v2/limits/get_limits.php rename to samples/Compute/v2/limits/get_limits.php diff --git a/samples/compute/v2/servers/add_security_group.php b/samples/Compute/v2/servers/add_security_group.php similarity index 100% rename from samples/compute/v2/servers/add_security_group.php rename to samples/Compute/v2/servers/add_security_group.php diff --git a/samples/compute/v2/servers/attach_volume_attachment.php b/samples/Compute/v2/servers/attach_volume_attachment.php similarity index 100% rename from samples/compute/v2/servers/attach_volume_attachment.php rename to samples/Compute/v2/servers/attach_volume_attachment.php diff --git a/samples/compute/v2/servers/change_server_password.php b/samples/Compute/v2/servers/change_server_password.php similarity index 100% rename from samples/compute/v2/servers/change_server_password.php rename to samples/Compute/v2/servers/change_server_password.php diff --git a/samples/compute/v2/servers/confirm_server_resize.php b/samples/Compute/v2/servers/confirm_server_resize.php similarity index 100% rename from samples/compute/v2/servers/confirm_server_resize.php rename to samples/Compute/v2/servers/confirm_server_resize.php diff --git a/samples/compute/v2/servers/create_interface_attachment.php b/samples/Compute/v2/servers/create_interface_attachment.php similarity index 100% rename from samples/compute/v2/servers/create_interface_attachment.php rename to samples/Compute/v2/servers/create_interface_attachment.php diff --git a/samples/compute/v2/servers/create_server.php b/samples/Compute/v2/servers/create_server.php similarity index 100% rename from samples/compute/v2/servers/create_server.php rename to samples/Compute/v2/servers/create_server.php diff --git a/samples/compute/v2/servers/delete_interface_attachment.php b/samples/Compute/v2/servers/delete_interface_attachment.php similarity index 100% rename from samples/compute/v2/servers/delete_interface_attachment.php rename to samples/Compute/v2/servers/delete_interface_attachment.php diff --git a/samples/compute/v2/servers/delete_server.php b/samples/Compute/v2/servers/delete_server.php similarity index 100% rename from samples/compute/v2/servers/delete_server.php rename to samples/Compute/v2/servers/delete_server.php diff --git a/samples/compute/v2/servers/delete_server_metadata_item.php b/samples/Compute/v2/servers/delete_server_metadata_item.php similarity index 100% rename from samples/compute/v2/servers/delete_server_metadata_item.php rename to samples/Compute/v2/servers/delete_server_metadata_item.php diff --git a/samples/compute/v2/servers/detach_volume_attachment.php b/samples/Compute/v2/servers/detach_volume_attachment.php similarity index 100% rename from samples/compute/v2/servers/detach_volume_attachment.php rename to samples/Compute/v2/servers/detach_volume_attachment.php diff --git a/samples/compute/v2/servers/get_interface_attachment.php b/samples/Compute/v2/servers/get_interface_attachment.php similarity index 100% rename from samples/compute/v2/servers/get_interface_attachment.php rename to samples/Compute/v2/servers/get_interface_attachment.php diff --git a/samples/compute/v2/servers/get_server.php b/samples/Compute/v2/servers/get_server.php similarity index 100% rename from samples/compute/v2/servers/get_server.php rename to samples/Compute/v2/servers/get_server.php diff --git a/samples/compute/v2/servers/get_server_console_output.php b/samples/Compute/v2/servers/get_server_console_output.php similarity index 100% rename from samples/compute/v2/servers/get_server_console_output.php rename to samples/Compute/v2/servers/get_server_console_output.php diff --git a/samples/compute/v2/servers/get_server_metadata.php b/samples/Compute/v2/servers/get_server_metadata.php similarity index 100% rename from samples/compute/v2/servers/get_server_metadata.php rename to samples/Compute/v2/servers/get_server_metadata.php diff --git a/samples/compute/v2/servers/get_server_metadata_item.php b/samples/Compute/v2/servers/get_server_metadata_item.php similarity index 100% rename from samples/compute/v2/servers/get_server_metadata_item.php rename to samples/Compute/v2/servers/get_server_metadata_item.php diff --git a/samples/compute/v2/servers/get_server_rdp_console.php b/samples/Compute/v2/servers/get_server_rdp_console.php similarity index 100% rename from samples/compute/v2/servers/get_server_rdp_console.php rename to samples/Compute/v2/servers/get_server_rdp_console.php diff --git a/samples/compute/v2/servers/get_server_serial_console.php b/samples/Compute/v2/servers/get_server_serial_console.php similarity index 100% rename from samples/compute/v2/servers/get_server_serial_console.php rename to samples/Compute/v2/servers/get_server_serial_console.php diff --git a/samples/compute/v2/servers/get_server_spice_console.php b/samples/Compute/v2/servers/get_server_spice_console.php similarity index 100% rename from samples/compute/v2/servers/get_server_spice_console.php rename to samples/Compute/v2/servers/get_server_spice_console.php diff --git a/samples/compute/v2/servers/get_server_vnc_console.php b/samples/Compute/v2/servers/get_server_vnc_console.php similarity index 100% rename from samples/compute/v2/servers/get_server_vnc_console.php rename to samples/Compute/v2/servers/get_server_vnc_console.php diff --git a/samples/compute/v2/servers/list_security_groups.php b/samples/Compute/v2/servers/list_security_groups.php similarity index 100% rename from samples/compute/v2/servers/list_security_groups.php rename to samples/Compute/v2/servers/list_security_groups.php diff --git a/samples/compute/v2/servers/list_server_addresses.php b/samples/Compute/v2/servers/list_server_addresses.php similarity index 100% rename from samples/compute/v2/servers/list_server_addresses.php rename to samples/Compute/v2/servers/list_server_addresses.php diff --git a/samples/compute/v2/servers/list_servers.php b/samples/Compute/v2/servers/list_servers.php similarity index 100% rename from samples/compute/v2/servers/list_servers.php rename to samples/Compute/v2/servers/list_servers.php diff --git a/samples/compute/v2/servers/list_volume_attachments.php b/samples/Compute/v2/servers/list_volume_attachments.php similarity index 100% rename from samples/compute/v2/servers/list_volume_attachments.php rename to samples/Compute/v2/servers/list_volume_attachments.php diff --git a/samples/compute/v2/servers/merge_server_metadata.php b/samples/Compute/v2/servers/merge_server_metadata.php similarity index 100% rename from samples/compute/v2/servers/merge_server_metadata.php rename to samples/Compute/v2/servers/merge_server_metadata.php diff --git a/samples/compute/v2/servers/reboot_server.php b/samples/Compute/v2/servers/reboot_server.php similarity index 100% rename from samples/compute/v2/servers/reboot_server.php rename to samples/Compute/v2/servers/reboot_server.php diff --git a/samples/compute/v2/servers/rebuild_server.php b/samples/Compute/v2/servers/rebuild_server.php similarity index 100% rename from samples/compute/v2/servers/rebuild_server.php rename to samples/Compute/v2/servers/rebuild_server.php diff --git a/samples/compute/v2/servers/remove_security_group.php b/samples/Compute/v2/servers/remove_security_group.php similarity index 100% rename from samples/compute/v2/servers/remove_security_group.php rename to samples/Compute/v2/servers/remove_security_group.php diff --git a/samples/compute/v2/servers/rescue_server.php b/samples/Compute/v2/servers/rescue_server.php similarity index 100% rename from samples/compute/v2/servers/rescue_server.php rename to samples/Compute/v2/servers/rescue_server.php diff --git a/samples/compute/v2/servers/reset_server_metadata.php b/samples/Compute/v2/servers/reset_server_metadata.php similarity index 100% rename from samples/compute/v2/servers/reset_server_metadata.php rename to samples/Compute/v2/servers/reset_server_metadata.php diff --git a/samples/compute/v2/servers/reset_server_state.php b/samples/Compute/v2/servers/reset_server_state.php similarity index 100% rename from samples/compute/v2/servers/reset_server_state.php rename to samples/Compute/v2/servers/reset_server_state.php diff --git a/samples/compute/v2/servers/resize_server.php b/samples/Compute/v2/servers/resize_server.php similarity index 100% rename from samples/compute/v2/servers/resize_server.php rename to samples/Compute/v2/servers/resize_server.php diff --git a/samples/compute/v2/servers/revert_server_resize.php b/samples/Compute/v2/servers/revert_server_resize.php similarity index 100% rename from samples/compute/v2/servers/revert_server_resize.php rename to samples/Compute/v2/servers/revert_server_resize.php diff --git a/samples/compute/v2/servers/start_server.php b/samples/Compute/v2/servers/start_server.php similarity index 100% rename from samples/compute/v2/servers/start_server.php rename to samples/Compute/v2/servers/start_server.php diff --git a/samples/compute/v2/servers/stop_server.php b/samples/Compute/v2/servers/stop_server.php similarity index 100% rename from samples/compute/v2/servers/stop_server.php rename to samples/Compute/v2/servers/stop_server.php diff --git a/samples/compute/v2/servers/unrescue_server.php b/samples/Compute/v2/servers/unrescue_server.php similarity index 100% rename from samples/compute/v2/servers/unrescue_server.php rename to samples/Compute/v2/servers/unrescue_server.php diff --git a/samples/compute/v2/servers/update_server.php b/samples/Compute/v2/servers/update_server.php similarity index 100% rename from samples/compute/v2/servers/update_server.php rename to samples/Compute/v2/servers/update_server.php diff --git a/samples/identity/v2/authentication.php b/samples/Identity/v2/authentication.php similarity index 100% rename from samples/identity/v2/authentication.php rename to samples/Identity/v2/authentication.php diff --git a/samples/identity/v2/generate_token.php b/samples/Identity/v2/generate_token.php similarity index 100% rename from samples/identity/v2/generate_token.php rename to samples/Identity/v2/generate_token.php diff --git a/samples/identity/v3/credentials/add_cred.php b/samples/Identity/v3/credentials/add_cred.php similarity index 100% rename from samples/identity/v3/credentials/add_cred.php rename to samples/Identity/v3/credentials/add_cred.php diff --git a/samples/identity/v3/credentials/delete_cred.php b/samples/Identity/v3/credentials/delete_cred.php similarity index 100% rename from samples/identity/v3/credentials/delete_cred.php rename to samples/Identity/v3/credentials/delete_cred.php diff --git a/samples/identity/v3/credentials/get_cred.php b/samples/Identity/v3/credentials/get_cred.php similarity index 100% rename from samples/identity/v3/credentials/get_cred.php rename to samples/Identity/v3/credentials/get_cred.php diff --git a/samples/identity/v3/credentials/list_creds.php b/samples/Identity/v3/credentials/list_creds.php similarity index 100% rename from samples/identity/v3/credentials/list_creds.php rename to samples/Identity/v3/credentials/list_creds.php diff --git a/samples/identity/v3/credentials/update_cred.php b/samples/Identity/v3/credentials/update_cred.php similarity index 100% rename from samples/identity/v3/credentials/update_cred.php rename to samples/Identity/v3/credentials/update_cred.php diff --git a/samples/identity/v3/domains/add_domain.php b/samples/Identity/v3/domains/add_domain.php similarity index 100% rename from samples/identity/v3/domains/add_domain.php rename to samples/Identity/v3/domains/add_domain.php diff --git a/samples/identity/v3/domains/check_group_role.php b/samples/Identity/v3/domains/check_group_role.php similarity index 100% rename from samples/identity/v3/domains/check_group_role.php rename to samples/Identity/v3/domains/check_group_role.php diff --git a/samples/identity/v3/domains/check_user_role.php b/samples/Identity/v3/domains/check_user_role.php similarity index 100% rename from samples/identity/v3/domains/check_user_role.php rename to samples/Identity/v3/domains/check_user_role.php diff --git a/samples/identity/v3/domains/delete_domain.php b/samples/Identity/v3/domains/delete_domain.php similarity index 100% rename from samples/identity/v3/domains/delete_domain.php rename to samples/Identity/v3/domains/delete_domain.php diff --git a/samples/identity/v3/domains/grant_group_role.php b/samples/Identity/v3/domains/grant_group_role.php similarity index 100% rename from samples/identity/v3/domains/grant_group_role.php rename to samples/Identity/v3/domains/grant_group_role.php diff --git a/samples/identity/v3/domains/grant_user_role.php b/samples/Identity/v3/domains/grant_user_role.php similarity index 100% rename from samples/identity/v3/domains/grant_user_role.php rename to samples/Identity/v3/domains/grant_user_role.php diff --git a/samples/identity/v3/domains/list_domains.php b/samples/Identity/v3/domains/list_domains.php similarity index 100% rename from samples/identity/v3/domains/list_domains.php rename to samples/Identity/v3/domains/list_domains.php diff --git a/samples/identity/v3/domains/list_group_roles.php b/samples/Identity/v3/domains/list_group_roles.php similarity index 100% rename from samples/identity/v3/domains/list_group_roles.php rename to samples/Identity/v3/domains/list_group_roles.php diff --git a/samples/identity/v3/domains/list_user_roles.php b/samples/Identity/v3/domains/list_user_roles.php similarity index 100% rename from samples/identity/v3/domains/list_user_roles.php rename to samples/Identity/v3/domains/list_user_roles.php diff --git a/samples/identity/v3/domains/revoke_group_role.php b/samples/Identity/v3/domains/revoke_group_role.php similarity index 100% rename from samples/identity/v3/domains/revoke_group_role.php rename to samples/Identity/v3/domains/revoke_group_role.php diff --git a/samples/identity/v3/domains/revoke_user_role.php b/samples/Identity/v3/domains/revoke_user_role.php similarity index 100% rename from samples/identity/v3/domains/revoke_user_role.php rename to samples/Identity/v3/domains/revoke_user_role.php diff --git a/samples/identity/v3/domains/show_domain.php b/samples/Identity/v3/domains/show_domain.php similarity index 100% rename from samples/identity/v3/domains/show_domain.php rename to samples/Identity/v3/domains/show_domain.php diff --git a/samples/identity/v3/domains/update_domain.php b/samples/Identity/v3/domains/update_domain.php similarity index 100% rename from samples/identity/v3/domains/update_domain.php rename to samples/Identity/v3/domains/update_domain.php diff --git a/samples/identity/v3/endpoints/add_endpoint.php b/samples/Identity/v3/endpoints/add_endpoint.php similarity index 100% rename from samples/identity/v3/endpoints/add_endpoint.php rename to samples/Identity/v3/endpoints/add_endpoint.php diff --git a/samples/identity/v3/endpoints/delete_endpoint.php b/samples/Identity/v3/endpoints/delete_endpoint.php similarity index 100% rename from samples/identity/v3/endpoints/delete_endpoint.php rename to samples/Identity/v3/endpoints/delete_endpoint.php diff --git a/samples/identity/v3/endpoints/get_endpoint.php b/samples/Identity/v3/endpoints/get_endpoint.php similarity index 100% rename from samples/identity/v3/endpoints/get_endpoint.php rename to samples/Identity/v3/endpoints/get_endpoint.php diff --git a/samples/identity/v3/endpoints/list_endpoints.php b/samples/Identity/v3/endpoints/list_endpoints.php similarity index 100% rename from samples/identity/v3/endpoints/list_endpoints.php rename to samples/Identity/v3/endpoints/list_endpoints.php diff --git a/samples/identity/v3/endpoints/update_endpoint.php b/samples/Identity/v3/endpoints/update_endpoint.php similarity index 100% rename from samples/identity/v3/endpoints/update_endpoint.php rename to samples/Identity/v3/endpoints/update_endpoint.php diff --git a/samples/identity/v3/groups/add_group.php b/samples/Identity/v3/groups/add_group.php similarity index 100% rename from samples/identity/v3/groups/add_group.php rename to samples/Identity/v3/groups/add_group.php diff --git a/samples/identity/v3/groups/add_user.php b/samples/Identity/v3/groups/add_user.php similarity index 100% rename from samples/identity/v3/groups/add_user.php rename to samples/Identity/v3/groups/add_user.php diff --git a/samples/identity/v3/groups/check_user_membership.php b/samples/Identity/v3/groups/check_user_membership.php similarity index 100% rename from samples/identity/v3/groups/check_user_membership.php rename to samples/Identity/v3/groups/check_user_membership.php diff --git a/samples/identity/v3/groups/delete_group.php b/samples/Identity/v3/groups/delete_group.php similarity index 100% rename from samples/identity/v3/groups/delete_group.php rename to samples/Identity/v3/groups/delete_group.php diff --git a/samples/identity/v3/groups/get_group.php b/samples/Identity/v3/groups/get_group.php similarity index 100% rename from samples/identity/v3/groups/get_group.php rename to samples/Identity/v3/groups/get_group.php diff --git a/samples/identity/v3/groups/list_groups.php b/samples/Identity/v3/groups/list_groups.php similarity index 100% rename from samples/identity/v3/groups/list_groups.php rename to samples/Identity/v3/groups/list_groups.php diff --git a/samples/identity/v3/groups/list_users.php b/samples/Identity/v3/groups/list_users.php similarity index 100% rename from samples/identity/v3/groups/list_users.php rename to samples/Identity/v3/groups/list_users.php diff --git a/samples/identity/v3/groups/remove_user.php b/samples/Identity/v3/groups/remove_user.php similarity index 100% rename from samples/identity/v3/groups/remove_user.php rename to samples/Identity/v3/groups/remove_user.php diff --git a/samples/identity/v3/groups/update_group.php b/samples/Identity/v3/groups/update_group.php similarity index 100% rename from samples/identity/v3/groups/update_group.php rename to samples/Identity/v3/groups/update_group.php diff --git a/samples/identity/v3/projects/add_project.php b/samples/Identity/v3/projects/add_project.php similarity index 100% rename from samples/identity/v3/projects/add_project.php rename to samples/Identity/v3/projects/add_project.php diff --git a/samples/identity/v3/projects/check_group_role.php b/samples/Identity/v3/projects/check_group_role.php similarity index 100% rename from samples/identity/v3/projects/check_group_role.php rename to samples/Identity/v3/projects/check_group_role.php diff --git a/samples/identity/v3/projects/check_user_role.php b/samples/Identity/v3/projects/check_user_role.php similarity index 100% rename from samples/identity/v3/projects/check_user_role.php rename to samples/Identity/v3/projects/check_user_role.php diff --git a/samples/identity/v3/projects/delete_project.php b/samples/Identity/v3/projects/delete_project.php similarity index 100% rename from samples/identity/v3/projects/delete_project.php rename to samples/Identity/v3/projects/delete_project.php diff --git a/samples/identity/v3/projects/get_project.php b/samples/Identity/v3/projects/get_project.php similarity index 100% rename from samples/identity/v3/projects/get_project.php rename to samples/Identity/v3/projects/get_project.php diff --git a/samples/identity/v3/projects/grant_group_role.php b/samples/Identity/v3/projects/grant_group_role.php similarity index 100% rename from samples/identity/v3/projects/grant_group_role.php rename to samples/Identity/v3/projects/grant_group_role.php diff --git a/samples/identity/v3/projects/grant_user_role.php b/samples/Identity/v3/projects/grant_user_role.php similarity index 100% rename from samples/identity/v3/projects/grant_user_role.php rename to samples/Identity/v3/projects/grant_user_role.php diff --git a/samples/identity/v3/projects/list_group_roles.php b/samples/Identity/v3/projects/list_group_roles.php similarity index 100% rename from samples/identity/v3/projects/list_group_roles.php rename to samples/Identity/v3/projects/list_group_roles.php diff --git a/samples/identity/v3/projects/list_projects.php b/samples/Identity/v3/projects/list_projects.php similarity index 100% rename from samples/identity/v3/projects/list_projects.php rename to samples/Identity/v3/projects/list_projects.php diff --git a/samples/identity/v3/projects/list_user_roles.php b/samples/Identity/v3/projects/list_user_roles.php similarity index 100% rename from samples/identity/v3/projects/list_user_roles.php rename to samples/Identity/v3/projects/list_user_roles.php diff --git a/samples/identity/v3/projects/revoke_group_role.php b/samples/Identity/v3/projects/revoke_group_role.php similarity index 100% rename from samples/identity/v3/projects/revoke_group_role.php rename to samples/Identity/v3/projects/revoke_group_role.php diff --git a/samples/identity/v3/projects/revoke_user_role.php b/samples/Identity/v3/projects/revoke_user_role.php similarity index 100% rename from samples/identity/v3/projects/revoke_user_role.php rename to samples/Identity/v3/projects/revoke_user_role.php diff --git a/samples/identity/v3/projects/update_project.php b/samples/Identity/v3/projects/update_project.php similarity index 100% rename from samples/identity/v3/projects/update_project.php rename to samples/Identity/v3/projects/update_project.php diff --git a/samples/identity/v3/roles/add_role.php b/samples/Identity/v3/roles/add_role.php similarity index 100% rename from samples/identity/v3/roles/add_role.php rename to samples/Identity/v3/roles/add_role.php diff --git a/samples/identity/v3/roles/list_assignments.php b/samples/Identity/v3/roles/list_assignments.php similarity index 100% rename from samples/identity/v3/roles/list_assignments.php rename to samples/Identity/v3/roles/list_assignments.php diff --git a/samples/identity/v3/roles/list_roles.php b/samples/Identity/v3/roles/list_roles.php similarity index 100% rename from samples/identity/v3/roles/list_roles.php rename to samples/Identity/v3/roles/list_roles.php diff --git a/samples/identity/v3/services/add_service.php b/samples/Identity/v3/services/add_service.php similarity index 100% rename from samples/identity/v3/services/add_service.php rename to samples/Identity/v3/services/add_service.php diff --git a/samples/identity/v3/services/delete_service.php b/samples/Identity/v3/services/delete_service.php similarity index 100% rename from samples/identity/v3/services/delete_service.php rename to samples/Identity/v3/services/delete_service.php diff --git a/samples/identity/v3/services/get_service.php b/samples/Identity/v3/services/get_service.php similarity index 100% rename from samples/identity/v3/services/get_service.php rename to samples/Identity/v3/services/get_service.php diff --git a/samples/identity/v3/services/list_services.php b/samples/Identity/v3/services/list_services.php similarity index 100% rename from samples/identity/v3/services/list_services.php rename to samples/Identity/v3/services/list_services.php diff --git a/samples/identity/v3/services/update_service.php b/samples/Identity/v3/services/update_service.php similarity index 100% rename from samples/identity/v3/services/update_service.php rename to samples/Identity/v3/services/update_service.php diff --git a/samples/identity/v3/tokens/export_authentication_token.php b/samples/Identity/v3/tokens/export_authentication_token.php similarity index 100% rename from samples/identity/v3/tokens/export_authentication_token.php rename to samples/Identity/v3/tokens/export_authentication_token.php diff --git a/samples/identity/v3/tokens/generate_token_from_id.php b/samples/Identity/v3/tokens/generate_token_from_id.php similarity index 100% rename from samples/identity/v3/tokens/generate_token_from_id.php rename to samples/Identity/v3/tokens/generate_token_from_id.php diff --git a/samples/identity/v3/tokens/generate_token_scoped_to_project_id.php b/samples/Identity/v3/tokens/generate_token_scoped_to_project_id.php similarity index 100% rename from samples/identity/v3/tokens/generate_token_scoped_to_project_id.php rename to samples/Identity/v3/tokens/generate_token_scoped_to_project_id.php diff --git a/samples/identity/v3/tokens/generate_token_scoped_to_project_name.php b/samples/Identity/v3/tokens/generate_token_scoped_to_project_name.php similarity index 100% rename from samples/identity/v3/tokens/generate_token_scoped_to_project_name.php rename to samples/Identity/v3/tokens/generate_token_scoped_to_project_name.php diff --git a/samples/identity/v3/tokens/generate_token_with_user_id.php b/samples/Identity/v3/tokens/generate_token_with_user_id.php similarity index 100% rename from samples/identity/v3/tokens/generate_token_with_user_id.php rename to samples/Identity/v3/tokens/generate_token_with_user_id.php diff --git a/samples/identity/v3/tokens/generate_token_with_username.php b/samples/Identity/v3/tokens/generate_token_with_username.php similarity index 100% rename from samples/identity/v3/tokens/generate_token_with_username.php rename to samples/Identity/v3/tokens/generate_token_with_username.php diff --git a/samples/identity/v3/tokens/revoke_token.php b/samples/Identity/v3/tokens/revoke_token.php similarity index 100% rename from samples/identity/v3/tokens/revoke_token.php rename to samples/Identity/v3/tokens/revoke_token.php diff --git a/samples/identity/v3/tokens/use_cached_authentication_token.php b/samples/Identity/v3/tokens/use_cached_authentication_token.php similarity index 100% rename from samples/identity/v3/tokens/use_cached_authentication_token.php rename to samples/Identity/v3/tokens/use_cached_authentication_token.php diff --git a/samples/identity/v3/tokens/validate_token.php b/samples/Identity/v3/tokens/validate_token.php similarity index 100% rename from samples/identity/v3/tokens/validate_token.php rename to samples/Identity/v3/tokens/validate_token.php diff --git a/samples/identity/v3/users/add_user.php b/samples/Identity/v3/users/add_user.php similarity index 100% rename from samples/identity/v3/users/add_user.php rename to samples/Identity/v3/users/add_user.php diff --git a/samples/identity/v3/users/delete_user.php b/samples/Identity/v3/users/delete_user.php similarity index 100% rename from samples/identity/v3/users/delete_user.php rename to samples/Identity/v3/users/delete_user.php diff --git a/samples/identity/v3/users/get_user.php b/samples/Identity/v3/users/get_user.php similarity index 100% rename from samples/identity/v3/users/get_user.php rename to samples/Identity/v3/users/get_user.php diff --git a/samples/identity/v3/users/list_groups.php b/samples/Identity/v3/users/list_groups.php similarity index 100% rename from samples/identity/v3/users/list_groups.php rename to samples/Identity/v3/users/list_groups.php diff --git a/samples/identity/v3/users/list_projects.php b/samples/Identity/v3/users/list_projects.php similarity index 100% rename from samples/identity/v3/users/list_projects.php rename to samples/Identity/v3/users/list_projects.php diff --git a/samples/identity/v3/users/list_users.php b/samples/Identity/v3/users/list_users.php similarity index 100% rename from samples/identity/v3/users/list_users.php rename to samples/Identity/v3/users/list_users.php diff --git a/samples/identity/v3/users/update_user.php b/samples/Identity/v3/users/update_user.php similarity index 100% rename from samples/identity/v3/users/update_user.php rename to samples/Identity/v3/users/update_user.php diff --git a/samples/images/v2/images/create.php b/samples/Images/v2/images/create.php similarity index 100% rename from samples/images/v2/images/create.php rename to samples/Images/v2/images/create.php diff --git a/samples/images/v2/images/deactivate.php b/samples/Images/v2/images/deactivate.php similarity index 100% rename from samples/images/v2/images/deactivate.php rename to samples/Images/v2/images/deactivate.php diff --git a/samples/images/v2/images/delete.php b/samples/Images/v2/images/delete.php similarity index 100% rename from samples/images/v2/images/delete.php rename to samples/Images/v2/images/delete.php diff --git a/samples/images/v2/images/download_binary_data.php b/samples/Images/v2/images/download_binary_data.php similarity index 100% rename from samples/images/v2/images/download_binary_data.php rename to samples/Images/v2/images/download_binary_data.php diff --git a/samples/images/v2/images/get.php b/samples/Images/v2/images/get.php similarity index 100% rename from samples/images/v2/images/get.php rename to samples/Images/v2/images/get.php diff --git a/samples/images/v2/images/list.php b/samples/Images/v2/images/list.php similarity index 100% rename from samples/images/v2/images/list.php rename to samples/Images/v2/images/list.php diff --git a/samples/images/v2/images/reactivate.php b/samples/Images/v2/images/reactivate.php similarity index 100% rename from samples/images/v2/images/reactivate.php rename to samples/Images/v2/images/reactivate.php diff --git a/samples/images/v2/images/update.php b/samples/Images/v2/images/update.php similarity index 100% rename from samples/images/v2/images/update.php rename to samples/Images/v2/images/update.php diff --git a/samples/images/v2/images/upload_binary_data.php b/samples/Images/v2/images/upload_binary_data.php similarity index 100% rename from samples/images/v2/images/upload_binary_data.php rename to samples/Images/v2/images/upload_binary_data.php diff --git a/samples/images/v2/members/add.php b/samples/Images/v2/members/add.php similarity index 100% rename from samples/images/v2/members/add.php rename to samples/Images/v2/members/add.php diff --git a/samples/images/v2/members/delete.php b/samples/Images/v2/members/delete.php similarity index 100% rename from samples/images/v2/members/delete.php rename to samples/Images/v2/members/delete.php diff --git a/samples/images/v2/members/get.php b/samples/Images/v2/members/get.php similarity index 100% rename from samples/images/v2/members/get.php rename to samples/Images/v2/members/get.php diff --git a/samples/images/v2/members/list.php b/samples/Images/v2/members/list.php similarity index 100% rename from samples/images/v2/members/list.php rename to samples/Images/v2/members/list.php diff --git a/samples/images/v2/members/update_status.php b/samples/Images/v2/members/update_status.php similarity index 100% rename from samples/images/v2/members/update_status.php rename to samples/Images/v2/members/update_status.php diff --git a/samples/networking/v2/floatingIPs/create.php b/samples/Networking/v2/floatingIPs/create.php similarity index 100% rename from samples/networking/v2/floatingIPs/create.php rename to samples/Networking/v2/floatingIPs/create.php diff --git a/samples/networking/v2/floatingIPs/delete.php b/samples/Networking/v2/floatingIPs/delete.php similarity index 100% rename from samples/networking/v2/floatingIPs/delete.php rename to samples/Networking/v2/floatingIPs/delete.php diff --git a/samples/networking/v2/floatingIPs/get.php b/samples/Networking/v2/floatingIPs/get.php similarity index 100% rename from samples/networking/v2/floatingIPs/get.php rename to samples/Networking/v2/floatingIPs/get.php diff --git a/samples/networking/v2/floatingIPs/list.php b/samples/Networking/v2/floatingIPs/list.php similarity index 100% rename from samples/networking/v2/floatingIPs/list.php rename to samples/Networking/v2/floatingIPs/list.php diff --git a/samples/networking/v2/floatingIPs/update.php b/samples/Networking/v2/floatingIPs/update.php similarity index 100% rename from samples/networking/v2/floatingIPs/update.php rename to samples/Networking/v2/floatingIPs/update.php diff --git a/samples/networking/v2/lbaas/healthmonitors/create.php b/samples/Networking/v2/lbaas/healthmonitors/create.php similarity index 100% rename from samples/networking/v2/lbaas/healthmonitors/create.php rename to samples/Networking/v2/lbaas/healthmonitors/create.php diff --git a/samples/networking/v2/lbaas/healthmonitors/delete.php b/samples/Networking/v2/lbaas/healthmonitors/delete.php similarity index 100% rename from samples/networking/v2/lbaas/healthmonitors/delete.php rename to samples/Networking/v2/lbaas/healthmonitors/delete.php diff --git a/samples/networking/v2/lbaas/healthmonitors/get.php b/samples/Networking/v2/lbaas/healthmonitors/get.php similarity index 100% rename from samples/networking/v2/lbaas/healthmonitors/get.php rename to samples/Networking/v2/lbaas/healthmonitors/get.php diff --git a/samples/networking/v2/lbaas/healthmonitors/list.php b/samples/Networking/v2/lbaas/healthmonitors/list.php similarity index 100% rename from samples/networking/v2/lbaas/healthmonitors/list.php rename to samples/Networking/v2/lbaas/healthmonitors/list.php diff --git a/samples/networking/v2/lbaas/healthmonitors/update.php b/samples/Networking/v2/lbaas/healthmonitors/update.php similarity index 100% rename from samples/networking/v2/lbaas/healthmonitors/update.php rename to samples/Networking/v2/lbaas/healthmonitors/update.php diff --git a/samples/networking/v2/lbaas/listeners/create.php b/samples/Networking/v2/lbaas/listeners/create.php similarity index 100% rename from samples/networking/v2/lbaas/listeners/create.php rename to samples/Networking/v2/lbaas/listeners/create.php diff --git a/samples/networking/v2/lbaas/listeners/delete.php b/samples/Networking/v2/lbaas/listeners/delete.php similarity index 100% rename from samples/networking/v2/lbaas/listeners/delete.php rename to samples/Networking/v2/lbaas/listeners/delete.php diff --git a/samples/networking/v2/lbaas/listeners/get.php b/samples/Networking/v2/lbaas/listeners/get.php similarity index 100% rename from samples/networking/v2/lbaas/listeners/get.php rename to samples/Networking/v2/lbaas/listeners/get.php diff --git a/samples/networking/v2/lbaas/listeners/list.php b/samples/Networking/v2/lbaas/listeners/list.php similarity index 100% rename from samples/networking/v2/lbaas/listeners/list.php rename to samples/Networking/v2/lbaas/listeners/list.php diff --git a/samples/networking/v2/lbaas/listeners/update.php b/samples/Networking/v2/lbaas/listeners/update.php similarity index 100% rename from samples/networking/v2/lbaas/listeners/update.php rename to samples/Networking/v2/lbaas/listeners/update.php diff --git a/samples/networking/v2/lbaas/loadbalancers/add_listener.php b/samples/Networking/v2/lbaas/loadbalancers/add_listener.php similarity index 100% rename from samples/networking/v2/lbaas/loadbalancers/add_listener.php rename to samples/Networking/v2/lbaas/loadbalancers/add_listener.php diff --git a/samples/networking/v2/lbaas/loadbalancers/create.php b/samples/Networking/v2/lbaas/loadbalancers/create.php similarity index 100% rename from samples/networking/v2/lbaas/loadbalancers/create.php rename to samples/Networking/v2/lbaas/loadbalancers/create.php diff --git a/samples/networking/v2/lbaas/loadbalancers/delete.php b/samples/Networking/v2/lbaas/loadbalancers/delete.php similarity index 100% rename from samples/networking/v2/lbaas/loadbalancers/delete.php rename to samples/Networking/v2/lbaas/loadbalancers/delete.php diff --git a/samples/networking/v2/lbaas/loadbalancers/get.php b/samples/Networking/v2/lbaas/loadbalancers/get.php similarity index 100% rename from samples/networking/v2/lbaas/loadbalancers/get.php rename to samples/Networking/v2/lbaas/loadbalancers/get.php diff --git a/samples/networking/v2/lbaas/loadbalancers/get_stats.php b/samples/Networking/v2/lbaas/loadbalancers/get_stats.php similarity index 100% rename from samples/networking/v2/lbaas/loadbalancers/get_stats.php rename to samples/Networking/v2/lbaas/loadbalancers/get_stats.php diff --git a/samples/networking/v2/lbaas/loadbalancers/get_statuses.php b/samples/Networking/v2/lbaas/loadbalancers/get_statuses.php similarity index 100% rename from samples/networking/v2/lbaas/loadbalancers/get_statuses.php rename to samples/Networking/v2/lbaas/loadbalancers/get_statuses.php diff --git a/samples/networking/v2/lbaas/loadbalancers/list.php b/samples/Networking/v2/lbaas/loadbalancers/list.php similarity index 100% rename from samples/networking/v2/lbaas/loadbalancers/list.php rename to samples/Networking/v2/lbaas/loadbalancers/list.php diff --git a/samples/networking/v2/lbaas/loadbalancers/update.php b/samples/Networking/v2/lbaas/loadbalancers/update.php similarity index 100% rename from samples/networking/v2/lbaas/loadbalancers/update.php rename to samples/Networking/v2/lbaas/loadbalancers/update.php diff --git a/samples/networking/v2/lbaas/pools/add-healthmonitor.php b/samples/Networking/v2/lbaas/pools/add-healthmonitor.php similarity index 100% rename from samples/networking/v2/lbaas/pools/add-healthmonitor.php rename to samples/Networking/v2/lbaas/pools/add-healthmonitor.php diff --git a/samples/networking/v2/lbaas/pools/add-member.php b/samples/Networking/v2/lbaas/pools/add-member.php similarity index 100% rename from samples/networking/v2/lbaas/pools/add-member.php rename to samples/Networking/v2/lbaas/pools/add-member.php diff --git a/samples/networking/v2/lbaas/pools/create.php b/samples/Networking/v2/lbaas/pools/create.php similarity index 100% rename from samples/networking/v2/lbaas/pools/create.php rename to samples/Networking/v2/lbaas/pools/create.php diff --git a/samples/networking/v2/lbaas/pools/delete-member.php b/samples/Networking/v2/lbaas/pools/delete-member.php similarity index 100% rename from samples/networking/v2/lbaas/pools/delete-member.php rename to samples/Networking/v2/lbaas/pools/delete-member.php diff --git a/samples/networking/v2/lbaas/pools/delete.php b/samples/Networking/v2/lbaas/pools/delete.php similarity index 100% rename from samples/networking/v2/lbaas/pools/delete.php rename to samples/Networking/v2/lbaas/pools/delete.php diff --git a/samples/networking/v2/lbaas/pools/get-member.php b/samples/Networking/v2/lbaas/pools/get-member.php similarity index 100% rename from samples/networking/v2/lbaas/pools/get-member.php rename to samples/Networking/v2/lbaas/pools/get-member.php diff --git a/samples/networking/v2/lbaas/pools/get.php b/samples/Networking/v2/lbaas/pools/get.php similarity index 100% rename from samples/networking/v2/lbaas/pools/get.php rename to samples/Networking/v2/lbaas/pools/get.php diff --git a/samples/networking/v2/lbaas/pools/list.php b/samples/Networking/v2/lbaas/pools/list.php similarity index 100% rename from samples/networking/v2/lbaas/pools/list.php rename to samples/Networking/v2/lbaas/pools/list.php diff --git a/samples/networking/v2/lbaas/pools/update.php b/samples/Networking/v2/lbaas/pools/update.php similarity index 100% rename from samples/networking/v2/lbaas/pools/update.php rename to samples/Networking/v2/lbaas/pools/update.php diff --git a/samples/networking/v2/networks/create.php b/samples/Networking/v2/networks/create.php similarity index 100% rename from samples/networking/v2/networks/create.php rename to samples/Networking/v2/networks/create.php diff --git a/samples/networking/v2/networks/create_batch.php b/samples/Networking/v2/networks/create_batch.php similarity index 100% rename from samples/networking/v2/networks/create_batch.php rename to samples/Networking/v2/networks/create_batch.php diff --git a/samples/networking/v2/networks/delete.php b/samples/Networking/v2/networks/delete.php similarity index 100% rename from samples/networking/v2/networks/delete.php rename to samples/Networking/v2/networks/delete.php diff --git a/samples/networking/v2/networks/get.php b/samples/Networking/v2/networks/get.php similarity index 100% rename from samples/networking/v2/networks/get.php rename to samples/Networking/v2/networks/get.php diff --git a/samples/networking/v2/networks/update.php b/samples/Networking/v2/networks/update.php similarity index 100% rename from samples/networking/v2/networks/update.php rename to samples/Networking/v2/networks/update.php diff --git a/samples/networking/v2/ports/create.php b/samples/Networking/v2/ports/create.php similarity index 100% rename from samples/networking/v2/ports/create.php rename to samples/Networking/v2/ports/create.php diff --git a/samples/networking/v2/ports/create_batch.php b/samples/Networking/v2/ports/create_batch.php similarity index 100% rename from samples/networking/v2/ports/create_batch.php rename to samples/Networking/v2/ports/create_batch.php diff --git a/samples/networking/v2/ports/create_with_fixed_ips.php b/samples/Networking/v2/ports/create_with_fixed_ips.php similarity index 100% rename from samples/networking/v2/ports/create_with_fixed_ips.php rename to samples/Networking/v2/ports/create_with_fixed_ips.php diff --git a/samples/networking/v2/ports/delete.php b/samples/Networking/v2/ports/delete.php similarity index 100% rename from samples/networking/v2/ports/delete.php rename to samples/Networking/v2/ports/delete.php diff --git a/samples/networking/v2/ports/get.php b/samples/Networking/v2/ports/get.php similarity index 100% rename from samples/networking/v2/ports/get.php rename to samples/Networking/v2/ports/get.php diff --git a/samples/networking/v2/ports/list.php b/samples/Networking/v2/ports/list.php similarity index 100% rename from samples/networking/v2/ports/list.php rename to samples/Networking/v2/ports/list.php diff --git a/samples/networking/v2/ports/update.php b/samples/Networking/v2/ports/update.php similarity index 100% rename from samples/networking/v2/ports/update.php rename to samples/Networking/v2/ports/update.php diff --git a/samples/networking/v2/securityGroupRules/create.php b/samples/Networking/v2/securityGroupRules/create.php similarity index 100% rename from samples/networking/v2/securityGroupRules/create.php rename to samples/Networking/v2/securityGroupRules/create.php diff --git a/samples/networking/v2/securityGroupRules/delete.php b/samples/Networking/v2/securityGroupRules/delete.php similarity index 100% rename from samples/networking/v2/securityGroupRules/delete.php rename to samples/Networking/v2/securityGroupRules/delete.php diff --git a/samples/networking/v2/securityGroupRules/get.php b/samples/Networking/v2/securityGroupRules/get.php similarity index 100% rename from samples/networking/v2/securityGroupRules/get.php rename to samples/Networking/v2/securityGroupRules/get.php diff --git a/samples/networking/v2/securityGroupRules/list.php b/samples/Networking/v2/securityGroupRules/list.php similarity index 100% rename from samples/networking/v2/securityGroupRules/list.php rename to samples/Networking/v2/securityGroupRules/list.php diff --git a/samples/networking/v2/securityGroups/create.php b/samples/Networking/v2/securityGroups/create.php similarity index 100% rename from samples/networking/v2/securityGroups/create.php rename to samples/Networking/v2/securityGroups/create.php diff --git a/samples/networking/v2/securityGroups/delete.php b/samples/Networking/v2/securityGroups/delete.php similarity index 100% rename from samples/networking/v2/securityGroups/delete.php rename to samples/Networking/v2/securityGroups/delete.php diff --git a/samples/networking/v2/securityGroups/get.php b/samples/Networking/v2/securityGroups/get.php similarity index 100% rename from samples/networking/v2/securityGroups/get.php rename to samples/Networking/v2/securityGroups/get.php diff --git a/samples/networking/v2/securityGroups/list.php b/samples/Networking/v2/securityGroups/list.php similarity index 100% rename from samples/networking/v2/securityGroups/list.php rename to samples/Networking/v2/securityGroups/list.php diff --git a/samples/networking/v2/subnets/create.php b/samples/Networking/v2/subnets/create.php similarity index 100% rename from samples/networking/v2/subnets/create.php rename to samples/Networking/v2/subnets/create.php diff --git a/samples/networking/v2/subnets/create_batch.php b/samples/Networking/v2/subnets/create_batch.php similarity index 100% rename from samples/networking/v2/subnets/create_batch.php rename to samples/Networking/v2/subnets/create_batch.php diff --git a/samples/networking/v2/subnets/create_with_gateway_ip.php b/samples/Networking/v2/subnets/create_with_gateway_ip.php similarity index 100% rename from samples/networking/v2/subnets/create_with_gateway_ip.php rename to samples/Networking/v2/subnets/create_with_gateway_ip.php diff --git a/samples/networking/v2/subnets/create_with_host_routes.php b/samples/Networking/v2/subnets/create_with_host_routes.php similarity index 100% rename from samples/networking/v2/subnets/create_with_host_routes.php rename to samples/Networking/v2/subnets/create_with_host_routes.php diff --git a/samples/networking/v2/subnets/delete.php b/samples/Networking/v2/subnets/delete.php similarity index 100% rename from samples/networking/v2/subnets/delete.php rename to samples/Networking/v2/subnets/delete.php diff --git a/samples/networking/v2/subnets/get.php b/samples/Networking/v2/subnets/get.php similarity index 100% rename from samples/networking/v2/subnets/get.php rename to samples/Networking/v2/subnets/get.php diff --git a/samples/networking/v2/subnets/update.php b/samples/Networking/v2/subnets/update.php similarity index 100% rename from samples/networking/v2/subnets/update.php rename to samples/Networking/v2/subnets/update.php diff --git a/samples/objectstore/v1/account/get.php b/samples/ObjectStore/v1/account/get.php similarity index 100% rename from samples/objectstore/v1/account/get.php rename to samples/ObjectStore/v1/account/get.php diff --git a/samples/objectstore/v1/account/get_metadata.php b/samples/ObjectStore/v1/account/get_metadata.php similarity index 100% rename from samples/objectstore/v1/account/get_metadata.php rename to samples/ObjectStore/v1/account/get_metadata.php diff --git a/samples/objectstore/v1/account/merge_metadata.php b/samples/ObjectStore/v1/account/merge_metadata.php similarity index 100% rename from samples/objectstore/v1/account/merge_metadata.php rename to samples/ObjectStore/v1/account/merge_metadata.php diff --git a/samples/objectstore/v1/account/reset_metadata.php b/samples/ObjectStore/v1/account/reset_metadata.php similarity index 100% rename from samples/objectstore/v1/account/reset_metadata.php rename to samples/ObjectStore/v1/account/reset_metadata.php diff --git a/samples/objectstore/v1/containers/create.php b/samples/ObjectStore/v1/containers/create.php similarity index 100% rename from samples/objectstore/v1/containers/create.php rename to samples/ObjectStore/v1/containers/create.php diff --git a/samples/objectstore/v1/containers/delete.php b/samples/ObjectStore/v1/containers/delete.php similarity index 100% rename from samples/objectstore/v1/containers/delete.php rename to samples/ObjectStore/v1/containers/delete.php diff --git a/samples/objectstore/v1/containers/get.php b/samples/ObjectStore/v1/containers/get.php similarity index 100% rename from samples/objectstore/v1/containers/get.php rename to samples/ObjectStore/v1/containers/get.php diff --git a/samples/objectstore/v1/containers/get_metadata.php b/samples/ObjectStore/v1/containers/get_metadata.php similarity index 100% rename from samples/objectstore/v1/containers/get_metadata.php rename to samples/ObjectStore/v1/containers/get_metadata.php diff --git a/samples/objectstore/v1/containers/list.php b/samples/ObjectStore/v1/containers/list.php similarity index 100% rename from samples/objectstore/v1/containers/list.php rename to samples/ObjectStore/v1/containers/list.php diff --git a/samples/objectstore/v1/containers/merge_metadata.php b/samples/ObjectStore/v1/containers/merge_metadata.php similarity index 100% rename from samples/objectstore/v1/containers/merge_metadata.php rename to samples/ObjectStore/v1/containers/merge_metadata.php diff --git a/samples/objectstore/v1/containers/reset_metadata.php b/samples/ObjectStore/v1/containers/reset_metadata.php similarity index 100% rename from samples/objectstore/v1/containers/reset_metadata.php rename to samples/ObjectStore/v1/containers/reset_metadata.php diff --git a/samples/objectstore/v1/objects/check_exists.php b/samples/ObjectStore/v1/objects/check_exists.php similarity index 100% rename from samples/objectstore/v1/objects/check_exists.php rename to samples/ObjectStore/v1/objects/check_exists.php diff --git a/samples/objectstore/v1/objects/copy.php b/samples/ObjectStore/v1/objects/copy.php similarity index 100% rename from samples/objectstore/v1/objects/copy.php rename to samples/ObjectStore/v1/objects/copy.php diff --git a/samples/objectstore/v1/objects/create.php b/samples/ObjectStore/v1/objects/create.php similarity index 100% rename from samples/objectstore/v1/objects/create.php rename to samples/ObjectStore/v1/objects/create.php diff --git a/samples/objectstore/v1/objects/create_from_stream.php b/samples/ObjectStore/v1/objects/create_from_stream.php similarity index 100% rename from samples/objectstore/v1/objects/create_from_stream.php rename to samples/ObjectStore/v1/objects/create_from_stream.php diff --git a/samples/objectstore/v1/objects/create_large_object.php b/samples/ObjectStore/v1/objects/create_large_object.php similarity index 100% rename from samples/objectstore/v1/objects/create_large_object.php rename to samples/ObjectStore/v1/objects/create_large_object.php diff --git a/samples/objectstore/v1/objects/delete.php b/samples/ObjectStore/v1/objects/delete.php similarity index 100% rename from samples/objectstore/v1/objects/delete.php rename to samples/ObjectStore/v1/objects/delete.php diff --git a/samples/objectstore/v1/objects/download.php b/samples/ObjectStore/v1/objects/download.php similarity index 100% rename from samples/objectstore/v1/objects/download.php rename to samples/ObjectStore/v1/objects/download.php diff --git a/samples/objectstore/v1/objects/download_stream.php b/samples/ObjectStore/v1/objects/download_stream.php similarity index 100% rename from samples/objectstore/v1/objects/download_stream.php rename to samples/ObjectStore/v1/objects/download_stream.php diff --git a/samples/objectstore/v1/objects/get.php b/samples/ObjectStore/v1/objects/get.php similarity index 100% rename from samples/objectstore/v1/objects/get.php rename to samples/ObjectStore/v1/objects/get.php diff --git a/samples/objectstore/v1/objects/get_metadata.php b/samples/ObjectStore/v1/objects/get_metadata.php similarity index 100% rename from samples/objectstore/v1/objects/get_metadata.php rename to samples/ObjectStore/v1/objects/get_metadata.php diff --git a/samples/objectstore/v1/objects/list.php b/samples/ObjectStore/v1/objects/list.php similarity index 100% rename from samples/objectstore/v1/objects/list.php rename to samples/ObjectStore/v1/objects/list.php diff --git a/samples/objectstore/v1/objects/merge_metadata.php b/samples/ObjectStore/v1/objects/merge_metadata.php similarity index 100% rename from samples/objectstore/v1/objects/merge_metadata.php rename to samples/ObjectStore/v1/objects/merge_metadata.php diff --git a/samples/objectstore/v1/objects/reset_metadata.php b/samples/ObjectStore/v1/objects/reset_metadata.php similarity index 100% rename from samples/objectstore/v1/objects/reset_metadata.php rename to samples/ObjectStore/v1/objects/reset_metadata.php diff --git a/tests/integration/Compute/v2/CoreTest.php b/tests/integration/Compute/v2/CoreTest.php index 8a00f0f0e..5d7c0b676 100644 --- a/tests/integration/Compute/v2/CoreTest.php +++ b/tests/integration/Compute/v2/CoreTest.php @@ -107,7 +107,7 @@ private function searchImages($name) } } - protected function setUp() + protected function setUp(): void { $this->network = $this->getNetworkService()->createNetwork( [ @@ -498,7 +498,7 @@ private function createServerImage() ]; /** @var $server \OpenStack\Compute\v2\Models\Server */ - require_once $this->sampleFile($replacements, 'images/create_server_image.php'); + require_once $this->sampleFile($replacements, 'Images/create_server_image.php'); $server->waitWithCallback(function (Server $server) { return !$server->taskState; @@ -511,7 +511,7 @@ private function createServerImage() private function listImages() { - require_once $this->sampleFile([], 'images/list_images.php'); + require_once $this->sampleFile([], 'Images/list_images.php'); $this->logStep('Listed all available images'); } @@ -520,7 +520,7 @@ private function getImage() { $replacements = ['{imageId}' => $this->imageId]; - require_once $this->sampleFile($replacements, 'images/get_image.php'); + require_once $this->sampleFile($replacements, 'Images/get_image.php'); $this->logStep('Retrieved details for image {imageId}', $replacements); } @@ -530,20 +530,20 @@ private function imageMetadata() $replacements = ['{imageId}' => $this->imageId]; /** @var $image \OpenStack\Compute\v2\Models\Image */ - require_once $this->sampleFile($replacements, 'images/reset_image_metadata.php'); + require_once $this->sampleFile($replacements, 'Images/reset_image_metadata.php'); $this->logStep('Reset metadata of image {imageId}', $replacements); - require_once $this->sampleFile($replacements, 'images/retrieve_image_metadata.php'); + require_once $this->sampleFile($replacements, 'Images/retrieve_image_metadata.php'); $this->logStep('Retrieved metadata of image {imageId}', $replacements); - require_once $this->sampleFile($replacements + ['{metadataKey}'], 'images/delete_image_metadata_item.php'); + require_once $this->sampleFile($replacements + ['{metadataKey}'], 'Images/delete_image_metadata_item.php'); $this->logStep('Deleted metadata key of image {imageId}', $replacements); } private function deleteServerImage() { $replacements = ['{imageId}' => $this->imageId]; - require_once $this->sampleFile($replacements, 'images/delete_image.php'); + require_once $this->sampleFile($replacements, 'Images/delete_image.php'); $this->logStep('Deleted image {imageId}', $replacements); } diff --git a/tests/integration/Runner.php b/tests/integration/Runner.php index 8a385e74c..e2cdeda12 100644 --- a/tests/integration/Runner.php +++ b/tests/integration/Runner.php @@ -36,7 +36,7 @@ private function assembleTestFiles() foreach ($this->traverse($versionPath->getPathname()) as $testPath) { if (strpos($testPath->getFilename(), 'Test.php')) { $testBn = strtolower(substr($testPath->getBasename(), 0, -8)); - $this->tests[strtolower($serviceBn)][strtolower($versionBn)][] = $testBn; + $this->tests[$serviceBn][strtolower($versionBn)][] = $testBn; } } } @@ -57,7 +57,7 @@ private function getOpts() break; } } - return strtolower($value); + return $value; }; return [ diff --git a/tests/integration/TestCase.php b/tests/integration/TestCase.php index f382e3015..136f4e9e1 100644 --- a/tests/integration/TestCase.php +++ b/tests/integration/TestCase.php @@ -19,7 +19,7 @@ public function __construct(LoggerInterface $logger, SampleManagerInterface $sam $this->sampleManager = $sampleManager; } - public function teardown() + public function teardown(): void { $this->sampleManager->deletePaths(); }