Merge pull request #222 from cloudfoundry-community/features/move-to-…

…poetry move to poetry
cloudfoundry-community · Jan 4, 2025 · de18753 · de18753
2 parents 77c1923 + df2620d
commit de18753
Show file tree

Hide file tree

Showing 276 changed files with 1,180 additions and 14 deletions.
diff --git a/.flake8 b/.flake8
@@ -3,5 +3,5 @@ ignore = E203, W503
 max-line-length = 130
 max-complexity = 16
 buildins = CloudFoundryClient
-exclude = vendors,.git,.github,main/cloudfoundry_client/dropsonde,venv,.eggs,build
+exclude = vendors,.git,.github,cloudfoundry_client/dropsonde,.venv,.eggs,build
 
diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       max-parallel: 1
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
 
     steps:
     - uses: actions/checkout@v4
@@ -23,14 +23,19 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
 
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install -r requirements.txt
-        pip install -r dev-requirements.txt
+    - name: Install and configure Poetry
+      uses: snok/install-poetry@v1
+      with:
+        virtual envs-create: true
+        virtualenvs-in-project: true
+        virtualenvs-path: .venv
+        installer-parallel: true
+
+    - name: Install project
+      run: poetry install --no-interaction
 
     - name: Launch tests
-      run: python setup.py test
+      run: poetry run pytest
 
     - name: Launch Linting
-      run: flake8 --show-source --statistics
+      run: poetry run flake8 --show-source --statistics
diff --git a/main/cloudfoundry_client/__init__.py → cloudfoundry_client/__init__.py b/main/cloudfoundry_client/__init__.py → cloudfoundry_client/__init__.py
diff --git a/main/cloudfoundry_client/client.py → cloudfoundry_client/client.py b/main/cloudfoundry_client/client.py → cloudfoundry_client/client.py
diff --git a/main/cloudfoundry_client/common_objects.py → cloudfoundry_client/common_objects.py b/main/cloudfoundry_client/common_objects.py → cloudfoundry_client/common_objects.py
diff --git a/main/cloudfoundry_client/doppler/__init__.py → cloudfoundry_client/doppler/__init__.py b/main/cloudfoundry_client/doppler/__init__.py → cloudfoundry_client/doppler/__init__.py
diff --git a/main/cloudfoundry_client/doppler/client.py → cloudfoundry_client/doppler/client.py b/main/cloudfoundry_client/doppler/client.py → cloudfoundry_client/doppler/client.py
diff --git a/...ient/doppler/websocket_envelope_reader.py → ...ient/doppler/websocket_envelope_reader.py b/...ient/doppler/websocket_envelope_reader.py → ...ient/doppler/websocket_envelope_reader.py
diff --git a/...cloudfoundry_client/dropsonde/__init__.py → cloudfoundry_client/dropsonde/__init__.py b/...cloudfoundry_client/dropsonde/__init__.py → cloudfoundry_client/dropsonde/__init__.py
diff --git a/...dfoundry_client/dropsonde/envelope_pb2.py → ...dfoundry_client/dropsonde/envelope_pb2.py b/...dfoundry_client/dropsonde/envelope_pb2.py → ...dfoundry_client/dropsonde/envelope_pb2.py
diff --git a/...loudfoundry_client/dropsonde/error_pb2.py → cloudfoundry_client/dropsonde/error_pb2.py b/...loudfoundry_client/dropsonde/error_pb2.py → cloudfoundry_client/dropsonde/error_pb2.py
diff --git a/...cloudfoundry_client/dropsonde/http_pb2.py → cloudfoundry_client/dropsonde/http_pb2.py b/...cloudfoundry_client/dropsonde/http_pb2.py → cloudfoundry_client/dropsonde/http_pb2.py
diff --git a/.../cloudfoundry_client/dropsonde/log_pb2.py → cloudfoundry_client/dropsonde/log_pb2.py b/.../cloudfoundry_client/dropsonde/log_pb2.py → cloudfoundry_client/dropsonde/log_pb2.py
diff --git a/...oudfoundry_client/dropsonde/metric_pb2.py → cloudfoundry_client/dropsonde/metric_pb2.py b/...oudfoundry_client/dropsonde/metric_pb2.py → cloudfoundry_client/dropsonde/metric_pb2.py
diff --git a/...cloudfoundry_client/dropsonde/uuid_pb2.py → cloudfoundry_client/dropsonde/uuid_pb2.py b/...cloudfoundry_client/dropsonde/uuid_pb2.py → cloudfoundry_client/dropsonde/uuid_pb2.py
diff --git a/main/cloudfoundry_client/errors.py → cloudfoundry_client/errors.py b/main/cloudfoundry_client/errors.py → cloudfoundry_client/errors.py
diff --git a/main/cloudfoundry_client/main/__init__.py → cloudfoundry_client/main/__init__.py b/main/cloudfoundry_client/main/__init__.py → cloudfoundry_client/main/__init__.py
diff --git a/...oundry_client/main/apps_command_domain.py → ...oundry_client/main/apps_command_domain.py b/...oundry_client/main/apps_command_domain.py → ...oundry_client/main/apps_command_domain.py
diff --git a/...loudfoundry_client/main/command_domain.py → cloudfoundry_client/main/command_domain.py b/...loudfoundry_client/main/command_domain.py → cloudfoundry_client/main/command_domain.py
diff --git a/main/cloudfoundry_client/main/main.py → cloudfoundry_client/main/main.py b/main/cloudfoundry_client/main/main.py → cloudfoundry_client/main/main.py
diff --git a/...foundry_client/main/operation_commands.py → ...foundry_client/main/operation_commands.py b/...foundry_client/main/operation_commands.py → ...foundry_client/main/operation_commands.py
diff --git a/...undry_client/main/tasks_command_domain.py → ...undry_client/main/tasks_command_domain.py b/...undry_client/main/tasks_command_domain.py → ...undry_client/main/tasks_command_domain.py
diff --git a/...loudfoundry_client/networking/__init__.py → cloudfoundry_client/networking/__init__.py b/...loudfoundry_client/networking/__init__.py → cloudfoundry_client/networking/__init__.py
diff --git a/...loudfoundry_client/networking/entities.py → cloudfoundry_client/networking/entities.py b/...loudfoundry_client/networking/entities.py → cloudfoundry_client/networking/entities.py
diff --git a/...dfoundry_client/networking/v1/__init__.py → ...dfoundry_client/networking/v1/__init__.py b/...dfoundry_client/networking/v1/__init__.py → ...dfoundry_client/networking/v1/__init__.py
diff --git a/...client/networking/v1/external/__init__.py → ...client/networking/v1/external/__init__.py b/...client/networking/v1/external/__init__.py → ...client/networking/v1/external/__init__.py
diff --git a/...client/networking/v1/external/policies.py → ...client/networking/v1/external/policies.py b/...client/networking/v1/external/policies.py → ...client/networking/v1/external/policies.py
diff --git a/...dry_client/networking/v1/external/tags.py → ...dry_client/networking/v1/external/tags.py b/...dry_client/networking/v1/external/tags.py → ...dry_client/networking/v1/external/tags.py
diff --git a/...loudfoundry_client/operations/__init__.py → cloudfoundry_client/operations/__init__.py b/...loudfoundry_client/operations/__init__.py → cloudfoundry_client/operations/__init__.py
diff --git a/...oundry_client/operations/push/__init__.py → ...oundry_client/operations/push/__init__.py b/...oundry_client/operations/push/__init__.py → ...oundry_client/operations/push/__init__.py
diff --git a/...undry_client/operations/push/cf_ignore.py → ...undry_client/operations/push/cf_ignore.py b/...undry_client/operations/push/cf_ignore.py → ...undry_client/operations/push/cf_ignore.py
diff --git a/...dry_client/operations/push/file_helper.py → ...dry_client/operations/push/file_helper.py b/...dry_client/operations/push/file_helper.py → ...dry_client/operations/push/file_helper.py
diff --git a/...oudfoundry_client/operations/push/push.py → cloudfoundry_client/operations/push/push.py b/...oudfoundry_client/operations/push/push.py → cloudfoundry_client/operations/push/push.py
diff --git a/...nt/operations/push/validation/__init__.py → ...nt/operations/push/validation/__init__.py b/...nt/operations/push/validation/__init__.py → ...nt/operations/push/validation/__init__.py
diff --git a/...nt/operations/push/validation/manifest.py → ...nt/operations/push/validation/manifest.py b/...nt/operations/push/validation/manifest.py → ...nt/operations/push/validation/manifest.py
diff --git a/...loudfoundry_client/rlpgateway/__init__.py → cloudfoundry_client/rlpgateway/__init__.py b/...loudfoundry_client/rlpgateway/__init__.py → cloudfoundry_client/rlpgateway/__init__.py
diff --git a/.../cloudfoundry_client/rlpgateway/client.py → cloudfoundry_client/rlpgateway/client.py b/.../cloudfoundry_client/rlpgateway/client.py → cloudfoundry_client/rlpgateway/client.py
diff --git a/main/cloudfoundry_client/v2/__init__.py → cloudfoundry_client/v2/__init__.py b/main/cloudfoundry_client/v2/__init__.py → cloudfoundry_client/v2/__init__.py
diff --git a/main/cloudfoundry_client/v2/apps.py → cloudfoundry_client/v2/apps.py b/main/cloudfoundry_client/v2/apps.py → cloudfoundry_client/v2/apps.py
diff --git a/main/cloudfoundry_client/v2/buildpacks.py → cloudfoundry_client/v2/buildpacks.py b/main/cloudfoundry_client/v2/buildpacks.py → cloudfoundry_client/v2/buildpacks.py
diff --git a/main/cloudfoundry_client/v2/entities.py → cloudfoundry_client/v2/entities.py b/main/cloudfoundry_client/v2/entities.py → cloudfoundry_client/v2/entities.py
diff --git a/main/cloudfoundry_client/v2/events.py → cloudfoundry_client/v2/events.py b/main/cloudfoundry_client/v2/events.py → cloudfoundry_client/v2/events.py
diff --git a/main/cloudfoundry_client/v2/jobs.py → cloudfoundry_client/v2/jobs.py b/main/cloudfoundry_client/v2/jobs.py → cloudfoundry_client/v2/jobs.py
diff --git a/main/cloudfoundry_client/v2/resources.py → cloudfoundry_client/v2/resources.py b/main/cloudfoundry_client/v2/resources.py → cloudfoundry_client/v2/resources.py
diff --git a/main/cloudfoundry_client/v2/routes.py → cloudfoundry_client/v2/routes.py b/main/cloudfoundry_client/v2/routes.py → cloudfoundry_client/v2/routes.py
diff --git a/...loudfoundry_client/v2/service_bindings.py → cloudfoundry_client/v2/service_bindings.py b/...loudfoundry_client/v2/service_bindings.py → cloudfoundry_client/v2/service_bindings.py
diff --git a/...cloudfoundry_client/v2/service_brokers.py → cloudfoundry_client/v2/service_brokers.py b/...cloudfoundry_client/v2/service_brokers.py → cloudfoundry_client/v2/service_brokers.py
diff --git a/...oudfoundry_client/v2/service_instances.py → cloudfoundry_client/v2/service_instances.py b/...oudfoundry_client/v2/service_instances.py → cloudfoundry_client/v2/service_instances.py
diff --git a/main/cloudfoundry_client/v2/service_keys.py → cloudfoundry_client/v2/service_keys.py b/main/cloudfoundry_client/v2/service_keys.py → cloudfoundry_client/v2/service_keys.py
diff --git a/...ry_client/v2/service_plan_visibilities.py → ...ry_client/v2/service_plan_visibilities.py b/...ry_client/v2/service_plan_visibilities.py → ...ry_client/v2/service_plan_visibilities.py
diff --git a/main/cloudfoundry_client/v2/service_plans.py → cloudfoundry_client/v2/service_plans.py b/main/cloudfoundry_client/v2/service_plans.py → cloudfoundry_client/v2/service_plans.py
diff --git a/main/cloudfoundry_client/v2/spaces.py → cloudfoundry_client/v2/spaces.py b/main/cloudfoundry_client/v2/spaces.py → cloudfoundry_client/v2/spaces.py
diff --git a/main/cloudfoundry_client/v3/__init__.py → cloudfoundry_client/v3/__init__.py b/main/cloudfoundry_client/v3/__init__.py → cloudfoundry_client/v3/__init__.py
diff --git a/main/cloudfoundry_client/v3/apps.py → cloudfoundry_client/v3/apps.py b/main/cloudfoundry_client/v3/apps.py → cloudfoundry_client/v3/apps.py
diff --git a/main/cloudfoundry_client/v3/buildpacks.py → cloudfoundry_client/v3/buildpacks.py b/main/cloudfoundry_client/v3/buildpacks.py → cloudfoundry_client/v3/buildpacks.py
diff --git a/main/cloudfoundry_client/v3/domains.py → cloudfoundry_client/v3/domains.py b/main/cloudfoundry_client/v3/domains.py → cloudfoundry_client/v3/domains.py
diff --git a/main/cloudfoundry_client/v3/entities.py → cloudfoundry_client/v3/entities.py b/main/cloudfoundry_client/v3/entities.py → cloudfoundry_client/v3/entities.py
diff --git a/main/cloudfoundry_client/v3/feature_flags.py → cloudfoundry_client/v3/feature_flags.py b/main/cloudfoundry_client/v3/feature_flags.py → cloudfoundry_client/v3/feature_flags.py
diff --git a/...udfoundry_client/v3/isolation_segments.py → cloudfoundry_client/v3/isolation_segments.py b/...udfoundry_client/v3/isolation_segments.py → cloudfoundry_client/v3/isolation_segments.py
diff --git a/main/cloudfoundry_client/v3/jobs.py → cloudfoundry_client/v3/jobs.py b/main/cloudfoundry_client/v3/jobs.py → cloudfoundry_client/v3/jobs.py
diff --git a/...dfoundry_client/v3/organization_quotas.py → ...dfoundry_client/v3/organization_quotas.py b/...dfoundry_client/v3/organization_quotas.py → ...dfoundry_client/v3/organization_quotas.py
diff --git a/main/cloudfoundry_client/v3/organizations.py → cloudfoundry_client/v3/organizations.py b/main/cloudfoundry_client/v3/organizations.py → cloudfoundry_client/v3/organizations.py
diff --git a/main/cloudfoundry_client/v3/processes.py → cloudfoundry_client/v3/processes.py b/main/cloudfoundry_client/v3/processes.py → cloudfoundry_client/v3/processes.py
diff --git a/main/cloudfoundry_client/v3/roles.py → cloudfoundry_client/v3/roles.py b/main/cloudfoundry_client/v3/roles.py → cloudfoundry_client/v3/roles.py
diff --git a/...cloudfoundry_client/v3/security_groups.py → cloudfoundry_client/v3/security_groups.py b/...cloudfoundry_client/v3/security_groups.py → cloudfoundry_client/v3/security_groups.py
diff --git a/...cloudfoundry_client/v3/service_brokers.py → cloudfoundry_client/v3/service_brokers.py b/...cloudfoundry_client/v3/service_brokers.py → cloudfoundry_client/v3/service_brokers.py
diff --git a/..._client/v3/service_credential_bindings.py → ..._client/v3/service_credential_bindings.py b/..._client/v3/service_credential_bindings.py → ..._client/v3/service_credential_bindings.py
diff --git a/...oudfoundry_client/v3/service_instances.py → cloudfoundry_client/v3/service_instances.py b/...oudfoundry_client/v3/service_instances.py → cloudfoundry_client/v3/service_instances.py
diff --git a/...oudfoundry_client/v3/service_offerings.py → cloudfoundry_client/v3/service_offerings.py b/...oudfoundry_client/v3/service_offerings.py → cloudfoundry_client/v3/service_offerings.py
diff --git a/main/cloudfoundry_client/v3/service_plans.py → cloudfoundry_client/v3/service_plans.py b/main/cloudfoundry_client/v3/service_plans.py → cloudfoundry_client/v3/service_plans.py
diff --git a/main/cloudfoundry_client/v3/spaces.py → cloudfoundry_client/v3/spaces.py b/main/cloudfoundry_client/v3/spaces.py → cloudfoundry_client/v3/spaces.py
diff --git a/main/cloudfoundry_client/v3/tasks.py → cloudfoundry_client/v3/tasks.py b/main/cloudfoundry_client/v3/tasks.py → cloudfoundry_client/v3/tasks.py
diff --git a/dev-requirements.txt b/dev-requirements.txt
diff --git a/poetry.lock b/poetry.lock
diff --git a/poetry.toml b/poetry.toml
@@ -0,0 +1,5 @@
+[virtualenvs]
+create = true
+in-project = true
+prefer-active-python = true
+prompt = "cf-python-client"
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,4 +4,43 @@ exclude = '''
 ^/(
   (main\/cloudfoundry_client\/dropsonde.*)
 )/
-'''
+'''
+
+[tool.poetry]
+name = "cloudfoundry_client"
+version = "1.37.1"
+description = "A client library for CloudFoundry"
+authors = ["Benjamin Einaudi <antechrestos@gmail.com>"]
+readme = "README.rst"
+homepage = "https://pypi.org/project/cloudfoundry-client/"
+documentation = "https://pypi.org/project/cloudfoundry-client/"
+repository = "https://github.com/cloudfoundry-community/cf-python-client"
+keywords = ["cloudfoundry", "cf"]
+include = ["requirements.txt"]
+
+[tool.poetry.dependencies]
+python = ">=3.9"
+aiohttp = ">=3.8.0"
+protobuf = ">= 3.20.0, < 6.0.0"
+oauth2-client= "1.4.2"
+websocket-client= "~1.8.0"
+PyYAML = ">=6.0"
+requests = ">=2.5.0"
+polling2= "0.5.0"
+
+[tool.poetry.group.dev.dependencies]
+black= "24.4.2"
+flake8= "7.1.0"
+pytest = "~8.2.2"
+
+[tool.poetry.scripts]
+cloudfoundry-client = "cloudfoundry_client.main.main:main"
+
+[tool.pytest.ini_options]
+console_output_style = "count"
+pythonpath = [".", "tests",]
+testpaths = ["tests"]
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"
diff --git a/requirements.txt b/requirements.txt
@@ -4,4 +4,3 @@ oauth2-client==1.4.2
 websocket-client~=1.8.0
 PyYAML>=6.0
 requests>=2.5.0
-polling2==0.5.0
diff --git a/test/__init__.py → tests/__init__.py b/test/__init__.py → tests/__init__.py
diff --git a/test/abstract_test_case.py → tests/abstract_test_case.py b/test/abstract_test_case.py → tests/abstract_test_case.py
diff --git a/test/fake_requests.py → tests/fake_requests.py b/test/fake_requests.py → tests/fake_requests.py
diff --git a/...alid_entity_with_invalid_entity_type.json → ...alid_entity_with_invalid_entity_type.json b/...alid_entity_with_invalid_entity_type.json → ...alid_entity_with_invalid_entity_type.json
diff --git a/.../GET_invalid_entity_with_null_entity.json → .../GET_invalid_entity_with_null_entity.json b/.../GET_invalid_entity_with_null_entity.json → .../GET_invalid_entity_with_null_entity.json
diff --git a/...ke/GET_invalid_entity_without_entity.json → ...ke/GET_invalid_entity_without_entity.json b/...ke/GET_invalid_entity_without_entity.json → ...ke/GET_invalid_entity_without_entity.json
diff --git a/...tures/fake/GET_multi_page_0_response.json → ...tures/fake/GET_multi_page_0_response.json b/...tures/fake/GET_multi_page_0_response.json → ...tures/fake/GET_multi_page_0_response.json
diff --git a/...tures/fake/GET_multi_page_1_response.json → ...tures/fake/GET_multi_page_1_response.json b/...tures/fake/GET_multi_page_1_response.json → ...tures/fake/GET_multi_page_1_response.json
diff --git a/test/fixtures/fake/GET_response.json → tests/fixtures/fake/GET_response.json b/test/fixtures/fake/GET_response.json → tests/fixtures/fake/GET_response.json
diff --git a/test/fixtures/fake/GET_{id}_response.json → tests/fixtures/fake/GET_{id}_response.json b/test/fixtures/fake/GET_{id}_response.json → tests/fixtures/fake/GET_{id}_response.json
diff --git a/test/fixtures/fake/manifest_main.yml → tests/fixtures/fake/manifest_main.yml b/test/fixtures/fake/manifest_main.yml → tests/fixtures/fake/manifest_main.yml
diff --git a/...ng/v1/external/policies/GET_response.json → ...ng/v1/external/policies/GET_response.json b/...ng/v1/external/policies/GET_response.json → ...ng/v1/external/policies/GET_response.json
diff --git a/test/fixtures/operations/manifest.yml → tests/fixtures/operations/manifest.yml b/test/fixtures/operations/manifest.yml → tests/fixtures/operations/manifest.yml
diff --git a/.../fixtures/operations/manifest_complex.yml → .../fixtures/operations/manifest_complex.yml b/.../fixtures/operations/manifest_complex.yml → .../fixtures/operations/manifest_complex.yml
diff --git a/test/fixtures/operations/manifest_empty.yml → tests/fixtures/operations/manifest_empty.yml b/test/fixtures/operations/manifest_empty.yml → tests/fixtures/operations/manifest_empty.yml
diff --git a/test/fixtures/recents/GET_response.bin → tests/fixtures/recents/GET_response.bin b/test/fixtures/recents/GET_response.bin → tests/fixtures/recents/GET_response.bin
diff --git a/test/fixtures/v2/apps/GET_response.json → tests/fixtures/v2/apps/GET_response.json b/test/fixtures/v2/apps/GET_response.json → tests/fixtures/v2/apps/GET_response.json
diff --git a/...v2/apps/GET_space_guid_name_response.json → ...v2/apps/GET_space_guid_name_response.json b/...v2/apps/GET_space_guid_name_response.json → ...v2/apps/GET_space_guid_name_response.json
diff --git a/...xtures/v2/apps/GET_{id}_env_response.json → ...xtures/v2/apps/GET_{id}_env_response.json b/...xtures/v2/apps/GET_{id}_env_response.json → ...xtures/v2/apps/GET_{id}_env_response.json
diff --git a/.../v2/apps/GET_{id}_instances_response.json → .../v2/apps/GET_{id}_instances_response.json b/.../v2/apps/GET_{id}_instances_response.json → .../v2/apps/GET_{id}_instances_response.json
diff --git a/.../GET_{id}_instances_stopped_response.json → .../GET_{id}_instances_stopped_response.json b/.../GET_{id}_instances_stopped_response.json → .../GET_{id}_instances_stopped_response.json
diff --git a/test/fixtures/v2/apps/GET_{id}_response.json → ...s/fixtures/v2/apps/GET_{id}_response.json b/test/fixtures/v2/apps/GET_{id}_response.json → ...s/fixtures/v2/apps/GET_{id}_response.json
diff --git a/...res/v2/apps/GET_{id}_routes_response.json → ...res/v2/apps/GET_{id}_routes_response.json b/...res/v2/apps/GET_{id}_routes_response.json → ...res/v2/apps/GET_{id}_routes_response.json
diff --git a/...s/GET_{id}_service_bindings_response.json → ...s/GET_{id}_service_bindings_response.json b/...s/GET_{id}_service_bindings_response.json → ...s/GET_{id}_service_bindings_response.json
diff --git a/...ures/v2/apps/GET_{id}_stats_response.json → ...ures/v2/apps/GET_{id}_stats_response.json b/...ures/v2/apps/GET_{id}_stats_response.json → ...ures/v2/apps/GET_{id}_stats_response.json
diff --git a/...es/v2/apps/GET_{id}_summary_response.json → ...es/v2/apps/GET_{id}_summary_response.json b/...es/v2/apps/GET_{id}_summary_response.json → ...es/v2/apps/GET_{id}_summary_response.json
diff --git a/test/fixtures/v2/apps/POST_response.json → tests/fixtures/v2/apps/POST_response.json b/test/fixtures/v2/apps/POST_response.json → tests/fixtures/v2/apps/POST_response.json
diff --git a/...s/v2/apps/POST_{id}_restage_response.json → ...s/v2/apps/POST_{id}_restage_response.json b/...s/v2/apps/POST_{id}_restage_response.json → ...s/v2/apps/POST_{id}_restage_response.json
diff --git a/test/fixtures/v2/apps/PUT_{id}_response.json → ...s/fixtures/v2/apps/PUT_{id}_response.json b/test/fixtures/v2/apps/PUT_{id}_response.json → ...s/fixtures/v2/apps/PUT_{id}_response.json
diff --git a/.../PUT_{id}_routes_{route_id}_response.json → .../PUT_{id}_routes_{route_id}_response.json b/.../PUT_{id}_routes_{route_id}_response.json → .../PUT_{id}_routes_{route_id}_response.json
diff --git a/.../fixtures/v2/buildpacks/GET_response.json → .../fixtures/v2/buildpacks/GET_response.json b/.../fixtures/v2/buildpacks/GET_response.json → .../fixtures/v2/buildpacks/GET_response.json
diff --git a/...ures/v2/buildpacks/GET_{id}_response.json → ...ures/v2/buildpacks/GET_{id}_response.json b/...ures/v2/buildpacks/GET_{id}_response.json → ...ures/v2/buildpacks/GET_{id}_response.json
diff --git a/...ures/v2/buildpacks/PUT_{id}_response.json → ...ures/v2/buildpacks/PUT_{id}_response.json b/...ures/v2/buildpacks/PUT_{id}_response.json → ...ures/v2/buildpacks/PUT_{id}_response.json
diff --git a/..._response_audit.route.delete-request.json → ..._response_audit.route.delete-request.json b/..._response_audit.route.delete-request.json → ..._response_audit.route.delete-request.json
diff --git a/...xtures/v2/organizations/GET_response.json → ...xtures/v2/organizations/GET_response.json b/...xtures/v2/organizations/GET_response.json → ...xtures/v2/organizations/GET_response.json
diff --git a/...s/v2/organizations/GET_{id}_response.json → ...s/v2/organizations/GET_{id}_response.json b/...s/v2/organizations/GET_{id}_response.json → ...s/v2/organizations/GET_{id}_response.json
diff --git a/test/fixtures/v2/routes/GET_response.json → tests/fixtures/v2/routes/GET_response.json b/test/fixtures/v2/routes/GET_response.json → tests/fixtures/v2/routes/GET_response.json
diff --git a/...fixtures/v2/routes/GET_{id}_response.json → ...fixtures/v2/routes/GET_{id}_response.json b/...fixtures/v2/routes/GET_{id}_response.json → ...fixtures/v2/routes/GET_{id}_response.json
diff --git a/...res/v2/service_bindings/GET_response.json → ...res/v2/service_bindings/GET_response.json b/...res/v2/service_bindings/GET_response.json → ...res/v2/service_bindings/GET_response.json
diff --git a/...2/service_bindings/GET_{id}_response.json → ...2/service_bindings/GET_{id}_response.json b/...2/service_bindings/GET_{id}_response.json → ...2/service_bindings/GET_{id}_response.json
diff --git a/...es/v2/service_bindings/POST_response.json → ...es/v2/service_bindings/POST_response.json b/...es/v2/service_bindings/POST_response.json → ...es/v2/service_bindings/POST_response.json
diff --git a/...ures/v2/service_brokers/GET_response.json → ...ures/v2/service_brokers/GET_response.json b/...ures/v2/service_brokers/GET_response.json → ...ures/v2/service_brokers/GET_response.json
diff --git a/...v2/service_brokers/GET_{id}_response.json → ...v2/service_brokers/GET_{id}_response.json b/...v2/service_brokers/GET_{id}_response.json → ...v2/service_brokers/GET_{id}_response.json
diff --git a/...res/v2/service_brokers/POST_response.json → ...res/v2/service_brokers/POST_response.json b/...res/v2/service_brokers/POST_response.json → ...res/v2/service_brokers/POST_response.json
diff --git a/...v2/service_brokers/PUT_{id}_response.json → ...v2/service_brokers/PUT_{id}_response.json b/...v2/service_brokers/PUT_{id}_response.json → ...v2/service_brokers/PUT_{id}_response.json
diff --git a/...es/v2/service_instances/GET_response.json → ...es/v2/service_instances/GET_response.json b/...es/v2/service_instances/GET_response.json → ...es/v2/service_instances/GET_response.json
diff --git a/.../service_instances/GET_{id}_response.json → .../service_instances/GET_{id}_response.json b/.../service_instances/GET_{id}_response.json → .../service_instances/GET_{id}_response.json
diff --git a/...s/v2/service_instances/POST_response.json → ...s/v2/service_instances/POST_response.json b/...s/v2/service_instances/POST_response.json → ...s/v2/service_instances/POST_response.json
diff --git a/.../service_instances/PUT_{id}_response.json → .../service_instances/PUT_{id}_response.json b/.../service_instances/PUT_{id}_response.json → .../service_instances/PUT_{id}_response.json
diff --git a/...ixtures/v2/service_keys/GET_response.json → ...ixtures/v2/service_keys/GET_response.json b/...ixtures/v2/service_keys/GET_response.json → ...ixtures/v2/service_keys/GET_response.json
diff --git a/...es/v2/service_keys/GET_{id}_response.json → ...es/v2/service_keys/GET_{id}_response.json b/...es/v2/service_keys/GET_{id}_response.json → ...es/v2/service_keys/GET_{id}_response.json
diff --git a/...xtures/v2/service_keys/POST_response.json → ...xtures/v2/service_keys/POST_response.json b/...xtures/v2/service_keys/POST_response.json → ...xtures/v2/service_keys/POST_response.json
diff --git a/...rvice_plan_visibilities/GET_response.json → ...rvice_plan_visibilities/GET_response.json b/...rvice_plan_visibilities/GET_response.json → ...rvice_plan_visibilities/GET_response.json
diff --git a/..._plan_visibilities/GET_{id}_response.json → ..._plan_visibilities/GET_{id}_response.json b/..._plan_visibilities/GET_{id}_response.json → ..._plan_visibilities/GET_{id}_response.json
diff --git a/...vice_plan_visibilities/POST_response.json → ...vice_plan_visibilities/POST_response.json b/...vice_plan_visibilities/POST_response.json → ...vice_plan_visibilities/POST_response.json
diff --git a/..._plan_visibilities/PUT_{id}_response.json → ..._plan_visibilities/PUT_{id}_response.json b/..._plan_visibilities/PUT_{id}_response.json → ..._plan_visibilities/PUT_{id}_response.json
diff --git a/...xtures/v2/service_plans/GET_response.json → ...xtures/v2/service_plans/GET_response.json b/...xtures/v2/service_plans/GET_response.json → ...xtures/v2/service_plans/GET_response.json
diff --git a/...s/v2/service_plans/GET_{id}_response.json → ...s/v2/service_plans/GET_{id}_response.json b/...s/v2/service_plans/GET_{id}_response.json → ...s/v2/service_plans/GET_{id}_response.json
diff --git a/test/fixtures/v2/services/GET_response.json → tests/fixtures/v2/services/GET_response.json b/test/fixtures/v2/services/GET_response.json → tests/fixtures/v2/services/GET_response.json
diff --git a/...xtures/v2/services/GET_{id}_response.json → ...xtures/v2/services/GET_{id}_response.json b/...xtures/v2/services/GET_{id}_response.json → ...xtures/v2/services/GET_{id}_response.json
diff --git a/test/fixtures/v2/spaces/GET_response.json → tests/fixtures/v2/spaces/GET_response.json b/test/fixtures/v2/spaces/GET_response.json → tests/fixtures/v2/spaces/GET_response.json
diff --git a/...fixtures/v2/spaces/GET_{id}_response.json → ...fixtures/v2/spaces/GET_{id}_response.json b/...fixtures/v2/spaces/GET_{id}_response.json → ...fixtures/v2/spaces/GET_{id}_response.json
diff --git a/test/fixtures/v3/apps/GET_response.json → tests/fixtures/v3/apps/GET_response.json b/test/fixtures/v3/apps/GET_response.json → tests/fixtures/v3/apps/GET_response.json
diff --git a/...s/v3/apps/GET_response_include_space.json → ...s/v3/apps/GET_response_include_space.json b/...s/v3/apps/GET_response_include_space.json → ...s/v3/apps/GET_response_include_space.json
diff --git a/...xtures/v3/apps/GET_{id}_env_response.json → ...xtures/v3/apps/GET_{id}_env_response.json b/...xtures/v3/apps/GET_{id}_env_response.json → ...xtures/v3/apps/GET_{id}_env_response.json
diff --git a/..._{id}_environment_variables_response.json → ..._{id}_environment_variables_response.json b/..._{id}_environment_variables_response.json → ..._{id}_environment_variables_response.json
diff --git a/test/fixtures/v3/apps/GET_{id}_response.json → ...s/fixtures/v3/apps/GET_{id}_response.json b/test/fixtures/v3/apps/GET_{id}_response.json → ...s/fixtures/v3/apps/GET_{id}_response.json
diff --git a/..._{id}_response_include_space_and_org.json → ..._{id}_response_include_space_and_org.json b/..._{id}_response_include_space_and_org.json → ..._{id}_response_include_space_and_org.json
diff --git a/...res/v3/apps/GET_{id}_routes_response.json → ...res/v3/apps/GET_{id}_routes_response.json b/...res/v3/apps/GET_{id}_routes_response.json → ...res/v3/apps/GET_{id}_routes_response.json
diff --git a/...pps/POST_{id}_actions_start_response.json → ...pps/POST_{id}_actions_start_response.json b/...pps/POST_{id}_actions_start_response.json → ...pps/POST_{id}_actions_start_response.json
diff --git a/.../fixtures/v3/buildpacks/GET_response.json → .../fixtures/v3/buildpacks/GET_response.json b/.../fixtures/v3/buildpacks/GET_response.json → .../fixtures/v3/buildpacks/GET_response.json
diff --git a/...ures/v3/buildpacks/GET_{id}_response.json → ...ures/v3/buildpacks/GET_{id}_response.json b/...ures/v3/buildpacks/GET_{id}_response.json → ...ures/v3/buildpacks/GET_{id}_response.json
diff --git a/...es/v3/buildpacks/PATCH_{id}_response.json → ...es/v3/buildpacks/PATCH_{id}_response.json b/...es/v3/buildpacks/PATCH_{id}_response.json → ...es/v3/buildpacks/PATCH_{id}_response.json
diff --git a/...fixtures/v3/buildpacks/POST_response.json → ...fixtures/v3/buildpacks/POST_response.json b/...fixtures/v3/buildpacks/POST_response.json → ...fixtures/v3/buildpacks/POST_response.json
diff --git a/test/fixtures/v3/domains/GET_response.json → tests/fixtures/v3/domains/GET_response.json b/test/fixtures/v3/domains/GET_response.json → tests/fixtures/v3/domains/GET_response.json
diff --git a/...ixtures/v3/domains/GET_{id}_response.json → ...ixtures/v3/domains/GET_{id}_response.json b/...ixtures/v3/domains/GET_{id}_response.json → ...ixtures/v3/domains/GET_{id}_response.json
diff --git a/...tures/v3/domains/PATCH_{id}_response.json → ...tures/v3/domains/PATCH_{id}_response.json b/...tures/v3/domains/PATCH_{id}_response.json → ...tures/v3/domains/PATCH_{id}_response.json
diff --git a/test/fixtures/v3/domains/POST_response.json → tests/fixtures/v3/domains/POST_response.json b/test/fixtures/v3/domains/POST_response.json → tests/fixtures/v3/domains/POST_response.json
diff --git a/...nships_shared_organizations_response.json → ...nships_shared_organizations_response.json b/...nships_shared_organizations_response.json → ...nships_shared_organizations_response.json
diff --git a/...xtures/v3/feature_flags/GET_response.json → ...xtures/v3/feature_flags/GET_response.json b/...xtures/v3/feature_flags/GET_response.json → ...xtures/v3/feature_flags/GET_response.json
diff --git a/...s/v3/feature_flags/GET_{id}_response.json → ...s/v3/feature_flags/GET_{id}_response.json b/...s/v3/feature_flags/GET_{id}_response.json → ...s/v3/feature_flags/GET_{id}_response.json
diff --git a/...v3/feature_flags/PATCH_{id}_response.json → ...v3/feature_flags/PATCH_{id}_response.json b/...v3/feature_flags/PATCH_{id}_response.json → ...v3/feature_flags/PATCH_{id}_response.json
diff --git a/...s/v3/isolation_segments/GET_response.json → ...s/v3/isolation_segments/GET_response.json b/...s/v3/isolation_segments/GET_response.json → ...s/v3/isolation_segments/GET_response.json
diff --git a/...relationships_organizations_response.json → ...relationships_organizations_response.json b/...relationships_organizations_response.json → ...relationships_organizations_response.json
diff --git a/...T_{id}_relationships_spaces_response.json → ...T_{id}_relationships_spaces_response.json b/...T_{id}_relationships_spaces_response.json → ...T_{id}_relationships_spaces_response.json
diff --git a/...isolation_segments/GET_{id}_response.json → ...isolation_segments/GET_{id}_response.json b/...isolation_segments/GET_{id}_response.json → ...isolation_segments/GET_{id}_response.json
diff --git a/...olation_segments/PATCH_{id}_response.json → ...olation_segments/PATCH_{id}_response.json b/...olation_segments/PATCH_{id}_response.json → ...olation_segments/PATCH_{id}_response.json
diff --git a/.../v3/isolation_segments/POST_response.json → .../v3/isolation_segments/POST_response.json b/.../v3/isolation_segments/POST_response.json → .../v3/isolation_segments/POST_response.json
diff --git a/...relationships_organizations_response.json → ...relationships_organizations_response.json b/...relationships_organizations_response.json → ...relationships_organizations_response.json
diff --git a/...s/v3/jobs/GET_{id}_complete_response.json → ...s/v3/jobs/GET_{id}_complete_response.json b/...s/v3/jobs/GET_{id}_complete_response.json → ...s/v3/jobs/GET_{id}_complete_response.json
diff --git a/...res/v3/jobs/GET_{id}_failed_response.json → ...res/v3/jobs/GET_{id}_failed_response.json b/...res/v3/jobs/GET_{id}_failed_response.json → ...res/v3/jobs/GET_{id}_failed_response.json
diff --git a/...v3/jobs/GET_{id}_processing_response.json → ...v3/jobs/GET_{id}_processing_response.json b/...v3/jobs/GET_{id}_processing_response.json → ...v3/jobs/GET_{id}_processing_response.json
diff --git a/.../v3/organization_quotas/GET_response.json → .../v3/organization_quotas/GET_response.json b/.../v3/organization_quotas/GET_response.json → .../v3/organization_quotas/GET_response.json
diff --git a/...rganization_quotas/GET_{id}_response.json → ...rganization_quotas/GET_{id}_response.json b/...rganization_quotas/GET_{id}_response.json → ...rganization_quotas/GET_{id}_response.json
diff --git a/...anization_quotas/PATCH_{id}_response.json → ...anization_quotas/PATCH_{id}_response.json b/...anization_quotas/PATCH_{id}_response.json → ...anization_quotas/PATCH_{id}_response.json
diff --git a/...v3/organization_quotas/POST_response.json → ...v3/organization_quotas/POST_response.json b/...v3/organization_quotas/POST_response.json → ...v3/organization_quotas/POST_response.json
diff --git a/...tas/POST_{id}_organizations_response.json → ...tas/POST_{id}_organizations_response.json b/...tas/POST_{id}_organizations_response.json → ...tas/POST_{id}_organizations_response.json
diff --git a/...xtures/v3/organizations/GET_response.json → ...xtures/v3/organizations/GET_response.json b/...xtures/v3/organizations/GET_response.json → ...xtures/v3/organizations/GET_response.json
diff --git a/...ons/GET_{id}_default_domain_response.json → ...ons/GET_{id}_default_domain_response.json b/...ons/GET_{id}_default_domain_response.json → ...ons/GET_{id}_default_domain_response.json
diff --git a/...s_default_isolation_segment_response.json → ...s_default_isolation_segment_response.json b/...s_default_isolation_segment_response.json → ...s_default_isolation_segment_response.json
diff --git a/...s/v3/organizations/GET_{id}_response.json → ...s/v3/organizations/GET_{id}_response.json b/...s/v3/organizations/GET_{id}_response.json → ...s/v3/organizations/GET_{id}_response.json
diff --git a/...ions/GET_{id}_usage_summary_response.json → ...ions/GET_{id}_usage_summary_response.json b/...ions/GET_{id}_usage_summary_response.json → ...ions/GET_{id}_usage_summary_response.json
diff --git a/...s_default_isolation_segment_response.json → ...s_default_isolation_segment_response.json b/...s_default_isolation_segment_response.json → ...s_default_isolation_segment_response.json
diff --git a/...v3/organizations/PATCH_{id}_response.json → ...v3/organizations/PATCH_{id}_response.json b/...v3/organizations/PATCH_{id}_response.json → ...v3/organizations/PATCH_{id}_response.json
diff --git a/...tures/v3/organizations/POST_response.json → ...tures/v3/organizations/POST_response.json b/...tures/v3/organizations/POST_response.json → ...tures/v3/organizations/POST_response.json
diff --git a/test/fixtures/v3/processes/GET_response.json → ...s/fixtures/v3/processes/GET_response.json b/test/fixtures/v3/processes/GET_response.json → ...s/fixtures/v3/processes/GET_response.json
diff --git a/...tures/v3/processes/GET_{id}_response.json → ...tures/v3/processes/GET_{id}_response.json b/...tures/v3/processes/GET_{id}_response.json → ...tures/v3/processes/GET_{id}_response.json
diff --git a/...v3/processes/GET_{id}_stats_response.json → ...v3/processes/GET_{id}_stats_response.json b/...v3/processes/GET_{id}_stats_response.json → ...v3/processes/GET_{id}_stats_response.json
diff --git a/test/fixtures/v3/roles/GET_response.json → tests/fixtures/v3/roles/GET_response.json b/test/fixtures/v3/roles/GET_response.json → tests/fixtures/v3/roles/GET_response.json
diff --git a/.../fixtures/v3/roles/GET_{id}_response.json → .../fixtures/v3/roles/GET_{id}_response.json b/.../fixtures/v3/roles/GET_{id}_response.json → .../fixtures/v3/roles/GET_{id}_response.json
diff --git a/...ures/v3/security_groups/GET_response.json → ...ures/v3/security_groups/GET_response.json b/...ures/v3/security_groups/GET_response.json → ...ures/v3/security_groups/GET_response.json
diff --git a/...v3/security_groups/GET_{id}_response.json → ...v3/security_groups/GET_{id}_response.json b/...v3/security_groups/GET_{id}_response.json → ...v3/security_groups/GET_{id}_response.json
diff --git a/.../security_groups/PATCH_{id}_response.json → .../security_groups/PATCH_{id}_response.json b/.../security_groups/PATCH_{id}_response.json → .../security_groups/PATCH_{id}_response.json
diff --git a/...res/v3/security_groups/POST_response.json → ...res/v3/security_groups/POST_response.json b/...res/v3/security_groups/POST_response.json → ...res/v3/security_groups/POST_response.json
diff --git a/...elationships_running_spaces_response.json → ...elationships_running_spaces_response.json b/...elationships_running_spaces_response.json → ...elationships_running_spaces_response.json
diff --git a/...elationships_staging_spaces_response.json → ...elationships_staging_spaces_response.json b/...elationships_staging_spaces_response.json → ...elationships_staging_spaces_response.json
diff --git a/...ures/v3/service_brokers/GET_response.json → ...ures/v3/service_brokers/GET_response.json b/...ures/v3/service_brokers/GET_response.json → ...ures/v3/service_brokers/GET_response.json
diff --git a/...v3/service_brokers/GET_{id}_response.json → ...v3/service_brokers/GET_{id}_response.json b/...v3/service_brokers/GET_{id}_response.json → ...v3/service_brokers/GET_{id}_response.json
diff --git a/.../service_brokers/PATCH_{id}_response.json → .../service_brokers/PATCH_{id}_response.json b/.../service_brokers/PATCH_{id}_response.json → .../service_brokers/PATCH_{id}_response.json
diff --git a/...res/v3/service_brokers/POST_response.json → ...res/v3/service_brokers/POST_response.json b/...res/v3/service_brokers/POST_response.json → ...res/v3/service_brokers/POST_response.json
diff --git a/...ice_credential_bindings/GET_response.json → ...ice_credential_bindings/GET_response.json b/...ice_credential_bindings/GET_response.json → ...ice_credential_bindings/GET_response.json
diff --git a/...l_bindings/GET_{id}_details_response.json → ...l_bindings/GET_{id}_details_response.json b/...l_bindings/GET_{id}_details_response.json → ...l_bindings/GET_{id}_details_response.json
diff --git a/...indings/GET_{id}_parameters_response.json → ...indings/GET_{id}_parameters_response.json b/...indings/GET_{id}_parameters_response.json → ...indings/GET_{id}_parameters_response.json
diff --git a/...redential_bindings/GET_{id}_response.json → ...redential_bindings/GET_{id}_response.json b/...redential_bindings/GET_{id}_response.json → ...redential_bindings/GET_{id}_response.json
diff --git a/...ce_credential_bindings/POST_response.json → ...ce_credential_bindings/POST_response.json b/...ce_credential_bindings/POST_response.json → ...ce_credential_bindings/POST_response.json
diff --git a/...es/v3/service_instances/GET_response.json → ...es/v3/service_instances/GET_response.json b/...es/v3/service_instances/GET_response.json → ...es/v3/service_instances/GET_response.json
diff --git a/...tances/GET_{id}_credentials_response.json → ...tances/GET_{id}_credentials_response.json b/...tances/GET_{id}_credentials_response.json → ...tances/GET_{id}_credentials_response.json
diff --git a/...tances/GET_{id}_permissions_response.json → ...tances/GET_{id}_permissions_response.json b/...tances/GET_{id}_permissions_response.json → ...tances/GET_{id}_permissions_response.json
diff --git a/.../service_instances/GET_{id}_response.json → .../service_instances/GET_{id}_response.json b/.../service_instances/GET_{id}_response.json → .../service_instances/GET_{id}_response.json
diff --git a/...es/v3/service_offerings/GET_response.json → ...es/v3/service_offerings/GET_response.json b/...es/v3/service_offerings/GET_response.json → ...es/v3/service_offerings/GET_response.json
diff --git a/.../service_offerings/GET_{id}_response.json → .../service_offerings/GET_{id}_response.json b/.../service_offerings/GET_{id}_response.json → .../service_offerings/GET_{id}_response.json
diff --git a/...ervice_offerings/PATCH_{id}_response.json → ...ervice_offerings/PATCH_{id}_response.json b/...ervice_offerings/PATCH_{id}_response.json → ...ervice_offerings/PATCH_{id}_response.json
diff --git a/...xtures/v3/service_plans/GET_response.json → ...xtures/v3/service_plans/GET_response.json b/...xtures/v3/service_plans/GET_response.json → ...xtures/v3/service_plans/GET_response.json
diff --git a/...s/v3/service_plans/GET_{id}_response.json → ...s/v3/service_plans/GET_{id}_response.json b/...s/v3/service_plans/GET_{id}_response.json → ...s/v3/service_plans/GET_{id}_response.json
diff --git a/...e_plans/GET_{id}_visibility_response.json → ...e_plans/GET_{id}_visibility_response.json b/...e_plans/GET_{id}_visibility_response.json → ...e_plans/GET_{id}_visibility_response.json
diff --git a/...v3/service_plans/PATCH_{id}_response.json → ...v3/service_plans/PATCH_{id}_response.json b/...v3/service_plans/PATCH_{id}_response.json → ...v3/service_plans/PATCH_{id}_response.json
diff --git a/...d}_visibility_organizations_response.json → ...d}_visibility_organizations_response.json b/...d}_visibility_organizations_response.json → ...d}_visibility_organizations_response.json
diff --git a/.../PATCH_{id}_visibility_type_response.json → .../PATCH_{id}_visibility_type_response.json b/.../PATCH_{id}_visibility_type_response.json → .../PATCH_{id}_visibility_type_response.json
diff --git a/..._plans/POST_{id}_visibility_response.json → ..._plans/POST_{id}_visibility_response.json b/..._plans/POST_{id}_visibility_response.json → ..._plans/POST_{id}_visibility_response.json
diff --git a/test/fixtures/v3/spaces/GET_response.json → tests/fixtures/v3/spaces/GET_response.json b/test/fixtures/v3/spaces/GET_response.json → tests/fixtures/v3/spaces/GET_response.json
diff --git a/...s/v3/spaces/GET_response_include_org.json → ...s/v3/spaces/GET_response_include_org.json b/...s/v3/spaces/GET_response_include_org.json → ...s/v3/spaces/GET_response_include_org.json
diff --git a/...tionships_isolation_segment_response.json → ...tionships_isolation_segment_response.json b/...tionships_isolation_segment_response.json → ...tionships_isolation_segment_response.json
diff --git a/...fixtures/v3/spaces/GET_{id}_response.json → ...fixtures/v3/spaces/GET_{id}_response.json b/...fixtures/v3/spaces/GET_{id}_response.json → ...fixtures/v3/spaces/GET_{id}_response.json
diff --git a/...spaces/GET_{id}_response_include_org.json → ...spaces/GET_{id}_response_include_org.json b/...spaces/GET_{id}_response_include_org.json → ...spaces/GET_{id}_response_include_org.json
diff --git a/test/fixtures/v3/spaces/POST_response.json → tests/fixtures/v3/spaces/POST_response.json b/test/fixtures/v3/spaces/POST_response.json → tests/fixtures/v3/spaces/POST_response.json
diff --git a/...tionships_isolation_segment_response.json → ...tionships_isolation_segment_response.json b/...tionships_isolation_segment_response.json → ...tionships_isolation_segment_response.json
diff --git a/test/fixtures/v3/tasks/GET_response.json → tests/fixtures/v3/tasks/GET_response.json b/test/fixtures/v3/tasks/GET_response.json → tests/fixtures/v3/tasks/GET_response.json
diff --git a/.../fixtures/v3/tasks/GET_{id}_response.json → .../fixtures/v3/tasks/GET_{id}_response.json b/.../fixtures/v3/tasks/GET_{id}_response.json → .../fixtures/v3/tasks/GET_{id}_response.json
diff --git a/test/fixtures/v3/tasks/POST_response.json → tests/fixtures/v3/tasks/POST_response.json b/test/fixtures/v3/tasks/POST_response.json → tests/fixtures/v3/tasks/POST_response.json
diff --git a/...ks/POST_{id}_actions_cancel_response.json → ...ks/POST_{id}_actions_cancel_response.json b/...ks/POST_{id}_actions_cancel_response.json → ...ks/POST_{id}_actions_cancel_response.json
diff --git a/test/networking/__init__.py → tests/networking/__init__.py b/test/networking/__init__.py → tests/networking/__init__.py
diff --git a/test/networking/v1/__init__.py → tests/networking/v1/__init__.py b/test/networking/v1/__init__.py → tests/networking/v1/__init__.py
diff --git a/test/networking/v1/external/__init__.py → tests/networking/v1/external/__init__.py b/test/networking/v1/external/__init__.py → tests/networking/v1/external/__init__.py
diff --git a/test/networking/v1/external/test_policies.py → ...s/networking/v1/external/test_policies.py b/test/networking/v1/external/test_policies.py → ...s/networking/v1/external/test_policies.py
diff --git a/test/operations/__init__.py → tests/operations/__init__.py b/test/operations/__init__.py → tests/operations/__init__.py
diff --git a/test/operations/push/__init__.py → tests/operations/push/__init__.py b/test/operations/push/__init__.py → tests/operations/push/__init__.py
diff --git a/test/operations/push/test_cf_ignore.py → tests/operations/push/test_cf_ignore.py b/test/operations/push/test_cf_ignore.py → tests/operations/push/test_cf_ignore.py
diff --git a/test/operations/push/test_file_helper.py → tests/operations/push/test_file_helper.py b/test/operations/push/test_file_helper.py → tests/operations/push/test_file_helper.py
diff --git a/test/operations/push/test_push.py → tests/operations/push/test_push.py b/test/operations/push/test_push.py → tests/operations/push/test_push.py
diff --git a/test/operations/push/validation/__init__.py → tests/operations/push/validation/__init__.py b/test/operations/push/validation/__init__.py → tests/operations/push/validation/__init__.py
diff --git a/...s/push/validation/test_manifest_reader.py → ...s/push/validation/test_manifest_reader.py b/...s/push/validation/test_manifest_reader.py → ...s/push/validation/test_manifest_reader.py
diff --git a/test/test_client.py → tests/test_client.py b/test/test_client.py → tests/test_client.py
diff --git a/test/test_request_object.py → tests/test_request_object.py b/test/test_request_object.py → tests/test_request_object.py
diff --git a/test/v2/__init__.py → tests/v2/__init__.py b/test/v2/__init__.py → tests/v2/__init__.py
diff --git a/test/v2/test_apps.py → tests/v2/test_apps.py b/test/v2/test_apps.py → tests/v2/test_apps.py
diff --git a/test/v2/test_buildpacks.py → tests/v2/test_buildpacks.py b/test/v2/test_buildpacks.py → tests/v2/test_buildpacks.py
diff --git a/test/v2/test_doppler.py → tests/v2/test_doppler.py b/test/v2/test_doppler.py → tests/v2/test_doppler.py
diff --git a/test/v2/test_entities.py → tests/v2/test_entities.py b/test/v2/test_entities.py → tests/v2/test_entities.py
diff --git a/test/v2/test_events.py → tests/v2/test_events.py b/test/v2/test_events.py → tests/v2/test_events.py
diff --git a/test/v2/test_organizations.py → tests/v2/test_organizations.py b/test/v2/test_organizations.py → tests/v2/test_organizations.py
diff --git a/test/v2/test_routes.py → tests/v2/test_routes.py b/test/v2/test_routes.py → tests/v2/test_routes.py
diff --git a/test/v2/test_service_bindings.py → tests/v2/test_service_bindings.py b/test/v2/test_service_bindings.py → tests/v2/test_service_bindings.py
diff --git a/test/v2/test_service_brokers.py → tests/v2/test_service_brokers.py b/test/v2/test_service_brokers.py → tests/v2/test_service_brokers.py
diff --git a/test/v2/test_service_instances.py → tests/v2/test_service_instances.py b/test/v2/test_service_instances.py → tests/v2/test_service_instances.py
diff --git a/test/v2/test_service_keys.py → tests/v2/test_service_keys.py b/test/v2/test_service_keys.py → tests/v2/test_service_keys.py
diff --git a/test/v2/test_service_plan_visibilities.py → tests/v2/test_service_plan_visibilities.py b/test/v2/test_service_plan_visibilities.py → tests/v2/test_service_plan_visibilities.py
diff --git a/test/v2/test_service_plans.py → tests/v2/test_service_plans.py b/test/v2/test_service_plans.py → tests/v2/test_service_plans.py
diff --git a/test/v2/test_services.py → tests/v2/test_services.py b/test/v2/test_services.py → tests/v2/test_services.py
diff --git a/test/v2/test_spaces.py → tests/v2/test_spaces.py b/test/v2/test_spaces.py → tests/v2/test_spaces.py
diff --git a/test/v3/__init__.py → tests/v3/__init__.py b/test/v3/__init__.py → tests/v3/__init__.py
diff --git a/test/v3/test_apps.py → tests/v3/test_apps.py b/test/v3/test_apps.py → tests/v3/test_apps.py
diff --git a/test/v3/test_buildpacks.py → tests/v3/test_buildpacks.py b/test/v3/test_buildpacks.py → tests/v3/test_buildpacks.py
diff --git a/test/v3/test_domains.py → tests/v3/test_domains.py b/test/v3/test_domains.py → tests/v3/test_domains.py
diff --git a/test/v3/test_entities.py → tests/v3/test_entities.py b/test/v3/test_entities.py → tests/v3/test_entities.py
diff --git a/test/v3/test_feature_flags.py → tests/v3/test_feature_flags.py b/test/v3/test_feature_flags.py → tests/v3/test_feature_flags.py
diff --git a/test/v3/test_isolation_segments.py → tests/v3/test_isolation_segments.py b/test/v3/test_isolation_segments.py → tests/v3/test_isolation_segments.py
diff --git a/test/v3/test_jobs.py → tests/v3/test_jobs.py b/test/v3/test_jobs.py → tests/v3/test_jobs.py
diff --git a/test/v3/test_organization_quotas.py → tests/v3/test_organization_quotas.py b/test/v3/test_organization_quotas.py → tests/v3/test_organization_quotas.py
diff --git a/test/v3/test_organizations.py → tests/v3/test_organizations.py b/test/v3/test_organizations.py → tests/v3/test_organizations.py
diff --git a/test/v3/test_processes.py → tests/v3/test_processes.py b/test/v3/test_processes.py → tests/v3/test_processes.py
diff --git a/test/v3/test_roles.py → tests/v3/test_roles.py b/test/v3/test_roles.py → tests/v3/test_roles.py
diff --git a/test/v3/test_security_groups.py → tests/v3/test_security_groups.py b/test/v3/test_security_groups.py → tests/v3/test_security_groups.py
diff --git a/test/v3/test_service_brokers.py → tests/v3/test_service_brokers.py b/test/v3/test_service_brokers.py → tests/v3/test_service_brokers.py
diff --git a/test/v3/test_service_credential_bindings.py → tests/v3/test_service_credential_bindings.py b/test/v3/test_service_credential_bindings.py → tests/v3/test_service_credential_bindings.py
diff --git a/test/v3/test_service_instances.py → tests/v3/test_service_instances.py b/test/v3/test_service_instances.py → tests/v3/test_service_instances.py
diff --git a/test/v3/test_service_offerings.py → tests/v3/test_service_offerings.py b/test/v3/test_service_offerings.py → tests/v3/test_service_offerings.py
diff --git a/test/v3/test_service_plans.py → tests/v3/test_service_plans.py b/test/v3/test_service_plans.py → tests/v3/test_service_plans.py
diff --git a/test/v3/test_spaces.py → tests/v3/test_spaces.py b/test/v3/test_spaces.py → tests/v3/test_spaces.py
diff --git a/test/v3/test_tasks.py → tests/v3/test_tasks.py b/test/v3/test_tasks.py → tests/v3/test_tasks.py