From 629fe87530295814b10c984706d8d2f4245df69e Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Mon, 17 Aug 2020 16:05:08 -0400 Subject: [PATCH 1/2] improve API version error --- .../templates/multiapi_operations_mixin.py.jinja2 | 2 +- .../multiapi/templates/multiapi_service_client.py.jinja2 | 6 +++--- .../Multiapi/multiapi/_multiapi_service_client.py | 6 +++--- .../Multiapi/multiapi/_operations_mixin.py | 8 ++++---- .../multiapi/aio/_multiapi_service_client_async.py | 6 +++--- .../Multiapi/multiapi/aio/_operations_mixin_async.py | 8 ++++---- .../_multiapi_service_client.py | 6 +++--- .../multiapicredentialdefaultpolicy/_operations_mixin.py | 8 ++++---- .../aio/_multiapi_service_client_async.py | 6 +++--- .../aio/_operations_mixin_async.py | 8 ++++---- .../_multiapi_custom_base_url_service_client.py | 4 ++-- .../multiapicustombaseurl/_operations_mixin.py | 2 +- .../aio/_multiapi_custom_base_url_service_client_async.py | 4 ++-- .../multiapicustombaseurl/aio/_operations_mixin_async.py | 2 +- .../multiapidataplane/_multiapi_service_client.py | 6 +++--- .../multiapidataplane/_operations_mixin.py | 8 ++++---- .../aio/_multiapi_service_client_async.py | 6 +++--- .../multiapidataplane/aio/_operations_mixin_async.py | 8 ++++---- .../multiapinoasync/_multiapi_service_client.py | 6 +++--- .../MultiapiNoAsync/multiapinoasync/_operations_mixin.py | 8 ++++---- .../submodule/_multiapi_service_client.py | 6 +++--- .../multiapiwithsubmodule/submodule/_operations_mixin.py | 8 ++++---- .../submodule/aio/_multiapi_service_client_async.py | 6 +++--- .../submodule/aio/_operations_mixin_async.py | 8 ++++---- 24 files changed, 73 insertions(+), 73 deletions(-) diff --git a/autorest/multiapi/templates/multiapi_operations_mixin.py.jinja2 b/autorest/multiapi/templates/multiapi_operations_mixin.py.jinja2 index 5b0f992694a..041c46a600d 100644 --- a/autorest/multiapi/templates/multiapi_operations_mixin.py.jinja2 +++ b/autorest/multiapi/templates/multiapi_operations_mixin.py.jinja2 @@ -27,7 +27,7 @@ class {{ client_name }}OperationsMixin(object): from {{ ".." if async_mode else "." }}{{ api }}{{ ".aio" if async_mode else "" }}.operations{{ "_async" if async_mode else "" }} import {{ client_name }}OperationsMixin as OperationClass {% endfor %} else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation '{{ operation_name }}'".format(api_version)) mixin_instance = OperationClass() mixin_instance._client = self._client mixin_instance._config = self._config diff --git a/autorest/multiapi/templates/multiapi_service_client.py.jinja2 b/autorest/multiapi/templates/multiapi_service_client.py.jinja2 index f54fd412b35..48edb4c4501 100644 --- a/autorest/multiapi/templates/multiapi_service_client.py.jinja2 +++ b/autorest/multiapi/templates/multiapi_service_client.py.jinja2 @@ -104,7 +104,7 @@ class {{ client_name }}({% if mixin_operations %}{{ client_name }}OperationsMixi base_url = {{ custom_base_url }} {% endfor %} else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} is not available".format(api_version)) {% else %} if not base_url: base_url = {{ base_url }} @@ -134,7 +134,7 @@ class {{ client_name }}({% if mixin_operations %}{{ client_name }}OperationsMixi from {{ relative_path }}{{ mod_api_version }} import models return models {% endfor %} - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} is not available".format(api_version)) {% for operation_group, available_apis in operations|dictsort %} @property @@ -152,7 +152,7 @@ class {{ client_name }}({% if mixin_operations %}{{ client_name }}OperationsMixi from {{ relative_path }}{{ api[0] }}.{{ "aio." if async_mode else "" }}operations{{ "_async" if async_mode else "" }} import {{ api[1] }} as OperationClass {% endfor %} else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation group '{{ operation_group }}'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) {% endfor %} diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/_multiapi_service_client.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/_multiapi_service_client.py index 3843e9e53e3..42b73724da5 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/_multiapi_service_client.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/_multiapi_service_client.py @@ -94,7 +94,7 @@ def models(cls, api_version=DEFAULT_API_VERSION): elif api_version == '3.0.0': from .v3 import models return models - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} is not available".format(api_version)) @property def operation_group_one(self): @@ -112,7 +112,7 @@ def operation_group_one(self): elif api_version == '3.0.0': from .v3.operations import OperationGroupOneOperations as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation group 'operation_group_one'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) @property @@ -128,7 +128,7 @@ def operation_group_two(self): elif api_version == '3.0.0': from .v3.operations import OperationGroupTwoOperations as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation group 'operation_group_two'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) def close(self): diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/_operations_mixin.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/_operations_mixin.py index 751101abb62..99f2897bd01 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/_operations_mixin.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/_operations_mixin.py @@ -50,7 +50,7 @@ def begin_test_lro( if api_version == '1.0.0': from .v1.operations import MultiapiServiceClientOperationsMixin as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation 'begin_test_lro'".format(api_version)) mixin_instance = OperationClass() mixin_instance._client = self._client mixin_instance._config = self._config @@ -84,7 +84,7 @@ def begin_test_lro_and_paging( if api_version == '1.0.0': from .v1.operations import MultiapiServiceClientOperationsMixin as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation 'begin_test_lro_and_paging'".format(api_version)) mixin_instance = OperationClass() mixin_instance._client = self._client mixin_instance._config = self._config @@ -115,7 +115,7 @@ def test_one( elif api_version == '2.0.0': from .v2.operations import MultiapiServiceClientOperationsMixin as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation 'test_one'".format(api_version)) mixin_instance = OperationClass() mixin_instance._client = self._client mixin_instance._config = self._config @@ -138,7 +138,7 @@ def test_paging( if api_version == '3.0.0': from .v3.operations import MultiapiServiceClientOperationsMixin as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation 'test_paging'".format(api_version)) mixin_instance = OperationClass() mixin_instance._client = self._client mixin_instance._config = self._config diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_multiapi_service_client_async.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_multiapi_service_client_async.py index b74931b636e..e6b5af05a60 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_multiapi_service_client_async.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_multiapi_service_client_async.py @@ -94,7 +94,7 @@ def models(cls, api_version=DEFAULT_API_VERSION): elif api_version == '3.0.0': from ..v3 import models return models - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} is not available".format(api_version)) @property def operation_group_one(self): @@ -112,7 +112,7 @@ def operation_group_one(self): elif api_version == '3.0.0': from ..v3.aio.operations_async import OperationGroupOneOperations as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation group 'operation_group_one'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) @property @@ -128,7 +128,7 @@ def operation_group_two(self): elif api_version == '3.0.0': from ..v3.aio.operations_async import OperationGroupTwoOperations as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation group 'operation_group_two'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) async def close(self): diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_operations_mixin_async.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_operations_mixin_async.py index 1dee0a92ab3..151fb548c17 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_operations_mixin_async.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_operations_mixin_async.py @@ -46,7 +46,7 @@ async def begin_test_lro( if api_version == '1.0.0': from ..v1.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation 'begin_test_lro'".format(api_version)) mixin_instance = OperationClass() mixin_instance._client = self._client mixin_instance._config = self._config @@ -80,7 +80,7 @@ def begin_test_lro_and_paging( if api_version == '1.0.0': from ..v1.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation 'begin_test_lro_and_paging'".format(api_version)) mixin_instance = OperationClass() mixin_instance._client = self._client mixin_instance._config = self._config @@ -111,7 +111,7 @@ async def test_one( elif api_version == '2.0.0': from ..v2.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation 'test_one'".format(api_version)) mixin_instance = OperationClass() mixin_instance._client = self._client mixin_instance._config = self._config @@ -134,7 +134,7 @@ def test_paging( if api_version == '3.0.0': from ..v3.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation 'test_paging'".format(api_version)) mixin_instance = OperationClass() mixin_instance._client = self._client mixin_instance._config = self._config diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/_multiapi_service_client.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/_multiapi_service_client.py index e34cefa092e..9e936e40633 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/_multiapi_service_client.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/_multiapi_service_client.py @@ -94,7 +94,7 @@ def models(cls, api_version=DEFAULT_API_VERSION): elif api_version == '3.0.0': from .v3 import models return models - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} is not available".format(api_version)) @property def operation_group_one(self): @@ -112,7 +112,7 @@ def operation_group_one(self): elif api_version == '3.0.0': from .v3.operations import OperationGroupOneOperations as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation group 'operation_group_one'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) @property @@ -128,7 +128,7 @@ def operation_group_two(self): elif api_version == '3.0.0': from .v3.operations import OperationGroupTwoOperations as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation group 'operation_group_two'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) def close(self): diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/_operations_mixin.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/_operations_mixin.py index defd4dfada9..58ed83b81ec 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/_operations_mixin.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/_operations_mixin.py @@ -50,7 +50,7 @@ def begin_test_lro( if api_version == '1.0.0': from .v1.operations import MultiapiServiceClientOperationsMixin as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation 'begin_test_lro'".format(api_version)) mixin_instance = OperationClass() mixin_instance._client = self._client mixin_instance._config = self._config @@ -84,7 +84,7 @@ def begin_test_lro_and_paging( if api_version == '1.0.0': from .v1.operations import MultiapiServiceClientOperationsMixin as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation 'begin_test_lro_and_paging'".format(api_version)) mixin_instance = OperationClass() mixin_instance._client = self._client mixin_instance._config = self._config @@ -115,7 +115,7 @@ def test_one( elif api_version == '2.0.0': from .v2.operations import MultiapiServiceClientOperationsMixin as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation 'test_one'".format(api_version)) mixin_instance = OperationClass() mixin_instance._client = self._client mixin_instance._config = self._config @@ -138,7 +138,7 @@ def test_paging( if api_version == '3.0.0': from .v3.operations import MultiapiServiceClientOperationsMixin as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation 'test_paging'".format(api_version)) mixin_instance = OperationClass() mixin_instance._client = self._client mixin_instance._config = self._config diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_multiapi_service_client_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_multiapi_service_client_async.py index fa63e8b4c12..05c39067fc7 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_multiapi_service_client_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_multiapi_service_client_async.py @@ -94,7 +94,7 @@ def models(cls, api_version=DEFAULT_API_VERSION): elif api_version == '3.0.0': from ..v3 import models return models - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} is not available".format(api_version)) @property def operation_group_one(self): @@ -112,7 +112,7 @@ def operation_group_one(self): elif api_version == '3.0.0': from ..v3.aio.operations_async import OperationGroupOneOperations as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation group 'operation_group_one'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) @property @@ -128,7 +128,7 @@ def operation_group_two(self): elif api_version == '3.0.0': from ..v3.aio.operations_async import OperationGroupTwoOperations as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation group 'operation_group_two'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) async def close(self): diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_operations_mixin_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_operations_mixin_async.py index b6e20906336..1562786abd2 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_operations_mixin_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_operations_mixin_async.py @@ -46,7 +46,7 @@ async def begin_test_lro( if api_version == '1.0.0': from ..v1.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation 'begin_test_lro'".format(api_version)) mixin_instance = OperationClass() mixin_instance._client = self._client mixin_instance._config = self._config @@ -80,7 +80,7 @@ def begin_test_lro_and_paging( if api_version == '1.0.0': from ..v1.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation 'begin_test_lro_and_paging'".format(api_version)) mixin_instance = OperationClass() mixin_instance._client = self._client mixin_instance._config = self._config @@ -111,7 +111,7 @@ async def test_one( elif api_version == '2.0.0': from ..v2.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation 'test_one'".format(api_version)) mixin_instance = OperationClass() mixin_instance._client = self._client mixin_instance._config = self._config @@ -134,7 +134,7 @@ def test_paging( if api_version == '3.0.0': from ..v3.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation 'test_paging'".format(api_version)) mixin_instance = OperationClass() mixin_instance._client = self._client mixin_instance._config = self._config diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/_multiapi_custom_base_url_service_client.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/_multiapi_custom_base_url_service_client.py index a86ae90b4b2..2d8fafb1cd5 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/_multiapi_custom_base_url_service_client.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/_multiapi_custom_base_url_service_client.py @@ -66,7 +66,7 @@ def __init__( elif api_version == '2.0.0': base_url = '{Endpoint}/multiapiCustomBaseUrl/v2' else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} is not available".format(api_version)) self._config = MultiapiCustomBaseUrlServiceClientConfiguration(credential, endpoint, **kwargs) self._client = PipelineClient(base_url=base_url, config=self._config, **kwargs) super(MultiapiCustomBaseUrlServiceClient, self).__init__( @@ -91,7 +91,7 @@ def models(cls, api_version=DEFAULT_API_VERSION): elif api_version == '2.0.0': from .v2 import models return models - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} is not available".format(api_version)) def close(self): self._client.close() diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/_operations_mixin.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/_operations_mixin.py index b5e74ba1935..2c14ab492d4 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/_operations_mixin.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/_operations_mixin.py @@ -44,7 +44,7 @@ def test( elif api_version == '2.0.0': from .v2.operations import MultiapiCustomBaseUrlServiceClientOperationsMixin as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation 'test'".format(api_version)) mixin_instance = OperationClass() mixin_instance._client = self._client mixin_instance._config = self._config diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/aio/_multiapi_custom_base_url_service_client_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/aio/_multiapi_custom_base_url_service_client_async.py index 80eca67efef..6902319c3ec 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/aio/_multiapi_custom_base_url_service_client_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/aio/_multiapi_custom_base_url_service_client_async.py @@ -66,7 +66,7 @@ def __init__( elif api_version == '2.0.0': base_url = '{Endpoint}/multiapiCustomBaseUrl/v2' else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} is not available".format(api_version)) self._config = MultiapiCustomBaseUrlServiceClientConfiguration(credential, endpoint, **kwargs) self._client = AsyncPipelineClient(base_url=base_url, config=self._config, **kwargs) super(MultiapiCustomBaseUrlServiceClient, self).__init__( @@ -91,7 +91,7 @@ def models(cls, api_version=DEFAULT_API_VERSION): elif api_version == '2.0.0': from ..v2 import models return models - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} is not available".format(api_version)) async def close(self): await self._client.close() diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/aio/_operations_mixin_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/aio/_operations_mixin_async.py index e1209a3f0cc..6f6bf9bca55 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/aio/_operations_mixin_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/aio/_operations_mixin_async.py @@ -40,7 +40,7 @@ async def test( elif api_version == '2.0.0': from ..v2.aio.operations_async import MultiapiCustomBaseUrlServiceClientOperationsMixin as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation 'test'".format(api_version)) mixin_instance = OperationClass() mixin_instance._client = self._client mixin_instance._config = self._config diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/_multiapi_service_client.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/_multiapi_service_client.py index 121d4da2945..a9c006cf798 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/_multiapi_service_client.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/_multiapi_service_client.py @@ -94,7 +94,7 @@ def models(cls, api_version=DEFAULT_API_VERSION): elif api_version == '3.0.0': from .v3 import models return models - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} is not available".format(api_version)) @property def operation_group_one(self): @@ -112,7 +112,7 @@ def operation_group_one(self): elif api_version == '3.0.0': from .v3.operations import OperationGroupOneOperations as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation group 'operation_group_one'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) @property @@ -128,7 +128,7 @@ def operation_group_two(self): elif api_version == '3.0.0': from .v3.operations import OperationGroupTwoOperations as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation group 'operation_group_two'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) def close(self): diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/_operations_mixin.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/_operations_mixin.py index 1b85ff963a5..1e9a2b411e9 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/_operations_mixin.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/_operations_mixin.py @@ -49,7 +49,7 @@ def begin_test_lro( if api_version == '1.0.0': from .v1.operations import MultiapiServiceClientOperationsMixin as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation 'begin_test_lro'".format(api_version)) mixin_instance = OperationClass() mixin_instance._client = self._client mixin_instance._config = self._config @@ -83,7 +83,7 @@ def begin_test_lro_and_paging( if api_version == '1.0.0': from .v1.operations import MultiapiServiceClientOperationsMixin as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation 'begin_test_lro_and_paging'".format(api_version)) mixin_instance = OperationClass() mixin_instance._client = self._client mixin_instance._config = self._config @@ -114,7 +114,7 @@ def test_one( elif api_version == '2.0.0': from .v2.operations import MultiapiServiceClientOperationsMixin as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation 'test_one'".format(api_version)) mixin_instance = OperationClass() mixin_instance._client = self._client mixin_instance._config = self._config @@ -137,7 +137,7 @@ def test_paging( if api_version == '3.0.0': from .v3.operations import MultiapiServiceClientOperationsMixin as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation 'test_paging'".format(api_version)) mixin_instance = OperationClass() mixin_instance._client = self._client mixin_instance._config = self._config diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/aio/_multiapi_service_client_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/aio/_multiapi_service_client_async.py index 379834d154f..acfdad7ee51 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/aio/_multiapi_service_client_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/aio/_multiapi_service_client_async.py @@ -94,7 +94,7 @@ def models(cls, api_version=DEFAULT_API_VERSION): elif api_version == '3.0.0': from ..v3 import models return models - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} is not available".format(api_version)) @property def operation_group_one(self): @@ -112,7 +112,7 @@ def operation_group_one(self): elif api_version == '3.0.0': from ..v3.aio.operations_async import OperationGroupOneOperations as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation group 'operation_group_one'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) @property @@ -128,7 +128,7 @@ def operation_group_two(self): elif api_version == '3.0.0': from ..v3.aio.operations_async import OperationGroupTwoOperations as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation group 'operation_group_two'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) async def close(self): diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/aio/_operations_mixin_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/aio/_operations_mixin_async.py index ff24d601ec1..3fd27f12c9c 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/aio/_operations_mixin_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/aio/_operations_mixin_async.py @@ -45,7 +45,7 @@ async def begin_test_lro( if api_version == '1.0.0': from ..v1.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation 'begin_test_lro'".format(api_version)) mixin_instance = OperationClass() mixin_instance._client = self._client mixin_instance._config = self._config @@ -79,7 +79,7 @@ def begin_test_lro_and_paging( if api_version == '1.0.0': from ..v1.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation 'begin_test_lro_and_paging'".format(api_version)) mixin_instance = OperationClass() mixin_instance._client = self._client mixin_instance._config = self._config @@ -110,7 +110,7 @@ async def test_one( elif api_version == '2.0.0': from ..v2.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation 'test_one'".format(api_version)) mixin_instance = OperationClass() mixin_instance._client = self._client mixin_instance._config = self._config @@ -133,7 +133,7 @@ def test_paging( if api_version == '3.0.0': from ..v3.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation 'test_paging'".format(api_version)) mixin_instance = OperationClass() mixin_instance._client = self._client mixin_instance._config = self._config diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/_multiapi_service_client.py b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/_multiapi_service_client.py index 7341bdcab3b..e06b1229205 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/_multiapi_service_client.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/_multiapi_service_client.py @@ -94,7 +94,7 @@ def models(cls, api_version=DEFAULT_API_VERSION): elif api_version == '3.0.0': from .v3 import models return models - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} is not available".format(api_version)) @property def operation_group_one(self): @@ -112,7 +112,7 @@ def operation_group_one(self): elif api_version == '3.0.0': from .v3.operations import OperationGroupOneOperations as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation group 'operation_group_one'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) @property @@ -128,7 +128,7 @@ def operation_group_two(self): elif api_version == '3.0.0': from .v3.operations import OperationGroupTwoOperations as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation group 'operation_group_two'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) def close(self): diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/_operations_mixin.py b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/_operations_mixin.py index 37cdb375734..e7a856df72f 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/_operations_mixin.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/_operations_mixin.py @@ -50,7 +50,7 @@ def begin_test_lro( if api_version == '1.0.0': from .v1.operations import MultiapiServiceClientOperationsMixin as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation 'begin_test_lro'".format(api_version)) mixin_instance = OperationClass() mixin_instance._client = self._client mixin_instance._config = self._config @@ -84,7 +84,7 @@ def begin_test_lro_and_paging( if api_version == '1.0.0': from .v1.operations import MultiapiServiceClientOperationsMixin as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation 'begin_test_lro_and_paging'".format(api_version)) mixin_instance = OperationClass() mixin_instance._client = self._client mixin_instance._config = self._config @@ -115,7 +115,7 @@ def test_one( elif api_version == '2.0.0': from .v2.operations import MultiapiServiceClientOperationsMixin as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation 'test_one'".format(api_version)) mixin_instance = OperationClass() mixin_instance._client = self._client mixin_instance._config = self._config @@ -138,7 +138,7 @@ def test_paging( if api_version == '3.0.0': from .v3.operations import MultiapiServiceClientOperationsMixin as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation 'test_paging'".format(api_version)) mixin_instance = OperationClass() mixin_instance._client = self._client mixin_instance._config = self._config diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/_multiapi_service_client.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/_multiapi_service_client.py index d3cc401bbdc..7e63f59594f 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/_multiapi_service_client.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/_multiapi_service_client.py @@ -94,7 +94,7 @@ def models(cls, api_version=DEFAULT_API_VERSION): elif api_version == '3.0.0': from .v3 import models return models - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} is not available".format(api_version)) @property def operation_group_one(self): @@ -112,7 +112,7 @@ def operation_group_one(self): elif api_version == '3.0.0': from .v3.operations import OperationGroupOneOperations as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation group 'operation_group_one'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) @property @@ -128,7 +128,7 @@ def operation_group_two(self): elif api_version == '3.0.0': from .v3.operations import OperationGroupTwoOperations as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation group 'operation_group_two'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) def close(self): diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/_operations_mixin.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/_operations_mixin.py index 2c8ad8a921a..b8b50254439 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/_operations_mixin.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/_operations_mixin.py @@ -50,7 +50,7 @@ def begin_test_lro( if api_version == '1.0.0': from .v1.operations import MultiapiServiceClientOperationsMixin as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation 'begin_test_lro'".format(api_version)) mixin_instance = OperationClass() mixin_instance._client = self._client mixin_instance._config = self._config @@ -84,7 +84,7 @@ def begin_test_lro_and_paging( if api_version == '1.0.0': from .v1.operations import MultiapiServiceClientOperationsMixin as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation 'begin_test_lro_and_paging'".format(api_version)) mixin_instance = OperationClass() mixin_instance._client = self._client mixin_instance._config = self._config @@ -115,7 +115,7 @@ def test_one( elif api_version == '2.0.0': from .v2.operations import MultiapiServiceClientOperationsMixin as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation 'test_one'".format(api_version)) mixin_instance = OperationClass() mixin_instance._client = self._client mixin_instance._config = self._config @@ -138,7 +138,7 @@ def test_paging( if api_version == '3.0.0': from .v3.operations import MultiapiServiceClientOperationsMixin as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation 'test_paging'".format(api_version)) mixin_instance = OperationClass() mixin_instance._client = self._client mixin_instance._config = self._config diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/aio/_multiapi_service_client_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/aio/_multiapi_service_client_async.py index 9028845aa92..b34051e1fa2 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/aio/_multiapi_service_client_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/aio/_multiapi_service_client_async.py @@ -94,7 +94,7 @@ def models(cls, api_version=DEFAULT_API_VERSION): elif api_version == '3.0.0': from ..v3 import models return models - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} is not available".format(api_version)) @property def operation_group_one(self): @@ -112,7 +112,7 @@ def operation_group_one(self): elif api_version == '3.0.0': from ..v3.aio.operations_async import OperationGroupOneOperations as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation group 'operation_group_one'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) @property @@ -128,7 +128,7 @@ def operation_group_two(self): elif api_version == '3.0.0': from ..v3.aio.operations_async import OperationGroupTwoOperations as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation group 'operation_group_two'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) async def close(self): diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/aio/_operations_mixin_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/aio/_operations_mixin_async.py index 5e0598ec8cb..0021fbf53ad 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/aio/_operations_mixin_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/aio/_operations_mixin_async.py @@ -46,7 +46,7 @@ async def begin_test_lro( if api_version == '1.0.0': from ..v1.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation 'begin_test_lro'".format(api_version)) mixin_instance = OperationClass() mixin_instance._client = self._client mixin_instance._config = self._config @@ -80,7 +80,7 @@ def begin_test_lro_and_paging( if api_version == '1.0.0': from ..v1.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation 'begin_test_lro_and_paging'".format(api_version)) mixin_instance = OperationClass() mixin_instance._client = self._client mixin_instance._config = self._config @@ -111,7 +111,7 @@ async def test_one( elif api_version == '2.0.0': from ..v2.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation 'test_one'".format(api_version)) mixin_instance = OperationClass() mixin_instance._client = self._client mixin_instance._config = self._config @@ -134,7 +134,7 @@ def test_paging( if api_version == '3.0.0': from ..v3.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) + raise NotImplementedError("API version {} does not have operation 'test_paging'".format(api_version)) mixin_instance = OperationClass() mixin_instance._client = self._client mixin_instance._config = self._config From 6a80807012638ceae5e60deef60129b902a88060 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Mon, 17 Aug 2020 16:08:06 -0400 Subject: [PATCH 2/2] update changelog --- ChangeLog.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog.md b/ChangeLog.md index 213636d21d0..63050890d6a 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -9,6 +9,8 @@ Modelerfour version: 4.15.400 - Updated minimum `azure-core` version to 1.8.0 #747 - Updated minimum `msrest` version to 0.6.18 #747 - Support for `multipart/form-data` #746 +- Better `NotImplementedError` thrown in multiapi case. Includes the name of the operation and operation group +in error that is thrown when an API version does not have that operation / operation group #752 **Bug fixes**