From cbdd714b5ac2b74cb8442c5605f7743392c7abb0 Mon Sep 17 00:00:00 2001 From: Quentin Dufour Date: Tue, 13 Sep 2022 16:00:03 +0200 Subject: [PATCH] Improve code generation --- .gitignore | 1 + .gitmodules | 3 + README.md | 18 +- build.gradle | 20 ++ garage | 1 + python/.gitlab-ci.yml | 2 +- python/.openapi-generator/FILES | 78 ++++-- python/.travis.yml | 2 +- python/README.md | 43 +-- python/docs/KeyApi.md | 108 +++---- python/docs/KeyIdAccessKeyDeleteRequest.md | 2 +- .../docs/KeyIdAccessKeyDeleteRequestDeny.md | 12 + python/docs/LayoutApi.md | 58 ++-- python/docs/MembershipApi.md | 30 +- .../__init__.py | 18 +- .../api/__init__.py | 2 +- .../api/key_api.py | 14 +- .../api/layout_api.py | 10 +- .../api/membership_api.py | 8 +- .../api_client.py | 10 +- .../apis/__init__.py | 8 +- .../configuration.py | 6 +- .../exceptions.py | 0 .../model/__init__.py | 2 +- .../model/cluster_layout.py | 6 +- .../model/connect_post200_response_inner.py | 4 +- .../model/key_get_request.py | 4 +- .../model/key_id_access_key_delete_request.py | 14 +- .../key_id_access_key_delete_request_allow.py | 4 +- .../key_id_access_key_delete_request_deny.py | 263 ++++++++++++++++++ .../model/key_import_post_request.py | 4 +- .../model/key_info.py | 8 +- .../model/key_info_buckets_inner.py | 6 +- .../key_info_buckets_inner_permissions.py | 4 +- .../model/key_info_permissions.py | 4 +- .../model/layout_version.py | 4 +- .../model/list_keys200_response_inner.py | 4 +- .../model/node_cluster_info.py | 4 +- .../model/node_network_info.py | 4 +- .../model/status_get200_response.py | 8 +- .../model_utils.py | 2 +- python/garage_admin_sdk/models/__init__.py | 27 ++ .../rest.py | 2 +- python/openapi_client/models/__init__.py | 26 -- python/setup.py | 4 +- python/test/test_cluster_layout.py | 6 +- .../test_connect_post200_response_inner.py | 4 +- python/test/test_key_api.py | 4 +- python/test/test_key_get_request.py | 4 +- .../test_key_id_access_key_delete_request.py | 8 +- ..._key_id_access_key_delete_request_allow.py | 4 +- ...t_key_id_access_key_delete_request_deny.py | 35 +++ python/test/test_key_import_post_request.py | 4 +- python/test/test_key_info.py | 8 +- python/test/test_key_info_buckets_inner.py | 6 +- ...test_key_info_buckets_inner_permissions.py | 4 +- python/test/test_key_info_permissions.py | 4 +- python/test/test_layout_api.py | 4 +- python/test/test_layout_version.py | 4 +- .../test/test_list_keys200_response_inner.py | 4 +- python/test/test_membership_api.py | 4 +- python/test/test_node_cluster_info.py | 4 +- python/test/test_node_network_info.py | 4 +- python/test/test_status_get200_response.py | 8 +- python/tox.ini | 2 +- 65 files changed, 680 insertions(+), 307 deletions(-) create mode 100644 .gitignore create mode 100644 .gitmodules create mode 100644 build.gradle create mode 160000 garage create mode 100644 python/docs/KeyIdAccessKeyDeleteRequestDeny.md rename python/{openapi_client => garage_admin_sdk}/__init__.py (62%) rename python/{openapi_client => garage_admin_sdk}/api/__init__.py (80%) rename python/{openapi_client => garage_admin_sdk}/api/key_api.py (98%) rename python/{openapi_client => garage_admin_sdk}/api/layout_api.py (98%) rename python/{openapi_client => garage_admin_sdk}/api/membership_api.py (97%) rename python/{openapi_client => garage_admin_sdk}/api_client.py (99%) rename python/{openapi_client => garage_admin_sdk}/apis/__init__.py (63%) rename python/{openapi_client => garage_admin_sdk}/configuration.py (98%) rename python/{openapi_client => garage_admin_sdk}/exceptions.py (100%) rename python/{openapi_client => garage_admin_sdk}/model/__init__.py (84%) rename python/{openapi_client => garage_admin_sdk}/model/cluster_layout.py (98%) rename python/{openapi_client => garage_admin_sdk}/model/connect_post200_response_inner.py (99%) rename python/{openapi_client => garage_admin_sdk}/model/key_get_request.py (99%) rename python/{openapi_client => garage_admin_sdk}/model/key_id_access_key_delete_request.py (95%) rename python/{openapi_client => garage_admin_sdk}/model/key_id_access_key_delete_request_allow.py (99%) create mode 100644 python/garage_admin_sdk/model/key_id_access_key_delete_request_deny.py rename python/{openapi_client => garage_admin_sdk}/model/key_import_post_request.py (99%) rename python/{openapi_client => garage_admin_sdk}/model/key_info.py (97%) rename python/{openapi_client => garage_admin_sdk}/model/key_info_buckets_inner.py (98%) rename python/{openapi_client => garage_admin_sdk}/model/key_info_buckets_inner_permissions.py (99%) rename python/{openapi_client => garage_admin_sdk}/model/key_info_permissions.py (99%) rename python/{openapi_client => garage_admin_sdk}/model/layout_version.py (99%) rename python/{openapi_client => garage_admin_sdk}/model/list_keys200_response_inner.py (99%) rename python/{openapi_client => garage_admin_sdk}/model/node_cluster_info.py (99%) rename python/{openapi_client => garage_admin_sdk}/model/node_network_info.py (99%) rename python/{openapi_client => garage_admin_sdk}/model/status_get200_response.py (98%) rename python/{openapi_client => garage_admin_sdk}/model_utils.py (99%) create mode 100644 python/garage_admin_sdk/models/__init__.py rename python/{openapi_client => garage_admin_sdk}/rest.py (98%) delete mode 100644 python/openapi_client/models/__init__.py create mode 100644 python/test/test_key_id_access_key_delete_request_deny.py diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..08a55c0 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.gradle diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..4879cdd --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "garage"] + path = garage + url = https://git.deuxfleurs.fr/Deuxfleurs/garage.git diff --git a/README.md b/README.md index 512cb9d..cb66e20 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,18 @@ +# Garage Admin SDK -# Generate - -## Python +## Clone this repo +```bash +git clone ... +git submodule init ``` -java -jar ~/Downloads/openapi-generator-cli.jar generate -i ../garage/doc/api/garage-admin-v0.yml -g python -o ./python/ + +## (Re)generate libraries + +```bash +# Check the OpenAPI spec file +gradle validate + +# (re)build the python client +gradle buildPythonClient ``` diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..f407b1c --- /dev/null +++ b/build.gradle @@ -0,0 +1,20 @@ +plugins { + id "org.openapi.generator" version "6.1.0" +} + +task validate(type: org.openapitools.generator.gradle.plugin.tasks.ValidateTask){ + inputSpec = "./garage/doc/api/garage-admin-v0.yml" + recommend = true +} + +task buildPythonClient(type: org.openapitools.generator.gradle.plugin.tasks.GenerateTask) { + generatorName = "python" + inputSpec = "./garage/doc/api/garage-admin-v0.yml" + outputDir = "$rootDir/python" + configOptions = [ + packageName: "garage_admin_sdk", + packageVersion: "0.7.3", + projectName: "garage-admin-sdk" + ] +} + diff --git a/garage b/garage new file mode 160000 index 0000000..a628359 --- /dev/null +++ b/garage @@ -0,0 +1 @@ +Subproject commit a628359122cd6204118e6238a65859d50e4cd472 diff --git a/python/.gitlab-ci.yml b/python/.gitlab-ci.yml index 5a39c63..99c5a5e 100644 --- a/python/.gitlab-ci.yml +++ b/python/.gitlab-ci.yml @@ -8,7 +8,7 @@ stages: script: - pip install -r requirements.txt - pip install -r test-requirements.txt - - pytest --cov=openapi_client + - pytest --cov=garage_admin_sdk test-3.6: extends: .tests diff --git a/python/.openapi-generator/FILES b/python/.openapi-generator/FILES index 9d5b133..f89861c 100644 --- a/python/.openapi-generator/FILES +++ b/python/.openapi-generator/FILES @@ -1,5 +1,6 @@ .gitignore .gitlab-ci.yml +.openapi-generator-ignore .travis.yml README.md docs/ClusterLayout.md @@ -8,6 +9,7 @@ docs/KeyApi.md docs/KeyGetRequest.md docs/KeyIdAccessKeyDeleteRequest.md docs/KeyIdAccessKeyDeleteRequestAllow.md +docs/KeyIdAccessKeyDeleteRequestDeny.md docs/KeyImportPostRequest.md docs/KeyInfo.md docs/KeyInfoBucketsInner.md @@ -20,38 +22,58 @@ docs/MembershipApi.md docs/NodeClusterInfo.md docs/NodeNetworkInfo.md docs/StatusGet200Response.md +garage_admin_sdk/__init__.py +garage_admin_sdk/api/__init__.py +garage_admin_sdk/api/key_api.py +garage_admin_sdk/api/layout_api.py +garage_admin_sdk/api/membership_api.py +garage_admin_sdk/api_client.py +garage_admin_sdk/apis/__init__.py +garage_admin_sdk/configuration.py +garage_admin_sdk/exceptions.py +garage_admin_sdk/model/__init__.py +garage_admin_sdk/model/cluster_layout.py +garage_admin_sdk/model/connect_post200_response_inner.py +garage_admin_sdk/model/key_get_request.py +garage_admin_sdk/model/key_id_access_key_delete_request.py +garage_admin_sdk/model/key_id_access_key_delete_request_allow.py +garage_admin_sdk/model/key_id_access_key_delete_request_deny.py +garage_admin_sdk/model/key_import_post_request.py +garage_admin_sdk/model/key_info.py +garage_admin_sdk/model/key_info_buckets_inner.py +garage_admin_sdk/model/key_info_buckets_inner_permissions.py +garage_admin_sdk/model/key_info_permissions.py +garage_admin_sdk/model/layout_version.py +garage_admin_sdk/model/list_keys200_response_inner.py +garage_admin_sdk/model/node_cluster_info.py +garage_admin_sdk/model/node_network_info.py +garage_admin_sdk/model/status_get200_response.py +garage_admin_sdk/model_utils.py +garage_admin_sdk/models/__init__.py +garage_admin_sdk/rest.py git_push.sh -openapi_client/__init__.py -openapi_client/api/__init__.py -openapi_client/api/key_api.py -openapi_client/api/layout_api.py -openapi_client/api/membership_api.py -openapi_client/api_client.py -openapi_client/apis/__init__.py -openapi_client/configuration.py -openapi_client/exceptions.py -openapi_client/model/__init__.py -openapi_client/model/cluster_layout.py -openapi_client/model/connect_post200_response_inner.py -openapi_client/model/key_get_request.py -openapi_client/model/key_id_access_key_delete_request.py -openapi_client/model/key_id_access_key_delete_request_allow.py -openapi_client/model/key_import_post_request.py -openapi_client/model/key_info.py -openapi_client/model/key_info_buckets_inner.py -openapi_client/model/key_info_buckets_inner_permissions.py -openapi_client/model/key_info_permissions.py -openapi_client/model/layout_version.py -openapi_client/model/list_keys200_response_inner.py -openapi_client/model/node_cluster_info.py -openapi_client/model/node_network_info.py -openapi_client/model/status_get200_response.py -openapi_client/model_utils.py -openapi_client/models/__init__.py -openapi_client/rest.py requirements.txt setup.cfg setup.py test-requirements.txt test/__init__.py +test/test_cluster_layout.py +test/test_connect_post200_response_inner.py +test/test_key_api.py +test/test_key_get_request.py +test/test_key_id_access_key_delete_request.py +test/test_key_id_access_key_delete_request_allow.py +test/test_key_id_access_key_delete_request_deny.py +test/test_key_import_post_request.py +test/test_key_info.py +test/test_key_info_buckets_inner.py +test/test_key_info_buckets_inner_permissions.py +test/test_key_info_permissions.py +test/test_layout_api.py +test/test_layout_version.py +test/test_list_keys200_response_inner.py +test/test_membership_api.py +test/test_node_cluster_info.py +test/test_node_network_info.py +test/test_status_get200_response.py tox.ini diff --git a/python/.travis.yml b/python/.travis.yml index 5b7949c..28b34a6 100644 --- a/python/.travis.yml +++ b/python/.travis.yml @@ -10,4 +10,4 @@ install: - "pip install -r requirements.txt" - "pip install -r test-requirements.txt" # command to run tests -script: pytest --cov=openapi_client +script: pytest --cov=garage_admin_sdk diff --git a/python/README.md b/python/README.md index f962f51..39e439b 100644 --- a/python/README.md +++ b/python/README.md @@ -1,4 +1,4 @@ -# openapi-client +# garage-admin-sdk Administrate your Garage cluster programatically, including status, layout, keys, buckets, and maintainance tasks. *Disclaimer: The API is not stable yet, hence its v0 tag. The API can change at any time, and changes can include breaking backward compatibility. Read the changelog and upgrade your scripts before upgrading. Additionnaly, this specification is very early stage and can contain bugs, especially on error return codes/types that are not tested yet. Do not expect a well finished and polished product!* @@ -7,7 +7,7 @@ Administrate your Garage cluster programatically, including status, layout, keys This Python package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project: - API version: v0.7.3 -- Package version: 1.0.0 +- Package version: 0.7.3 - Build package: org.openapitools.codegen.languages.PythonClientCodegen ## Requirements. @@ -26,7 +26,7 @@ pip install git+https://github.com/GIT_USER_ID/GIT_REPO_ID.git Then import the package: ```python -import openapi_client +import garage_admin_sdk ``` ### Setuptools @@ -40,7 +40,7 @@ python setup.py install --user Then import the package: ```python -import openapi_client +import garage_admin_sdk ``` ## Getting Started @@ -50,17 +50,17 @@ Please follow the [installation procedure](#installation--usage) and then run th ```python import time -import openapi_client +import garage_admin_sdk from pprint import pprint -from openapi_client.api import key_api -from openapi_client.model.key_get_request import KeyGetRequest -from openapi_client.model.key_id_access_key_delete_request import KeyIdAccessKeyDeleteRequest -from openapi_client.model.key_import_post_request import KeyImportPostRequest -from openapi_client.model.key_info import KeyInfo -from openapi_client.model.list_keys200_response_inner import ListKeys200ResponseInner +from garage_admin_sdk.api import key_api +from garage_admin_sdk.model.key_get_request import KeyGetRequest +from garage_admin_sdk.model.key_id_access_key_delete_request import KeyIdAccessKeyDeleteRequest +from garage_admin_sdk.model.key_import_post_request import KeyImportPostRequest +from garage_admin_sdk.model.key_info import KeyInfo +from garage_admin_sdk.model.list_keys200_response_inner import ListKeys200ResponseInner # Defining the host is optional and defaults to http://localhost:3903/v0 # See configuration.py for a list of all supported configuration parameters. -configuration = openapi_client.Configuration( +configuration = garage_admin_sdk.Configuration( host = "http://localhost:3903/v0" ) @@ -70,13 +70,13 @@ configuration = openapi_client.Configuration( # satisfies your auth use case. # Configure Bearer authorization: bearerAuth -configuration = openapi_client.Configuration( +configuration = garage_admin_sdk.Configuration( access_token = 'YOUR_BEARER_TOKEN' ) # Enter a context with an instance of the API client -with openapi_client.ApiClient(configuration) as api_client: +with garage_admin_sdk.ApiClient(configuration) as api_client: # Create an instance of the API class api_instance = key_api.KeyApi(api_client) key_import_post_request = KeyImportPostRequest( @@ -89,7 +89,7 @@ with openapi_client.ApiClient(configuration) as api_client: # Import an existing key api_response = api_instance.key_import_post(key_import_post_request=key_import_post_request) pprint(api_response) - except openapi_client.ApiException as e: + except garage_admin_sdk.ApiException as e: print("Exception when calling KeyApi->key_import_post: %s\n" % e) ``` @@ -121,6 +121,7 @@ Class | Method | HTTP request | Description - [KeyGetRequest](docs/KeyGetRequest.md) - [KeyIdAccessKeyDeleteRequest](docs/KeyIdAccessKeyDeleteRequest.md) - [KeyIdAccessKeyDeleteRequestAllow](docs/KeyIdAccessKeyDeleteRequestAllow.md) + - [KeyIdAccessKeyDeleteRequestDeny](docs/KeyIdAccessKeyDeleteRequestDeny.md) - [KeyImportPostRequest](docs/KeyImportPostRequest.md) - [KeyInfo](docs/KeyInfo.md) - [KeyInfoBucketsInner](docs/KeyInfoBucketsInner.md) @@ -147,21 +148,21 @@ Class | Method | HTTP request | Description ## Notes for Large OpenAPI documents -If the OpenAPI document is large, imports in openapi_client.apis and openapi_client.models may fail with a +If the OpenAPI document is large, imports in garage_admin_sdk.apis and garage_admin_sdk.models may fail with a RecursionError indicating the maximum recursion limit has been exceeded. In that case, there are a couple of solutions: Solution 1: Use specific imports for apis and models like: -- `from openapi_client.api.default_api import DefaultApi` -- `from openapi_client.model.pet import Pet` +- `from garage_admin_sdk.api.default_api import DefaultApi` +- `from garage_admin_sdk.model.pet import Pet` Solution 2: Before importing the package, adjust the maximum recursion limit as shown below: ``` import sys sys.setrecursionlimit(1500) -import openapi_client -from openapi_client.apis import * -from openapi_client.models import * +import garage_admin_sdk +from garage_admin_sdk.apis import * +from garage_admin_sdk.models import * ``` diff --git a/python/docs/KeyApi.md b/python/docs/KeyApi.md index 23223b1..566ca2f 100644 --- a/python/docs/KeyApi.md +++ b/python/docs/KeyApi.md @@ -1,4 +1,4 @@ -# openapi_client.KeyApi +# garage_admin_sdk.KeyApi All URIs are relative to *http://localhost:3903/v0* @@ -26,14 +26,14 @@ Imports an existing API key. This feature must only be used for migrations and b ```python import time -import openapi_client -from openapi_client.api import key_api -from openapi_client.model.key_import_post_request import KeyImportPostRequest -from openapi_client.model.key_info import KeyInfo +import garage_admin_sdk +from garage_admin_sdk.api import key_api +from garage_admin_sdk.model.key_import_post_request import KeyImportPostRequest +from garage_admin_sdk.model.key_info import KeyInfo from pprint import pprint # Defining the host is optional and defaults to http://localhost:3903/v0 # See configuration.py for a list of all supported configuration parameters. -configuration = openapi_client.Configuration( +configuration = garage_admin_sdk.Configuration( host = "http://localhost:3903/v0" ) @@ -43,12 +43,12 @@ configuration = openapi_client.Configuration( # satisfies your auth use case. # Configure Bearer authorization: bearerAuth -configuration = openapi_client.Configuration( +configuration = garage_admin_sdk.Configuration( access_token = 'YOUR_BEARER_TOKEN' ) # Enter a context with an instance of the API client -with openapi_client.ApiClient(configuration) as api_client: +with garage_admin_sdk.ApiClient(configuration) as api_client: # Create an instance of the API class api_instance = key_api.KeyApi(api_client) key_import_post_request = KeyImportPostRequest( @@ -63,7 +63,7 @@ with openapi_client.ApiClient(configuration) as api_client: # Import an existing key api_response = api_instance.key_import_post(key_import_post_request=key_import_post_request) pprint(api_response) - except openapi_client.ApiException as e: + except garage_admin_sdk.ApiException as e: print("Exception when calling KeyApi->key_import_post: %s\n" % e) ``` @@ -111,14 +111,14 @@ Creates a new API access key. ```python import time -import openapi_client -from openapi_client.api import key_api -from openapi_client.model.key_get_request import KeyGetRequest -from openapi_client.model.key_info import KeyInfo +import garage_admin_sdk +from garage_admin_sdk.api import key_api +from garage_admin_sdk.model.key_get_request import KeyGetRequest +from garage_admin_sdk.model.key_info import KeyInfo from pprint import pprint # Defining the host is optional and defaults to http://localhost:3903/v0 # See configuration.py for a list of all supported configuration parameters. -configuration = openapi_client.Configuration( +configuration = garage_admin_sdk.Configuration( host = "http://localhost:3903/v0" ) @@ -128,12 +128,12 @@ configuration = openapi_client.Configuration( # satisfies your auth use case. # Configure Bearer authorization: bearerAuth -configuration = openapi_client.Configuration( +configuration = garage_admin_sdk.Configuration( access_token = 'YOUR_BEARER_TOKEN' ) # Enter a context with an instance of the API client -with openapi_client.ApiClient(configuration) as api_client: +with garage_admin_sdk.ApiClient(configuration) as api_client: # Create an instance of the API class api_instance = key_api.KeyApi(api_client) key_get_request = KeyGetRequest( @@ -146,7 +146,7 @@ with openapi_client.ApiClient(configuration) as api_client: # Create a new API key api_response = api_instance.key_post(key_get_request=key_get_request) pprint(api_response) - except openapi_client.ApiException as e: + except garage_admin_sdk.ApiException as e: print("Exception when calling KeyApi->key_post: %s\n" % e) ``` @@ -192,12 +192,12 @@ Delete a key ```python import time -import openapi_client -from openapi_client.api import key_api +import garage_admin_sdk +from garage_admin_sdk.api import key_api from pprint import pprint # Defining the host is optional and defaults to http://localhost:3903/v0 # See configuration.py for a list of all supported configuration parameters. -configuration = openapi_client.Configuration( +configuration = garage_admin_sdk.Configuration( host = "http://localhost:3903/v0" ) @@ -207,12 +207,12 @@ configuration = openapi_client.Configuration( # satisfies your auth use case. # Configure Bearer authorization: bearerAuth -configuration = openapi_client.Configuration( +configuration = garage_admin_sdk.Configuration( access_token = 'YOUR_BEARER_TOKEN' ) # Enter a context with an instance of the API client -with openapi_client.ApiClient(configuration) as api_client: +with garage_admin_sdk.ApiClient(configuration) as api_client: # Create an instance of the API class api_instance = key_api.KeyApi(api_client) access_key = "GK31c2f218a2e44f485b94239e" # str | The exact API access key generated by Garage @@ -221,7 +221,7 @@ with openapi_client.ApiClient(configuration) as api_client: try: # Delete a key api_instance.keyidaccess_key_delete(access_key) - except openapi_client.ApiException as e: + except garage_admin_sdk.ApiException as e: print("Exception when calling KeyApi->keyidaccess_key_delete: %s\n" % e) ``` @@ -268,13 +268,13 @@ Return information about a specific key and return its information ```python import time -import openapi_client -from openapi_client.api import key_api -from openapi_client.model.key_info import KeyInfo +import garage_admin_sdk +from garage_admin_sdk.api import key_api +from garage_admin_sdk.model.key_info import KeyInfo from pprint import pprint # Defining the host is optional and defaults to http://localhost:3903/v0 # See configuration.py for a list of all supported configuration parameters. -configuration = openapi_client.Configuration( +configuration = garage_admin_sdk.Configuration( host = "http://localhost:3903/v0" ) @@ -284,12 +284,12 @@ configuration = openapi_client.Configuration( # satisfies your auth use case. # Configure Bearer authorization: bearerAuth -configuration = openapi_client.Configuration( +configuration = garage_admin_sdk.Configuration( access_token = 'YOUR_BEARER_TOKEN' ) # Enter a context with an instance of the API client -with openapi_client.ApiClient(configuration) as api_client: +with garage_admin_sdk.ApiClient(configuration) as api_client: # Create an instance of the API class api_instance = key_api.KeyApi(api_client) access_key = "GK31c2f218a2e44f485b94239e" # str | The exact API access key generated by Garage @@ -299,7 +299,7 @@ with openapi_client.ApiClient(configuration) as api_client: # Get key information api_response = api_instance.keyidaccess_key_get(access_key) pprint(api_response) - except openapi_client.ApiException as e: + except garage_admin_sdk.ApiException as e: print("Exception when calling KeyApi->keyidaccess_key_get: %s\n" % e) ``` @@ -346,14 +346,14 @@ Updates information about the specified API access key. ```python import time -import openapi_client -from openapi_client.api import key_api -from openapi_client.model.key_id_access_key_delete_request import KeyIdAccessKeyDeleteRequest -from openapi_client.model.key_info import KeyInfo +import garage_admin_sdk +from garage_admin_sdk.api import key_api +from garage_admin_sdk.model.key_id_access_key_delete_request import KeyIdAccessKeyDeleteRequest +from garage_admin_sdk.model.key_info import KeyInfo from pprint import pprint # Defining the host is optional and defaults to http://localhost:3903/v0 # See configuration.py for a list of all supported configuration parameters. -configuration = openapi_client.Configuration( +configuration = garage_admin_sdk.Configuration( host = "http://localhost:3903/v0" ) @@ -363,12 +363,12 @@ configuration = openapi_client.Configuration( # satisfies your auth use case. # Configure Bearer authorization: bearerAuth -configuration = openapi_client.Configuration( +configuration = garage_admin_sdk.Configuration( access_token = 'YOUR_BEARER_TOKEN' ) # Enter a context with an instance of the API client -with openapi_client.ApiClient(configuration) as api_client: +with garage_admin_sdk.ApiClient(configuration) as api_client: # Create an instance of the API class api_instance = key_api.KeyApi(api_client) access_key = "GK31c2f218a2e44f485b94239e" # str | The exact API access key generated by Garage @@ -377,7 +377,7 @@ with openapi_client.ApiClient(configuration) as api_client: allow=KeyIdAccessKeyDeleteRequestAllow( create_bucket=True, ), - deny=KeyIdAccessKeyDeleteRequestAllow( + deny=KeyIdAccessKeyDeleteRequestDeny( create_bucket=True, ), ) # KeyIdAccessKeyDeleteRequest | For a given key, provide a first set with the permissions to grant, and a second set with the permissions to remove (optional) @@ -387,7 +387,7 @@ with openapi_client.ApiClient(configuration) as api_client: # Update a key api_response = api_instance.keyidaccess_key_post(access_key) pprint(api_response) - except openapi_client.ApiException as e: + except garage_admin_sdk.ApiException as e: print("Exception when calling KeyApi->keyidaccess_key_post: %s\n" % e) # example passing only required values which don't have defaults set @@ -396,7 +396,7 @@ with openapi_client.ApiClient(configuration) as api_client: # Update a key api_response = api_instance.keyidaccess_key_post(access_key, key_id_access_key_delete_request=key_id_access_key_delete_request) pprint(api_response) - except openapi_client.ApiException as e: + except garage_admin_sdk.ApiException as e: print("Exception when calling KeyApi->keyidaccess_key_post: %s\n" % e) ``` @@ -445,13 +445,13 @@ Find the first key matching the given pattern based on its identifier aor friend ```python import time -import openapi_client -from openapi_client.api import key_api -from openapi_client.model.key_info import KeyInfo +import garage_admin_sdk +from garage_admin_sdk.api import key_api +from garage_admin_sdk.model.key_info import KeyInfo from pprint import pprint # Defining the host is optional and defaults to http://localhost:3903/v0 # See configuration.py for a list of all supported configuration parameters. -configuration = openapi_client.Configuration( +configuration = garage_admin_sdk.Configuration( host = "http://localhost:3903/v0" ) @@ -461,12 +461,12 @@ configuration = openapi_client.Configuration( # satisfies your auth use case. # Configure Bearer authorization: bearerAuth -configuration = openapi_client.Configuration( +configuration = garage_admin_sdk.Configuration( access_token = 'YOUR_BEARER_TOKEN' ) # Enter a context with an instance of the API client -with openapi_client.ApiClient(configuration) as api_client: +with garage_admin_sdk.ApiClient(configuration) as api_client: # Create an instance of the API class api_instance = key_api.KeyApi(api_client) pattern = "test-k" # str | A pattern (beginning or full string) corresponding to a key identifier or friendly name @@ -476,7 +476,7 @@ with openapi_client.ApiClient(configuration) as api_client: # Select key by pattern api_response = api_instance.keysearchpattern_get(pattern) pprint(api_response) - except openapi_client.ApiException as e: + except garage_admin_sdk.ApiException as e: print("Exception when calling KeyApi->keysearchpattern_get: %s\n" % e) ``` @@ -523,13 +523,13 @@ Returns all API access keys in the cluster. ```python import time -import openapi_client -from openapi_client.api import key_api -from openapi_client.model.list_keys200_response_inner import ListKeys200ResponseInner +import garage_admin_sdk +from garage_admin_sdk.api import key_api +from garage_admin_sdk.model.list_keys200_response_inner import ListKeys200ResponseInner from pprint import pprint # Defining the host is optional and defaults to http://localhost:3903/v0 # See configuration.py for a list of all supported configuration parameters. -configuration = openapi_client.Configuration( +configuration = garage_admin_sdk.Configuration( host = "http://localhost:3903/v0" ) @@ -539,12 +539,12 @@ configuration = openapi_client.Configuration( # satisfies your auth use case. # Configure Bearer authorization: bearerAuth -configuration = openapi_client.Configuration( +configuration = garage_admin_sdk.Configuration( access_token = 'YOUR_BEARER_TOKEN' ) # Enter a context with an instance of the API client -with openapi_client.ApiClient(configuration) as api_client: +with garage_admin_sdk.ApiClient(configuration) as api_client: # Create an instance of the API class api_instance = key_api.KeyApi(api_client) @@ -553,7 +553,7 @@ with openapi_client.ApiClient(configuration) as api_client: # List all keys api_response = api_instance.list_keys() pprint(api_response) - except openapi_client.ApiException as e: + except garage_admin_sdk.ApiException as e: print("Exception when calling KeyApi->list_keys: %s\n" % e) ``` diff --git a/python/docs/KeyIdAccessKeyDeleteRequest.md b/python/docs/KeyIdAccessKeyDeleteRequest.md index a410342..7c08a54 100644 --- a/python/docs/KeyIdAccessKeyDeleteRequest.md +++ b/python/docs/KeyIdAccessKeyDeleteRequest.md @@ -6,7 +6,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **name** | **str** | | [optional] **allow** | [**KeyIdAccessKeyDeleteRequestAllow**](KeyIdAccessKeyDeleteRequestAllow.md) | | [optional] -**deny** | [**KeyIdAccessKeyDeleteRequestAllow**](KeyIdAccessKeyDeleteRequestAllow.md) | | [optional] +**deny** | [**KeyIdAccessKeyDeleteRequestDeny**](KeyIdAccessKeyDeleteRequestDeny.md) | | [optional] **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/python/docs/KeyIdAccessKeyDeleteRequestDeny.md b/python/docs/KeyIdAccessKeyDeleteRequestDeny.md new file mode 100644 index 0000000..e174671 --- /dev/null +++ b/python/docs/KeyIdAccessKeyDeleteRequestDeny.md @@ -0,0 +1,12 @@ +# KeyIdAccessKeyDeleteRequestDeny + + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**create_bucket** | **bool** | | [optional] +**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional] + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/python/docs/LayoutApi.md b/python/docs/LayoutApi.md index 3801170..5460eae 100644 --- a/python/docs/LayoutApi.md +++ b/python/docs/LayoutApi.md @@ -1,4 +1,4 @@ -# openapi_client.LayoutApi +# garage_admin_sdk.LayoutApi All URIs are relative to *http://localhost:3903/v0* @@ -23,13 +23,13 @@ Applies to the cluster the layout changes currently registered as staged layout ```python import time -import openapi_client -from openapi_client.api import layout_api -from openapi_client.model.layout_version import LayoutVersion +import garage_admin_sdk +from garage_admin_sdk.api import layout_api +from garage_admin_sdk.model.layout_version import LayoutVersion from pprint import pprint # Defining the host is optional and defaults to http://localhost:3903/v0 # See configuration.py for a list of all supported configuration parameters. -configuration = openapi_client.Configuration( +configuration = garage_admin_sdk.Configuration( host = "http://localhost:3903/v0" ) @@ -39,12 +39,12 @@ configuration = openapi_client.Configuration( # satisfies your auth use case. # Configure Bearer authorization: bearerAuth -configuration = openapi_client.Configuration( +configuration = garage_admin_sdk.Configuration( access_token = 'YOUR_BEARER_TOKEN' ) # Enter a context with an instance of the API client -with openapi_client.ApiClient(configuration) as api_client: +with garage_admin_sdk.ApiClient(configuration) as api_client: # Create an instance of the API class api_instance = layout_api.LayoutApi(api_client) layout_version = LayoutVersion( @@ -56,7 +56,7 @@ with openapi_client.ApiClient(configuration) as api_client: try: # Apply staged layout api_instance.layout_apply_post(layout_version=layout_version) - except openapi_client.ApiException as e: + except garage_admin_sdk.ApiException as e: print("Exception when calling LayoutApi->layout_apply_post: %s\n" % e) ``` @@ -104,13 +104,13 @@ Returns the cluster's current layout, including: - Currently configured cluste ```python import time -import openapi_client -from openapi_client.api import layout_api -from openapi_client.model.cluster_layout import ClusterLayout +import garage_admin_sdk +from garage_admin_sdk.api import layout_api +from garage_admin_sdk.model.cluster_layout import ClusterLayout from pprint import pprint # Defining the host is optional and defaults to http://localhost:3903/v0 # See configuration.py for a list of all supported configuration parameters. -configuration = openapi_client.Configuration( +configuration = garage_admin_sdk.Configuration( host = "http://localhost:3903/v0" ) @@ -120,12 +120,12 @@ configuration = openapi_client.Configuration( # satisfies your auth use case. # Configure Bearer authorization: bearerAuth -configuration = openapi_client.Configuration( +configuration = garage_admin_sdk.Configuration( access_token = 'YOUR_BEARER_TOKEN' ) # Enter a context with an instance of the API client -with openapi_client.ApiClient(configuration) as api_client: +with garage_admin_sdk.ApiClient(configuration) as api_client: # Create an instance of the API class api_instance = layout_api.LayoutApi(api_client) @@ -134,7 +134,7 @@ with openapi_client.ApiClient(configuration) as api_client: # Details on the current and staged layout api_response = api_instance.layout_get() pprint(api_response) - except openapi_client.ApiException as e: + except garage_admin_sdk.ApiException as e: print("Exception when calling LayoutApi->layout_get: %s\n" % e) ``` @@ -178,13 +178,13 @@ Send modifications to the cluster layout. These modifications will be included i ```python import time -import openapi_client -from openapi_client.api import layout_api -from openapi_client.model.node_cluster_info import NodeClusterInfo +import garage_admin_sdk +from garage_admin_sdk.api import layout_api +from garage_admin_sdk.model.node_cluster_info import NodeClusterInfo from pprint import pprint # Defining the host is optional and defaults to http://localhost:3903/v0 # See configuration.py for a list of all supported configuration parameters. -configuration = openapi_client.Configuration( +configuration = garage_admin_sdk.Configuration( host = "http://localhost:3903/v0" ) @@ -194,12 +194,12 @@ configuration = openapi_client.Configuration( # satisfies your auth use case. # Configure Bearer authorization: bearerAuth -configuration = openapi_client.Configuration( +configuration = garage_admin_sdk.Configuration( access_token = 'YOUR_BEARER_TOKEN' ) # Enter a context with an instance of the API client -with openapi_client.ApiClient(configuration) as api_client: +with garage_admin_sdk.ApiClient(configuration) as api_client: # Create an instance of the API class api_instance = layout_api.LayoutApi(api_client) request_body = { @@ -211,7 +211,7 @@ with openapi_client.ApiClient(configuration) as api_client: try: # Send modifications to the cluster layout api_instance.layout_post(request_body=request_body) - except openapi_client.ApiException as e: + except garage_admin_sdk.ApiException as e: print("Exception when calling LayoutApi->layout_post: %s\n" % e) ``` @@ -259,13 +259,13 @@ Clears all of the staged layout changes. ```python import time -import openapi_client -from openapi_client.api import layout_api -from openapi_client.model.layout_version import LayoutVersion +import garage_admin_sdk +from garage_admin_sdk.api import layout_api +from garage_admin_sdk.model.layout_version import LayoutVersion from pprint import pprint # Defining the host is optional and defaults to http://localhost:3903/v0 # See configuration.py for a list of all supported configuration parameters. -configuration = openapi_client.Configuration( +configuration = garage_admin_sdk.Configuration( host = "http://localhost:3903/v0" ) @@ -275,12 +275,12 @@ configuration = openapi_client.Configuration( # satisfies your auth use case. # Configure Bearer authorization: bearerAuth -configuration = openapi_client.Configuration( +configuration = garage_admin_sdk.Configuration( access_token = 'YOUR_BEARER_TOKEN' ) # Enter a context with an instance of the API client -with openapi_client.ApiClient(configuration) as api_client: +with garage_admin_sdk.ApiClient(configuration) as api_client: # Create an instance of the API class api_instance = layout_api.LayoutApi(api_client) layout_version = LayoutVersion( @@ -292,7 +292,7 @@ with openapi_client.ApiClient(configuration) as api_client: try: # Clear staged layout api_instance.layout_revert_post(layout_version=layout_version) - except openapi_client.ApiException as e: + except garage_admin_sdk.ApiException as e: print("Exception when calling LayoutApi->layout_revert_post: %s\n" % e) ``` diff --git a/python/docs/MembershipApi.md b/python/docs/MembershipApi.md index 4a41e10..3aaed05 100644 --- a/python/docs/MembershipApi.md +++ b/python/docs/MembershipApi.md @@ -1,4 +1,4 @@ -# openapi_client.MembershipApi +# garage_admin_sdk.MembershipApi All URIs are relative to *http://localhost:3903/v0* @@ -21,13 +21,13 @@ Instructs this Garage node to connect to other Garage nodes at specified `connect_post: %s\n" % e) ``` @@ -101,13 +101,13 @@ Returns the cluster's current status, including: - ID of the node being queried ```python import time -import openapi_client -from openapi_client.api import membership_api -from openapi_client.model.status_get200_response import StatusGet200Response +import garage_admin_sdk +from garage_admin_sdk.api import membership_api +from garage_admin_sdk.model.status_get200_response import StatusGet200Response from pprint import pprint # Defining the host is optional and defaults to http://localhost:3903/v0 # See configuration.py for a list of all supported configuration parameters. -configuration = openapi_client.Configuration( +configuration = garage_admin_sdk.Configuration( host = "http://localhost:3903/v0" ) @@ -117,12 +117,12 @@ configuration = openapi_client.Configuration( # satisfies your auth use case. # Configure Bearer authorization: bearerAuth -configuration = openapi_client.Configuration( +configuration = garage_admin_sdk.Configuration( access_token = 'YOUR_BEARER_TOKEN' ) # Enter a context with an instance of the API client -with openapi_client.ApiClient(configuration) as api_client: +with garage_admin_sdk.ApiClient(configuration) as api_client: # Create an instance of the API class api_instance = membership_api.MembershipApi(api_client) @@ -131,7 +131,7 @@ with openapi_client.ApiClient(configuration) as api_client: # Status of this node and other nodes in the cluster api_response = api_instance.status_get() pprint(api_response) - except openapi_client.ApiException as e: + except garage_admin_sdk.ApiException as e: print("Exception when calling MembershipApi->status_get: %s\n" % e) ``` diff --git a/python/openapi_client/__init__.py b/python/garage_admin_sdk/__init__.py similarity index 62% rename from python/openapi_client/__init__.py rename to python/garage_admin_sdk/__init__.py index e2c8b2e..b6cc358 100644 --- a/python/openapi_client/__init__.py +++ b/python/garage_admin_sdk/__init__.py @@ -10,18 +10,18 @@ """ -__version__ = "1.0.0" +__version__ = "0.7.3" # import ApiClient -from openapi_client.api_client import ApiClient +from garage_admin_sdk.api_client import ApiClient # import Configuration -from openapi_client.configuration import Configuration +from garage_admin_sdk.configuration import Configuration # import exceptions -from openapi_client.exceptions import OpenApiException -from openapi_client.exceptions import ApiAttributeError -from openapi_client.exceptions import ApiTypeError -from openapi_client.exceptions import ApiValueError -from openapi_client.exceptions import ApiKeyError -from openapi_client.exceptions import ApiException +from garage_admin_sdk.exceptions import OpenApiException +from garage_admin_sdk.exceptions import ApiAttributeError +from garage_admin_sdk.exceptions import ApiTypeError +from garage_admin_sdk.exceptions import ApiValueError +from garage_admin_sdk.exceptions import ApiKeyError +from garage_admin_sdk.exceptions import ApiException diff --git a/python/openapi_client/api/__init__.py b/python/garage_admin_sdk/api/__init__.py similarity index 80% rename from python/openapi_client/api/__init__.py rename to python/garage_admin_sdk/api/__init__.py index c7b7cee..7c0365d 100644 --- a/python/openapi_client/api/__init__.py +++ b/python/garage_admin_sdk/api/__init__.py @@ -1,3 +1,3 @@ # do not import all apis into this module because that uses a lot of memory and stack frames # if you need the ability to import all apis from one package, import them with -# from openapi_client.apis import KeyApi +# from garage_admin_sdk.apis import KeyApi diff --git a/python/openapi_client/api/key_api.py b/python/garage_admin_sdk/api/key_api.py similarity index 98% rename from python/openapi_client/api/key_api.py rename to python/garage_admin_sdk/api/key_api.py index fb3efc6..16a48c8 100644 --- a/python/openapi_client/api/key_api.py +++ b/python/garage_admin_sdk/api/key_api.py @@ -11,8 +11,8 @@ import re # noqa: F401 import sys # noqa: F401 -from openapi_client.api_client import ApiClient, Endpoint as _Endpoint -from openapi_client.model_utils import ( # noqa: F401 +from garage_admin_sdk.api_client import ApiClient, Endpoint as _Endpoint +from garage_admin_sdk.model_utils import ( # noqa: F401 check_allowed_values, check_validations, date, @@ -21,11 +21,11 @@ from openapi_client.model_utils import ( # noqa: F401 none_type, validate_and_convert_types ) -from openapi_client.model.key_get_request import KeyGetRequest -from openapi_client.model.key_id_access_key_delete_request import KeyIdAccessKeyDeleteRequest -from openapi_client.model.key_import_post_request import KeyImportPostRequest -from openapi_client.model.key_info import KeyInfo -from openapi_client.model.list_keys200_response_inner import ListKeys200ResponseInner +from garage_admin_sdk.model.key_get_request import KeyGetRequest +from garage_admin_sdk.model.key_id_access_key_delete_request import KeyIdAccessKeyDeleteRequest +from garage_admin_sdk.model.key_import_post_request import KeyImportPostRequest +from garage_admin_sdk.model.key_info import KeyInfo +from garage_admin_sdk.model.list_keys200_response_inner import ListKeys200ResponseInner class KeyApi(object): diff --git a/python/openapi_client/api/layout_api.py b/python/garage_admin_sdk/api/layout_api.py similarity index 98% rename from python/openapi_client/api/layout_api.py rename to python/garage_admin_sdk/api/layout_api.py index e2b9338..9e62403 100644 --- a/python/openapi_client/api/layout_api.py +++ b/python/garage_admin_sdk/api/layout_api.py @@ -11,8 +11,8 @@ import re # noqa: F401 import sys # noqa: F401 -from openapi_client.api_client import ApiClient, Endpoint as _Endpoint -from openapi_client.model_utils import ( # noqa: F401 +from garage_admin_sdk.api_client import ApiClient, Endpoint as _Endpoint +from garage_admin_sdk.model_utils import ( # noqa: F401 check_allowed_values, check_validations, date, @@ -21,9 +21,9 @@ from openapi_client.model_utils import ( # noqa: F401 none_type, validate_and_convert_types ) -from openapi_client.model.cluster_layout import ClusterLayout -from openapi_client.model.layout_version import LayoutVersion -from openapi_client.model.node_cluster_info import NodeClusterInfo +from garage_admin_sdk.model.cluster_layout import ClusterLayout +from garage_admin_sdk.model.layout_version import LayoutVersion +from garage_admin_sdk.model.node_cluster_info import NodeClusterInfo class LayoutApi(object): diff --git a/python/openapi_client/api/membership_api.py b/python/garage_admin_sdk/api/membership_api.py similarity index 97% rename from python/openapi_client/api/membership_api.py rename to python/garage_admin_sdk/api/membership_api.py index 743fd29..f0ad18e 100644 --- a/python/openapi_client/api/membership_api.py +++ b/python/garage_admin_sdk/api/membership_api.py @@ -11,8 +11,8 @@ import re # noqa: F401 import sys # noqa: F401 -from openapi_client.api_client import ApiClient, Endpoint as _Endpoint -from openapi_client.model_utils import ( # noqa: F401 +from garage_admin_sdk.api_client import ApiClient, Endpoint as _Endpoint +from garage_admin_sdk.model_utils import ( # noqa: F401 check_allowed_values, check_validations, date, @@ -21,8 +21,8 @@ from openapi_client.model_utils import ( # noqa: F401 none_type, validate_and_convert_types ) -from openapi_client.model.connect_post200_response_inner import ConnectPost200ResponseInner -from openapi_client.model.status_get200_response import StatusGet200Response +from garage_admin_sdk.model.connect_post200_response_inner import ConnectPost200ResponseInner +from garage_admin_sdk.model.status_get200_response import StatusGet200Response class MembershipApi(object): diff --git a/python/openapi_client/api_client.py b/python/garage_admin_sdk/api_client.py similarity index 99% rename from python/openapi_client/api_client.py rename to python/garage_admin_sdk/api_client.py index 9a50082..0bf4c71 100644 --- a/python/openapi_client/api_client.py +++ b/python/garage_admin_sdk/api_client.py @@ -20,10 +20,10 @@ from urllib.parse import quote from urllib3.fields import RequestField -from openapi_client import rest -from openapi_client.configuration import Configuration -from openapi_client.exceptions import ApiTypeError, ApiValueError, ApiException -from openapi_client.model_utils import ( +from garage_admin_sdk import rest +from garage_admin_sdk.configuration import Configuration +from garage_admin_sdk.exceptions import ApiTypeError, ApiValueError, ApiException +from garage_admin_sdk.model_utils import ( ModelNormal, ModelSimple, ModelComposed, @@ -76,7 +76,7 @@ class ApiClient(object): self.default_headers[header_name] = header_value self.cookie = cookie # Set default User-Agent. - self.user_agent = 'OpenAPI-Generator/1.0.0/python' + self.user_agent = 'OpenAPI-Generator/0.7.3/python' def __enter__(self): return self diff --git a/python/openapi_client/apis/__init__.py b/python/garage_admin_sdk/apis/__init__.py similarity index 63% rename from python/openapi_client/apis/__init__.py rename to python/garage_admin_sdk/apis/__init__.py index c028166..faf42e3 100644 --- a/python/openapi_client/apis/__init__.py +++ b/python/garage_admin_sdk/apis/__init__.py @@ -6,7 +6,7 @@ # raise a `RecursionError`. # In order to avoid this, import only the API that you directly need like: # -# from openapi_client.api.key_api import KeyApi +# from garage_admin_sdk.api.key_api import KeyApi # # or import this package, but before doing it, use: # @@ -14,6 +14,6 @@ # sys.setrecursionlimit(n) # Import APIs into API package: -from openapi_client.api.key_api import KeyApi -from openapi_client.api.layout_api import LayoutApi -from openapi_client.api.membership_api import MembershipApi +from garage_admin_sdk.api.key_api import KeyApi +from garage_admin_sdk.api.layout_api import LayoutApi +from garage_admin_sdk.api.membership_api import MembershipApi diff --git a/python/openapi_client/configuration.py b/python/garage_admin_sdk/configuration.py similarity index 98% rename from python/openapi_client/configuration.py rename to python/garage_admin_sdk/configuration.py index 7411da7..687c827 100644 --- a/python/openapi_client/configuration.py +++ b/python/garage_admin_sdk/configuration.py @@ -15,7 +15,7 @@ import sys import urllib3 from http import client as http_client -from openapi_client.exceptions import ApiValueError +from garage_admin_sdk.exceptions import ApiValueError JSON_SCHEMA_VALIDATION_KEYWORDS = { @@ -133,7 +133,7 @@ class Configuration(object): self.logger = {} """Logging Settings """ - self.logger["package_logger"] = logging.getLogger("openapi_client") + self.logger["package_logger"] = logging.getLogger("garage_admin_sdk") self.logger["urllib3_logger"] = logging.getLogger("urllib3") self.logger_format = '%(asctime)s %(levelname)s %(message)s' """Log format @@ -388,7 +388,7 @@ class Configuration(object): "OS: {env}\n"\ "Python Version: {pyversion}\n"\ "Version of the API: v0.7.3\n"\ - "SDK Package Version: 1.0.0".\ + "SDK Package Version: 0.7.3".\ format(env=sys.platform, pyversion=sys.version) def get_host_settings(self): diff --git a/python/openapi_client/exceptions.py b/python/garage_admin_sdk/exceptions.py similarity index 100% rename from python/openapi_client/exceptions.py rename to python/garage_admin_sdk/exceptions.py diff --git a/python/openapi_client/model/__init__.py b/python/garage_admin_sdk/model/__init__.py similarity index 84% rename from python/openapi_client/model/__init__.py rename to python/garage_admin_sdk/model/__init__.py index b9db195..fa934d9 100644 --- a/python/openapi_client/model/__init__.py +++ b/python/garage_admin_sdk/model/__init__.py @@ -2,4 +2,4 @@ # reference which would not work in python2 # do not import all models into this module because that uses a lot of memory and stack frames # if you need the ability to import all models from one package, import them with -# from openapi_client.models import ModelA, ModelB +# from garage_admin_sdk.models import ModelA, ModelB diff --git a/python/openapi_client/model/cluster_layout.py b/python/garage_admin_sdk/model/cluster_layout.py similarity index 98% rename from python/openapi_client/model/cluster_layout.py rename to python/garage_admin_sdk/model/cluster_layout.py index a5e6ea0..84898fa 100644 --- a/python/openapi_client/model/cluster_layout.py +++ b/python/garage_admin_sdk/model/cluster_layout.py @@ -11,7 +11,7 @@ import re # noqa: F401 import sys # noqa: F401 -from openapi_client.model_utils import ( # noqa: F401 +from garage_admin_sdk.model_utils import ( # noqa: F401 ApiTypeError, ModelComposed, ModelNormal, @@ -26,11 +26,11 @@ from openapi_client.model_utils import ( # noqa: F401 validate_get_composed_info, OpenApiModel ) -from openapi_client.exceptions import ApiAttributeError +from garage_admin_sdk.exceptions import ApiAttributeError def lazy_import(): - from openapi_client.model.node_cluster_info import NodeClusterInfo + from garage_admin_sdk.model.node_cluster_info import NodeClusterInfo globals()['NodeClusterInfo'] = NodeClusterInfo diff --git a/python/openapi_client/model/connect_post200_response_inner.py b/python/garage_admin_sdk/model/connect_post200_response_inner.py similarity index 99% rename from python/openapi_client/model/connect_post200_response_inner.py rename to python/garage_admin_sdk/model/connect_post200_response_inner.py index e988aec..891ece3 100644 --- a/python/openapi_client/model/connect_post200_response_inner.py +++ b/python/garage_admin_sdk/model/connect_post200_response_inner.py @@ -11,7 +11,7 @@ import re # noqa: F401 import sys # noqa: F401 -from openapi_client.model_utils import ( # noqa: F401 +from garage_admin_sdk.model_utils import ( # noqa: F401 ApiTypeError, ModelComposed, ModelNormal, @@ -26,7 +26,7 @@ from openapi_client.model_utils import ( # noqa: F401 validate_get_composed_info, OpenApiModel ) -from openapi_client.exceptions import ApiAttributeError +from garage_admin_sdk.exceptions import ApiAttributeError diff --git a/python/openapi_client/model/key_get_request.py b/python/garage_admin_sdk/model/key_get_request.py similarity index 99% rename from python/openapi_client/model/key_get_request.py rename to python/garage_admin_sdk/model/key_get_request.py index f300bdf..7ce2d7a 100644 --- a/python/openapi_client/model/key_get_request.py +++ b/python/garage_admin_sdk/model/key_get_request.py @@ -11,7 +11,7 @@ import re # noqa: F401 import sys # noqa: F401 -from openapi_client.model_utils import ( # noqa: F401 +from garage_admin_sdk.model_utils import ( # noqa: F401 ApiTypeError, ModelComposed, ModelNormal, @@ -26,7 +26,7 @@ from openapi_client.model_utils import ( # noqa: F401 validate_get_composed_info, OpenApiModel ) -from openapi_client.exceptions import ApiAttributeError +from garage_admin_sdk.exceptions import ApiAttributeError diff --git a/python/openapi_client/model/key_id_access_key_delete_request.py b/python/garage_admin_sdk/model/key_id_access_key_delete_request.py similarity index 95% rename from python/openapi_client/model/key_id_access_key_delete_request.py rename to python/garage_admin_sdk/model/key_id_access_key_delete_request.py index b9e719a..591d526 100644 --- a/python/openapi_client/model/key_id_access_key_delete_request.py +++ b/python/garage_admin_sdk/model/key_id_access_key_delete_request.py @@ -11,7 +11,7 @@ import re # noqa: F401 import sys # noqa: F401 -from openapi_client.model_utils import ( # noqa: F401 +from garage_admin_sdk.model_utils import ( # noqa: F401 ApiTypeError, ModelComposed, ModelNormal, @@ -26,12 +26,14 @@ from openapi_client.model_utils import ( # noqa: F401 validate_get_composed_info, OpenApiModel ) -from openapi_client.exceptions import ApiAttributeError +from garage_admin_sdk.exceptions import ApiAttributeError def lazy_import(): - from openapi_client.model.key_id_access_key_delete_request_allow import KeyIdAccessKeyDeleteRequestAllow + from garage_admin_sdk.model.key_id_access_key_delete_request_allow import KeyIdAccessKeyDeleteRequestAllow + from garage_admin_sdk.model.key_id_access_key_delete_request_deny import KeyIdAccessKeyDeleteRequestDeny globals()['KeyIdAccessKeyDeleteRequestAllow'] = KeyIdAccessKeyDeleteRequestAllow + globals()['KeyIdAccessKeyDeleteRequestDeny'] = KeyIdAccessKeyDeleteRequestDeny class KeyIdAccessKeyDeleteRequest(ModelNormal): @@ -89,7 +91,7 @@ class KeyIdAccessKeyDeleteRequest(ModelNormal): return { 'name': (str,), # noqa: E501 'allow': (KeyIdAccessKeyDeleteRequestAllow,), # noqa: E501 - 'deny': (KeyIdAccessKeyDeleteRequestAllow,), # noqa: E501 + 'deny': (KeyIdAccessKeyDeleteRequestDeny,), # noqa: E501 } @cached_property @@ -146,7 +148,7 @@ class KeyIdAccessKeyDeleteRequest(ModelNormal): _visited_composed_classes = (Animal,) name (str): [optional] # noqa: E501 allow (KeyIdAccessKeyDeleteRequestAllow): [optional] # noqa: E501 - deny (KeyIdAccessKeyDeleteRequestAllow): [optional] # noqa: E501 + deny (KeyIdAccessKeyDeleteRequestDeny): [optional] # noqa: E501 """ _check_type = kwargs.pop('_check_type', True) @@ -234,7 +236,7 @@ class KeyIdAccessKeyDeleteRequest(ModelNormal): _visited_composed_classes = (Animal,) name (str): [optional] # noqa: E501 allow (KeyIdAccessKeyDeleteRequestAllow): [optional] # noqa: E501 - deny (KeyIdAccessKeyDeleteRequestAllow): [optional] # noqa: E501 + deny (KeyIdAccessKeyDeleteRequestDeny): [optional] # noqa: E501 """ _check_type = kwargs.pop('_check_type', True) diff --git a/python/openapi_client/model/key_id_access_key_delete_request_allow.py b/python/garage_admin_sdk/model/key_id_access_key_delete_request_allow.py similarity index 99% rename from python/openapi_client/model/key_id_access_key_delete_request_allow.py rename to python/garage_admin_sdk/model/key_id_access_key_delete_request_allow.py index af8a32b..001be9c 100644 --- a/python/openapi_client/model/key_id_access_key_delete_request_allow.py +++ b/python/garage_admin_sdk/model/key_id_access_key_delete_request_allow.py @@ -11,7 +11,7 @@ import re # noqa: F401 import sys # noqa: F401 -from openapi_client.model_utils import ( # noqa: F401 +from garage_admin_sdk.model_utils import ( # noqa: F401 ApiTypeError, ModelComposed, ModelNormal, @@ -26,7 +26,7 @@ from openapi_client.model_utils import ( # noqa: F401 validate_get_composed_info, OpenApiModel ) -from openapi_client.exceptions import ApiAttributeError +from garage_admin_sdk.exceptions import ApiAttributeError diff --git a/python/garage_admin_sdk/model/key_id_access_key_delete_request_deny.py b/python/garage_admin_sdk/model/key_id_access_key_delete_request_deny.py new file mode 100644 index 0000000..6d3d02d --- /dev/null +++ b/python/garage_admin_sdk/model/key_id_access_key_delete_request_deny.py @@ -0,0 +1,263 @@ +""" + Garage Administration API v0+garage-v0.7.3 + + Administrate your Garage cluster programatically, including status, layout, keys, buckets, and maintainance tasks. *Disclaimer: The API is not stable yet, hence its v0 tag. The API can change at any time, and changes can include breaking backward compatibility. Read the changelog and upgrade your scripts before upgrading. Additionnaly, this specification is very early stage and can contain bugs, especially on error return codes/types that are not tested yet. Do not expect a well finished and polished product!* # noqa: E501 + + The version of the OpenAPI document: v0.7.3 + Generated by: https://openapi-generator.tech +""" + + +import re # noqa: F401 +import sys # noqa: F401 + +from garage_admin_sdk.model_utils import ( # noqa: F401 + ApiTypeError, + ModelComposed, + ModelNormal, + ModelSimple, + cached_property, + change_keys_js_to_python, + convert_js_args_to_python_args, + date, + datetime, + file_type, + none_type, + validate_get_composed_info, + OpenApiModel +) +from garage_admin_sdk.exceptions import ApiAttributeError + + + +class KeyIdAccessKeyDeleteRequestDeny(ModelNormal): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + + Attributes: + allowed_values (dict): The key is the tuple path to the attribute + and the for var_name this is (var_name,). The value is a dict + with a capitalized key describing the allowed value and an allowed + value. These dicts store the allowed enum values. + attribute_map (dict): The key is attribute name + and the value is json key in definition. + discriminator_value_class_map (dict): A dict to go from the discriminator + variable value to the discriminator class name. + validations (dict): The key is the tuple path to the attribute + and the for var_name this is (var_name,). The value is a dict + that stores validations for max_length, min_length, max_items, + min_items, exclusive_maximum, inclusive_maximum, exclusive_minimum, + inclusive_minimum, and regex. + additional_properties_type (tuple): A tuple of classes accepted + as additional properties values. + """ + + allowed_values = { + } + + validations = { + } + + @cached_property + def additional_properties_type(): + """ + This must be a method because a model may have properties that are + of type self, this must run after the class is loaded + """ + return (bool, date, datetime, dict, float, int, list, str, none_type,) # noqa: E501 + + _nullable = False + + @cached_property + def openapi_types(): + """ + This must be a method because a model may have properties that are + of type self, this must run after the class is loaded + + Returns + openapi_types (dict): The key is attribute name + and the value is attribute type. + """ + return { + 'create_bucket': (bool,), # noqa: E501 + } + + @cached_property + def discriminator(): + return None + + + attribute_map = { + 'create_bucket': 'createBucket', # noqa: E501 + } + + read_only_vars = { + } + + _composed_schemas = {} + + @classmethod + @convert_js_args_to_python_args + def _from_openapi_data(cls, *args, **kwargs): # noqa: E501 + """KeyIdAccessKeyDeleteRequestDeny - a model defined in OpenAPI + + Keyword Args: + _check_type (bool): if True, values for parameters in openapi_types + will be type checked and a TypeError will be + raised if the wrong type is input. + Defaults to True + _path_to_item (tuple/list): This is a list of keys or values to + drill down to the model in received_data + when deserializing a response + _spec_property_naming (bool): True if the variable names in the input data + are serialized names, as specified in the OpenAPI document. + False if the variable names in the input data + are pythonic names, e.g. snake case (default) + _configuration (Configuration): the instance to use when + deserializing a file_type parameter. + If passed, type conversion is attempted + If omitted no type conversion is done. + _visited_composed_classes (tuple): This stores a tuple of + classes that we have traveled through so that + if we see that class again we will not use its + discriminator again. + When traveling through a discriminator, the + composed schema that is + is traveled through is added to this set. + For example if Animal has a discriminator + petType and we pass in "Dog", and the class Dog + allOf includes Animal, we move through Animal + once using the discriminator, and pick Dog. + Then in Dog, we will make an instance of the + Animal class but this time we won't travel + through its discriminator because we passed in + _visited_composed_classes = (Animal,) + create_bucket (bool): [optional] # noqa: E501 + """ + + _check_type = kwargs.pop('_check_type', True) + _spec_property_naming = kwargs.pop('_spec_property_naming', True) + _path_to_item = kwargs.pop('_path_to_item', ()) + _configuration = kwargs.pop('_configuration', None) + _visited_composed_classes = kwargs.pop('_visited_composed_classes', ()) + + self = super(OpenApiModel, cls).__new__(cls) + + if args: + for arg in args: + if isinstance(arg, dict): + kwargs.update(arg) + else: + raise ApiTypeError( + "Invalid positional arguments=%s passed to %s. Remove those invalid positional arguments." % ( + args, + self.__class__.__name__, + ), + path_to_item=_path_to_item, + valid_classes=(self.__class__,), + ) + + self._data_store = {} + self._check_type = _check_type + self._spec_property_naming = _spec_property_naming + self._path_to_item = _path_to_item + self._configuration = _configuration + self._visited_composed_classes = _visited_composed_classes + (self.__class__,) + + for var_name, var_value in kwargs.items(): + if var_name not in self.attribute_map and \ + self._configuration is not None and \ + self._configuration.discard_unknown_keys and \ + self.additional_properties_type is None: + # discard variable. + continue + setattr(self, var_name, var_value) + return self + + required_properties = set([ + '_data_store', + '_check_type', + '_spec_property_naming', + '_path_to_item', + '_configuration', + '_visited_composed_classes', + ]) + + @convert_js_args_to_python_args + def __init__(self, *args, **kwargs): # noqa: E501 + """KeyIdAccessKeyDeleteRequestDeny - a model defined in OpenAPI + + Keyword Args: + _check_type (bool): if True, values for parameters in openapi_types + will be type checked and a TypeError will be + raised if the wrong type is input. + Defaults to True + _path_to_item (tuple/list): This is a list of keys or values to + drill down to the model in received_data + when deserializing a response + _spec_property_naming (bool): True if the variable names in the input data + are serialized names, as specified in the OpenAPI document. + False if the variable names in the input data + are pythonic names, e.g. snake case (default) + _configuration (Configuration): the instance to use when + deserializing a file_type parameter. + If passed, type conversion is attempted + If omitted no type conversion is done. + _visited_composed_classes (tuple): This stores a tuple of + classes that we have traveled through so that + if we see that class again we will not use its + discriminator again. + When traveling through a discriminator, the + composed schema that is + is traveled through is added to this set. + For example if Animal has a discriminator + petType and we pass in "Dog", and the class Dog + allOf includes Animal, we move through Animal + once using the discriminator, and pick Dog. + Then in Dog, we will make an instance of the + Animal class but this time we won't travel + through its discriminator because we passed in + _visited_composed_classes = (Animal,) + create_bucket (bool): [optional] # noqa: E501 + """ + + _check_type = kwargs.pop('_check_type', True) + _spec_property_naming = kwargs.pop('_spec_property_naming', False) + _path_to_item = kwargs.pop('_path_to_item', ()) + _configuration = kwargs.pop('_configuration', None) + _visited_composed_classes = kwargs.pop('_visited_composed_classes', ()) + + if args: + for arg in args: + if isinstance(arg, dict): + kwargs.update(arg) + else: + raise ApiTypeError( + "Invalid positional arguments=%s passed to %s. Remove those invalid positional arguments." % ( + args, + self.__class__.__name__, + ), + path_to_item=_path_to_item, + valid_classes=(self.__class__,), + ) + + self._data_store = {} + self._check_type = _check_type + self._spec_property_naming = _spec_property_naming + self._path_to_item = _path_to_item + self._configuration = _configuration + self._visited_composed_classes = _visited_composed_classes + (self.__class__,) + + for var_name, var_value in kwargs.items(): + if var_name not in self.attribute_map and \ + self._configuration is not None and \ + self._configuration.discard_unknown_keys and \ + self.additional_properties_type is None: + # discard variable. + continue + setattr(self, var_name, var_value) + if var_name in self.read_only_vars: + raise ApiAttributeError(f"`{var_name}` is a read-only attribute. Use `from_openapi_data` to instantiate " + f"class with read only attributes.") diff --git a/python/openapi_client/model/key_import_post_request.py b/python/garage_admin_sdk/model/key_import_post_request.py similarity index 99% rename from python/openapi_client/model/key_import_post_request.py rename to python/garage_admin_sdk/model/key_import_post_request.py index 57334cf..5383969 100644 --- a/python/openapi_client/model/key_import_post_request.py +++ b/python/garage_admin_sdk/model/key_import_post_request.py @@ -11,7 +11,7 @@ import re # noqa: F401 import sys # noqa: F401 -from openapi_client.model_utils import ( # noqa: F401 +from garage_admin_sdk.model_utils import ( # noqa: F401 ApiTypeError, ModelComposed, ModelNormal, @@ -26,7 +26,7 @@ from openapi_client.model_utils import ( # noqa: F401 validate_get_composed_info, OpenApiModel ) -from openapi_client.exceptions import ApiAttributeError +from garage_admin_sdk.exceptions import ApiAttributeError diff --git a/python/openapi_client/model/key_info.py b/python/garage_admin_sdk/model/key_info.py similarity index 97% rename from python/openapi_client/model/key_info.py rename to python/garage_admin_sdk/model/key_info.py index 3947eb4..6f21a62 100644 --- a/python/openapi_client/model/key_info.py +++ b/python/garage_admin_sdk/model/key_info.py @@ -11,7 +11,7 @@ import re # noqa: F401 import sys # noqa: F401 -from openapi_client.model_utils import ( # noqa: F401 +from garage_admin_sdk.model_utils import ( # noqa: F401 ApiTypeError, ModelComposed, ModelNormal, @@ -26,12 +26,12 @@ from openapi_client.model_utils import ( # noqa: F401 validate_get_composed_info, OpenApiModel ) -from openapi_client.exceptions import ApiAttributeError +from garage_admin_sdk.exceptions import ApiAttributeError def lazy_import(): - from openapi_client.model.key_info_buckets_inner import KeyInfoBucketsInner - from openapi_client.model.key_info_permissions import KeyInfoPermissions + from garage_admin_sdk.model.key_info_buckets_inner import KeyInfoBucketsInner + from garage_admin_sdk.model.key_info_permissions import KeyInfoPermissions globals()['KeyInfoBucketsInner'] = KeyInfoBucketsInner globals()['KeyInfoPermissions'] = KeyInfoPermissions diff --git a/python/openapi_client/model/key_info_buckets_inner.py b/python/garage_admin_sdk/model/key_info_buckets_inner.py similarity index 98% rename from python/openapi_client/model/key_info_buckets_inner.py rename to python/garage_admin_sdk/model/key_info_buckets_inner.py index 50f7ab6..aab4598 100644 --- a/python/openapi_client/model/key_info_buckets_inner.py +++ b/python/garage_admin_sdk/model/key_info_buckets_inner.py @@ -11,7 +11,7 @@ import re # noqa: F401 import sys # noqa: F401 -from openapi_client.model_utils import ( # noqa: F401 +from garage_admin_sdk.model_utils import ( # noqa: F401 ApiTypeError, ModelComposed, ModelNormal, @@ -26,11 +26,11 @@ from openapi_client.model_utils import ( # noqa: F401 validate_get_composed_info, OpenApiModel ) -from openapi_client.exceptions import ApiAttributeError +from garage_admin_sdk.exceptions import ApiAttributeError def lazy_import(): - from openapi_client.model.key_info_buckets_inner_permissions import KeyInfoBucketsInnerPermissions + from garage_admin_sdk.model.key_info_buckets_inner_permissions import KeyInfoBucketsInnerPermissions globals()['KeyInfoBucketsInnerPermissions'] = KeyInfoBucketsInnerPermissions diff --git a/python/openapi_client/model/key_info_buckets_inner_permissions.py b/python/garage_admin_sdk/model/key_info_buckets_inner_permissions.py similarity index 99% rename from python/openapi_client/model/key_info_buckets_inner_permissions.py rename to python/garage_admin_sdk/model/key_info_buckets_inner_permissions.py index b619036..4c0d3d4 100644 --- a/python/openapi_client/model/key_info_buckets_inner_permissions.py +++ b/python/garage_admin_sdk/model/key_info_buckets_inner_permissions.py @@ -11,7 +11,7 @@ import re # noqa: F401 import sys # noqa: F401 -from openapi_client.model_utils import ( # noqa: F401 +from garage_admin_sdk.model_utils import ( # noqa: F401 ApiTypeError, ModelComposed, ModelNormal, @@ -26,7 +26,7 @@ from openapi_client.model_utils import ( # noqa: F401 validate_get_composed_info, OpenApiModel ) -from openapi_client.exceptions import ApiAttributeError +from garage_admin_sdk.exceptions import ApiAttributeError diff --git a/python/openapi_client/model/key_info_permissions.py b/python/garage_admin_sdk/model/key_info_permissions.py similarity index 99% rename from python/openapi_client/model/key_info_permissions.py rename to python/garage_admin_sdk/model/key_info_permissions.py index ab755be..404ceda 100644 --- a/python/openapi_client/model/key_info_permissions.py +++ b/python/garage_admin_sdk/model/key_info_permissions.py @@ -11,7 +11,7 @@ import re # noqa: F401 import sys # noqa: F401 -from openapi_client.model_utils import ( # noqa: F401 +from garage_admin_sdk.model_utils import ( # noqa: F401 ApiTypeError, ModelComposed, ModelNormal, @@ -26,7 +26,7 @@ from openapi_client.model_utils import ( # noqa: F401 validate_get_composed_info, OpenApiModel ) -from openapi_client.exceptions import ApiAttributeError +from garage_admin_sdk.exceptions import ApiAttributeError diff --git a/python/openapi_client/model/layout_version.py b/python/garage_admin_sdk/model/layout_version.py similarity index 99% rename from python/openapi_client/model/layout_version.py rename to python/garage_admin_sdk/model/layout_version.py index 4df5abe..ff5d382 100644 --- a/python/openapi_client/model/layout_version.py +++ b/python/garage_admin_sdk/model/layout_version.py @@ -11,7 +11,7 @@ import re # noqa: F401 import sys # noqa: F401 -from openapi_client.model_utils import ( # noqa: F401 +from garage_admin_sdk.model_utils import ( # noqa: F401 ApiTypeError, ModelComposed, ModelNormal, @@ -26,7 +26,7 @@ from openapi_client.model_utils import ( # noqa: F401 validate_get_composed_info, OpenApiModel ) -from openapi_client.exceptions import ApiAttributeError +from garage_admin_sdk.exceptions import ApiAttributeError diff --git a/python/openapi_client/model/list_keys200_response_inner.py b/python/garage_admin_sdk/model/list_keys200_response_inner.py similarity index 99% rename from python/openapi_client/model/list_keys200_response_inner.py rename to python/garage_admin_sdk/model/list_keys200_response_inner.py index 1683b68..4a2daec 100644 --- a/python/openapi_client/model/list_keys200_response_inner.py +++ b/python/garage_admin_sdk/model/list_keys200_response_inner.py @@ -11,7 +11,7 @@ import re # noqa: F401 import sys # noqa: F401 -from openapi_client.model_utils import ( # noqa: F401 +from garage_admin_sdk.model_utils import ( # noqa: F401 ApiTypeError, ModelComposed, ModelNormal, @@ -26,7 +26,7 @@ from openapi_client.model_utils import ( # noqa: F401 validate_get_composed_info, OpenApiModel ) -from openapi_client.exceptions import ApiAttributeError +from garage_admin_sdk.exceptions import ApiAttributeError diff --git a/python/openapi_client/model/node_cluster_info.py b/python/garage_admin_sdk/model/node_cluster_info.py similarity index 99% rename from python/openapi_client/model/node_cluster_info.py rename to python/garage_admin_sdk/model/node_cluster_info.py index d30c774..d73568f 100644 --- a/python/openapi_client/model/node_cluster_info.py +++ b/python/garage_admin_sdk/model/node_cluster_info.py @@ -11,7 +11,7 @@ import re # noqa: F401 import sys # noqa: F401 -from openapi_client.model_utils import ( # noqa: F401 +from garage_admin_sdk.model_utils import ( # noqa: F401 ApiTypeError, ModelComposed, ModelNormal, @@ -26,7 +26,7 @@ from openapi_client.model_utils import ( # noqa: F401 validate_get_composed_info, OpenApiModel ) -from openapi_client.exceptions import ApiAttributeError +from garage_admin_sdk.exceptions import ApiAttributeError diff --git a/python/openapi_client/model/node_network_info.py b/python/garage_admin_sdk/model/node_network_info.py similarity index 99% rename from python/openapi_client/model/node_network_info.py rename to python/garage_admin_sdk/model/node_network_info.py index 329c857..c4696cb 100644 --- a/python/openapi_client/model/node_network_info.py +++ b/python/garage_admin_sdk/model/node_network_info.py @@ -11,7 +11,7 @@ import re # noqa: F401 import sys # noqa: F401 -from openapi_client.model_utils import ( # noqa: F401 +from garage_admin_sdk.model_utils import ( # noqa: F401 ApiTypeError, ModelComposed, ModelNormal, @@ -26,7 +26,7 @@ from openapi_client.model_utils import ( # noqa: F401 validate_get_composed_info, OpenApiModel ) -from openapi_client.exceptions import ApiAttributeError +from garage_admin_sdk.exceptions import ApiAttributeError diff --git a/python/openapi_client/model/status_get200_response.py b/python/garage_admin_sdk/model/status_get200_response.py similarity index 98% rename from python/openapi_client/model/status_get200_response.py rename to python/garage_admin_sdk/model/status_get200_response.py index 91f5d0c..428fbd4 100644 --- a/python/openapi_client/model/status_get200_response.py +++ b/python/garage_admin_sdk/model/status_get200_response.py @@ -11,7 +11,7 @@ import re # noqa: F401 import sys # noqa: F401 -from openapi_client.model_utils import ( # noqa: F401 +from garage_admin_sdk.model_utils import ( # noqa: F401 ApiTypeError, ModelComposed, ModelNormal, @@ -26,12 +26,12 @@ from openapi_client.model_utils import ( # noqa: F401 validate_get_composed_info, OpenApiModel ) -from openapi_client.exceptions import ApiAttributeError +from garage_admin_sdk.exceptions import ApiAttributeError def lazy_import(): - from openapi_client.model.cluster_layout import ClusterLayout - from openapi_client.model.node_network_info import NodeNetworkInfo + from garage_admin_sdk.model.cluster_layout import ClusterLayout + from garage_admin_sdk.model.node_network_info import NodeNetworkInfo globals()['ClusterLayout'] = ClusterLayout globals()['NodeNetworkInfo'] = NodeNetworkInfo diff --git a/python/openapi_client/model_utils.py b/python/garage_admin_sdk/model_utils.py similarity index 99% rename from python/openapi_client/model_utils.py rename to python/garage_admin_sdk/model_utils.py index 332e4c6..9601ab9 100644 --- a/python/openapi_client/model_utils.py +++ b/python/garage_admin_sdk/model_utils.py @@ -20,7 +20,7 @@ import uuid from dateutil.parser import parse -from openapi_client.exceptions import ( +from garage_admin_sdk.exceptions import ( ApiKeyError, ApiAttributeError, ApiTypeError, diff --git a/python/garage_admin_sdk/models/__init__.py b/python/garage_admin_sdk/models/__init__.py new file mode 100644 index 0000000..d6b923c --- /dev/null +++ b/python/garage_admin_sdk/models/__init__.py @@ -0,0 +1,27 @@ +# flake8: noqa + +# import all models into this package +# if you have many models here with many references from one model to another this may +# raise a RecursionError +# to avoid this, import only the models that you directly need like: +# from from garage_admin_sdk.model.pet import Pet +# or import this package, but before doing it, use: +# import sys +# sys.setrecursionlimit(n) + +from garage_admin_sdk.model.cluster_layout import ClusterLayout +from garage_admin_sdk.model.connect_post200_response_inner import ConnectPost200ResponseInner +from garage_admin_sdk.model.key_get_request import KeyGetRequest +from garage_admin_sdk.model.key_id_access_key_delete_request import KeyIdAccessKeyDeleteRequest +from garage_admin_sdk.model.key_id_access_key_delete_request_allow import KeyIdAccessKeyDeleteRequestAllow +from garage_admin_sdk.model.key_id_access_key_delete_request_deny import KeyIdAccessKeyDeleteRequestDeny +from garage_admin_sdk.model.key_import_post_request import KeyImportPostRequest +from garage_admin_sdk.model.key_info import KeyInfo +from garage_admin_sdk.model.key_info_buckets_inner import KeyInfoBucketsInner +from garage_admin_sdk.model.key_info_buckets_inner_permissions import KeyInfoBucketsInnerPermissions +from garage_admin_sdk.model.key_info_permissions import KeyInfoPermissions +from garage_admin_sdk.model.layout_version import LayoutVersion +from garage_admin_sdk.model.list_keys200_response_inner import ListKeys200ResponseInner +from garage_admin_sdk.model.node_cluster_info import NodeClusterInfo +from garage_admin_sdk.model.node_network_info import NodeNetworkInfo +from garage_admin_sdk.model.status_get200_response import StatusGet200Response diff --git a/python/openapi_client/rest.py b/python/garage_admin_sdk/rest.py similarity index 98% rename from python/openapi_client/rest.py rename to python/garage_admin_sdk/rest.py index fd35f37..0b07c3c 100644 --- a/python/openapi_client/rest.py +++ b/python/garage_admin_sdk/rest.py @@ -19,7 +19,7 @@ from urllib.request import proxy_bypass_environment import urllib3 import ipaddress -from openapi_client.exceptions import ApiException, UnauthorizedException, ForbiddenException, NotFoundException, ServiceException, ApiValueError +from garage_admin_sdk.exceptions import ApiException, UnauthorizedException, ForbiddenException, NotFoundException, ServiceException, ApiValueError logger = logging.getLogger(__name__) diff --git a/python/openapi_client/models/__init__.py b/python/openapi_client/models/__init__.py deleted file mode 100644 index 6b16b62..0000000 --- a/python/openapi_client/models/__init__.py +++ /dev/null @@ -1,26 +0,0 @@ -# flake8: noqa - -# import all models into this package -# if you have many models here with many references from one model to another this may -# raise a RecursionError -# to avoid this, import only the models that you directly need like: -# from from openapi_client.model.pet import Pet -# or import this package, but before doing it, use: -# import sys -# sys.setrecursionlimit(n) - -from openapi_client.model.cluster_layout import ClusterLayout -from openapi_client.model.connect_post200_response_inner import ConnectPost200ResponseInner -from openapi_client.model.key_get_request import KeyGetRequest -from openapi_client.model.key_id_access_key_delete_request import KeyIdAccessKeyDeleteRequest -from openapi_client.model.key_id_access_key_delete_request_allow import KeyIdAccessKeyDeleteRequestAllow -from openapi_client.model.key_import_post_request import KeyImportPostRequest -from openapi_client.model.key_info import KeyInfo -from openapi_client.model.key_info_buckets_inner import KeyInfoBucketsInner -from openapi_client.model.key_info_buckets_inner_permissions import KeyInfoBucketsInnerPermissions -from openapi_client.model.key_info_permissions import KeyInfoPermissions -from openapi_client.model.layout_version import LayoutVersion -from openapi_client.model.list_keys200_response_inner import ListKeys200ResponseInner -from openapi_client.model.node_cluster_info import NodeClusterInfo -from openapi_client.model.node_network_info import NodeNetworkInfo -from openapi_client.model.status_get200_response import StatusGet200Response diff --git a/python/setup.py b/python/setup.py index 5fa1aa6..74307ad 100644 --- a/python/setup.py +++ b/python/setup.py @@ -10,8 +10,8 @@ from setuptools import setup, find_packages # noqa: H301 -NAME = "openapi-client" -VERSION = "1.0.0" +NAME = "garage-admin-sdk" +VERSION = "0.7.3" # To install the library, run the following # # python setup.py install diff --git a/python/test/test_cluster_layout.py b/python/test/test_cluster_layout.py index cddd826..36dc0f1 100644 --- a/python/test/test_cluster_layout.py +++ b/python/test/test_cluster_layout.py @@ -11,10 +11,10 @@ import sys import unittest -import openapi_client -from openapi_client.model.node_cluster_info import NodeClusterInfo +import garage_admin_sdk +from garage_admin_sdk.model.node_cluster_info import NodeClusterInfo globals()['NodeClusterInfo'] = NodeClusterInfo -from openapi_client.model.cluster_layout import ClusterLayout +from garage_admin_sdk.model.cluster_layout import ClusterLayout class TestClusterLayout(unittest.TestCase): diff --git a/python/test/test_connect_post200_response_inner.py b/python/test/test_connect_post200_response_inner.py index 9a03593..20d1b22 100644 --- a/python/test/test_connect_post200_response_inner.py +++ b/python/test/test_connect_post200_response_inner.py @@ -11,8 +11,8 @@ import sys import unittest -import openapi_client -from openapi_client.model.connect_post200_response_inner import ConnectPost200ResponseInner +import garage_admin_sdk +from garage_admin_sdk.model.connect_post200_response_inner import ConnectPost200ResponseInner class TestConnectPost200ResponseInner(unittest.TestCase): diff --git a/python/test/test_key_api.py b/python/test/test_key_api.py index e9f35ec..c7e3aaf 100644 --- a/python/test/test_key_api.py +++ b/python/test/test_key_api.py @@ -10,8 +10,8 @@ import unittest -import openapi_client -from openapi_client.api.key_api import KeyApi # noqa: E501 +import garage_admin_sdk +from garage_admin_sdk.api.key_api import KeyApi # noqa: E501 class TestKeyApi(unittest.TestCase): diff --git a/python/test/test_key_get_request.py b/python/test/test_key_get_request.py index f66e99c..7601762 100644 --- a/python/test/test_key_get_request.py +++ b/python/test/test_key_get_request.py @@ -11,8 +11,8 @@ import sys import unittest -import openapi_client -from openapi_client.model.key_get_request import KeyGetRequest +import garage_admin_sdk +from garage_admin_sdk.model.key_get_request import KeyGetRequest class TestKeyGetRequest(unittest.TestCase): diff --git a/python/test/test_key_id_access_key_delete_request.py b/python/test/test_key_id_access_key_delete_request.py index 84a4176..73724a4 100644 --- a/python/test/test_key_id_access_key_delete_request.py +++ b/python/test/test_key_id_access_key_delete_request.py @@ -11,10 +11,12 @@ import sys import unittest -import openapi_client -from openapi_client.model.key_id_access_key_delete_request_allow import KeyIdAccessKeyDeleteRequestAllow +import garage_admin_sdk +from garage_admin_sdk.model.key_id_access_key_delete_request_allow import KeyIdAccessKeyDeleteRequestAllow +from garage_admin_sdk.model.key_id_access_key_delete_request_deny import KeyIdAccessKeyDeleteRequestDeny globals()['KeyIdAccessKeyDeleteRequestAllow'] = KeyIdAccessKeyDeleteRequestAllow -from openapi_client.model.key_id_access_key_delete_request import KeyIdAccessKeyDeleteRequest +globals()['KeyIdAccessKeyDeleteRequestDeny'] = KeyIdAccessKeyDeleteRequestDeny +from garage_admin_sdk.model.key_id_access_key_delete_request import KeyIdAccessKeyDeleteRequest class TestKeyIdAccessKeyDeleteRequest(unittest.TestCase): diff --git a/python/test/test_key_id_access_key_delete_request_allow.py b/python/test/test_key_id_access_key_delete_request_allow.py index 2b6006d..261d258 100644 --- a/python/test/test_key_id_access_key_delete_request_allow.py +++ b/python/test/test_key_id_access_key_delete_request_allow.py @@ -11,8 +11,8 @@ import sys import unittest -import openapi_client -from openapi_client.model.key_id_access_key_delete_request_allow import KeyIdAccessKeyDeleteRequestAllow +import garage_admin_sdk +from garage_admin_sdk.model.key_id_access_key_delete_request_allow import KeyIdAccessKeyDeleteRequestAllow class TestKeyIdAccessKeyDeleteRequestAllow(unittest.TestCase): diff --git a/python/test/test_key_id_access_key_delete_request_deny.py b/python/test/test_key_id_access_key_delete_request_deny.py new file mode 100644 index 0000000..0af472b --- /dev/null +++ b/python/test/test_key_id_access_key_delete_request_deny.py @@ -0,0 +1,35 @@ +""" + Garage Administration API v0+garage-v0.7.3 + + Administrate your Garage cluster programatically, including status, layout, keys, buckets, and maintainance tasks. *Disclaimer: The API is not stable yet, hence its v0 tag. The API can change at any time, and changes can include breaking backward compatibility. Read the changelog and upgrade your scripts before upgrading. Additionnaly, this specification is very early stage and can contain bugs, especially on error return codes/types that are not tested yet. Do not expect a well finished and polished product!* # noqa: E501 + + The version of the OpenAPI document: v0.7.3 + Generated by: https://openapi-generator.tech +""" + + +import sys +import unittest + +import garage_admin_sdk +from garage_admin_sdk.model.key_id_access_key_delete_request_deny import KeyIdAccessKeyDeleteRequestDeny + + +class TestKeyIdAccessKeyDeleteRequestDeny(unittest.TestCase): + """KeyIdAccessKeyDeleteRequestDeny unit test stubs""" + + def setUp(self): + pass + + def tearDown(self): + pass + + def testKeyIdAccessKeyDeleteRequestDeny(self): + """Test KeyIdAccessKeyDeleteRequestDeny""" + # FIXME: construct object with mandatory attributes with example values + # model = KeyIdAccessKeyDeleteRequestDeny() # noqa: E501 + pass + + +if __name__ == '__main__': + unittest.main() diff --git a/python/test/test_key_import_post_request.py b/python/test/test_key_import_post_request.py index 30bfb9c..8d9494f 100644 --- a/python/test/test_key_import_post_request.py +++ b/python/test/test_key_import_post_request.py @@ -11,8 +11,8 @@ import sys import unittest -import openapi_client -from openapi_client.model.key_import_post_request import KeyImportPostRequest +import garage_admin_sdk +from garage_admin_sdk.model.key_import_post_request import KeyImportPostRequest class TestKeyImportPostRequest(unittest.TestCase): diff --git a/python/test/test_key_info.py b/python/test/test_key_info.py index c6f06d2..be15dd4 100644 --- a/python/test/test_key_info.py +++ b/python/test/test_key_info.py @@ -11,12 +11,12 @@ import sys import unittest -import openapi_client -from openapi_client.model.key_info_buckets_inner import KeyInfoBucketsInner -from openapi_client.model.key_info_permissions import KeyInfoPermissions +import garage_admin_sdk +from garage_admin_sdk.model.key_info_buckets_inner import KeyInfoBucketsInner +from garage_admin_sdk.model.key_info_permissions import KeyInfoPermissions globals()['KeyInfoBucketsInner'] = KeyInfoBucketsInner globals()['KeyInfoPermissions'] = KeyInfoPermissions -from openapi_client.model.key_info import KeyInfo +from garage_admin_sdk.model.key_info import KeyInfo class TestKeyInfo(unittest.TestCase): diff --git a/python/test/test_key_info_buckets_inner.py b/python/test/test_key_info_buckets_inner.py index 4d2404e..2ad9f1f 100644 --- a/python/test/test_key_info_buckets_inner.py +++ b/python/test/test_key_info_buckets_inner.py @@ -11,10 +11,10 @@ import sys import unittest -import openapi_client -from openapi_client.model.key_info_buckets_inner_permissions import KeyInfoBucketsInnerPermissions +import garage_admin_sdk +from garage_admin_sdk.model.key_info_buckets_inner_permissions import KeyInfoBucketsInnerPermissions globals()['KeyInfoBucketsInnerPermissions'] = KeyInfoBucketsInnerPermissions -from openapi_client.model.key_info_buckets_inner import KeyInfoBucketsInner +from garage_admin_sdk.model.key_info_buckets_inner import KeyInfoBucketsInner class TestKeyInfoBucketsInner(unittest.TestCase): diff --git a/python/test/test_key_info_buckets_inner_permissions.py b/python/test/test_key_info_buckets_inner_permissions.py index a400c88..12a4757 100644 --- a/python/test/test_key_info_buckets_inner_permissions.py +++ b/python/test/test_key_info_buckets_inner_permissions.py @@ -11,8 +11,8 @@ import sys import unittest -import openapi_client -from openapi_client.model.key_info_buckets_inner_permissions import KeyInfoBucketsInnerPermissions +import garage_admin_sdk +from garage_admin_sdk.model.key_info_buckets_inner_permissions import KeyInfoBucketsInnerPermissions class TestKeyInfoBucketsInnerPermissions(unittest.TestCase): diff --git a/python/test/test_key_info_permissions.py b/python/test/test_key_info_permissions.py index f0aaf0e..c29ae3f 100644 --- a/python/test/test_key_info_permissions.py +++ b/python/test/test_key_info_permissions.py @@ -11,8 +11,8 @@ import sys import unittest -import openapi_client -from openapi_client.model.key_info_permissions import KeyInfoPermissions +import garage_admin_sdk +from garage_admin_sdk.model.key_info_permissions import KeyInfoPermissions class TestKeyInfoPermissions(unittest.TestCase): diff --git a/python/test/test_layout_api.py b/python/test/test_layout_api.py index 02e7bb7..7b3fe0a 100644 --- a/python/test/test_layout_api.py +++ b/python/test/test_layout_api.py @@ -10,8 +10,8 @@ import unittest -import openapi_client -from openapi_client.api.layout_api import LayoutApi # noqa: E501 +import garage_admin_sdk +from garage_admin_sdk.api.layout_api import LayoutApi # noqa: E501 class TestLayoutApi(unittest.TestCase): diff --git a/python/test/test_layout_version.py b/python/test/test_layout_version.py index 4230b24..a69d089 100644 --- a/python/test/test_layout_version.py +++ b/python/test/test_layout_version.py @@ -11,8 +11,8 @@ import sys import unittest -import openapi_client -from openapi_client.model.layout_version import LayoutVersion +import garage_admin_sdk +from garage_admin_sdk.model.layout_version import LayoutVersion class TestLayoutVersion(unittest.TestCase): diff --git a/python/test/test_list_keys200_response_inner.py b/python/test/test_list_keys200_response_inner.py index e8a1f54..21ecead 100644 --- a/python/test/test_list_keys200_response_inner.py +++ b/python/test/test_list_keys200_response_inner.py @@ -11,8 +11,8 @@ import sys import unittest -import openapi_client -from openapi_client.model.list_keys200_response_inner import ListKeys200ResponseInner +import garage_admin_sdk +from garage_admin_sdk.model.list_keys200_response_inner import ListKeys200ResponseInner class TestListKeys200ResponseInner(unittest.TestCase): diff --git a/python/test/test_membership_api.py b/python/test/test_membership_api.py index ee1cec4..7c191bf 100644 --- a/python/test/test_membership_api.py +++ b/python/test/test_membership_api.py @@ -10,8 +10,8 @@ import unittest -import openapi_client -from openapi_client.api.membership_api import MembershipApi # noqa: E501 +import garage_admin_sdk +from garage_admin_sdk.api.membership_api import MembershipApi # noqa: E501 class TestMembershipApi(unittest.TestCase): diff --git a/python/test/test_node_cluster_info.py b/python/test/test_node_cluster_info.py index e014480..df6b51e 100644 --- a/python/test/test_node_cluster_info.py +++ b/python/test/test_node_cluster_info.py @@ -11,8 +11,8 @@ import sys import unittest -import openapi_client -from openapi_client.model.node_cluster_info import NodeClusterInfo +import garage_admin_sdk +from garage_admin_sdk.model.node_cluster_info import NodeClusterInfo class TestNodeClusterInfo(unittest.TestCase): diff --git a/python/test/test_node_network_info.py b/python/test/test_node_network_info.py index 98c0304..6287a6f 100644 --- a/python/test/test_node_network_info.py +++ b/python/test/test_node_network_info.py @@ -11,8 +11,8 @@ import sys import unittest -import openapi_client -from openapi_client.model.node_network_info import NodeNetworkInfo +import garage_admin_sdk +from garage_admin_sdk.model.node_network_info import NodeNetworkInfo class TestNodeNetworkInfo(unittest.TestCase): diff --git a/python/test/test_status_get200_response.py b/python/test/test_status_get200_response.py index ac46a42..5766179 100644 --- a/python/test/test_status_get200_response.py +++ b/python/test/test_status_get200_response.py @@ -11,12 +11,12 @@ import sys import unittest -import openapi_client -from openapi_client.model.cluster_layout import ClusterLayout -from openapi_client.model.node_network_info import NodeNetworkInfo +import garage_admin_sdk +from garage_admin_sdk.model.cluster_layout import ClusterLayout +from garage_admin_sdk.model.node_network_info import NodeNetworkInfo globals()['ClusterLayout'] = ClusterLayout globals()['NodeNetworkInfo'] = NodeNetworkInfo -from openapi_client.model.status_get200_response import StatusGet200Response +from garage_admin_sdk.model.status_get200_response import StatusGet200Response class TestStatusGet200Response(unittest.TestCase): diff --git a/python/tox.ini b/python/tox.ini index 1a9028b..01994f1 100644 --- a/python/tox.ini +++ b/python/tox.ini @@ -6,4 +6,4 @@ deps=-r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands= - pytest --cov=openapi_client + pytest --cov=garage_admin_sdk