From 6301c1653538b0e92c4dccc61b212298fe2a30fb Mon Sep 17 00:00:00 2001 From: Konstantin Babushkin Date: Sun, 30 Apr 2023 12:37:38 +0200 Subject: [PATCH 01/12] fix tests for new Guzzle --- samples/images/v2/images/upload_binary_data.php | 6 +++++- .../Common/Resource/OperatorResourceTest.php | 4 +++- tests/unit/Images/v2/Models/ImageTest.php | 16 +++++++++++++--- tests/unit/Images/v2/ServiceTest.php | 12 ++++++++++-- .../unit/ObjectStore/v1/Models/ContainerTest.php | 5 +++-- 5 files changed, 34 insertions(+), 9 deletions(-) diff --git a/samples/images/v2/images/upload_binary_data.php b/samples/images/v2/images/upload_binary_data.php index fc42e6ff0..152f55a05 100644 --- a/samples/images/v2/images/upload_binary_data.php +++ b/samples/images/v2/images/upload_binary_data.php @@ -12,5 +12,9 @@ $service = $openstack->imagesV2(); $image = $service->getImage('{imageId}'); -$stream = \GuzzleHttp\Psr7\stream_for(fopen('{fileName}', 'r')); + +$stream = function_exists('\GuzzleHttp\Psr7\stream_for') + ? \GuzzleHttp\Psr7\stream_for(fopen('{fileName}', 'r')) + : \GuzzleHttp\Psr7\Utils::streamFor(fopen('{fileName}', 'r')); + $image->uploadData($stream); diff --git a/tests/unit/Common/Resource/OperatorResourceTest.php b/tests/unit/Common/Resource/OperatorResourceTest.php index 3ebcb0760..51f55e512 100644 --- a/tests/unit/Common/Resource/OperatorResourceTest.php +++ b/tests/unit/Common/Resource/OperatorResourceTest.php @@ -28,7 +28,9 @@ public function setUp(): void public function test_it_retrieves_base_http_url() { - $returnedUri = \GuzzleHttp\Psr7\uri_for('http://foo.com'); + $returnedUri = function_exists('\GuzzleHttp\Psr7\uri_for') + ? \GuzzleHttp\Psr7\uri_for('http://foo.com') + : \GuzzleHttp\Psr7\Utils::uriFor('http://foo.com'); $this->client->getConfig('base_uri')->shouldBeCalled()->willReturn($returnedUri); $uri = $this->resource->testBaseUri(); diff --git a/tests/unit/Images/v2/Models/ImageTest.php b/tests/unit/Images/v2/Models/ImageTest.php index 0ef1a9103..b1ea16741 100644 --- a/tests/unit/Images/v2/Models/ImageTest.php +++ b/tests/unit/Images/v2/Models/ImageTest.php @@ -30,7 +30,11 @@ public function setUp(): void public function test_it_retrieves() { - $this->client->getConfig('base_uri')->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\uri_for('')); + $returnedUri = function_exists('\GuzzleHttp\Psr7\uri_for') + ? \GuzzleHttp\Psr7\uri_for('') + : \GuzzleHttp\Psr7\Utils::uriFor(''); + + $this->client->getConfig('base_uri')->shouldBeCalled()->willReturn($returnedUri); $this->setupMock('GET', $this->path, null, [], 'GET_image'); @@ -123,7 +127,10 @@ public function test_it_deactivates() public function test_it_uploads_data_stream() { - $stream = \GuzzleHttp\Psr7\stream_for('data'); + $stream = function_exists('\GuzzleHttp\Psr7\stream_for') + ? \GuzzleHttp\Psr7\stream_for('data') + : \GuzzleHttp\Psr7\Utils::streamFor('data'); + $headers = ['Content-Type' => 'application/octet-stream']; $this->setupMock('PUT', $this->path . '/file', $stream, $headers, new Response(204)); @@ -133,7 +140,10 @@ public function test_it_uploads_data_stream() public function test_it_downloads_data() { - $stream = \GuzzleHttp\Psr7\stream_for('data'); + $stream = function_exists('\GuzzleHttp\Psr7\stream_for') + ? \GuzzleHttp\Psr7\stream_for('data') + : \GuzzleHttp\Psr7\Utils::streamFor('data'); + $headers = ['Content-Type' => 'application/octet-stream']; $response = new Response(200, $headers, $stream); diff --git a/tests/unit/Images/v2/ServiceTest.php b/tests/unit/Images/v2/ServiceTest.php index 6a72cb2b1..f26b78146 100644 --- a/tests/unit/Images/v2/ServiceTest.php +++ b/tests/unit/Images/v2/ServiceTest.php @@ -23,10 +23,14 @@ public function setUp(): void public function test_it_creates_image() { + $returnedUri = function_exists('\GuzzleHttp\Psr7\uri_for') + ? \GuzzleHttp\Psr7\uri_for('') + : \GuzzleHttp\Psr7\Utils::uriFor(''); + $this->client ->getConfig('base_uri') ->shouldBeCalled() - ->willReturn(\GuzzleHttp\Psr7\uri_for('')); + ->willReturn($returnedUri); $expectedJson = [ "name" => "Ubuntu 12.10", @@ -58,10 +62,14 @@ public function test_it_creates_image() public function test_it_lists_images() { + $returnedUri = function_exists('\GuzzleHttp\Psr7\uri_for') + ? \GuzzleHttp\Psr7\uri_for('') + : \GuzzleHttp\Psr7\Utils::uriFor(''); + $this->client ->getConfig('base_uri') ->shouldBeCalled() - ->willReturn(\GuzzleHttp\Psr7\uri_for('')); + ->willReturn($returnedUri); $this->client ->request('GET', 'v2/images', ['query' => ['limit' => 5], 'headers' => []]) diff --git a/tests/unit/ObjectStore/v1/Models/ContainerTest.php b/tests/unit/ObjectStore/v1/Models/ContainerTest.php index 0e1484b6d..c34cd9246 100644 --- a/tests/unit/ObjectStore/v1/Models/ContainerTest.php +++ b/tests/unit/ObjectStore/v1/Models/ContainerTest.php @@ -210,8 +210,9 @@ public function test_other_exceptions_are_thrown() public function test_it_chunks_according_to_provided_segment_size() { - /** @var \GuzzleHttp\Psr7\Stream $stream */ - $stream = \GuzzleHttp\Psr7\stream_for(implode('', range('A', 'X'))); + $stream = function_exists('\GuzzleHttp\Psr7\stream_for') + ? \GuzzleHttp\Psr7\stream_for(implode('', range('A', 'X'))) + : \GuzzleHttp\Psr7\Utils::streamFor(implode('', range('A', 'X'))); $data = [ 'name' => 'object', From 3140af9e27e51abc14fb9b5b344b0338c0b97e92 Mon Sep 17 00:00:00 2001 From: Konstantin Babushkin Date: Sun, 30 Apr 2023 12:52:58 +0200 Subject: [PATCH 02/12] unit tests workflow --- .github/workflows/unit_tests.yml | 36 ++++++++++++++++++++++++++++++++ .gitignore | 1 + composer.json | 3 ++- 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/unit_tests.yml diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml new file mode 100644 index 000000000..b104e2bea --- /dev/null +++ b/.github/workflows/unit_tests.yml @@ -0,0 +1,36 @@ +name: Run Unit Tests +on: + push: + pull_request: +jobs: + tests: + runs-on: ubuntu-22.04 + if: "!contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'ci skip')" + strategy: + fail-fast: false + matrix: + php: [ 7.2, 7.3, 7.4, 8.0, 8.1 ] + name: "php-${{ matrix.php }}" + steps: + - uses: actions/checkout@v2 + - name: get cache directory + id: composer-cache + run: | + echo "::set-output name=dir::$(composer config cache-files-dir)" + - uses: actions/cache@v2 + with: + path: | + ~/.php_cs.cache + ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-cache-${{ matrix.php }}-${{ hashFiles('**.composer.lock') }} + - uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + extensions: curl + tools: composer:v2 + coverage: none + - run: composer install --prefer-dist --no-interaction --no-progress + - run: vendor/bin/parallel-lint --exclude vendor . + - name: execute unit tests + run: vendor/bin/phpunit --configuration phpunit.xml.dist + diff --git a/.gitignore b/.gitignore index 5bf48fc4c..009ad83a5 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ coverage/ vendor/ *.pyc phpunit.xml +.phpunit.result.cache coverage.xml composer.lock env_test.sh diff --git a/composer.json b/composer.json index 3029f7258..ec065b988 100644 --- a/composer.json +++ b/composer.json @@ -43,7 +43,8 @@ "psr/log": "^1.0", "php-coveralls/php-coveralls": "^2.0", "friendsofphp/php-cs-fixer": "^2.18", - "php-parallel-lint/php-parallel-lint": "^1.2" + "php-parallel-lint/php-parallel-lint": "^1.2", + "phpspec/prophecy": "^1.17" }, "extra": { "branch-alias": { From bb809525ccc30fa85e79e7e2dc2b78ea9e23ebfd Mon Sep 17 00:00:00 2001 From: Konstantin Babushkin Date: Sat, 24 Jun 2023 19:35:13 +0200 Subject: [PATCH 03/12] integration test --- .../object_storage_integration_tests.yml | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 .github/workflows/object_storage_integration_tests.yml diff --git a/.github/workflows/object_storage_integration_tests.yml b/.github/workflows/object_storage_integration_tests.yml new file mode 100644 index 000000000..e76b90d27 --- /dev/null +++ b/.github/workflows/object_storage_integration_tests.yml @@ -0,0 +1,48 @@ +name: Run Object Storage Integration Tests +on: + push: + pull_request: +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"] + php_version: [ 8.1 ] + 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: + - uses: actions/checkout@v2 + - name: get cache directory + id: composer-cache + run: | + echo "::set-output name=dir::$(composer config cache-files-dir)" + - uses: actions/cache@v2 + with: + path: | + ~/.php_cs.cache + ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-cache-${{ matrix.php_version }}-${{ hashFiles('**.composer.lock') }} + - uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php_version }} + extensions: curl + tools: composer:v2 + coverage: none + - run: composer install --prefer-dist --no-interaction --no-progress + - name: Deploy devstack + uses: EmilienM/devstack-action@v0.11 + with: + branch: ${{ matrix.openstack_version }} + conf_overrides: | + SWIFT_ENABLE_TEMPURLS=True + SWIFT_TEMPURL_KEY=secretkey + [[post-config|\$SWIFT_CONFIG_PROXY_SERVER]] + [filter:versioned_writes] + allow_object_versioning = true + enabled_services: 's-account,s-container,s-object,s-proxy' + - name: execute integration tests + run: php ./tests/integration/run.php -s=ObjectStore + From b04ae9f46bf4e45cb840739174dd999543caac58 Mon Sep 17 00:00:00 2001 From: Konstantin Babushkin Date: Sun, 24 Sep 2023 19:36:39 +0200 Subject: [PATCH 04/12] 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(); } From dff81e0830397071ce9d7abb6bd1cec08b0a1894 Mon Sep 17 00:00:00 2001 From: Konstantin Babushkin Date: Sun, 24 Sep 2023 19:40:31 +0200 Subject: [PATCH 05/12] run integration test on push for test --- .github/workflows/integration_object_storage.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/integration_object_storage.yml b/.github/workflows/integration_object_storage.yml index 80524d6e9..4a1ab5ebb 100644 --- a/.github/workflows/integration_object_storage.yml +++ b/.github/workflows/integration_object_storage.yml @@ -1,5 +1,6 @@ name: Run Object Storage Integration Tests on: + push: pull_request: paths: - '**ObjectStore**' From 7f31ef51934ae01cb293af34b8cc5ff824343f54 Mon Sep 17 00:00:00 2001 From: Konstantin Babushkin Date: Sun, 24 Sep 2023 20:33:48 +0200 Subject: [PATCH 06/12] add identity integration tests --- .github/workflows/integration_identity.yml | 62 +++++++++++++++++++ .../workflows/integration_object_storage.yml | 1 - 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/integration_identity.yml diff --git a/.github/workflows/integration_identity.yml b/.github/workflows/integration_identity.yml new file mode 100644 index 000000000..9478b23ee --- /dev/null +++ b/.github/workflows/integration_identity.yml @@ -0,0 +1,62 @@ +name: Run Identity Integration Tests +on: + pull_request: + paths: + - '**Identity**' +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" ] + php_version: [ 8.1 ] + 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: + - uses: actions/checkout@v2 + - name: get cache directory + id: composer-cache + run: | + echo "::set-output name=dir::$(composer config cache-files-dir)" + - uses: actions/cache@v2 + with: + path: | + ~/.php_cs.cache + ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-cache-${{ matrix.php_version }}-${{ hashFiles('**.composer.lock') }} + - uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php_version }} + extensions: curl + 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: + branch: ${{ matrix.openstack_version }} + - 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/.github/workflows/integration_object_storage.yml b/.github/workflows/integration_object_storage.yml index 4a1ab5ebb..80524d6e9 100644 --- a/.github/workflows/integration_object_storage.yml +++ b/.github/workflows/integration_object_storage.yml @@ -1,6 +1,5 @@ name: Run Object Storage Integration Tests on: - push: pull_request: paths: - '**ObjectStore**' From b874645d2f25a006908cca4fa460dc38a23a130b Mon Sep 17 00:00:00 2001 From: Konstantin Babushkin Date: Sun, 24 Sep 2023 21:01:18 +0200 Subject: [PATCH 07/12] update cache definition --- .github/workflows/integration_identity.yml | 12 ++++++++---- .github/workflows/integration_object_storage.yml | 14 +++++++++----- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/.github/workflows/integration_identity.yml b/.github/workflows/integration_identity.yml index 9478b23ee..75f063b7d 100644 --- a/.github/workflows/integration_identity.yml +++ b/.github/workflows/integration_identity.yml @@ -20,12 +20,14 @@ jobs: id: composer-cache run: | echo "::set-output name=dir::$(composer config cache-files-dir)" - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.php_cs.cache ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-cache-${{ matrix.php_version }}-${{ hashFiles('**.composer.lock') }} + restore-keys: | + ${{ runner.os }}-composer-${{ matrix.php_version }}- - uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php_version }} @@ -34,10 +36,12 @@ jobs: coverage: none - run: composer install --prefer-dist --no-interaction --no-progress - name: Restore devstack cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: - path: /opt/stack/ - key: ${{ runner.os }}-oscache-${{ matrix.openstack_version }} + path: | + /opt/stack/ + ~/devstack/ + key: ${{ runner.os }}-openstack-${{ matrix.openstack_version }}-{{env.GITHUB_WORKFLOW}} - name: Deploy devstack uses: EmilienM/devstack-action@v0.11 with: diff --git a/.github/workflows/integration_object_storage.yml b/.github/workflows/integration_object_storage.yml index 80524d6e9..b9cd3561b 100644 --- a/.github/workflows/integration_object_storage.yml +++ b/.github/workflows/integration_object_storage.yml @@ -20,12 +20,14 @@ jobs: id: composer-cache run: | echo "::set-output name=dir::$(composer config cache-files-dir)" - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.php_cs.cache ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-cache-${{ matrix.php_version }}-${{ hashFiles('**.composer.lock') }} + key: ${{ runner.os }}-composer-${{ matrix.php_version }}-${{ hashFiles('**.composer.lock') }} + restore-keys: | + ${{ runner.os }}-composer-${{ matrix.php_version }}- - uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php_version }} @@ -34,10 +36,12 @@ jobs: coverage: none - run: composer install --prefer-dist --no-interaction --no-progress - name: Restore devstack cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: - path: /opt/stack/ - key: ${{ runner.os }}-oscache-${{ matrix.openstack_version }} + path: | + /opt/stack/ + ~/devstack/ + key: ${{ runner.os }}-openstack-${{ matrix.openstack_version }}-{{env.GITHUB_WORKFLOW}} - name: Deploy devstack uses: EmilienM/devstack-action@v0.11 with: From f1b6faff5c26ed31c8d6689325b96872e02e229c Mon Sep 17 00:00:00 2001 From: Konstantin Babushkin Date: Sun, 24 Sep 2023 21:03:46 +0200 Subject: [PATCH 08/12] update cache definition --- .github/workflows/integration_identity.yml | 2 +- .github/workflows/integration_object_storage.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration_identity.yml b/.github/workflows/integration_identity.yml index 75f063b7d..899d1c53e 100644 --- a/.github/workflows/integration_identity.yml +++ b/.github/workflows/integration_identity.yml @@ -41,7 +41,7 @@ jobs: path: | /opt/stack/ ~/devstack/ - key: ${{ runner.os }}-openstack-${{ matrix.openstack_version }}-{{env.GITHUB_WORKFLOW}} + key: ${{ runner.os }}-openstack-${{ matrix.openstack_version }}-${{ env.GITHUB_WORKFLOW }} - name: Deploy devstack uses: EmilienM/devstack-action@v0.11 with: diff --git a/.github/workflows/integration_object_storage.yml b/.github/workflows/integration_object_storage.yml index b9cd3561b..d1f47152d 100644 --- a/.github/workflows/integration_object_storage.yml +++ b/.github/workflows/integration_object_storage.yml @@ -41,7 +41,7 @@ jobs: path: | /opt/stack/ ~/devstack/ - key: ${{ runner.os }}-openstack-${{ matrix.openstack_version }}-{{env.GITHUB_WORKFLOW}} + key: ${{ runner.os }}-openstack-${{ matrix.openstack_version }}-${{ env.GITHUB_WORKFLOW }} - name: Deploy devstack uses: EmilienM/devstack-action@v0.11 with: From 39077a71e2412236ba6110391d5eb584a4da7dde Mon Sep 17 00:00:00 2001 From: Konstantin Babushkin Date: Sun, 24 Sep 2023 21:05:44 +0200 Subject: [PATCH 09/12] update cache definition --- .github/workflows/integration_identity.yml | 2 +- .github/workflows/integration_object_storage.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration_identity.yml b/.github/workflows/integration_identity.yml index 899d1c53e..47c6b2a9c 100644 --- a/.github/workflows/integration_identity.yml +++ b/.github/workflows/integration_identity.yml @@ -41,7 +41,7 @@ jobs: path: | /opt/stack/ ~/devstack/ - key: ${{ runner.os }}-openstack-${{ matrix.openstack_version }}-${{ env.GITHUB_WORKFLOW }} + key: ${{ runner.os }}-openstack-${{ matrix.openstack_version }}-${{ github.workflow }} - name: Deploy devstack uses: EmilienM/devstack-action@v0.11 with: diff --git a/.github/workflows/integration_object_storage.yml b/.github/workflows/integration_object_storage.yml index d1f47152d..462cec15d 100644 --- a/.github/workflows/integration_object_storage.yml +++ b/.github/workflows/integration_object_storage.yml @@ -41,7 +41,7 @@ jobs: path: | /opt/stack/ ~/devstack/ - key: ${{ runner.os }}-openstack-${{ matrix.openstack_version }}-${{ env.GITHUB_WORKFLOW }} + key: ${{ runner.os }}-openstack-${{ matrix.openstack_version }}-${{ github.workflow }} - name: Deploy devstack uses: EmilienM/devstack-action@v0.11 with: From 36e52ae7c54503c011f998df6210a4968c8c491c Mon Sep 17 00:00:00 2001 From: Konstantin Babushkin Date: Sun, 24 Sep 2023 21:21:07 +0200 Subject: [PATCH 10/12] fix name and test type --- .github/workflows/integration_identity.yml | 4 ++-- .github/workflows/integration_object_storage.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/integration_identity.yml b/.github/workflows/integration_identity.yml index 47c6b2a9c..a223eb030 100644 --- a/.github/workflows/integration_identity.yml +++ b/.github/workflows/integration_identity.yml @@ -13,7 +13,7 @@ jobs: php_version: [ 8.1 ] 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}} + name: Deploy OpenStack ${{ matrix.name }} and run Identity integration tests with php ${{matrix.php_version}} steps: - uses: actions/checkout@v2 - name: get cache directory @@ -62,5 +62,5 @@ jobs: echo OS_DOMAIN_ID=default } >> "$GITHUB_ENV" - name: Execute integration tests - run: php ./tests/integration/run.php -s=ObjectStore + run: php ./tests/integration/run.php -s=Identity diff --git a/.github/workflows/integration_object_storage.yml b/.github/workflows/integration_object_storage.yml index 462cec15d..956f455a3 100644 --- a/.github/workflows/integration_object_storage.yml +++ b/.github/workflows/integration_object_storage.yml @@ -13,7 +13,7 @@ jobs: php_version: [ 8.1 ] 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}} + name: Deploy OpenStack ${{ matrix.name }} and run ObjectStore integration tests with php ${{matrix.php_version}} steps: - uses: actions/checkout@v2 - name: get cache directory From 7555dbc6297f15c7feb63faa4bd849b81f9fe554 Mon Sep 17 00:00:00 2001 From: Konstantin Babushkin Date: Sun, 24 Sep 2023 21:34:00 +0200 Subject: [PATCH 11/12] use CamelCase directories in samples for docs --- .../block-storage/v2/volume-types.rst | 10 +++--- doc/services/block-storage/v2/volumes.rst | 18 +++++----- doc/services/compute/v2/flavors.rst | 4 +-- doc/services/compute/v2/images.rst | 10 +++--- doc/services/compute/v2/servers.rst | 36 +++++++++---------- doc/services/identity/v2/authentication.rst | 2 +- doc/services/identity/v3/credentials.rst | 10 +++--- doc/services/identity/v3/domains.rst | 26 +++++++------- doc/services/identity/v3/endpoints.rst | 10 +++--- doc/services/identity/v3/groups.rst | 18 +++++----- doc/services/identity/v3/projects.rst | 26 +++++++------- doc/services/identity/v3/roles.rst | 6 ++-- doc/services/identity/v3/services.rst | 8 ++--- doc/services/identity/v3/tokens.rst | 18 +++++----- doc/services/identity/v3/users.rst | 14 ++++---- doc/services/images/v2/images.rst | 18 +++++----- doc/services/images/v2/members.rst | 10 +++--- .../v2/loadbalancer-healthmonitors.rst | 10 +++--- .../networking/v2/loadbalancer-listeners.rst | 10 +++--- .../networking/v2/loadbalancer-pools.rst | 18 +++++----- doc/services/networking/v2/loadbalancers.rst | 16 ++++----- doc/services/networking/v2/networks.rst | 10 +++--- doc/services/networking/v2/ports.rst | 10 +++--- doc/services/networking/v2/subnets.rst | 12 +++---- doc/services/object-store/v1/account.rst | 8 ++--- doc/services/object-store/v1/containers.rst | 12 +++---- doc/services/object-store/v1/objects.rst | 22 ++++++------ 27 files changed, 186 insertions(+), 186 deletions(-) diff --git a/doc/services/block-storage/v2/volume-types.rst b/doc/services/block-storage/v2/volume-types.rst index 7c038544d..cb515a0d7 100644 --- a/doc/services/block-storage/v2/volume-types.rst +++ b/doc/services/block-storage/v2/volume-types.rst @@ -3,7 +3,7 @@ Volume Types Listing volume types -------------------- -.. sample:: blockstoragev2/volume_types/list.php +.. sample:: BlockStorage/v2/volume_types/list.php .. refdoc:: OpenStack/BlockStorage/v2/Service.html#method_listVolumeTypes Each iteration will return a :php:class:`VolumeType` instance . @@ -17,7 +17,7 @@ Create volume type The only attributes that are required when creating a volume are a name. The simplest example would therefore be this: -.. sample:: blockstoragev2/volume_types/create.php +.. sample:: BlockStorage/v2/volume_types/create.php .. refdoc:: OpenStack/BlockStorage/v2/Service.html#method_createVolumeType @@ -27,7 +27,7 @@ Retrieve details of a volume type When retrieving a volume type, sometimes you only want to operate on it - say to update or delete it. If this is the case, then there is no need to perform an initial GET request to the API: -.. sample:: blockstoragev2/volume_types/get.php +.. sample:: BlockStorage/v2/volume_types/get.php If, however, you *do* want to retrieve all the details of a remote volume type from the API, you just call: @@ -46,7 +46,7 @@ Update a volume type The first step when updating a volume type is modifying the attributes you want updated. By default, only a volume type's name can be edited. -.. sample:: blockstoragev2/volume_types/update.php +.. sample:: BlockStorage/v2/volume_types/update.php .. refdoc:: OpenStack/BlockStorage/v2/Models/VolumeType.html#method_update @@ -55,5 +55,5 @@ Delete volume type To permanently delete a volume type: -.. sample:: blockstoragev2/volume_types/delete.php +.. sample:: BlockStorage/v2/volume_types/delete.php .. refdoc:: OpenStack/BlockStorage/v2/Models/VolumeType.html#method_delete \ No newline at end of file diff --git a/doc/services/block-storage/v2/volumes.rst b/doc/services/block-storage/v2/volumes.rst index e171e6708..e0d0691fa 100644 --- a/doc/services/block-storage/v2/volumes.rst +++ b/doc/services/block-storage/v2/volumes.rst @@ -4,7 +4,7 @@ Volumes List volumes ------------ -.. sample:: blockstoragev2/volumes/list.php +.. sample:: BlockStorage/v2/volumes/list.php .. refdoc:: OpenStack/BlockStorage/v2/Service.html#method_listVolumes Each iteration will return a php:class:`Volume` instance . @@ -17,7 +17,7 @@ Detailed information By default, only the ``id``, ``links`` and ``name`` attributes are returned. To return *all* information for a flavor, you must enable detailed information, like so: -.. sample:: blockstoragev2/volumes/list_detail.php +.. sample:: BlockStorage/v2/volumes/list_detail.php Create volume ------------- @@ -25,7 +25,7 @@ Create volume The only attributes that are required when creating a volume are a size in GiB. The simplest example would therefore be this: -.. sample:: blockstoragev2/volumes/create.php +.. sample:: BlockStorage/v2/volumes/create.php You can further configure your new volume, however, by following the below sections, which instruct you how to add specific functionality. @@ -35,17 +35,17 @@ specific functionality. Create from image ~~~~~~~~~~~~~~~~~ -.. sample:: blockstoragev2/volumes/create_from_image.php +.. sample:: BlockStorage/v2/volumes/create_from_image.php Create from snapshot ~~~~~~~~~~~~~~~~~~~~ -.. sample:: blockstoragev2/volumes/create_from_snapshot.php +.. sample:: BlockStorage/v2/volumes/create_from_snapshot.php Create from source volume ~~~~~~~~~~~~~~~~~~~~~~~~~ -.. sample:: blockstoragev2/volumes/create_from_source_volume.php +.. sample:: BlockStorage/v2/volumes/create_from_source_volume.php Retrieve volume details @@ -54,7 +54,7 @@ Retrieve volume details When retrieving a volume, sometimes you only want to operate on it - say to update or delete it. If this is the case, then there is no need to perform an initial GET request to the API: -.. sample:: blockstoragev2/volumes/get.php +.. sample:: BlockStorage/v2/volumes/get.php If, however, you *do* want to retrieve all the details of a remote volume from the API, you just call: @@ -73,7 +73,7 @@ Update volume The first step when updating a volume is modifying the attributes you want updated. By default, only a volume's name and description can be edited. -.. sample:: blockstoragev2/volumes/update.php +.. sample:: BlockStorage/v2/volumes/update.php .. refdoc:: OpenStack/BlockStorage/v2/Models/Volume.html#method_update Delete volume @@ -81,5 +81,5 @@ Delete volume To permanently delete a volume: -.. sample:: blockstoragev2/volumes/delete.php +.. sample:: BlockStorage/v2/volumes/delete.php .. refdoc:: OpenStack/BlockStorage/v2/Models/Volume.html#method_delete \ No newline at end of file diff --git a/doc/services/compute/v2/flavors.rst b/doc/services/compute/v2/flavors.rst index dc6859efb..6d71b734c 100644 --- a/doc/services/compute/v2/flavors.rst +++ b/doc/services/compute/v2/flavors.rst @@ -4,7 +4,7 @@ Flavors List flavors ------------ -.. sample:: compute/v2/flavors/list_flavors.php +.. sample:: Compute/v2/flavors/list_flavors.php .. refdoc:: OpenStack/Compute/v2/Service.html#method_listFlavors Each iteration will return a :php:class:`Flavor` instance . @@ -26,7 +26,7 @@ for a flavor, you must pass ``true`` as the last parameter, like so: Retrieve a flavor ----------------- -.. sample:: compute/v2/flavors/get_flavor.php +.. sample:: Compute/v2/flavors/get_flavor.php .. refdoc:: OpenStack/Compute/v2/Service.html#method_getFlavor When retrieving a flavor, sometimes you only want to operate on it. If this is the case, diff --git a/doc/services/compute/v2/images.rst b/doc/services/compute/v2/images.rst index 8b04aaa06..6a2ce6e7a 100644 --- a/doc/services/compute/v2/images.rst +++ b/doc/services/compute/v2/images.rst @@ -4,7 +4,7 @@ Images List images ----------- -.. sample:: compute/v2/images/list_images.php +.. sample:: Compute/v2/images/list_images.php Each iteration will return an :apiref:Image instance _. @@ -27,7 +27,7 @@ Retrieve an image When retrieving an image, sometimes you only want to operate on it - say to update or delete it. If this is the case, then there is no need to perform an initial GET request to the server: -.. sample:: compute/v2/images/get_image.php +.. sample:: Compute/v2/images/get_image.php .. refdoc:: OpenStack/Compute/v2/Service.html#method_getImage If, however, you *do* want to retrieve all the details of a remote image from the API, you just call: @@ -41,7 +41,7 @@ which will update the state of the local object. This gives you an element of co Delete an image --------------- -.. sample:: compute/v2/images/delete_image.php +.. sample:: Compute/v2/images/delete_image.php .. refdoc:: OpenStack/Compute/v2/Models/Image.html#method_delete Retrieve metadata @@ -58,7 +58,7 @@ This operation will retrieve the existing metadata for an image: Reset metadata -------------- -.. sample:: compute/v2/images/reset_image_metadata.php +.. sample:: Compute/v2/images/reset_image_metadata.php This operation will _replace_ all existing metadata with whatever is provided in the request. Any existing metadata not specified in the request will be deleted. @@ -95,5 +95,5 @@ Delete image metadata item This operation allows you to remove a specific metadata item: -.. sample:: compute/v2/images/delete_image_metadata_item.php +.. sample:: Compute/v2/images/delete_image_metadata_item.php .. refdoc:: OpenStack/Compute/v2/Models/Image.html#method_deleteMetadataItem \ No newline at end of file diff --git a/doc/services/compute/v2/servers.rst b/doc/services/compute/v2/servers.rst index 63a10235b..a80fc4b99 100644 --- a/doc/services/compute/v2/servers.rst +++ b/doc/services/compute/v2/servers.rst @@ -6,7 +6,7 @@ Listing servers To list a collection of servers, you run: -.. sample:: compute/v2/servers/list_servers.php +.. sample:: Compute/v2/servers/list_servers.php Each iteration will return a :apiref:Server instance . @@ -44,7 +44,7 @@ Create a server The only attributes that are required when creating a server are a name, flavor ID and image ID. The simplest example would therefore be this: -.. sample:: compute/v2/servers/create_server.php +.. sample:: Compute/v2/servers/create_server.php You can further configure your new server, however, by following the below sections, which instruct you how to add specific functionality. They are interoperable and can work together. @@ -139,7 +139,7 @@ Retrieve a server When retrieving a server, sometimes you only want to operate on it - say to update or delete it. If this is the case, then there is no need to perform an initial GET request to the server: -.. sample:: compute/v2/servers/get_server.php +.. sample:: Compute/v2/servers/get_server.php If, however, you *do* want to retrieve all the details of a remote server from the API, you just call: @@ -157,7 +157,7 @@ Update a server The first step when updating a server is modifying the attributes you want updated. By default, only a server's name, IPv4 and IPv6 IPs, and its auto disk config attributes can be edited. -.. sample:: compute/v2/servers/update_server.php +.. sample:: Compute/v2/servers/update_server.php .. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_update Delete a server @@ -165,7 +165,7 @@ Delete a server To permanently delete a server: -.. sample:: compute/v2/servers/delete_server.php +.. sample:: Compute/v2/servers/delete_server.php .. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_delete Retrieve metadata @@ -173,7 +173,7 @@ Retrieve metadata This operation will retrieve the existing metadata for a server: -.. sample:: compute/v2/servers/get_server_metadata.php +.. sample:: Compute/v2/servers/get_server_metadata.php .. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_getMetadata Reset metadata @@ -182,7 +182,7 @@ Reset metadata This operation will _replace_ all existing metadata with whatever is provided in the request. Any existing metadata not specified in the request will be deleted. -.. sample:: compute/v2/servers/reset_server_metadata.php +.. sample:: Compute/v2/servers/reset_server_metadata.php .. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_resetMetadata Merge metadata @@ -191,7 +191,7 @@ Merge metadata This operation will _merge_ specified metadata with what already exists. Existing values will be overriden, new values will be added. Any existing keys that are not specified in the request will remain unaffected. -.. sample:: compute/v2/servers/merge_server_metadata.php +.. sample:: Compute/v2/servers/merge_server_metadata.php .. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_mergeMetadata Retrieve metadata item @@ -199,7 +199,7 @@ Retrieve metadata item This operation allows you to retrieve the value for a specific metadata item: -.. sample:: compute/v2/servers/get_server_metadata_item.php +.. sample:: Compute/v2/servers/get_server_metadata_item.php .. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_getMetadataItem Delete metadata item @@ -207,7 +207,7 @@ Delete metadata item This operation allows you to remove a specific metadata item: -.. sample:: compute/v2/servers/delete_server_metadata_item.php +.. sample:: Compute/v2/servers/delete_server_metadata_item.php .. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_deleteMetadataItem Change root password @@ -215,7 +215,7 @@ Change root password This operation will replace the root password for a server. -.. sample:: compute/v2/servers/change_server_password.php +.. sample:: Compute/v2/servers/change_server_password.php .. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_changePassword Reset server state @@ -223,7 +223,7 @@ Reset server state This operation will reset the state of the server. -.. sample:: compute/v2/servers/reset_server_state.php +.. sample:: Compute/v2/servers/reset_server_state.php .. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_resetState Reboot server @@ -232,7 +232,7 @@ Reboot server This operation will reboot a server. Please be aware that you must specify whether you want to initiate a HARD or SOFT reboot (you specify this as a string argument). -.. sample:: compute/v2/servers/reboot_server.php +.. sample:: Compute/v2/servers/reboot_server.php .. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_reboot Rebuild server @@ -242,7 +242,7 @@ Rebuilding a server will re-initialize the booting procedure for the server and system. It will shutdown, re-image and then reboot your instance. Any data saved on your instance will be lost when the rebuild is performed. -.. sample:: compute/v2/servers/rebuild_server.php +.. sample:: Compute/v2/servers/rebuild_server.php .. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_rebuild Resize server @@ -252,7 +252,7 @@ You can resize the flavor of a server by performing this operation. As soon the transition to a VERIFY_RESIZE state and a VM status of RESIZED. You will either need to confirm or revert the resize in order to continue. -.. sample:: compute/v2/servers/resize_server.php +.. sample:: Compute/v2/servers/resize_server.php .. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_resize Confirm server resize @@ -262,7 +262,7 @@ Once a server has been resized, you can confirm the operation by calling this. T VERIFY_RESIZE and a VM status of RESIZED. Once this operation completes, the server should transition to an ACTIVE state and a migration status of confirmed. -.. sample:: compute/v2/servers/confirm_server_resize.php +.. sample:: Compute/v2/servers/confirm_server_resize.php .. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_confirmResize Revert server resize @@ -272,7 +272,7 @@ Once a server has been resized, you can revert the operation by calling this. Th VERIFY_RESIZE and a VM status of RESIZED. Once this operation completes, the server should transition to an ACTIVE state and a migration status of reverted. -.. sample:: compute/v2/servers/revert_server_resize.php +.. sample:: Compute/v2/servers/revert_server_resize.php .. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_revertResize Create server image @@ -281,7 +281,7 @@ Create server image This operation will create a new server image. The only required option is the new image's name. You may also specify additional metadata: -.. sample:: compute/v2/images/create_server_image.php +.. sample:: Compute/v2/images/create_server_image.php .. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_createImage List server IP addresses diff --git a/doc/services/identity/v2/authentication.rst b/doc/services/identity/v2/authentication.rst index eb3edfc6c..6f5d515fd 100644 --- a/doc/services/identity/v2/authentication.rst +++ b/doc/services/identity/v2/authentication.rst @@ -9,4 +9,4 @@ We recommend users to use identity v3 when possible. RackSpace cloud and OVH cloud, however, are still using Keystone v2.0. This following code will work for such providers. -.. sample:: identity/v2/authentication.php +.. sample:: Identity/v2/authentication.php diff --git a/doc/services/identity/v3/credentials.rst b/doc/services/identity/v3/credentials.rst index 0471cc9e8..b0cf1d849 100644 --- a/doc/services/identity/v3/credentials.rst +++ b/doc/services/identity/v3/credentials.rst @@ -7,7 +7,7 @@ Add credential Create a secret/access pair for use with ec2 style auth. This operation will generates a new set of credentials that map the user/tenant pair. -.. sample:: identity/v3/credentials/add_cred.php +.. sample:: Identity/v2/credentials/add_cred.php .. refdoc:: OpenStack/Identity/v3/Service.html#method_createCredential List credentials @@ -15,7 +15,7 @@ List credentials List all credentials for a given user. -.. sample:: identity/v3/credentials/list_creds.php +.. sample:: Identity/v2/credentials/list_creds.php .. refdoc:: OpenStack/Identity/v3/Service.html#method_listCredentials Show credential details @@ -23,13 +23,13 @@ Show credential details Retrieve a user's access/secret pair by the access key. -.. sample:: identity/v3/credentials/get_cred.php +.. sample:: Identity/v2/credentials/get_cred.php .. refdoc:: OpenStack/Identity/v3/Service.html#method_getCredential Update credential ----------------- -.. sample:: identity/v3/credentials/update_cred.php +.. sample:: Identity/v2/credentials/update_cred.php .. refdoc:: OpenStack/Identity/v3/Models/Credential.html#method_update Delete credential @@ -37,5 +37,5 @@ Delete credential Delete a user's access/secret pair. -.. sample:: identity/v3/credentials/delete_cred.php +.. sample:: Identity/v2/credentials/delete_cred.php .. refdoc:: OpenStack/Identity/v3/Models/Credential.html#method_delete diff --git a/doc/services/identity/v3/domains.rst b/doc/services/identity/v3/domains.rst index c56c0bd68..079937e86 100644 --- a/doc/services/identity/v3/domains.rst +++ b/doc/services/identity/v3/domains.rst @@ -4,77 +4,77 @@ Domains Add domain ---------- -.. sample:: identity/v3/domains/add_domain.php +.. sample:: Identity/v2/domains/add_domain.php .. refdoc:: OpenStack/Identity/v3/Service.html#method_createDomain List domains ------------ -.. sample:: identity/v3/domains/list_domains.php +.. sample:: Identity/v2/domains/list_domains.php .. refdoc:: OpenStack/Identity/v3/Service.html#method_listDomains Show domain details ------------------- -.. sample:: identity/v3/domains/show_domain.php +.. sample:: Identity/v2/domains/show_domain.php .. refdoc:: OpenStack/Identity/v3/Service.html#method_getDomain Update domain ------------- -.. sample:: identity/v3/domains/update_domain.php +.. sample:: Identity/v2/domains/update_domain.php .. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_update Delete domain ------------- -.. sample:: identity/v3/domains/delete_domain.php +.. sample:: Identity/v2/domains/delete_domain.php .. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_delete List roles for domain user -------------------------- -.. sample:: identity/v3/domains/list_user_roles.php +.. sample:: Identity/v2/domains/list_user_roles.php .. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_listUserRoles Grant role to domain user ------------------------- -.. sample:: identity/v3/domains/grant_user_role.php +.. sample:: Identity/v2/domains/grant_user_role.php .. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_grantUserRole Check role for domain user -------------------------- -.. sample:: identity/v3/domains/check_user_role.php +.. sample:: Identity/v2/domains/check_user_role.php .. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_checkUserRole Revoke role for domain user --------------------------- -.. sample:: identity/v3/domains/revoke_user_role.php +.. sample:: Identity/v2/domains/revoke_user_role.php .. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_revokeUserRole List roles for domain group --------------------------- -.. sample:: identity/v3/domains/list_group_roles.php +.. sample:: Identity/v2/domains/list_group_roles.php .. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_listGroupRoles Grant role to domain group -------------------------- -.. sample:: identity/v3/domains/grant_group_role.php +.. sample:: Identity/v2/domains/grant_group_role.php .. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_grantGroupRole Check role for domain group --------------------------- -.. sample:: identity/v3/domains/check_group_role.php +.. sample:: Identity/v2/domains/check_group_role.php .. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_checkGroupRole Revoke role for domain group ---------------------------- -.. sample:: identity/v3/domains/revoke_group_role.php +.. sample:: Identity/v2/domains/revoke_group_role.php .. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_revokeGroupRole diff --git a/doc/services/identity/v3/endpoints.rst b/doc/services/identity/v3/endpoints.rst index 0040aacac..c4aadb84a 100644 --- a/doc/services/identity/v3/endpoints.rst +++ b/doc/services/identity/v3/endpoints.rst @@ -4,29 +4,29 @@ Endpoints Add endpoints ------------- -.. sample:: identity/v3/endpoints/add_endpoint.php +.. sample:: Identity/v2/endpoints/add_endpoint.php .. refdoc:: OpenStack/Identity/v3/Service.html#method_createEndpoint Get endpoint ------------ -.. sample:: identity/v3/endpoints/get_endpoint.php +.. sample:: Identity/v2/endpoints/get_endpoint.php .. refdoc:: OpenStack/Identity/v3/Service.html#method_getEndpoint List endpoints -------------- -.. sample:: identity/v3/endpoints/list_endpoints.php +.. sample:: Identity/v2/endpoints/list_endpoints.php .. refdoc:: OpenStack/Identity/v3/Service.html#method_listEndpoints Update endpoint --------------- -.. sample:: identity/v3/endpoints/update_endpoint.php +.. sample:: Identity/v2/endpoints/update_endpoint.php .. refdoc:: OpenStack/Identity/v3/Models/Endpoint.html#method_update Delete endpoint --------------- -.. sample:: identity/v3/endpoints/delete_endpoint.php +.. sample:: Identity/v2/endpoints/delete_endpoint.php .. refdoc:: OpenStack/Identity/v3/Models/Endpoint.html#method_delete diff --git a/doc/services/identity/v3/groups.rst b/doc/services/identity/v3/groups.rst index f9db091b0..7a29b6725 100644 --- a/doc/services/identity/v3/groups.rst +++ b/doc/services/identity/v3/groups.rst @@ -4,53 +4,53 @@ Groups Add group --------- -.. sample:: identity/v3/groups/add_group.php +.. sample:: Identity/v2/groups/add_group.php .. refdoc:: OpenStack/Identity/v3/Service.html#method_createGroup List groups ----------- -.. sample:: identity/v3/groups/list_groups.php +.. sample:: Identity/v2/groups/list_groups.php .. refdoc:: OpenStack/Identity/v3/Service.html#method_listGroups Show group details ------------------ -.. sample:: identity/v3/groups/get_group.php +.. sample:: Identity/v2/groups/get_group.php .. refdoc:: OpenStack/Identity/v3/Service.html#method_getGroup Update group ------------ -.. sample:: identity/v3/groups/update_group.php +.. sample:: Identity/v2/groups/update_group.php .. refdoc:: OpenStack/Identity/v3/Models/Group.html#method_update Delete group ------------ -.. sample:: identity/v3/groups/delete_group.php +.. sample:: Identity/v2/groups/delete_group.php .. refdoc:: OpenStack/Identity/v3/Models/Group.html#method_delete List users in a group --------------------- -.. sample:: identity/v3/groups/list_users.php +.. sample:: Identity/v2/groups/list_users.php .. refdoc:: OpenStack/Identity/v3/Models/Group.html#method_listUsers Add user to group ----------------- -.. sample:: identity/v3/groups/add_user.php +.. sample:: Identity/v2/groups/add_user.php .. refdoc:: OpenStack/Identity/v3/Models/Group.html#method_addUser Remove user from group ---------------------- -.. sample:: identity/v3/groups/remove_user.php +.. sample:: Identity/v2/groups/remove_user.php .. refdoc:: OpenStack/Identity/v3/Models/Group.html#method_removeUser Check user membership in a group -------------------------------- -.. sample:: identity/v3/groups/check_user_membership.php +.. sample:: Identity/v2/groups/check_user_membership.php .. refdoc:: OpenStack/Identity/v3/Models/Group.html#method_checkMembership diff --git a/doc/services/identity/v3/projects.rst b/doc/services/identity/v3/projects.rst index cd2e07b22..55177cf25 100644 --- a/doc/services/identity/v3/projects.rst +++ b/doc/services/identity/v3/projects.rst @@ -4,77 +4,77 @@ Projects Add project ----------- -.. sample:: identity/v3/projects/add_project.php +.. sample:: Identity/v2/projects/add_project.php .. refdoc:: OpenStack/Identity/v3/Service.html#method_createProject List projects ------------- -.. sample:: identity/v3/projects/list_projects.php +.. sample:: Identity/v2/projects/list_projects.php .. refdoc:: OpenStack/Identity/v3/Service.html#method_listProjects Show project details -------------------- -.. sample:: identity/v3/projects/get_project.php +.. sample:: Identity/v2/projects/get_project.php .. refdoc:: OpenStack/Identity/v3/Service.html#method_getProject Update project -------------- -.. sample:: identity/v3/projects/update_project.php +.. sample:: Identity/v2/projects/update_project.php .. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_update Delete project -------------- -.. sample:: identity/v3/projects/delete_project.php +.. sample:: Identity/v2/projects/delete_project.php .. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_delete List roles for project user --------------------------- -.. sample:: identity/v3/projects/list_user_roles.php +.. sample:: Identity/v2/projects/list_user_roles.php .. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_listUserRoles Grant role to project user -------------------------- -.. sample:: identity/v3/projects/grant_user_role.php +.. sample:: Identity/v2/projects/grant_user_role.php .. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_grantUserRole Check role for project user --------------------------- -.. sample:: identity/v3/projects/check_user_role.php +.. sample:: Identity/v2/projects/check_user_role.php .. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_checkUserRole Revoke role for project user ---------------------------- -.. sample:: identity/v3/projects/revoke_user_role.php +.. sample:: Identity/v2/projects/revoke_user_role.php .. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_revokeUserRole List roles for project group ---------------------------- -.. sample:: identity/v3/projects/list_group_roles.php +.. sample:: Identity/v2/projects/list_group_roles.php .. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_listGroupRoles Grant role to project group --------------------------- -.. sample:: identity/v3/projects/grant_group_role.php +.. sample:: Identity/v2/projects/grant_group_role.php .. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_grantGroupRole Check role for project group ---------------------------- -.. sample:: identity/v3/projects/check_group_role.php +.. sample:: Identity/v2/projects/check_group_role.php .. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_checkGroupRole Revoke role for project group ----------------------------- -.. sample:: identity/v3/projects/revoke_group_role.php +.. sample:: Identity/v2/projects/revoke_group_role.php .. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_revokeGroupRole \ No newline at end of file diff --git a/doc/services/identity/v3/roles.rst b/doc/services/identity/v3/roles.rst index 27d3458cb..5baf9ab1b 100644 --- a/doc/services/identity/v3/roles.rst +++ b/doc/services/identity/v3/roles.rst @@ -4,17 +4,17 @@ Roles Add role -------- -.. sample:: identity/v3/roles/add_role.php +.. sample:: Identity/v2/roles/add_role.php .. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_createRole List roles ---------- -.. sample:: identity/v3/roles/list_roles.php +.. sample:: Identity/v2/roles/list_roles.php .. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_listRoles List role assignments --------------------- -.. sample:: identity/v3/roles/list_assignments.php +.. sample:: Identity/v2/roles/list_assignments.php .. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_listRoleAssignments diff --git a/doc/services/identity/v3/services.rst b/doc/services/identity/v3/services.rst index 770ded17a..4ba154af0 100644 --- a/doc/services/identity/v3/services.rst +++ b/doc/services/identity/v3/services.rst @@ -4,23 +4,23 @@ Services Add service ----------- -.. sample:: identity/v3/services/add_service.php +.. sample:: Identity/v2/services/add_service.php .. refdoc:: OpenStack/Identity/v3/Service.html#method_createService List services ------------- -.. sample:: identity/v3/services/list_services.php +.. sample:: Identity/v2/services/list_services.php .. refdoc:: OpenStack/Identity/v3/Service.html#method_listServices Show service details -------------------- -.. sample:: identity/v3/services/get_service.php +.. sample:: Identity/v2/services/get_service.php .. refdoc:: OpenStack/Identity/v3/Service.html#method_getService Delete service -------------- -.. sample:: identity/v3/services/delete_service.php +.. sample:: Identity/v2/services/delete_service.php .. refdoc:: OpenStack/Identity/v3/Models/Service.html#method_delete \ No newline at end of file diff --git a/doc/services/identity/v3/tokens.rst b/doc/services/identity/v3/tokens.rst index 9fe4b25c3..72e8617e9 100644 --- a/doc/services/identity/v3/tokens.rst +++ b/doc/services/identity/v3/tokens.rst @@ -10,38 +10,38 @@ Authenticate (generate) token Generate token with user ID ~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.. sample:: identity/v3/tokens/generate_token_with_user_id.php +.. sample:: Identity/v2/tokens/generate_token_with_user_id.php Generate token with username ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.. sample:: identity/v3/tokens/generate_token_with_username.php +.. sample:: Identity/v2/tokens/generate_token_with_username.php Generate token from ID ~~~~~~~~~~~~~~~~~~~~~~ -.. sample:: identity/v3/tokens/generate_token_from_id.php +.. sample:: Identity/v2/tokens/generate_token_from_id.php Generate token scoped to project ID ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.. sample:: identity/v3/tokens/generate_token_scoped_to_project_id.php +.. sample:: Identity/v2/tokens/generate_token_scoped_to_project_id.php Generate token scoped to project name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.. sample:: identity/v3/tokens/generate_token_scoped_to_project_name.php +.. sample:: Identity/v2/tokens/generate_token_scoped_to_project_name.php Validate token -------------- -.. sample:: identity/v3/tokens/validate_token.php +.. sample:: Identity/v2/tokens/validate_token.php .. refdoc:: OpenStack/Identity/v3/Service.html#method_validateToken Revoke token ------------ -.. sample:: identity/v3/tokens/revoke_token.php +.. sample:: Identity/v2/tokens/revoke_token.php .. refdoc:: OpenStack/Identity/v3/Service.html#method_revokeToken Cache authentication token @@ -66,7 +66,7 @@ expire. Generate token and persist to file ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.. sample:: identity/v3/tokens/export_authentication_token.php +.. sample:: Identity/v2/tokens/export_authentication_token.php For scalability, it is recommended that cached tokens are stored in persistent storage such as memcache or redis instead @@ -75,4 +75,4 @@ of a local file. Initialize Open Stack using cached authentication token ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.. sample:: identity/v3/tokens/use_cached_authentication_token.php +.. sample:: Identity/v2/tokens/use_cached_authentication_token.php diff --git a/doc/services/identity/v3/users.rst b/doc/services/identity/v3/users.rst index 9fd79ec21..db27edbd7 100644 --- a/doc/services/identity/v3/users.rst +++ b/doc/services/identity/v3/users.rst @@ -4,41 +4,41 @@ Users Add user -------- -.. sample:: identity/v3/users/add_user.php +.. sample:: Identity/v2/users/add_user.php .. refdoc:: OpenStack/Identity/v3/Service.html#method_createUser List users ---------- -.. sample:: identity/v3/users/list_users.php +.. sample:: Identity/v2/users/list_users.php .. refdoc:: OpenStack/Identity/v3/Service.html#method_listUsers Show user details ----------------- -.. sample:: identity/v3/users/get_user.php +.. sample:: Identity/v2/users/get_user.php .. refdoc:: OpenStack/Identity/v3/Service.html#method_getUser Update user ----------- -.. sample:: identity/v3/users/update_user.php +.. sample:: Identity/v2/users/update_user.php .. refdoc:: OpenStack/Identity/v3/Models/User.html#method_update Delete user ----------- -.. sample:: identity/v3/users/delete_user.php +.. sample:: Identity/v2/users/delete_user.php .. refdoc:: OpenStack/Identity/v3/Models/User.html#method_delete List groups for user -------------------- -.. sample:: identity/v3/users/list_groups.php +.. sample:: Identity/v2/users/list_groups.php .. refdoc:: OpenStack/Identity/v3/Models/User.html#method_listGroups List projects for user ---------------------- -.. sample:: identity/v3/users/list_projects.php +.. sample:: Identity/v2/users/list_projects.php .. refdoc:: OpenStack/Identity/v3/Models/User.html#method_listProjects diff --git a/doc/services/images/v2/images.rst b/doc/services/images/v2/images.rst index 1bd8949aa..eacc94f55 100644 --- a/doc/services/images/v2/images.rst +++ b/doc/services/images/v2/images.rst @@ -6,13 +6,13 @@ Create image The only required attribute when creating a new image is ``name``. -.. sample:: images/v2/images/create.php +.. sample:: Images/v2/images/create.php .. refdoc:: OpenStack/Images/v2/Service.html#method_createImage List images ----------- -.. sample:: images/v2/images/list.php +.. sample:: Images/v2/images/list.php .. refdoc:: OpenStack/Images/v2/Service.html#method_listImages .. include:: /common/generators.rst @@ -20,25 +20,25 @@ List images Show image details ------------------ -.. sample:: images/v2/images/get.php +.. sample:: Images/v2/images/get.php .. refdoc:: OpenStack/Images/v2/Service.html#method_getImage Update image ------------ -.. sample:: images/v2/images/update.php +.. sample:: Images/v2/images/update.php .. refdoc:: OpenStack/Images/v2/Models/Image.html#method_update Delete image ------------ -.. sample:: images/v2/images/delete.php +.. sample:: Images/v2/images/delete.php .. refdoc:: OpenStack/Images/v2/Models/Image.html#method_delete Reactivate image ---------------- -.. sample:: images/v2/images/reactivate.php +.. sample:: Images/v2/images/reactivate.php .. refdoc:: OpenStack/Images/v2/Models/Image.html#method_reactivate Deactivate image @@ -46,7 +46,7 @@ Deactivate image If you try to download a deactivated image, a Forbidden error is returned. -.. sample:: images/v2/images/deactivate.php +.. sample:: Images/v2/images/deactivate.php .. refdoc:: OpenStack/Images/v2/Models/Image.html#method_deactivate Upload binary data @@ -61,11 +61,11 @@ Before you can store binary image data, you must meet the following precondition The size of the data that you want to store must not exceed the size that the Image service allows. -.. sample:: images/v2/images/upload_binary_data.php +.. sample:: Images/v2/images/upload_binary_data.php .. refdoc:: OpenStack/Images/v2/Models/Image.html#method_uploadData Download binary data -------------------- -.. sample:: images/v2/images/download_binary_data.php +.. sample:: Images/v2/images/download_binary_data.php .. refdoc:: OpenStack/Images/v2/Models/Image.html#method_downloadData \ No newline at end of file diff --git a/doc/services/images/v2/members.rst b/doc/services/images/v2/members.rst index 5b8bee400..08abc547c 100644 --- a/doc/services/images/v2/members.rst +++ b/doc/services/images/v2/members.rst @@ -4,13 +4,13 @@ Image Members Add member to image ------------------- -.. sample:: images/v2/members/add.php +.. sample:: Images/v2/members/add.php .. refdoc:: OpenStack/Images/v2/Models/Image.html#method_addMember List image members ------------------ -.. sample:: images/v2/members/list.php +.. sample:: Images/v2/members/list.php .. refdoc:: OpenStack/Images/v2/Models/Image.html#method_listMembers .. include:: /common/generators.rst @@ -18,17 +18,17 @@ List image members Show member details ------------------- -.. sample:: images/v2/members/get.php +.. sample:: Images/v2/members/get.php .. refdoc:: OpenStack/Images/v2/Models/Image.html#method_getMember Remove member from image ------------------------ -.. sample:: images/v2/members/delete.php +.. sample:: Images/v2/members/delete.php .. refdoc:: OpenStack/Images/v2/Models/Member.html#method_delete Update status of image member ----------------------------- -.. sample:: images/v2/members/update_status.php +.. sample:: Images/v2/members/update_status.php .. refdoc:: OpenStack/Images/v2/Models/Member.html#method_updateStatus \ No newline at end of file diff --git a/doc/services/networking/v2/loadbalancer-healthmonitors.rst b/doc/services/networking/v2/loadbalancer-healthmonitors.rst index 5a8a27ba4..e383a2ff9 100644 --- a/doc/services/networking/v2/loadbalancer-healthmonitors.rst +++ b/doc/services/networking/v2/loadbalancer-healthmonitors.rst @@ -4,29 +4,29 @@ LoadBalancer HealthMonitors Create HealthMonitor -------------------- -.. sample:: networking/v2/lbaas/healthmonitors/create.php +.. sample:: Networking/v2/lbaas/healthmonitors/create.php .. refdoc:: OpenStack/Networking/v2/Service.html#method_createLoadBalancerHealthMonitor Get HealthMonitor ----------------- -.. sample:: networking/v2/lbaas/healthmonitors/get.php +.. sample:: Networking/v2/lbaas/healthmonitors/get.php .. refdoc:: OpenStack/Networking/v2/Service.html#method_getLoadBalancerHealthMonitor List HealthMonitors ------------------- -.. sample:: networking/v2/lbaas/healthmonitors/list.php +.. sample:: Networking/v2/lbaas/healthmonitors/list.php .. refdoc:: OpenStack/Networking/v2/Service.html#method_listLoadBalancerHealthMonitors Update HealthMonitor -------------------- -.. sample:: networking/v2/lbaas/healthmonitors/update.php +.. sample:: Networking/v2/lbaas/healthmonitors/update.php .. refdoc:: OpenStack/Networking/v2/Models/LoadBalancerHealthMonitor.html#method_update Delete HealthMonitor -------------------- -.. sample:: networking/v2/lbaas/healthmonitors/delete.php +.. sample:: Networking/v2/lbaas/healthmonitors/delete.php .. refdoc:: OpenStack/Networking/v2/Models/LoadBalancerHealthMonitor.html#method_delete diff --git a/doc/services/networking/v2/loadbalancer-listeners.rst b/doc/services/networking/v2/loadbalancer-listeners.rst index 90237d861..a99a1df53 100644 --- a/doc/services/networking/v2/loadbalancer-listeners.rst +++ b/doc/services/networking/v2/loadbalancer-listeners.rst @@ -4,29 +4,29 @@ LoadBalancer Listeners Create Listener --------------- -.. sample:: networking/v2/lbaas/listeners/create.php +.. sample:: Networking/v2/lbaas/listeners/create.php .. refdoc:: OpenStack/Networking/v2/Service.html#method_createLoadBalancerListener Get Listener ------------ -.. sample:: networking/v2/lbaas/listeners/get.php +.. sample:: Networking/v2/lbaas/listeners/get.php .. refdoc:: OpenStack/Networking/v2/Service.html#method_getLoadBalancerListener List Listeners -------------- -.. sample:: networking/v2/lbaas/listeners/list.php +.. sample:: Networking/v2/lbaas/listeners/list.php .. refdoc:: OpenStack/Networking/v2/Service.html#method_listLoadBalancerListeners Update Listener --------------- -.. sample:: networking/v2/lbaas/listeners/update.php +.. sample:: Networking/v2/lbaas/listeners/update.php .. refdoc:: OpenStack/Networking/v2/Models/LoadBalancerListener.html#method_update Delete Listener --------------- -.. sample:: networking/v2/lbaas/listeners/delete.php +.. sample:: Networking/v2/lbaas/listeners/delete.php .. refdoc:: OpenStack/Networking/v2/Models/LoadBalancerListener.html#method_delete diff --git a/doc/services/networking/v2/loadbalancer-pools.rst b/doc/services/networking/v2/loadbalancer-pools.rst index ce1489180..891b487da 100644 --- a/doc/services/networking/v2/loadbalancer-pools.rst +++ b/doc/services/networking/v2/loadbalancer-pools.rst @@ -4,53 +4,53 @@ LoadBalancer Pools Create Pool ----------- -.. sample:: networking/v2/lbaas/pools/create.php +.. sample:: Networking/v2/lbaas/pools/create.php .. refdoc:: OpenStack/Networking/v2/Service.html#method_createLoadBalancerPool Get Pool -------- -.. sample:: networking/v2/lbaas/pools/get.php +.. sample:: Networking/v2/lbaas/pools/get.php .. refdoc:: OpenStack/Networking/v2/Service.html#method_getLoadBalancerPool List Pools ---------- -.. sample:: networking/v2/lbaas/pools/list.php +.. sample:: Networking/v2/lbaas/pools/list.php .. refdoc:: OpenStack/Networking/v2/Service.html#method_listLoadBalancerPools Update Pool ----------- -.. sample:: networking/v2/lbaas/pools/update.php +.. sample:: Networking/v2/lbaas/pools/update.php .. refdoc:: OpenStack/Networking/v2/Models/LoadBalancerPool.html#method_update Delete Pool ----------- -.. sample:: networking/v2/lbaas/pools/delete.php +.. sample:: Networking/v2/lbaas/pools/delete.php .. refdoc:: OpenStack/Networking/v2/Models/LoadBalancerPool.html#method_delete Add Member ---------- -.. sample:: networking/v2/lbaas/pools/add-member.php +.. sample:: Networking/v2/lbaas/pools/add-member.php .. refdoc:: OpenStack/Networking/v2/Models/LoadBalancerPool.html#method_addMember Get Member ---------- -.. sample:: networking/v2/lbaas/pools/get-member.php +.. sample:: Networking/v2/lbaas/pools/get-member.php .. refdoc:: OpenStack/Networking/v2/Models/LoadBalancerPool.html#method_getMember Delete Member ------------- -.. sample:: networking/v2/lbaas/pools/delete-member.php +.. sample:: Networking/v2/lbaas/pools/delete-member.php .. refdoc:: OpenStack/Networking/v2/Models/LoadBalancerPool.html#method_deleteMember Add Health Monitor ------------------ -.. sample:: networking/v2/lbaas/pools/add-healthmonitor.php +.. sample:: Networking/v2/lbaas/pools/add-healthmonitor.php .. refdoc:: OpenStack/Networking/v2/Models/LoadBalancerPool.html#method_addHealthMonitor diff --git a/doc/services/networking/v2/loadbalancers.rst b/doc/services/networking/v2/loadbalancers.rst index 1733a54d7..a04ae8152 100644 --- a/doc/services/networking/v2/loadbalancers.rst +++ b/doc/services/networking/v2/loadbalancers.rst @@ -4,44 +4,44 @@ LoadBalancers Create LoadBalancer ------------------- -.. sample:: networking/v2/lbaas/loadbalancers/create.php +.. sample:: Networking/v2/lbaas/loadbalancers/create.php .. refdoc:: OpenStack/Networking/v2/Service.html#method_createLoadBalancer Get LoadBalancer ---------------- -.. sample:: networking/v2/lbaas/loadbalancers/get.php +.. sample:: Networking/v2/lbaas/loadbalancers/get.php .. refdoc:: OpenStack/Networking/v2/Service.html#method_getLoadBalancer List LoadBalancers ------------------ -.. sample:: networking/v2/lbaas/loadbalancers/list.php +.. sample:: Networking/v2/lbaas/loadbalancers/list.php .. refdoc:: OpenStack/Networking/v2/Service.html#method_listLoadBalancers Update LoadBalancer ------------------- -.. sample:: networking/v2/lbaas/loadbalancers/update.php +.. sample:: Networking/v2/lbaas/loadbalancers/update.php .. refdoc:: OpenStack/Networking/v2/Models/LoadBalancer.html#method_update Delete LoadBalancer ------------------- -.. sample:: networking/v2/lbaas/loadbalancers/delete.php +.. sample:: Networking/v2/lbaas/loadbalancers/delete.php .. refdoc:: OpenStack/Networking/v2/Models/LoadBalancer.html#method_delete Add Listener to LoadBalancer ---------------------------- -.. sample:: networking/v2/lbaas/loadbalancers/add_listener.php +.. sample:: Networking/v2/lbaas/loadbalancers/add_listener.php .. refdoc:: OpenStack/Networking/v2/Models/LoadBalancer.html#method_addListener Get Stats for LoadBalancer -------------------------- -.. sample:: networking/v2/lbaas/loadbalancers/get_stats.php +.. sample:: Networking/v2/lbaas/loadbalancers/get_stats.php .. refdoc:: OpenStack/Networking/v2/Models/LoadBalancer.html#method_getStats Get Status Tree for LoadBalancer -------------------------------- -.. sample:: networking/v2/lbaas/loadbalancers/get_statuses.php +.. sample:: Networking/v2/lbaas/loadbalancers/get_statuses.php .. refdoc:: OpenStack/Networking/v2/Models/LoadBalancer.html#method_getStatuses diff --git a/doc/services/networking/v2/networks.rst b/doc/services/networking/v2/networks.rst index 3f3d67f83..27719c397 100644 --- a/doc/services/networking/v2/networks.rst +++ b/doc/services/networking/v2/networks.rst @@ -4,29 +4,29 @@ Networks Create network -------------- -.. sample:: networking/v2/networks/create.php +.. sample:: Networking/v2/networks/create.php .. refdoc:: OpenStack/Networking/v2/networks/Service.html#method_createNetwork Create networks --------------- -.. sample:: networking/v2/networks/create_batch.php +.. sample:: Networking/v2/networks/create_batch.php .. refdoc:: OpenStack/Networking/v2/networks/Service.html#method_createNetworks Get network ----------- -.. sample:: networking/v2/networks/get.php +.. sample:: Networking/v2/networks/get.php .. refdoc:: OpenStack/Networking/v2/networks/Service.html#method_getNetwork Update network -------------- -.. sample:: networking/v2/networks/update.php +.. sample:: Networking/v2/networks/update.php .. refdoc:: OpenStack/Networking/v2/networks/Models/Network.html#method_update Delete network -------------- -.. sample:: networking/v2/networks/delete.php +.. sample:: Networking/v2/networks/delete.php .. refdoc:: OpenStack/Networking/v2/networks/Models/Network.html#method_delete \ No newline at end of file diff --git a/doc/services/networking/v2/ports.rst b/doc/services/networking/v2/ports.rst index 157d32818..7efc7e909 100644 --- a/doc/services/networking/v2/ports.rst +++ b/doc/services/networking/v2/ports.rst @@ -4,29 +4,29 @@ Ports Create port ----------- -.. sample:: networking/v2/ports/create.php +.. sample:: Networking/v2/ports/create.php .. refdoc:: OpenStack/Networking/v2/ports/Service.html#method_createPort Create ports ------------ -.. sample:: networking/v2/ports/create_batch.php +.. sample:: Networking/v2/ports/create_batch.php .. refdoc:: OpenStack/Networking/v2/ports/Service.html#method_createPorts Get port -------- -.. sample:: networking/v2/ports/get.php +.. sample:: Networking/v2/ports/get.php .. refdoc:: OpenStack/Networking/v2/ports/Service.html#method_getPort Update port ----------- -.. sample:: networking/v2/ports/update.php +.. sample:: Networking/v2/ports/update.php .. refdoc:: OpenStack/Networking/v2/ports/Models/Port.html#method_update Delete port ----------- -.. sample:: networking/v2/ports/delete.php +.. sample:: Networking/v2/ports/delete.php .. refdoc:: OpenStack/Networking/v2/ports/Models/Port.html#method_delete \ No newline at end of file diff --git a/doc/services/networking/v2/subnets.rst b/doc/services/networking/v2/subnets.rst index cb0f74097..39b50901e 100644 --- a/doc/services/networking/v2/subnets.rst +++ b/doc/services/networking/v2/subnets.rst @@ -4,31 +4,31 @@ Subnets Create subnet ------------- -.. sample:: networking/v2/subnets/create.php +.. sample:: Networking/v2/subnets/create.php .. refdoc:: OpenStack/Networking/v2/subnets/Service.html#method_createSubnet To create a subnet with gateway IP: -.. sample:: networking/v2/subnets/create_with_gateway_ip.php +.. sample:: Networking/v2/subnets/create_with_gateway_ip.php To create a subnet with host routes: -.. sample:: networking/v2/subnets/create_with_host_routes.php +.. sample:: Networking/v2/subnets/create_with_host_routes.php Get subnet ---------- -.. sample:: networking/v2/subnets/get.php +.. sample:: Networking/v2/subnets/get.php .. refdoc:: OpenStack/Networking/v2/subnets/Service.html#method_getSubnet Update subnet ------------- -.. sample:: networking/v2/subnets/update.php +.. sample:: Networking/v2/subnets/update.php .. refdoc:: OpenStack/Networking/v2/subnets/Models/Subnet.html#method_update Delete subnet ------------- -.. sample:: networking/v2/subnets/delete.php +.. sample:: Networking/v2/subnets/delete.php .. refdoc:: OpenStack/Networking/v2/subnets/Models/Subnet.html#method_delete \ No newline at end of file diff --git a/doc/services/object-store/v1/account.rst b/doc/services/object-store/v1/account.rst index adc06e091..972e9f20c 100644 --- a/doc/services/object-store/v1/account.rst +++ b/doc/services/object-store/v1/account.rst @@ -6,13 +6,13 @@ Show account details To work with an Object Store account, you must first retrieve an account object like so: -.. sample:: objectstore/v1/account/get.php +.. sample:: ObjectStore/v2/account/get.php .. refdoc:: OpenStack/ObjectStore/v1/Service.html#method_getAccount Get account metadata -------------------- -.. sample:: objectstore/v1/account/get_metadata.php +.. sample:: ObjectStore/v2/account/get_metadata.php .. refdoc:: OpenStack/ObjectStore/v1/Models/Account.html#method_getMetadata Replace all metadata with new values @@ -43,7 +43,7 @@ the metadata of the account will now be: To merge metadata, you must run: -.. sample:: objectstore/v1/account/reset_metadata.php +.. sample:: ObjectStore/v2/account/reset_metadata.php .. refdoc:: OpenStack/ObjectStore/v1/Models/Account.html#method_resetMetadata Merge new metadata values with existing @@ -75,5 +75,5 @@ the metadata of the account will now be: To reset metadata, you must run: -.. sample:: objectstore/v1/account/merge_metadata.php +.. sample:: ObjectStore/v2/account/merge_metadata.php .. refdoc:: OpenStack/ObjectStore/v1/Models/Account.html#method_mergeMetadata \ No newline at end of file diff --git a/doc/services/object-store/v1/containers.rst b/doc/services/object-store/v1/containers.rst index 8c40d060e..fdf742f34 100644 --- a/doc/services/object-store/v1/containers.rst +++ b/doc/services/object-store/v1/containers.rst @@ -4,7 +4,7 @@ Containers Show details for a container ---------------------------- -.. sample:: objectstore/v1/containers/get.php +.. sample:: ObjectStore/v2/containers/get.php .. refdoc:: OpenStack/ObjectStore/v1/Service.html#method_getContainer At this point, the object returned is *empty* because we did not execute a HTTP request to receive the state of the @@ -25,7 +25,7 @@ and all of the local properties will match those of the remote resource. List containers --------------- -.. sample:: objectstore/v1/containers/list.php +.. sample:: ObjectStore/v2/containers/list.php .. refdoc:: OpenStack/ObjectStore/v1/Service.html#method_listContainers When listing containers, you must be aware that not *all* information about a container is returned in a collection. @@ -46,7 +46,7 @@ container. Delete container ---------------- -.. sample:: objectstore/v1/containers/delete.php +.. sample:: ObjectStore/v2/containers/delete.php .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_delete The API will only accept DELETE requests on containers when they are empty. If you have a container with any objects @@ -55,7 +55,7 @@ inside, the operation will fail. Get metadata ------------ -.. sample:: objectstore/v1/containers/get_metadata.php +.. sample:: ObjectStore/v2/containers/get_metadata.php .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_getMetadata The returned value will be a standard associative array, or hash, containing arbitrary key/value pairs. These will @@ -65,7 +65,7 @@ correspond to the values set either when the container was created, or when a pr Replace all metadata with new values ------------------------------------ -.. sample:: objectstore/v1/containers/reset_metadata.php +.. sample:: ObjectStore/v2/containers/reset_metadata.php .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_resetMetadata In order to replace all existing metadata with a set of new values, you can use this operation. Any existing metadata @@ -95,7 +95,7 @@ the metadata of the account will now be: Merge new metadata values with existing --------------------------------------- -.. sample:: objectstore/v1/containers/merge_metadata.php +.. sample:: ObjectStore/v2/containers/merge_metadata.php .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_mergeMetadata In order to merge a set of new metadata values with the existing metadata set, you can use this operation. Any existing diff --git a/doc/services/object-store/v1/objects.rst b/doc/services/object-store/v1/objects.rst index 97fff919b..a679330e1 100644 --- a/doc/services/object-store/v1/objects.rst +++ b/doc/services/object-store/v1/objects.rst @@ -4,7 +4,7 @@ Objects Show details for an object -------------------------- -.. sample:: objectstore/v1/objects/get.php +.. sample:: ObjectStore/v2/objects/get.php .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_getObject At this point, the object returned is *empty* because we did not execute a HTTP request to receive the state of the @@ -26,7 +26,7 @@ of the object's metadata, will not download the object's content. To do this, se Download an object ------------------ -.. sample:: objectstore/v1/objects/download.php +.. sample:: ObjectStore/v2/objects/download.php .. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_download As you will notice, a Stream_ object is returned by this call. For more information about dealing with streams, please @@ -41,7 +41,7 @@ parameter ``$data`` to ``['stream' => true]`` to get the stream before the end o List objects ------------ -.. sample:: objectstore/v1/objects/list.php +.. sample:: ObjectStore/v2/objects/list.php .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_listObjects When listing objects, you must be aware that not *all* information about a container is returned in a collection. @@ -64,13 +64,13 @@ Create an object When creating an object, you can upload its content according to a string representation: -.. sample:: objectstore/v1/objects/create.php +.. sample:: ObjectStore/v2/objects/create.php .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_createObject If that is not optimal or convenient, you can use a stream instead. Any instance of ``\Psr\Http\Message\StreamInterface`` is acceptable. For example, to use a normal Guzzle stream: -.. sample:: objectstore/v1/objects/create_from_stream.php +.. sample:: ObjectStore/v2/objects/create_from_stream.php Create a large object (over 5GB) -------------------------------- @@ -84,25 +84,25 @@ uploading, this is what happens under the hood: To upload a DLO, you need to call: -.. sample:: objectstore/v1/objects/create_large_object.php +.. sample:: ObjectStore/v2/objects/create_large_object.php .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_createLargeObject Copy object ----------- -.. sample:: objectstore/v1/objects/copy.php +.. sample:: ObjectStore/v2/objects/copy.php .. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_copy Delete object ------------- -.. sample:: objectstore/v1/objects/delete.php +.. sample:: ObjectStore/v2/objects/delete.php .. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_delete Get metadata ------------ -.. sample:: objectstore/v1/objects/get_metadata.php +.. sample:: ObjectStore/v2/objects/get_metadata.php .. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_getMetadata The returned value will be a standard associative array, or hash, containing arbitrary key/value pairs. These will @@ -112,7 +112,7 @@ correspond to the values set either when the object was created, or when a previ Replace all metadata with new values ------------------------------------ -.. sample:: objectstore/v1/objects/reset_metadata.php +.. sample:: ObjectStore/v2/objects/reset_metadata.php .. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_resetMetadata In order to replace all existing metadata with a set of new values, you can use this operation. Any existing metadata @@ -142,7 +142,7 @@ the metadata of the account will now be: Merge new metadata values with existing --------------------------------------- -.. sample:: objectstore/v1/objects/merge_metadata.php +.. sample:: ObjectStore/v2/objects/merge_metadata.php .. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_mergeMetadata In order to merge a set of new metadata values with the existing metadata set, you can use this operation. Any existing From 40d24983e569ab967c45eff0a9ddee3558ccba14 Mon Sep 17 00:00:00 2001 From: Konstantin Babushkin Date: Sun, 24 Sep 2023 21:34:19 +0200 Subject: [PATCH 12/12] remove /opt/stack/data from cache --- .github/workflows/integration_identity.yml | 3 ++- .github/workflows/integration_object_storage.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration_identity.yml b/.github/workflows/integration_identity.yml index a223eb030..0c52d3a31 100644 --- a/.github/workflows/integration_identity.yml +++ b/.github/workflows/integration_identity.yml @@ -39,7 +39,8 @@ jobs: uses: actions/cache@v3 with: path: | - /opt/stack/ + /opt/stack/* + !/opt/stack/data ~/devstack/ key: ${{ runner.os }}-openstack-${{ matrix.openstack_version }}-${{ github.workflow }} - name: Deploy devstack diff --git a/.github/workflows/integration_object_storage.yml b/.github/workflows/integration_object_storage.yml index 956f455a3..9e94f73e4 100644 --- a/.github/workflows/integration_object_storage.yml +++ b/.github/workflows/integration_object_storage.yml @@ -39,7 +39,8 @@ jobs: uses: actions/cache@v3 with: path: | - /opt/stack/ + /opt/stack/* + !/opt/stack/data ~/devstack/ key: ${{ runner.os }}-openstack-${{ matrix.openstack_version }}-${{ github.workflow }} - name: Deploy devstack