diff --git a/ChangeLog.md b/ChangeLog.md index 213636d21d0..05742be04dd 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,9 +1,13 @@ # Change Log -### 2020-xx-xx - 5.1.0-preview.8 +### 2020-xx-xx - 5.2.0-preview.1 Autorest Core version: 3.0.6302 Modelerfour version: 4.15.400 +**Breaking Changes** + +- Removed the `_async` suffix from async files #759 + **New Features** - Updated minimum `azure-core` version to 1.8.0 #747 diff --git a/autorest/codegen/models/operation_group.py b/autorest/codegen/models/operation_group.py index 1601c9c1a5d..d401ac41321 100644 --- a/autorest/codegen/models/operation_group.py +++ b/autorest/codegen/models/operation_group.py @@ -59,15 +59,15 @@ def imports(self, async_mode: bool, has_schemas: bool) -> FileImport: file_import.add_from_import("..", "models", ImportType.LOCAL) return file_import - def get_filename(self, async_mode: bool) -> str: + @property + def filename(self) -> str: basename = self.name if self.is_empty_operation_group: basename = self.code_model.module_name - async_suffix = "_async" if async_mode else "" if basename == "operations": - return f"_operations{async_suffix}" - return f"_{basename}_operations{async_suffix}" + return f"_operations" + return f"_{basename}_operations" @property def is_empty_operation_group(self) -> bool: diff --git a/autorest/codegen/serializers/__init__.py b/autorest/codegen/serializers/__init__.py index aa663b36b57..5b295b79874 100644 --- a/autorest/codegen/serializers/__init__.py +++ b/autorest/codegen/serializers/__init__.py @@ -98,7 +98,7 @@ def _serialize_and_write_operations_folder( if not code_model.options["no_async"]: operations_async_init_serializer = OperationsInitSerializer(code_model=code_model, env=env, async_mode=True) self._autorestapi.write_file( - namespace_path / Path("aio") / Path(f"operations_async") / Path("__init__.py"), + namespace_path / Path("aio") / Path(f"operations") / Path("__init__.py"), operations_async_init_serializer.serialize(), ) @@ -108,7 +108,7 @@ def _serialize_and_write_operations_folder( code_model=code_model, env=env, operation_group=operation_group, async_mode=False ) self._autorestapi.write_file( - namespace_path / Path(f"operations") / Path(f"{operation_group.get_filename(async_mode=False)}.py"), + namespace_path / Path(f"operations") / Path(f"{operation_group.filename}.py"), operation_group_serializer.serialize(), ) @@ -121,8 +121,8 @@ def _serialize_and_write_operations_folder( ( namespace_path / Path("aio") - / Path(f"operations_async") - / Path(f"{operation_group.get_filename(async_mode=True)}.py") + / Path(f"operations") + / Path(f"{operation_group.filename}.py") ), operation_group_async_serializer.serialize(), ) @@ -193,13 +193,13 @@ def _serialize_and_write_aio_folder(self, code_model: CodeModel, env: Environmen # Write the service client self._autorestapi.write_file( - aio_path / Path(f"_{code_model.module_name}_async.py"), + aio_path / Path(f"_{code_model.module_name}.py"), aio_general_serializer.serialize_service_client_file(), ) # Write the config file self._autorestapi.write_file( - aio_path / Path("_configuration_async.py"), aio_general_serializer.serialize_config_file() + aio_path / Path("_configuration.py"), aio_general_serializer.serialize_config_file() ) def _serialize_and_write_metadata(self, code_model: CodeModel, env: Environment, namespace_path: Path) -> None: diff --git a/autorest/codegen/templates/init.py.jinja2 b/autorest/codegen/templates/init.py.jinja2 index 88c6de0008a..654a57cb2ce 100644 --- a/autorest/codegen/templates/init.py.jinja2 +++ b/autorest/codegen/templates/init.py.jinja2 @@ -1,8 +1,7 @@ -{% set async_suffix = "_async" if async_mode else "" %} # coding=utf-8 {{ code_model.options['license_header'] }} -from ._{{ code_model.module_name + async_suffix }} import {{ code_model.class_name }} +from ._{{ code_model.module_name }} import {{ code_model.class_name }} {% if not async_mode and code_model.options['package_version']%} from ._version import VERSION diff --git a/autorest/codegen/templates/operations_container_init.py.jinja2 b/autorest/codegen/templates/operations_container_init.py.jinja2 index 46866a66755..ee2152fa3fa 100644 --- a/autorest/codegen/templates/operations_container_init.py.jinja2 +++ b/autorest/codegen/templates/operations_container_init.py.jinja2 @@ -1,10 +1,9 @@ -{% set async_suffix = "_async" if async_mode else "" %} {# actual template starts here #} # coding=utf-8 {{ code_model.options['license_header'] }} {% for operation_group in operation_groups %} -from .{{ operation_group.get_filename(async_mode) }} import {{ operation_group.class_name }} +from .{{ operation_group.filename }} import {{ operation_group.class_name }} {% endfor %} __all__ = [ diff --git a/autorest/codegen/templates/service_client.py.jinja2 b/autorest/codegen/templates/service_client.py.jinja2 index 73c059aeef2..2b2e27ae3cf 100644 --- a/autorest/codegen/templates/service_client.py.jinja2 +++ b/autorest/codegen/templates/service_client.py.jinja2 @@ -1,6 +1,4 @@ {% import 'keywords.jinja2' as keywords with context %} -{% set config_import = "._configuration_async" if async_mode else "._configuration" %} -{% set operations_import = ".operations_async" if async_mode else ".operations" %} {% set path_to_models = ".." if async_mode else "." %} {% macro method_signature() %} def __init__( @@ -33,9 +31,9 @@ def __init__( {{ imports }} -from {{ config_import }} import {{ code_model.class_name }}Configuration +from ._configuration import {{ code_model.class_name }}Configuration {% for operation_group in code_model.operation_groups %} -from {{ operations_import }} import {{ operation_group.class_name }} +from .operations import {{ operation_group.class_name }} {% endfor %} {% if code_model.sorted_schemas %} from {{ path_to_models }} import models @@ -48,7 +46,7 @@ class {{ code_model.class_name }}({{ base_class }}): {% for operation_group in code_model.operation_groups|rejectattr("is_empty_operation_group") %} :ivar {{ operation_group.name }}: {{ operation_group.class_name }} operations {% if async_mode %} - :vartype {{ operation_group.name }}: {{ code_model.namespace }}.aio.operations_async.{{ operation_group.class_name }} + :vartype {{ operation_group.name }}: {{ code_model.namespace }}.aio.operations.{{ operation_group.class_name }} {% else %} :vartype {{ operation_group.name }}: {{ code_model.namespace }}.operations.{{ operation_group.class_name }} {% endif %} diff --git a/autorest/multiapi/serializers/multiapi_serializer.py b/autorest/multiapi/serializers/multiapi_serializer.py index 27c53ebfca2..1cf72fc027b 100644 --- a/autorest/multiapi/serializers/multiapi_serializer.py +++ b/autorest/multiapi/serializers/multiapi_serializer.py @@ -17,7 +17,7 @@ def __init__( self.conf = conf self.async_mode = async_mode self._autorestapi = autorestapi - self.service_client_filename = service_client_filename + "_async" if async_mode else service_client_filename + self.service_client_filename = service_client_filename self.env = Environment( loader=PackageLoader("autorest.multiapi", "templates"), keep_trailing_newline=True, @@ -41,13 +41,13 @@ def serialize(self): self.serialize_multiapi_client() ) - configuration_filename = "_configuration_async.py" if self.async_mode else "_configuration.py" + configuration_filename = "_configuration.py" self._autorestapi.write_file( self._get_file_path(configuration_filename), self.serialize_multiapi_config() ) - operation_mixins_filename = "_operations_mixin_async.py" if self.async_mode else "_operations_mixin.py" + operation_mixins_filename = "_operations_mixin.py" if self.conf["mixin_operations"]: self._autorestapi.write_file( self._get_file_path(operation_mixins_filename), diff --git a/autorest/multiapi/templates/multiapi_operations_mixin.py.jinja2 b/autorest/multiapi/templates/multiapi_operations_mixin.py.jinja2 index 5b0f992694a..eec8b6cd6d3 100644 --- a/autorest/multiapi/templates/multiapi_operations_mixin.py.jinja2 +++ b/autorest/multiapi/templates/multiapi_operations_mixin.py.jinja2 @@ -24,7 +24,7 @@ class {{ client_name }}OperationsMixin(object): {% for api in metadata['available_apis']|sort %} {% set if_statement = "if" if loop.first else "elif" %} {{ if_statement }} api_version == '{{ mod_to_api_version[api] }}': - from {{ ".." if async_mode else "." }}{{ api }}{{ ".aio" if async_mode else "" }}.operations{{ "_async" if async_mode else "" }} import {{ client_name }}OperationsMixin as OperationClass + from {{ ".." if async_mode else "." }}{{ api }}{{ ".aio" if async_mode else "" }}.operations import {{ client_name }}OperationsMixin as OperationClass {% endfor %} else: raise NotImplementedError("APIVersion {} is not available".format(api_version)) diff --git a/autorest/multiapi/templates/multiapi_service_client.py.jinja2 b/autorest/multiapi/templates/multiapi_service_client.py.jinja2 index f54fd412b35..ae5ab6c8148 100644 --- a/autorest/multiapi/templates/multiapi_service_client.py.jinja2 +++ b/autorest/multiapi/templates/multiapi_service_client.py.jinja2 @@ -20,8 +20,6 @@ def __init__( **kwargs # type: Any ){{" -> None" if async_mode else "" }}:{% endmacro %} {# actual template starts here #} -{% set config_import = "._configuration_async" if async_mode else "._configuration" %} -{% set operations_mixin_import = "._operations_mixin_async" if async_mode else "._operations_mixin" %} {% set pipeline_client = "ARMPipelineClient" if azure_arm else "PipelineClient" %} {% set relative_path = ".." if async_mode else "." %} {% set def = "async def" if async_mode else "def" %} @@ -44,8 +42,8 @@ from msrest import Serializer, Deserializer from azure.profiles import KnownProfiles, ProfileDefinition from azure.profiles.multiapiclient import MultiApiClientMixin -from {{ config_import }} import {{ client_name }}Configuration -{% if mixin_operations %}from {{ operations_mixin_import }} import {{ client_name }}OperationsMixin{% endif %} +from ._configuration import {{ client_name }}Configuration +{% if mixin_operations %}from ._operations_mixin import {{ client_name }}OperationsMixin{% endif %} class _SDKClient(object): def __init__(self, *args, **kwargs): @@ -142,14 +140,14 @@ class {{ client_name }}({% if mixin_operations %}{{ client_name }}OperationsMixi """Instance depends on the API version: {% for api in available_apis | sort %} - * {{ mod_to_api_version[api[0]] }}: :class:`{{ api[1] }}<{{ module_name }}.{{ api[0] }}{{ ".aio" if async_mode else "" }}.operations{{ "_async" if async_mode else "" }}.{{ api[1] }}>` + * {{ mod_to_api_version[api[0]] }}: :class:`{{ api[1] }}<{{ module_name }}.{{ api[0] }}{{ ".aio" if async_mode else "" }}.operations.{{ api[1] }}>` {% endfor %} """ api_version = self._get_api_version('{{ operation_group }}') {% for api in available_apis | sort %} {% set if_statement = "if" if loop.first else "elif" %} {{ if_statement }} api_version == '{{ mod_to_api_version[api[0]] }}': - from {{ relative_path }}{{ api[0] }}.{{ "aio." if async_mode else "" }}operations{{ "_async" if async_mode else "" }} import {{ api[1] }} as OperationClass + from {{ relative_path }}{{ api[0] }}.{{ "aio." if async_mode else "" }}operations import {{ api[1] }} as OperationClass {% endfor %} else: raise NotImplementedError("APIVersion {} is not available".format(api_version)) diff --git a/package.json b/package.json index 05504b6535f..d750cdbccb6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@autorest/python", - "version": "5.1.0-preview.7", + "version": "5.2.0-preview.1", "description": "The Python extension for generators in AutoRest.", "scripts": { "prepare": "node run-python3.js prepare.py", diff --git a/test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/aio/__init__.py b/test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/aio/__init__.py index 2834400134d..6d18bde12b7 100644 --- a/test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/aio/__init__.py +++ b/test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_duration_test_service_async import AutoRestDurationTestService +from ._auto_rest_duration_test_service import AutoRestDurationTestService __all__ = ['AutoRestDurationTestService'] diff --git a/test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/aio/_auto_rest_duration_test_service_async.py b/test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/aio/_auto_rest_duration_test_service.py similarity index 89% rename from test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/aio/_auto_rest_duration_test_service_async.py rename to test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/aio/_auto_rest_duration_test_service.py index df0a74c1e78..ec4a1a583f9 100644 --- a/test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/aio/_auto_rest_duration_test_service_async.py +++ b/test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/aio/_auto_rest_duration_test_service.py @@ -11,8 +11,8 @@ from azure.core import AsyncPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import AutoRestDurationTestServiceConfiguration -from .operations_async import DurationOperations +from ._configuration import AutoRestDurationTestServiceConfiguration +from .operations import DurationOperations from .. import models @@ -20,7 +20,7 @@ class AutoRestDurationTestService(object): """Test Infrastructure for AutoRest. :ivar duration: DurationOperations operations - :vartype duration: bodyduration.aio.operations_async.DurationOperations + :vartype duration: bodyduration.aio.operations.DurationOperations :param str base_url: Service URL """ diff --git a/test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/aio/_configuration.py similarity index 100% rename from test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/aio/_configuration_async.py rename to test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/aio/_configuration.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/aio/operations_async/__init__.py b/test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/aio/operations/__init__.py similarity index 89% rename from test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/aio/operations_async/__init__.py rename to test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/aio/operations/__init__.py index 881d8474599..6bb953af616 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/aio/operations_async/__init__.py +++ b/test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._duration_operations_async import DurationOperations +from ._duration_operations import DurationOperations __all__ = [ 'DurationOperations', diff --git a/test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/aio/operations_async/_duration_operations_async.py b/test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/aio/operations/_duration_operations.py similarity index 100% rename from test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/aio/operations_async/_duration_operations_async.py rename to test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/aio/operations/_duration_operations.py diff --git a/test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/__init__.py b/test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/__init__.py index e59b56d509c..2c14a8a3dbd 100644 --- a/test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/__init__.py +++ b/test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_parameter_grouping_test_service_async import AutoRestParameterGroupingTestService +from ._auto_rest_parameter_grouping_test_service import AutoRestParameterGroupingTestService __all__ = ['AutoRestParameterGroupingTestService'] diff --git a/test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/_auto_rest_parameter_grouping_test_service_async.py b/test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/_auto_rest_parameter_grouping_test_service.py similarity index 91% rename from test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/_auto_rest_parameter_grouping_test_service_async.py rename to test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/_auto_rest_parameter_grouping_test_service.py index ea42c6ed6bb..dff36a4fbd8 100644 --- a/test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/_auto_rest_parameter_grouping_test_service_async.py +++ b/test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/_auto_rest_parameter_grouping_test_service.py @@ -11,8 +11,8 @@ from azure.core import AsyncPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import AutoRestParameterGroupingTestServiceConfiguration -from .operations_async import ParameterGroupingOperations +from ._configuration import AutoRestParameterGroupingTestServiceConfiguration +from .operations import ParameterGroupingOperations from .. import models @@ -20,7 +20,7 @@ class AutoRestParameterGroupingTestService(object): """Test Infrastructure for AutoRest. :ivar parameter_grouping: ParameterGroupingOperations operations - :vartype parameter_grouping: azureparametergrouping.aio.operations_async.ParameterGroupingOperations + :vartype parameter_grouping: azureparametergrouping.aio.operations.ParameterGroupingOperations :param str base_url: Service URL """ diff --git a/test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/_configuration.py similarity index 100% rename from test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/_configuration_async.py rename to test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/_configuration.py diff --git a/test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/operations_async/__init__.py b/test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/operations/__init__.py similarity index 86% rename from test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/operations_async/__init__.py rename to test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/operations/__init__.py index 6ccb8d48d1b..4477c024861 100644 --- a/test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/operations_async/__init__.py +++ b/test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._parameter_grouping_operations_async import ParameterGroupingOperations +from ._parameter_grouping_operations import ParameterGroupingOperations __all__ = [ 'ParameterGroupingOperations', diff --git a/test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/operations_async/_parameter_grouping_operations_async.py b/test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/operations/_parameter_grouping_operations.py similarity index 100% rename from test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/operations_async/_parameter_grouping_operations_async.py rename to test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/operations/_parameter_grouping_operations.py diff --git a/test/azure/Expected/AcceptanceTests/AzureReport/azurereport/aio/__init__.py b/test/azure/Expected/AcceptanceTests/AzureReport/azurereport/aio/__init__.py index 3780c785ac3..ca5b91c8c24 100644 --- a/test/azure/Expected/AcceptanceTests/AzureReport/azurereport/aio/__init__.py +++ b/test/azure/Expected/AcceptanceTests/AzureReport/azurereport/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_report_service_for_azure_async import AutoRestReportServiceForAzure +from ._auto_rest_report_service_for_azure import AutoRestReportServiceForAzure __all__ = ['AutoRestReportServiceForAzure'] diff --git a/test/azure/Expected/AcceptanceTests/AzureReport/azurereport/aio/_auto_rest_report_service_for_azure_async.py b/test/azure/Expected/AcceptanceTests/AzureReport/azurereport/aio/_auto_rest_report_service_for_azure.py similarity index 91% rename from test/azure/Expected/AcceptanceTests/AzureReport/azurereport/aio/_auto_rest_report_service_for_azure_async.py rename to test/azure/Expected/AcceptanceTests/AzureReport/azurereport/aio/_auto_rest_report_service_for_azure.py index 41188fdd1ea..05440aa7909 100644 --- a/test/azure/Expected/AcceptanceTests/AzureReport/azurereport/aio/_auto_rest_report_service_for_azure_async.py +++ b/test/azure/Expected/AcceptanceTests/AzureReport/azurereport/aio/_auto_rest_report_service_for_azure.py @@ -11,8 +11,8 @@ from azure.core import AsyncPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import AutoRestReportServiceForAzureConfiguration -from .operations_async import AutoRestReportServiceForAzureOperationsMixin +from ._configuration import AutoRestReportServiceForAzureConfiguration +from .operations import AutoRestReportServiceForAzureOperationsMixin from .. import models diff --git a/test/azure/Expected/AcceptanceTests/AzureReport/azurereport/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/AzureReport/azurereport/aio/_configuration.py similarity index 100% rename from test/azure/Expected/AcceptanceTests/AzureReport/azurereport/aio/_configuration_async.py rename to test/azure/Expected/AcceptanceTests/AzureReport/azurereport/aio/_configuration.py diff --git a/test/azure/Expected/AcceptanceTests/AzureReport/azurereport/aio/operations_async/__init__.py b/test/azure/Expected/AcceptanceTests/AzureReport/azurereport/aio/operations/__init__.py similarity index 82% rename from test/azure/Expected/AcceptanceTests/AzureReport/azurereport/aio/operations_async/__init__.py rename to test/azure/Expected/AcceptanceTests/AzureReport/azurereport/aio/operations/__init__.py index faf7e27cb8d..548915fdd77 100644 --- a/test/azure/Expected/AcceptanceTests/AzureReport/azurereport/aio/operations_async/__init__.py +++ b/test/azure/Expected/AcceptanceTests/AzureReport/azurereport/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_report_service_for_azure_operations_async import AutoRestReportServiceForAzureOperationsMixin +from ._auto_rest_report_service_for_azure_operations import AutoRestReportServiceForAzureOperationsMixin __all__ = [ 'AutoRestReportServiceForAzureOperationsMixin', diff --git a/test/azure/Expected/AcceptanceTests/AzureReport/azurereport/aio/operations_async/_auto_rest_report_service_for_azure_operations_async.py b/test/azure/Expected/AcceptanceTests/AzureReport/azurereport/aio/operations/_auto_rest_report_service_for_azure_operations.py similarity index 100% rename from test/azure/Expected/AcceptanceTests/AzureReport/azurereport/aio/operations_async/_auto_rest_report_service_for_azure_operations_async.py rename to test/azure/Expected/AcceptanceTests/AzureReport/azurereport/aio/operations/_auto_rest_report_service_for_azure_operations.py diff --git a/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/__init__.py b/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/__init__.py index c479fe729d2..e6a9ec4072b 100644 --- a/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/__init__.py +++ b/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_azure_special_parameters_test_client_async import AutoRestAzureSpecialParametersTestClient +from ._auto_rest_azure_special_parameters_test_client import AutoRestAzureSpecialParametersTestClient __all__ = ['AutoRestAzureSpecialParametersTestClient'] diff --git a/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/_auto_rest_azure_special_parameters_test_client_async.py b/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/_auto_rest_azure_special_parameters_test_client.py similarity index 81% rename from test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/_auto_rest_azure_special_parameters_test_client_async.py rename to test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/_auto_rest_azure_special_parameters_test_client.py index 5ca4de9feec..7b1e7ac6b06 100644 --- a/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/_auto_rest_azure_special_parameters_test_client_async.py +++ b/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/_auto_rest_azure_special_parameters_test_client.py @@ -15,15 +15,15 @@ # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials_async import AsyncTokenCredential -from ._configuration_async import AutoRestAzureSpecialParametersTestClientConfiguration -from .operations_async import XMsClientRequestIdOperations -from .operations_async import SubscriptionInCredentialsOperations -from .operations_async import SubscriptionInMethodOperations -from .operations_async import ApiVersionDefaultOperations -from .operations_async import ApiVersionLocalOperations -from .operations_async import SkipUrlEncodingOperations -from .operations_async import OdataOperations -from .operations_async import HeaderOperations +from ._configuration import AutoRestAzureSpecialParametersTestClientConfiguration +from .operations import XMsClientRequestIdOperations +from .operations import SubscriptionInCredentialsOperations +from .operations import SubscriptionInMethodOperations +from .operations import ApiVersionDefaultOperations +from .operations import ApiVersionLocalOperations +from .operations import SkipUrlEncodingOperations +from .operations import OdataOperations +from .operations import HeaderOperations from .. import models @@ -31,21 +31,21 @@ class AutoRestAzureSpecialParametersTestClient(object): """Test Infrastructure for AutoRest. :ivar xms_client_request_id: XMsClientRequestIdOperations operations - :vartype xms_client_request_id: azurespecialproperties.aio.operations_async.XMsClientRequestIdOperations + :vartype xms_client_request_id: azurespecialproperties.aio.operations.XMsClientRequestIdOperations :ivar subscription_in_credentials: SubscriptionInCredentialsOperations operations - :vartype subscription_in_credentials: azurespecialproperties.aio.operations_async.SubscriptionInCredentialsOperations + :vartype subscription_in_credentials: azurespecialproperties.aio.operations.SubscriptionInCredentialsOperations :ivar subscription_in_method: SubscriptionInMethodOperations operations - :vartype subscription_in_method: azurespecialproperties.aio.operations_async.SubscriptionInMethodOperations + :vartype subscription_in_method: azurespecialproperties.aio.operations.SubscriptionInMethodOperations :ivar api_version_default: ApiVersionDefaultOperations operations - :vartype api_version_default: azurespecialproperties.aio.operations_async.ApiVersionDefaultOperations + :vartype api_version_default: azurespecialproperties.aio.operations.ApiVersionDefaultOperations :ivar api_version_local: ApiVersionLocalOperations operations - :vartype api_version_local: azurespecialproperties.aio.operations_async.ApiVersionLocalOperations + :vartype api_version_local: azurespecialproperties.aio.operations.ApiVersionLocalOperations :ivar skip_url_encoding: SkipUrlEncodingOperations operations - :vartype skip_url_encoding: azurespecialproperties.aio.operations_async.SkipUrlEncodingOperations + :vartype skip_url_encoding: azurespecialproperties.aio.operations.SkipUrlEncodingOperations :ivar odata: OdataOperations operations - :vartype odata: azurespecialproperties.aio.operations_async.OdataOperations + :vartype odata: azurespecialproperties.aio.operations.OdataOperations :ivar header: HeaderOperations operations - :vartype header: azurespecialproperties.aio.operations_async.HeaderOperations + :vartype header: azurespecialproperties.aio.operations.HeaderOperations :param credential: Credential needed for the client to connect to Azure. :type credential: ~azure.core.credentials_async.AsyncTokenCredential :param subscription_id: The subscription id, which appears in the path, always modeled in credentials. The value is always '1234-5678-9012-3456'. diff --git a/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/_configuration.py similarity index 100% rename from test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/_configuration_async.py rename to test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/_configuration.py diff --git a/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations_async/__init__.py b/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/__init__.py similarity index 55% rename from test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations_async/__init__.py rename to test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/__init__.py index 0f68b685277..e4bc5b5806e 100644 --- a/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations_async/__init__.py +++ b/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/__init__.py @@ -6,14 +6,14 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._xms_client_request_id_operations_async import XMsClientRequestIdOperations -from ._subscription_in_credentials_operations_async import SubscriptionInCredentialsOperations -from ._subscription_in_method_operations_async import SubscriptionInMethodOperations -from ._api_version_default_operations_async import ApiVersionDefaultOperations -from ._api_version_local_operations_async import ApiVersionLocalOperations -from ._skip_url_encoding_operations_async import SkipUrlEncodingOperations -from ._odata_operations_async import OdataOperations -from ._header_operations_async import HeaderOperations +from ._xms_client_request_id_operations import XMsClientRequestIdOperations +from ._subscription_in_credentials_operations import SubscriptionInCredentialsOperations +from ._subscription_in_method_operations import SubscriptionInMethodOperations +from ._api_version_default_operations import ApiVersionDefaultOperations +from ._api_version_local_operations import ApiVersionLocalOperations +from ._skip_url_encoding_operations import SkipUrlEncodingOperations +from ._odata_operations import OdataOperations +from ._header_operations import HeaderOperations __all__ = [ 'XMsClientRequestIdOperations', diff --git a/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations_async/_api_version_default_operations_async.py b/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_api_version_default_operations.py similarity index 100% rename from test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations_async/_api_version_default_operations_async.py rename to test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_api_version_default_operations.py diff --git a/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations_async/_api_version_local_operations_async.py b/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_api_version_local_operations.py similarity index 100% rename from test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations_async/_api_version_local_operations_async.py rename to test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_api_version_local_operations.py diff --git a/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations_async/_header_operations_async.py b/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_header_operations.py similarity index 100% rename from test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations_async/_header_operations_async.py rename to test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_header_operations.py diff --git a/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations_async/_odata_operations_async.py b/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_odata_operations.py similarity index 100% rename from test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations_async/_odata_operations_async.py rename to test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_odata_operations.py diff --git a/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations_async/_skip_url_encoding_operations_async.py b/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_skip_url_encoding_operations.py similarity index 100% rename from test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations_async/_skip_url_encoding_operations_async.py rename to test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_skip_url_encoding_operations.py diff --git a/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations_async/_subscription_in_credentials_operations_async.py b/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_subscription_in_credentials_operations.py similarity index 100% rename from test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations_async/_subscription_in_credentials_operations_async.py rename to test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_subscription_in_credentials_operations.py diff --git a/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations_async/_subscription_in_method_operations_async.py b/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_subscription_in_method_operations.py similarity index 100% rename from test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations_async/_subscription_in_method_operations_async.py rename to test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_subscription_in_method_operations.py diff --git a/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations_async/_xms_client_request_id_operations_async.py b/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_xms_client_request_id_operations.py similarity index 100% rename from test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations_async/_xms_client_request_id_operations_async.py rename to test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_xms_client_request_id_operations.py diff --git a/test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/__init__.py b/test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/__init__.py index 49f16ddc823..6f73fcb5690 100644 --- a/test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/__init__.py +++ b/test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_parameterized_host_test_client_async import AutoRestParameterizedHostTestClient +from ._auto_rest_parameterized_host_test_client import AutoRestParameterizedHostTestClient __all__ = ['AutoRestParameterizedHostTestClient'] diff --git a/test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/_auto_rest_parameterized_host_test_client_async.py b/test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/_auto_rest_parameterized_host_test_client.py similarity index 90% rename from test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/_auto_rest_parameterized_host_test_client_async.py rename to test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/_auto_rest_parameterized_host_test_client.py index c3287ee2a9f..ea32c13082e 100644 --- a/test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/_auto_rest_parameterized_host_test_client_async.py +++ b/test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/_auto_rest_parameterized_host_test_client.py @@ -11,8 +11,8 @@ from azure.core import AsyncPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import AutoRestParameterizedHostTestClientConfiguration -from .operations_async import PathsOperations +from ._configuration import AutoRestParameterizedHostTestClientConfiguration +from .operations import PathsOperations from .. import models @@ -20,7 +20,7 @@ class AutoRestParameterizedHostTestClient(object): """Test Infrastructure for AutoRest. :ivar paths: PathsOperations operations - :vartype paths: custombaseurl.aio.operations_async.PathsOperations + :vartype paths: custombaseurl.aio.operations.PathsOperations :param host: A string value that is used as a global part of the parameterized host. :type host: str """ diff --git a/test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/_configuration.py similarity index 100% rename from test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/_configuration_async.py rename to test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/_configuration.py diff --git a/test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/operations_async/__init__.py b/test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/operations/__init__.py similarity index 90% rename from test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/operations_async/__init__.py rename to test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/operations/__init__.py index fd09bf0ca10..2f0d3b169c3 100644 --- a/test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/operations_async/__init__.py +++ b/test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._paths_operations_async import PathsOperations +from ._paths_operations import PathsOperations __all__ = [ 'PathsOperations', diff --git a/test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/operations_async/_paths_operations_async.py b/test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/operations/_paths_operations.py similarity index 100% rename from test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/operations_async/_paths_operations_async.py rename to test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/operations/_paths_operations.py diff --git a/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/__init__.py b/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/__init__.py index a212258119a..a4e14423746 100644 --- a/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/__init__.py +++ b/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_parameterized_host_test_paging_client_async import AutoRestParameterizedHostTestPagingClient +from ._auto_rest_parameterized_host_test_paging_client import AutoRestParameterizedHostTestPagingClient __all__ = ['AutoRestParameterizedHostTestPagingClient'] diff --git a/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/_auto_rest_parameterized_host_test_paging_client_async.py b/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/_auto_rest_parameterized_host_test_paging_client.py similarity index 91% rename from test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/_auto_rest_parameterized_host_test_paging_client_async.py rename to test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/_auto_rest_parameterized_host_test_paging_client.py index 2fd9665576a..8c7af90c862 100644 --- a/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/_auto_rest_parameterized_host_test_paging_client_async.py +++ b/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/_auto_rest_parameterized_host_test_paging_client.py @@ -15,8 +15,8 @@ # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials_async import AsyncTokenCredential -from ._configuration_async import AutoRestParameterizedHostTestPagingClientConfiguration -from .operations_async import PagingOperations +from ._configuration import AutoRestParameterizedHostTestPagingClientConfiguration +from .operations import PagingOperations from .. import models @@ -24,7 +24,7 @@ class AutoRestParameterizedHostTestPagingClient(object): """Test Infrastructure for AutoRest. :ivar paging: PagingOperations operations - :vartype paging: custombaseurlpaging.aio.operations_async.PagingOperations + :vartype paging: custombaseurlpaging.aio.operations.PagingOperations :param credential: Credential needed for the client to connect to Azure. :type credential: ~azure.core.credentials_async.AsyncTokenCredential :param host: A string value that is used as a global part of the parameterized host. diff --git a/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/_configuration.py similarity index 100% rename from test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/_configuration_async.py rename to test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/_configuration.py diff --git a/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/operations_async/__init__.py b/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/operations/__init__.py similarity index 90% rename from test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/operations_async/__init__.py rename to test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/operations/__init__.py index b09c17e546d..9a5b2005928 100644 --- a/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/operations_async/__init__.py +++ b/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._paging_operations_async import PagingOperations +from ._paging_operations import PagingOperations __all__ = [ 'PagingOperations', diff --git a/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/operations_async/_paging_operations_async.py b/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/operations/_paging_operations.py similarity index 100% rename from test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/operations_async/_paging_operations_async.py rename to test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/operations/_paging_operations.py diff --git a/test/azure/Expected/AcceptanceTests/Head/head/aio/__init__.py b/test/azure/Expected/AcceptanceTests/Head/head/aio/__init__.py index 0738ddead5b..6e499e6a6b1 100644 --- a/test/azure/Expected/AcceptanceTests/Head/head/aio/__init__.py +++ b/test/azure/Expected/AcceptanceTests/Head/head/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_head_test_service_async import AutoRestHeadTestService +from ._auto_rest_head_test_service import AutoRestHeadTestService __all__ = ['AutoRestHeadTestService'] diff --git a/test/azure/Expected/AcceptanceTests/Head/head/aio/_auto_rest_head_test_service_async.py b/test/azure/Expected/AcceptanceTests/Head/head/aio/_auto_rest_head_test_service.py similarity index 91% rename from test/azure/Expected/AcceptanceTests/Head/head/aio/_auto_rest_head_test_service_async.py rename to test/azure/Expected/AcceptanceTests/Head/head/aio/_auto_rest_head_test_service.py index 525c9306bdb..0f47bad210e 100644 --- a/test/azure/Expected/AcceptanceTests/Head/head/aio/_auto_rest_head_test_service_async.py +++ b/test/azure/Expected/AcceptanceTests/Head/head/aio/_auto_rest_head_test_service.py @@ -17,15 +17,15 @@ from azure.core.credentials_async import AsyncTokenCredential -from ._configuration_async import AutoRestHeadTestServiceConfiguration -from .operations_async import HttpSuccessOperations +from ._configuration import AutoRestHeadTestServiceConfiguration +from .operations import HttpSuccessOperations class AutoRestHeadTestService(object): """Test Infrastructure for AutoRest. :ivar http_success: HttpSuccessOperations operations - :vartype http_success: head.aio.operations_async.HttpSuccessOperations + :vartype http_success: head.aio.operations.HttpSuccessOperations :param credential: Credential needed for the client to connect to Azure. :type credential: ~azure.core.credentials_async.AsyncTokenCredential :param str base_url: Service URL diff --git a/test/azure/Expected/AcceptanceTests/Head/head/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/Head/head/aio/_configuration.py similarity index 100% rename from test/azure/Expected/AcceptanceTests/Head/head/aio/_configuration_async.py rename to test/azure/Expected/AcceptanceTests/Head/head/aio/_configuration.py diff --git a/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/operations_async/__init__.py b/test/azure/Expected/AcceptanceTests/Head/head/aio/operations/__init__.py similarity index 88% rename from test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/operations_async/__init__.py rename to test/azure/Expected/AcceptanceTests/Head/head/aio/operations/__init__.py index d4a3ccc1963..ab55c6fdc9f 100644 --- a/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/operations_async/__init__.py +++ b/test/azure/Expected/AcceptanceTests/Head/head/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._http_success_operations_async import HttpSuccessOperations +from ._http_success_operations import HttpSuccessOperations __all__ = [ 'HttpSuccessOperations', diff --git a/test/azure/Expected/AcceptanceTests/Head/head/aio/operations_async/_http_success_operations_async.py b/test/azure/Expected/AcceptanceTests/Head/head/aio/operations/_http_success_operations.py similarity index 100% rename from test/azure/Expected/AcceptanceTests/Head/head/aio/operations_async/_http_success_operations_async.py rename to test/azure/Expected/AcceptanceTests/Head/head/aio/operations/_http_success_operations.py diff --git a/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/__init__.py b/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/__init__.py index c1d8b07a550..5afbe70b8cc 100644 --- a/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/__init__.py +++ b/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_head_exception_test_service_async import AutoRestHeadExceptionTestService +from ._auto_rest_head_exception_test_service import AutoRestHeadExceptionTestService __all__ = ['AutoRestHeadExceptionTestService'] diff --git a/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/_auto_rest_head_exception_test_service_async.py b/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/_auto_rest_head_exception_test_service.py similarity index 90% rename from test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/_auto_rest_head_exception_test_service_async.py rename to test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/_auto_rest_head_exception_test_service.py index de3832258b5..fa8166487f9 100644 --- a/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/_auto_rest_head_exception_test_service_async.py +++ b/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/_auto_rest_head_exception_test_service.py @@ -17,15 +17,15 @@ from azure.core.credentials_async import AsyncTokenCredential -from ._configuration_async import AutoRestHeadExceptionTestServiceConfiguration -from .operations_async import HeadExceptionOperations +from ._configuration import AutoRestHeadExceptionTestServiceConfiguration +from .operations import HeadExceptionOperations class AutoRestHeadExceptionTestService(object): """Test Infrastructure for AutoRest. :ivar head_exception: HeadExceptionOperations operations - :vartype head_exception: headexceptions.aio.operations_async.HeadExceptionOperations + :vartype head_exception: headexceptions.aio.operations.HeadExceptionOperations :param credential: Credential needed for the client to connect to Azure. :type credential: ~azure.core.credentials_async.AsyncTokenCredential :param str base_url: Service URL diff --git a/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/_configuration.py similarity index 100% rename from test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/_configuration_async.py rename to test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/_configuration.py diff --git a/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/operations_async/__init__.py b/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/operations/__init__.py similarity index 88% rename from test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/operations_async/__init__.py rename to test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/operations/__init__.py index 1da0ff90f4a..1935f5267e4 100644 --- a/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/operations_async/__init__.py +++ b/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._head_exception_operations_async import HeadExceptionOperations +from ._head_exception_operations import HeadExceptionOperations __all__ = [ 'HeadExceptionOperations', diff --git a/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/operations_async/_head_exception_operations_async.py b/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/operations/_head_exception_operations.py similarity index 100% rename from test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/operations_async/_head_exception_operations_async.py rename to test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/operations/_head_exception_operations.py diff --git a/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/__init__.py b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/__init__.py index 0738ddead5b..6e499e6a6b1 100644 --- a/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/__init__.py +++ b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_head_test_service_async import AutoRestHeadTestService +from ._auto_rest_head_test_service import AutoRestHeadTestService __all__ = ['AutoRestHeadTestService'] diff --git a/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/_auto_rest_head_test_service_async.py b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/_auto_rest_head_test_service.py similarity index 92% rename from test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/_auto_rest_head_test_service_async.py rename to test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/_auto_rest_head_test_service.py index d54124aea8a..b183194f153 100644 --- a/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/_auto_rest_head_test_service_async.py +++ b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/_auto_rest_head_test_service.py @@ -16,15 +16,15 @@ # pylint: disable=unused-import,ungrouped-imports from typing import Dict -from ._configuration_async import AutoRestHeadTestServiceConfiguration -from .operations_async import HttpSuccessOperations +from ._configuration import AutoRestHeadTestServiceConfiguration +from .operations import HttpSuccessOperations class AutoRestHeadTestService(object): """Test Infrastructure for AutoRest. :ivar http_success: HttpSuccessOperations operations - :vartype http_success: headwithazurekeycredentialpolicy.aio.operations_async.HttpSuccessOperations + :vartype http_success: headwithazurekeycredentialpolicy.aio.operations.HttpSuccessOperations :param credential: Credential needed for the client to connect to Azure. :type credential: ~azure.core.credentials.AzureKeyCredential :param str base_url: Service URL diff --git a/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/_configuration.py similarity index 100% rename from test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/_configuration_async.py rename to test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/_configuration.py diff --git a/test/azure/Expected/AcceptanceTests/Head/head/aio/operations_async/__init__.py b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/operations/__init__.py similarity index 88% rename from test/azure/Expected/AcceptanceTests/Head/head/aio/operations_async/__init__.py rename to test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/operations/__init__.py index d4a3ccc1963..ab55c6fdc9f 100644 --- a/test/azure/Expected/AcceptanceTests/Head/head/aio/operations_async/__init__.py +++ b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._http_success_operations_async import HttpSuccessOperations +from ._http_success_operations import HttpSuccessOperations __all__ = [ 'HttpSuccessOperations', diff --git a/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/operations_async/_http_success_operations_async.py b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/operations/_http_success_operations.py similarity index 100% rename from test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/operations_async/_http_success_operations_async.py rename to test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/operations/_http_success_operations.py diff --git a/test/azure/Expected/AcceptanceTests/Lro/lro/aio/__init__.py b/test/azure/Expected/AcceptanceTests/Lro/lro/aio/__init__.py index 006cd8f319e..30f2e48cb1c 100644 --- a/test/azure/Expected/AcceptanceTests/Lro/lro/aio/__init__.py +++ b/test/azure/Expected/AcceptanceTests/Lro/lro/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_long_running_operation_test_service_async import AutoRestLongRunningOperationTestService +from ._auto_rest_long_running_operation_test_service import AutoRestLongRunningOperationTestService __all__ = ['AutoRestLongRunningOperationTestService'] diff --git a/test/azure/Expected/AcceptanceTests/Lro/lro/aio/_auto_rest_long_running_operation_test_service_async.py b/test/azure/Expected/AcceptanceTests/Lro/lro/aio/_auto_rest_long_running_operation_test_service.py similarity index 83% rename from test/azure/Expected/AcceptanceTests/Lro/lro/aio/_auto_rest_long_running_operation_test_service_async.py rename to test/azure/Expected/AcceptanceTests/Lro/lro/aio/_auto_rest_long_running_operation_test_service.py index 0677f430d53..40821bc4a4f 100644 --- a/test/azure/Expected/AcceptanceTests/Lro/lro/aio/_auto_rest_long_running_operation_test_service_async.py +++ b/test/azure/Expected/AcceptanceTests/Lro/lro/aio/_auto_rest_long_running_operation_test_service.py @@ -15,11 +15,11 @@ # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials_async import AsyncTokenCredential -from ._configuration_async import AutoRestLongRunningOperationTestServiceConfiguration -from .operations_async import LROsOperations -from .operations_async import LRORetrysOperations -from .operations_async import LROSADsOperations -from .operations_async import LROsCustomHeaderOperations +from ._configuration import AutoRestLongRunningOperationTestServiceConfiguration +from .operations import LROsOperations +from .operations import LRORetrysOperations +from .operations import LROSADsOperations +from .operations import LROsCustomHeaderOperations from .. import models @@ -27,13 +27,13 @@ class AutoRestLongRunningOperationTestService(object): """Long-running Operation for AutoRest. :ivar lros: LROsOperations operations - :vartype lros: lro.aio.operations_async.LROsOperations + :vartype lros: lro.aio.operations.LROsOperations :ivar lro_retrys: LRORetrysOperations operations - :vartype lro_retrys: lro.aio.operations_async.LRORetrysOperations + :vartype lro_retrys: lro.aio.operations.LRORetrysOperations :ivar lrosads: LROSADsOperations operations - :vartype lrosads: lro.aio.operations_async.LROSADsOperations + :vartype lrosads: lro.aio.operations.LROSADsOperations :ivar lr_os_custom_header: LROsCustomHeaderOperations operations - :vartype lr_os_custom_header: lro.aio.operations_async.LROsCustomHeaderOperations + :vartype lr_os_custom_header: lro.aio.operations.LROsCustomHeaderOperations :param credential: Credential needed for the client to connect to Azure. :type credential: ~azure.core.credentials_async.AsyncTokenCredential :param str base_url: Service URL diff --git a/test/azure/Expected/AcceptanceTests/Lro/lro/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/Lro/lro/aio/_configuration.py similarity index 100% rename from test/azure/Expected/AcceptanceTests/Lro/lro/aio/_configuration_async.py rename to test/azure/Expected/AcceptanceTests/Lro/lro/aio/_configuration.py diff --git a/test/azure/Expected/AcceptanceTests/Lro/lro/aio/operations_async/__init__.py b/test/azure/Expected/AcceptanceTests/Lro/lro/aio/operations/__init__.py similarity index 70% rename from test/azure/Expected/AcceptanceTests/Lro/lro/aio/operations_async/__init__.py rename to test/azure/Expected/AcceptanceTests/Lro/lro/aio/operations/__init__.py index 7b084050df8..6e8646cae89 100644 --- a/test/azure/Expected/AcceptanceTests/Lro/lro/aio/operations_async/__init__.py +++ b/test/azure/Expected/AcceptanceTests/Lro/lro/aio/operations/__init__.py @@ -6,10 +6,10 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._lros_operations_async import LROsOperations -from ._lro_retrys_operations_async import LRORetrysOperations -from ._lrosads_operations_async import LROSADsOperations -from ._lr_os_custom_header_operations_async import LROsCustomHeaderOperations +from ._lros_operations import LROsOperations +from ._lro_retrys_operations import LRORetrysOperations +from ._lrosads_operations import LROSADsOperations +from ._lr_os_custom_header_operations import LROsCustomHeaderOperations __all__ = [ 'LROsOperations', diff --git a/test/azure/Expected/AcceptanceTests/Lro/lro/aio/operations_async/_lr_os_custom_header_operations_async.py b/test/azure/Expected/AcceptanceTests/Lro/lro/aio/operations/_lr_os_custom_header_operations.py similarity index 100% rename from test/azure/Expected/AcceptanceTests/Lro/lro/aio/operations_async/_lr_os_custom_header_operations_async.py rename to test/azure/Expected/AcceptanceTests/Lro/lro/aio/operations/_lr_os_custom_header_operations.py diff --git a/test/azure/Expected/AcceptanceTests/Lro/lro/aio/operations_async/_lro_retrys_operations_async.py b/test/azure/Expected/AcceptanceTests/Lro/lro/aio/operations/_lro_retrys_operations.py similarity index 100% rename from test/azure/Expected/AcceptanceTests/Lro/lro/aio/operations_async/_lro_retrys_operations_async.py rename to test/azure/Expected/AcceptanceTests/Lro/lro/aio/operations/_lro_retrys_operations.py diff --git a/test/azure/Expected/AcceptanceTests/Lro/lro/aio/operations_async/_lros_operations_async.py b/test/azure/Expected/AcceptanceTests/Lro/lro/aio/operations/_lros_operations.py similarity index 100% rename from test/azure/Expected/AcceptanceTests/Lro/lro/aio/operations_async/_lros_operations_async.py rename to test/azure/Expected/AcceptanceTests/Lro/lro/aio/operations/_lros_operations.py diff --git a/test/azure/Expected/AcceptanceTests/Lro/lro/aio/operations_async/_lrosads_operations_async.py b/test/azure/Expected/AcceptanceTests/Lro/lro/aio/operations/_lrosads_operations.py similarity index 100% rename from test/azure/Expected/AcceptanceTests/Lro/lro/aio/operations_async/_lrosads_operations_async.py rename to test/azure/Expected/AcceptanceTests/Lro/lro/aio/operations/_lrosads_operations.py diff --git a/test/azure/Expected/AcceptanceTests/Paging/paging/aio/__init__.py b/test/azure/Expected/AcceptanceTests/Paging/paging/aio/__init__.py index c86e0198c2c..df3a3b51061 100644 --- a/test/azure/Expected/AcceptanceTests/Paging/paging/aio/__init__.py +++ b/test/azure/Expected/AcceptanceTests/Paging/paging/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_paging_test_service_async import AutoRestPagingTestService +from ._auto_rest_paging_test_service import AutoRestPagingTestService __all__ = ['AutoRestPagingTestService'] diff --git a/test/azure/Expected/AcceptanceTests/Paging/paging/aio/_auto_rest_paging_test_service_async.py b/test/azure/Expected/AcceptanceTests/Paging/paging/aio/_auto_rest_paging_test_service.py similarity index 92% rename from test/azure/Expected/AcceptanceTests/Paging/paging/aio/_auto_rest_paging_test_service_async.py rename to test/azure/Expected/AcceptanceTests/Paging/paging/aio/_auto_rest_paging_test_service.py index 308c1a264c5..8c6c2ab39b2 100644 --- a/test/azure/Expected/AcceptanceTests/Paging/paging/aio/_auto_rest_paging_test_service_async.py +++ b/test/azure/Expected/AcceptanceTests/Paging/paging/aio/_auto_rest_paging_test_service.py @@ -15,8 +15,8 @@ # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials_async import AsyncTokenCredential -from ._configuration_async import AutoRestPagingTestServiceConfiguration -from .operations_async import PagingOperations +from ._configuration import AutoRestPagingTestServiceConfiguration +from .operations import PagingOperations from .. import models @@ -24,7 +24,7 @@ class AutoRestPagingTestService(object): """Long-running Operation for AutoRest. :ivar paging: PagingOperations operations - :vartype paging: paging.aio.operations_async.PagingOperations + :vartype paging: paging.aio.operations.PagingOperations :param credential: Credential needed for the client to connect to Azure. :type credential: ~azure.core.credentials_async.AsyncTokenCredential :param str base_url: Service URL diff --git a/test/azure/Expected/AcceptanceTests/Paging/paging/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/Paging/paging/aio/_configuration.py similarity index 100% rename from test/azure/Expected/AcceptanceTests/Paging/paging/aio/_configuration_async.py rename to test/azure/Expected/AcceptanceTests/Paging/paging/aio/_configuration.py diff --git a/test/azure/Expected/AcceptanceTests/Paging/paging/aio/operations_async/__init__.py b/test/azure/Expected/AcceptanceTests/Paging/paging/aio/operations/__init__.py similarity index 90% rename from test/azure/Expected/AcceptanceTests/Paging/paging/aio/operations_async/__init__.py rename to test/azure/Expected/AcceptanceTests/Paging/paging/aio/operations/__init__.py index b09c17e546d..9a5b2005928 100644 --- a/test/azure/Expected/AcceptanceTests/Paging/paging/aio/operations_async/__init__.py +++ b/test/azure/Expected/AcceptanceTests/Paging/paging/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._paging_operations_async import PagingOperations +from ._paging_operations import PagingOperations __all__ = [ 'PagingOperations', diff --git a/test/azure/Expected/AcceptanceTests/Paging/paging/aio/operations_async/_paging_operations_async.py b/test/azure/Expected/AcceptanceTests/Paging/paging/aio/operations/_paging_operations.py similarity index 100% rename from test/azure/Expected/AcceptanceTests/Paging/paging/aio/operations_async/_paging_operations_async.py rename to test/azure/Expected/AcceptanceTests/Paging/paging/aio/operations/_paging_operations.py diff --git a/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/__init__.py b/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/__init__.py index 4e7988b5c17..9cfe0ace1ba 100644 --- a/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/__init__.py +++ b/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._storage_management_client_async import StorageManagementClient +from ._storage_management_client import StorageManagementClient __all__ = ['StorageManagementClient'] diff --git a/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/_configuration.py similarity index 100% rename from test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/_configuration_async.py rename to test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/_configuration.py diff --git a/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/_storage_management_client_async.py b/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/_storage_management_client.py similarity index 89% rename from test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/_storage_management_client_async.py rename to test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/_storage_management_client.py index 8da671c1e3a..9a1d617e955 100644 --- a/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/_storage_management_client_async.py +++ b/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/_storage_management_client.py @@ -15,9 +15,9 @@ # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials_async import AsyncTokenCredential -from ._configuration_async import StorageManagementClientConfiguration -from .operations_async import StorageAccountsOperations -from .operations_async import UsageOperations +from ._configuration import StorageManagementClientConfiguration +from .operations import StorageAccountsOperations +from .operations import UsageOperations from .. import models @@ -25,9 +25,9 @@ class StorageManagementClient(object): """StorageManagementClient. :ivar storage_accounts: StorageAccountsOperations operations - :vartype storage_accounts: storage.aio.operations_async.StorageAccountsOperations + :vartype storage_accounts: storage.aio.operations.StorageAccountsOperations :ivar usage: UsageOperations operations - :vartype usage: storage.aio.operations_async.UsageOperations + :vartype usage: storage.aio.operations.UsageOperations :param credential: Credential needed for the client to connect to Azure. :type credential: ~azure.core.credentials_async.AsyncTokenCredential :param subscription_id: Gets subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. diff --git a/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/operations_async/__init__.py b/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/operations/__init__.py similarity index 80% rename from test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/operations_async/__init__.py rename to test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/operations/__init__.py index 09d03b33be1..291f880b141 100644 --- a/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/operations_async/__init__.py +++ b/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/operations/__init__.py @@ -6,8 +6,8 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._storage_accounts_operations_async import StorageAccountsOperations -from ._usage_operations_async import UsageOperations +from ._storage_accounts_operations import StorageAccountsOperations +from ._usage_operations import UsageOperations __all__ = [ 'StorageAccountsOperations', diff --git a/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/operations_async/_storage_accounts_operations_async.py b/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/operations/_storage_accounts_operations.py similarity index 100% rename from test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/operations_async/_storage_accounts_operations_async.py rename to test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/operations/_storage_accounts_operations.py diff --git a/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/operations_async/_usage_operations_async.py b/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/operations/_usage_operations.py similarity index 100% rename from test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/operations_async/_usage_operations_async.py rename to test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/operations/_usage_operations.py diff --git a/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/__init__.py b/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/__init__.py index ccf308e036e..563416485a7 100644 --- a/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/__init__.py +++ b/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._microsoft_azure_test_url_async import MicrosoftAzureTestUrl +from ._microsoft_azure_test_url import MicrosoftAzureTestUrl __all__ = ['MicrosoftAzureTestUrl'] diff --git a/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/_configuration.py similarity index 100% rename from test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/_configuration_async.py rename to test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/_configuration.py diff --git a/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/_microsoft_azure_test_url_async.py b/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/_microsoft_azure_test_url.py similarity index 91% rename from test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/_microsoft_azure_test_url_async.py rename to test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/_microsoft_azure_test_url.py index 68cd3303c69..3f8500c0c8c 100644 --- a/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/_microsoft_azure_test_url_async.py +++ b/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/_microsoft_azure_test_url.py @@ -15,8 +15,8 @@ # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials_async import AsyncTokenCredential -from ._configuration_async import MicrosoftAzureTestUrlConfiguration -from .operations_async import GroupOperations +from ._configuration import MicrosoftAzureTestUrlConfiguration +from .operations import GroupOperations from .. import models @@ -24,7 +24,7 @@ class MicrosoftAzureTestUrl(object): """Some cool documentation. :ivar group: GroupOperations operations - :vartype group: subscriptionidapiversion.aio.operations_async.GroupOperations + :vartype group: subscriptionidapiversion.aio.operations.GroupOperations :param credential: Credential needed for the client to connect to Azure. :type credential: ~azure.core.credentials_async.AsyncTokenCredential :param subscription_id: Subscription Id. diff --git a/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/operations_async/__init__.py b/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/operations/__init__.py similarity index 90% rename from test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/operations_async/__init__.py rename to test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/operations/__init__.py index 170cc1cfd48..59b9cb0110a 100644 --- a/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/operations_async/__init__.py +++ b/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._group_operations_async import GroupOperations +from ._group_operations import GroupOperations __all__ = [ 'GroupOperations', diff --git a/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/operations_async/_group_operations_async.py b/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/operations/_group_operations.py similarity index 100% rename from test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/operations_async/_group_operations_async.py rename to test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/operations/_group_operations.py diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/__init__.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/__init__.py index ec341e1dd7e..c5088f7a288 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/__init__.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._multiapi_service_client_async import MultiapiServiceClient +from ._multiapi_service_client import MultiapiServiceClient __all__ = ['MultiapiServiceClient'] diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_configuration.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_configuration_async.py rename to test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_configuration.py 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.py similarity index 86% rename from test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_multiapi_service_client_async.py rename to test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_multiapi_service_client.py index b74931b636e..76a480bccd5 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.py @@ -14,8 +14,8 @@ from azure.profiles import KnownProfiles, ProfileDefinition from azure.profiles.multiapiclient import MultiApiClientMixin -from ._configuration_async import MultiapiServiceClientConfiguration -from ._operations_mixin_async import MultiapiServiceClientOperationsMixin +from ._configuration import MultiapiServiceClientConfiguration +from ._operations_mixin import MultiapiServiceClientOperationsMixin class _SDKClient(object): def __init__(self, *args, **kwargs): """This is a fake class to support current implemetation of MultiApiClientMixin." @@ -100,17 +100,17 @@ def models(cls, api_version=DEFAULT_API_VERSION): def operation_group_one(self): """Instance depends on the API version: - * 1.0.0: :class:`OperationGroupOneOperations` - * 2.0.0: :class:`OperationGroupOneOperations` - * 3.0.0: :class:`OperationGroupOneOperations` + * 1.0.0: :class:`OperationGroupOneOperations` + * 2.0.0: :class:`OperationGroupOneOperations` + * 3.0.0: :class:`OperationGroupOneOperations` """ api_version = self._get_api_version('operation_group_one') if api_version == '1.0.0': - from ..v1.aio.operations_async import OperationGroupOneOperations as OperationClass + from ..v1.aio.operations import OperationGroupOneOperations as OperationClass elif api_version == '2.0.0': - from ..v2.aio.operations_async import OperationGroupOneOperations as OperationClass + from ..v2.aio.operations import OperationGroupOneOperations as OperationClass elif api_version == '3.0.0': - from ..v3.aio.operations_async import OperationGroupOneOperations as OperationClass + from ..v3.aio.operations import OperationGroupOneOperations as OperationClass else: raise NotImplementedError("APIVersion {} is not available".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) @@ -119,14 +119,14 @@ def operation_group_one(self): def operation_group_two(self): """Instance depends on the API version: - * 2.0.0: :class:`OperationGroupTwoOperations` - * 3.0.0: :class:`OperationGroupTwoOperations` + * 2.0.0: :class:`OperationGroupTwoOperations` + * 3.0.0: :class:`OperationGroupTwoOperations` """ api_version = self._get_api_version('operation_group_two') if api_version == '2.0.0': - from ..v2.aio.operations_async import OperationGroupTwoOperations as OperationClass + from ..v2.aio.operations import OperationGroupTwoOperations as OperationClass elif api_version == '3.0.0': - from ..v3.aio.operations_async import OperationGroupTwoOperations as OperationClass + from ..v3.aio.operations import OperationGroupTwoOperations as OperationClass else: raise NotImplementedError("APIVersion {} is not available".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_operations_mixin_async.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_operations_mixin.py similarity index 93% rename from test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_operations_mixin_async.py rename to test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_operations_mixin.py index 1dee0a92ab3..a17c89d64a1 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_operations_mixin_async.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_operations_mixin.py @@ -44,7 +44,7 @@ async def begin_test_lro( """ api_version = self._get_api_version('begin_test_lro') if api_version == '1.0.0': - from ..v1.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass + from ..v1.aio.operations import MultiapiServiceClientOperationsMixin as OperationClass else: raise NotImplementedError("APIVersion {} is not available".format(api_version)) mixin_instance = OperationClass() @@ -78,7 +78,7 @@ def begin_test_lro_and_paging( """ api_version = self._get_api_version('begin_test_lro_and_paging') if api_version == '1.0.0': - from ..v1.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass + from ..v1.aio.operations import MultiapiServiceClientOperationsMixin as OperationClass else: raise NotImplementedError("APIVersion {} is not available".format(api_version)) mixin_instance = OperationClass() @@ -107,9 +107,9 @@ async def test_one( """ api_version = self._get_api_version('test_one') if api_version == '1.0.0': - from ..v1.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass + from ..v1.aio.operations import MultiapiServiceClientOperationsMixin as OperationClass elif api_version == '2.0.0': - from ..v2.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass + from ..v2.aio.operations import MultiapiServiceClientOperationsMixin as OperationClass else: raise NotImplementedError("APIVersion {} is not available".format(api_version)) mixin_instance = OperationClass() @@ -132,7 +132,7 @@ def test_paging( """ api_version = self._get_api_version('test_paging') if api_version == '3.0.0': - from ..v3.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass + from ..v3.aio.operations import MultiapiServiceClientOperationsMixin as OperationClass else: raise NotImplementedError("APIVersion {} is not available".format(api_version)) mixin_instance = OperationClass() diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/__init__.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/__init__.py index ec341e1dd7e..c5088f7a288 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/__init__.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._multiapi_service_client_async import MultiapiServiceClient +from ._multiapi_service_client import MultiapiServiceClient __all__ = ['MultiapiServiceClient'] diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/_configuration.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/_configuration_async.py rename to test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/_configuration.py diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/_multiapi_service_client_async.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/_multiapi_service_client.py similarity index 88% rename from test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/_multiapi_service_client_async.py rename to test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/_multiapi_service_client.py index 7ad647fa6c6..ae9a9df1872 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/_multiapi_service_client_async.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/_multiapi_service_client.py @@ -15,9 +15,9 @@ # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials_async import AsyncTokenCredential -from ._configuration_async import MultiapiServiceClientConfiguration -from .operations_async import MultiapiServiceClientOperationsMixin -from .operations_async import OperationGroupOneOperations +from ._configuration import MultiapiServiceClientConfiguration +from .operations import MultiapiServiceClientOperationsMixin +from .operations import OperationGroupOneOperations from .. import models @@ -25,7 +25,7 @@ class MultiapiServiceClient(MultiapiServiceClientOperationsMixin): """Service client for multiapi client testing. :ivar operation_group_one: OperationGroupOneOperations operations - :vartype operation_group_one: multiapi.v1.aio.operations_async.OperationGroupOneOperations + :vartype operation_group_one: multiapi.v1.aio.operations.OperationGroupOneOperations :param credential: Credential needed for the client to connect to Azure. :type credential: ~azure.core.credentials_async.AsyncTokenCredential :param str base_url: Service URL diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/operations_async/__init__.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/operations/__init__.py similarity index 76% rename from test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/operations_async/__init__.py rename to test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/operations/__init__.py index ec2cdbef519..1d9facfa368 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/operations_async/__init__.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/operations/__init__.py @@ -6,8 +6,8 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._multiapi_service_client_operations_async import MultiapiServiceClientOperationsMixin -from ._operation_group_one_operations_async import OperationGroupOneOperations +from ._multiapi_service_client_operations import MultiapiServiceClientOperationsMixin +from ._operation_group_one_operations import OperationGroupOneOperations __all__ = [ 'MultiapiServiceClientOperationsMixin', diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/operations_async/_multiapi_service_client_operations_async.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/operations/_multiapi_service_client_operations.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/operations_async/_multiapi_service_client_operations_async.py rename to test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/operations/_multiapi_service_client_operations.py diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/operations_async/_operation_group_one_operations_async.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/operations/_operation_group_one_operations.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/operations_async/_operation_group_one_operations_async.py rename to test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/operations/_operation_group_one_operations.py diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/__init__.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/__init__.py index ec341e1dd7e..c5088f7a288 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/__init__.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._multiapi_service_client_async import MultiapiServiceClient +from ._multiapi_service_client import MultiapiServiceClient __all__ = ['MultiapiServiceClient'] diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/_configuration.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/_configuration_async.py rename to test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/_configuration.py diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/_multiapi_service_client_async.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/_multiapi_service_client.py similarity index 84% rename from test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/_multiapi_service_client_async.py rename to test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/_multiapi_service_client.py index af6549cdcad..583850a48a6 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/_multiapi_service_client_async.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/_multiapi_service_client.py @@ -15,10 +15,10 @@ # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials_async import AsyncTokenCredential -from ._configuration_async import MultiapiServiceClientConfiguration -from .operations_async import MultiapiServiceClientOperationsMixin -from .operations_async import OperationGroupOneOperations -from .operations_async import OperationGroupTwoOperations +from ._configuration import MultiapiServiceClientConfiguration +from .operations import MultiapiServiceClientOperationsMixin +from .operations import OperationGroupOneOperations +from .operations import OperationGroupTwoOperations from .. import models @@ -26,9 +26,9 @@ class MultiapiServiceClient(MultiapiServiceClientOperationsMixin): """Service client for multiapi client testing. :ivar operation_group_one: OperationGroupOneOperations operations - :vartype operation_group_one: multiapi.v3.aio.operations_async.OperationGroupOneOperations + :vartype operation_group_one: multiapi.v2.aio.operations.OperationGroupOneOperations :ivar operation_group_two: OperationGroupTwoOperations operations - :vartype operation_group_two: multiapi.v3.aio.operations_async.OperationGroupTwoOperations + :vartype operation_group_two: multiapi.v2.aio.operations.OperationGroupTwoOperations :param credential: Credential needed for the client to connect to Azure. :type credential: ~azure.core.credentials_async.AsyncTokenCredential :param str base_url: Service URL diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations_async/__init__.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/operations/__init__.py similarity index 70% rename from test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations_async/__init__.py rename to test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/operations/__init__.py index a627ee1aa5c..356f78798f2 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations_async/__init__.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/operations/__init__.py @@ -6,9 +6,9 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._multiapi_service_client_operations_async import MultiapiServiceClientOperationsMixin -from ._operation_group_one_operations_async import OperationGroupOneOperations -from ._operation_group_two_operations_async import OperationGroupTwoOperations +from ._multiapi_service_client_operations import MultiapiServiceClientOperationsMixin +from ._operation_group_one_operations import OperationGroupOneOperations +from ._operation_group_two_operations import OperationGroupTwoOperations __all__ = [ 'MultiapiServiceClientOperationsMixin', diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/operations_async/_multiapi_service_client_operations_async.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/operations/_multiapi_service_client_operations.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/operations_async/_multiapi_service_client_operations_async.py rename to test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/operations/_multiapi_service_client_operations.py diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/operations_async/_operation_group_one_operations_async.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/operations/_operation_group_one_operations.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/operations_async/_operation_group_one_operations_async.py rename to test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/operations/_operation_group_one_operations.py diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/operations_async/_operation_group_two_operations_async.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/operations/_operation_group_two_operations.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/operations_async/_operation_group_two_operations_async.py rename to test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/operations/_operation_group_two_operations.py diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/__init__.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/__init__.py index ec341e1dd7e..c5088f7a288 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/__init__.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._multiapi_service_client_async import MultiapiServiceClient +from ._multiapi_service_client import MultiapiServiceClient __all__ = ['MultiapiServiceClient'] diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/_configuration.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/_configuration_async.py rename to test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/_configuration.py diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/_multiapi_service_client_async.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/_multiapi_service_client.py similarity index 84% rename from test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/_multiapi_service_client_async.py rename to test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/_multiapi_service_client.py index e3157a5a547..c0c3883e952 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/_multiapi_service_client_async.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/_multiapi_service_client.py @@ -15,10 +15,10 @@ # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials_async import AsyncTokenCredential -from ._configuration_async import MultiapiServiceClientConfiguration -from .operations_async import MultiapiServiceClientOperationsMixin -from .operations_async import OperationGroupOneOperations -from .operations_async import OperationGroupTwoOperations +from ._configuration import MultiapiServiceClientConfiguration +from .operations import MultiapiServiceClientOperationsMixin +from .operations import OperationGroupOneOperations +from .operations import OperationGroupTwoOperations from .. import models @@ -26,9 +26,9 @@ class MultiapiServiceClient(MultiapiServiceClientOperationsMixin): """Service client for multiapi client testing. :ivar operation_group_one: OperationGroupOneOperations operations - :vartype operation_group_one: multiapi.v2.aio.operations_async.OperationGroupOneOperations + :vartype operation_group_one: multiapi.v3.aio.operations.OperationGroupOneOperations :ivar operation_group_two: OperationGroupTwoOperations operations - :vartype operation_group_two: multiapi.v2.aio.operations_async.OperationGroupTwoOperations + :vartype operation_group_two: multiapi.v3.aio.operations.OperationGroupTwoOperations :param credential: Credential needed for the client to connect to Azure. :type credential: ~azure.core.credentials_async.AsyncTokenCredential :param str base_url: Service URL diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/operations_async/__init__.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations/__init__.py similarity index 70% rename from test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/operations_async/__init__.py rename to test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations/__init__.py index a627ee1aa5c..356f78798f2 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/operations_async/__init__.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations/__init__.py @@ -6,9 +6,9 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._multiapi_service_client_operations_async import MultiapiServiceClientOperationsMixin -from ._operation_group_one_operations_async import OperationGroupOneOperations -from ._operation_group_two_operations_async import OperationGroupTwoOperations +from ._multiapi_service_client_operations import MultiapiServiceClientOperationsMixin +from ._operation_group_one_operations import OperationGroupOneOperations +from ._operation_group_two_operations import OperationGroupTwoOperations __all__ = [ 'MultiapiServiceClientOperationsMixin', diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations_async/_multiapi_service_client_operations_async.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations/_multiapi_service_client_operations.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations_async/_multiapi_service_client_operations_async.py rename to test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations/_multiapi_service_client_operations.py diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations_async/_operation_group_one_operations_async.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations/_operation_group_one_operations.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations_async/_operation_group_one_operations_async.py rename to test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations/_operation_group_one_operations.py diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations_async/_operation_group_two_operations_async.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations/_operation_group_two_operations.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations_async/_operation_group_two_operations_async.py rename to test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations/_operation_group_two_operations.py diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/__init__.py index ec341e1dd7e..c5088f7a288 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/__init__.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._multiapi_service_client_async import MultiapiServiceClient +from ._multiapi_service_client import MultiapiServiceClient __all__ = ['MultiapiServiceClient'] diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_configuration.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_configuration_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_configuration.py 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.py similarity index 84% rename from test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_multiapi_service_client_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_multiapi_service_client.py index fa63e8b4c12..446bd341ca1 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.py @@ -14,8 +14,8 @@ from azure.profiles import KnownProfiles, ProfileDefinition from azure.profiles.multiapiclient import MultiApiClientMixin -from ._configuration_async import MultiapiServiceClientConfiguration -from ._operations_mixin_async import MultiapiServiceClientOperationsMixin +from ._configuration import MultiapiServiceClientConfiguration +from ._operations_mixin import MultiapiServiceClientOperationsMixin class _SDKClient(object): def __init__(self, *args, **kwargs): """This is a fake class to support current implemetation of MultiApiClientMixin." @@ -100,17 +100,17 @@ def models(cls, api_version=DEFAULT_API_VERSION): def operation_group_one(self): """Instance depends on the API version: - * 1.0.0: :class:`OperationGroupOneOperations` - * 2.0.0: :class:`OperationGroupOneOperations` - * 3.0.0: :class:`OperationGroupOneOperations` + * 1.0.0: :class:`OperationGroupOneOperations` + * 2.0.0: :class:`OperationGroupOneOperations` + * 3.0.0: :class:`OperationGroupOneOperations` """ api_version = self._get_api_version('operation_group_one') if api_version == '1.0.0': - from ..v1.aio.operations_async import OperationGroupOneOperations as OperationClass + from ..v1.aio.operations import OperationGroupOneOperations as OperationClass elif api_version == '2.0.0': - from ..v2.aio.operations_async import OperationGroupOneOperations as OperationClass + from ..v2.aio.operations import OperationGroupOneOperations as OperationClass elif api_version == '3.0.0': - from ..v3.aio.operations_async import OperationGroupOneOperations as OperationClass + from ..v3.aio.operations import OperationGroupOneOperations as OperationClass else: raise NotImplementedError("APIVersion {} is not available".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) @@ -119,14 +119,14 @@ def operation_group_one(self): def operation_group_two(self): """Instance depends on the API version: - * 2.0.0: :class:`OperationGroupTwoOperations` - * 3.0.0: :class:`OperationGroupTwoOperations` + * 2.0.0: :class:`OperationGroupTwoOperations` + * 3.0.0: :class:`OperationGroupTwoOperations` """ api_version = self._get_api_version('operation_group_two') if api_version == '2.0.0': - from ..v2.aio.operations_async import OperationGroupTwoOperations as OperationClass + from ..v2.aio.operations import OperationGroupTwoOperations as OperationClass elif api_version == '3.0.0': - from ..v3.aio.operations_async import OperationGroupTwoOperations as OperationClass + from ..v3.aio.operations import OperationGroupTwoOperations as OperationClass else: raise NotImplementedError("APIVersion {} is not available".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_operations_mixin_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_operations_mixin.py similarity index 93% rename from test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_operations_mixin_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_operations_mixin.py index b6e20906336..c76da0c751b 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_operations_mixin_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_operations_mixin.py @@ -44,7 +44,7 @@ async def begin_test_lro( """ api_version = self._get_api_version('begin_test_lro') if api_version == '1.0.0': - from ..v1.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass + from ..v1.aio.operations import MultiapiServiceClientOperationsMixin as OperationClass else: raise NotImplementedError("APIVersion {} is not available".format(api_version)) mixin_instance = OperationClass() @@ -78,7 +78,7 @@ def begin_test_lro_and_paging( """ api_version = self._get_api_version('begin_test_lro_and_paging') if api_version == '1.0.0': - from ..v1.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass + from ..v1.aio.operations import MultiapiServiceClientOperationsMixin as OperationClass else: raise NotImplementedError("APIVersion {} is not available".format(api_version)) mixin_instance = OperationClass() @@ -107,9 +107,9 @@ async def test_one( """ api_version = self._get_api_version('test_one') if api_version == '1.0.0': - from ..v1.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass + from ..v1.aio.operations import MultiapiServiceClientOperationsMixin as OperationClass elif api_version == '2.0.0': - from ..v2.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass + from ..v2.aio.operations import MultiapiServiceClientOperationsMixin as OperationClass else: raise NotImplementedError("APIVersion {} is not available".format(api_version)) mixin_instance = OperationClass() @@ -132,7 +132,7 @@ def test_paging( """ api_version = self._get_api_version('test_paging') if api_version == '3.0.0': - from ..v3.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass + from ..v3.aio.operations import MultiapiServiceClientOperationsMixin as OperationClass else: raise NotImplementedError("APIVersion {} is not available".format(api_version)) mixin_instance = OperationClass() diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/__init__.py index ec341e1dd7e..c5088f7a288 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/__init__.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._multiapi_service_client_async import MultiapiServiceClient +from ._multiapi_service_client import MultiapiServiceClient __all__ = ['MultiapiServiceClient'] diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/_configuration.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/_configuration_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/_configuration.py diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/_multiapi_service_client_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/_multiapi_service_client.py similarity index 90% rename from test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/_multiapi_service_client_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/_multiapi_service_client.py index 8a7b0199712..20113b75758 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/_multiapi_service_client_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/_multiapi_service_client.py @@ -12,9 +12,9 @@ from azure.mgmt.core import AsyncARMPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import MultiapiServiceClientConfiguration -from .operations_async import MultiapiServiceClientOperationsMixin -from .operations_async import OperationGroupOneOperations +from ._configuration import MultiapiServiceClientConfiguration +from .operations import MultiapiServiceClientOperationsMixin +from .operations import OperationGroupOneOperations from .. import models @@ -22,7 +22,7 @@ class MultiapiServiceClient(MultiapiServiceClientOperationsMixin): """Service client for multiapi client testing. :ivar operation_group_one: OperationGroupOneOperations operations - :vartype operation_group_one: multiapicredentialdefaultpolicy.v1.aio.operations_async.OperationGroupOneOperations + :vartype operation_group_one: multiapicredentialdefaultpolicy.v1.aio.operations.OperationGroupOneOperations :param credential: Credential needed for the client to connect to Azure. :type credential: ~azure.core.credentials.AzureKeyCredential :param str base_url: Service URL diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/operations_async/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/operations/__init__.py similarity index 76% rename from test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/operations_async/__init__.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/operations/__init__.py index ec2cdbef519..1d9facfa368 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/operations_async/__init__.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/operations/__init__.py @@ -6,8 +6,8 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._multiapi_service_client_operations_async import MultiapiServiceClientOperationsMixin -from ._operation_group_one_operations_async import OperationGroupOneOperations +from ._multiapi_service_client_operations import MultiapiServiceClientOperationsMixin +from ._operation_group_one_operations import OperationGroupOneOperations __all__ = [ 'MultiapiServiceClientOperationsMixin', diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/operations_async/_multiapi_service_client_operations_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/operations/_multiapi_service_client_operations.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/operations_async/_multiapi_service_client_operations_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/operations/_multiapi_service_client_operations.py diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/operations_async/_operation_group_one_operations_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/operations/_operation_group_one_operations.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/operations_async/_operation_group_one_operations_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/operations/_operation_group_one_operations.py diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/__init__.py index ec341e1dd7e..c5088f7a288 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/__init__.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._multiapi_service_client_async import MultiapiServiceClient +from ._multiapi_service_client import MultiapiServiceClient __all__ = ['MultiapiServiceClient'] diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/_configuration.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/_configuration_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/_configuration.py diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/_multiapi_service_client_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/_multiapi_service_client.py similarity index 87% rename from test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/_multiapi_service_client_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/_multiapi_service_client.py index 9446496a6ef..64c401a0034 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/_multiapi_service_client_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/_multiapi_service_client.py @@ -12,10 +12,10 @@ from azure.mgmt.core import AsyncARMPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import MultiapiServiceClientConfiguration -from .operations_async import MultiapiServiceClientOperationsMixin -from .operations_async import OperationGroupOneOperations -from .operations_async import OperationGroupTwoOperations +from ._configuration import MultiapiServiceClientConfiguration +from .operations import MultiapiServiceClientOperationsMixin +from .operations import OperationGroupOneOperations +from .operations import OperationGroupTwoOperations from .. import models @@ -23,9 +23,9 @@ class MultiapiServiceClient(MultiapiServiceClientOperationsMixin): """Service client for multiapi client testing. :ivar operation_group_one: OperationGroupOneOperations operations - :vartype operation_group_one: multiapicredentialdefaultpolicy.v2.aio.operations_async.OperationGroupOneOperations + :vartype operation_group_one: multiapicredentialdefaultpolicy.v2.aio.operations.OperationGroupOneOperations :ivar operation_group_two: OperationGroupTwoOperations operations - :vartype operation_group_two: multiapicredentialdefaultpolicy.v2.aio.operations_async.OperationGroupTwoOperations + :vartype operation_group_two: multiapicredentialdefaultpolicy.v2.aio.operations.OperationGroupTwoOperations :param credential: Credential needed for the client to connect to Azure. :type credential: ~azure.core.credentials.AzureKeyCredential :param str base_url: Service URL diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations_async/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations/__init__.py similarity index 70% rename from test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations_async/__init__.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations/__init__.py index a627ee1aa5c..356f78798f2 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations_async/__init__.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations/__init__.py @@ -6,9 +6,9 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._multiapi_service_client_operations_async import MultiapiServiceClientOperationsMixin -from ._operation_group_one_operations_async import OperationGroupOneOperations -from ._operation_group_two_operations_async import OperationGroupTwoOperations +from ._multiapi_service_client_operations import MultiapiServiceClientOperationsMixin +from ._operation_group_one_operations import OperationGroupOneOperations +from ._operation_group_two_operations import OperationGroupTwoOperations __all__ = [ 'MultiapiServiceClientOperationsMixin', diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations_async/_multiapi_service_client_operations_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations/_multiapi_service_client_operations.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations_async/_multiapi_service_client_operations_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations/_multiapi_service_client_operations.py diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations_async/_operation_group_one_operations_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations/_operation_group_one_operations.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations_async/_operation_group_one_operations_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations/_operation_group_one_operations.py diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations_async/_operation_group_two_operations_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations/_operation_group_two_operations.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations_async/_operation_group_two_operations_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations/_operation_group_two_operations.py diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/__init__.py index ec341e1dd7e..c5088f7a288 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/__init__.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._multiapi_service_client_async import MultiapiServiceClient +from ._multiapi_service_client import MultiapiServiceClient __all__ = ['MultiapiServiceClient'] diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/_configuration.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/_configuration_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/_configuration.py diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/_multiapi_service_client_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/_multiapi_service_client.py similarity index 87% rename from test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/_multiapi_service_client_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/_multiapi_service_client.py index a448b0b30c4..4bfbf3111e7 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/_multiapi_service_client_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/_multiapi_service_client.py @@ -12,10 +12,10 @@ from azure.mgmt.core import AsyncARMPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import MultiapiServiceClientConfiguration -from .operations_async import MultiapiServiceClientOperationsMixin -from .operations_async import OperationGroupOneOperations -from .operations_async import OperationGroupTwoOperations +from ._configuration import MultiapiServiceClientConfiguration +from .operations import MultiapiServiceClientOperationsMixin +from .operations import OperationGroupOneOperations +from .operations import OperationGroupTwoOperations from .. import models @@ -23,9 +23,9 @@ class MultiapiServiceClient(MultiapiServiceClientOperationsMixin): """Service client for multiapi client testing. :ivar operation_group_one: OperationGroupOneOperations operations - :vartype operation_group_one: multiapicredentialdefaultpolicy.v3.aio.operations_async.OperationGroupOneOperations + :vartype operation_group_one: multiapicredentialdefaultpolicy.v3.aio.operations.OperationGroupOneOperations :ivar operation_group_two: OperationGroupTwoOperations operations - :vartype operation_group_two: multiapicredentialdefaultpolicy.v3.aio.operations_async.OperationGroupTwoOperations + :vartype operation_group_two: multiapicredentialdefaultpolicy.v3.aio.operations.OperationGroupTwoOperations :param credential: Credential needed for the client to connect to Azure. :type credential: ~azure.core.credentials.AzureKeyCredential :param str base_url: Service URL diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations_async/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations/__init__.py similarity index 70% rename from test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations_async/__init__.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations/__init__.py index a627ee1aa5c..356f78798f2 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations_async/__init__.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations/__init__.py @@ -6,9 +6,9 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._multiapi_service_client_operations_async import MultiapiServiceClientOperationsMixin -from ._operation_group_one_operations_async import OperationGroupOneOperations -from ._operation_group_two_operations_async import OperationGroupTwoOperations +from ._multiapi_service_client_operations import MultiapiServiceClientOperationsMixin +from ._operation_group_one_operations import OperationGroupOneOperations +from ._operation_group_two_operations import OperationGroupTwoOperations __all__ = [ 'MultiapiServiceClientOperationsMixin', diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations_async/_multiapi_service_client_operations_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations/_multiapi_service_client_operations.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations_async/_multiapi_service_client_operations_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations/_multiapi_service_client_operations.py diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations_async/_operation_group_one_operations_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations/_operation_group_one_operations.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations_async/_operation_group_one_operations_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations/_operation_group_one_operations.py diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations_async/_operation_group_two_operations_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations/_operation_group_two_operations.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations_async/_operation_group_two_operations_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations/_operation_group_two_operations.py diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/aio/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/aio/__init__.py index f92dbe9db9a..25fe821f2ff 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/aio/__init__.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._multiapi_custom_base_url_service_client_async import MultiapiCustomBaseUrlServiceClient +from ._multiapi_custom_base_url_service_client import MultiapiCustomBaseUrlServiceClient __all__ = ['MultiapiCustomBaseUrlServiceClient'] diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/aio/_configuration.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/aio/_configuration_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/aio/_configuration.py 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.py similarity index 96% rename from test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/aio/_multiapi_custom_base_url_service_client_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/aio/_multiapi_custom_base_url_service_client.py index 80eca67efef..5c0776ccfdd 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.py @@ -14,8 +14,8 @@ from azure.profiles import KnownProfiles, ProfileDefinition from azure.profiles.multiapiclient import MultiApiClientMixin -from ._configuration_async import MultiapiCustomBaseUrlServiceClientConfiguration -from ._operations_mixin_async import MultiapiCustomBaseUrlServiceClientOperationsMixin +from ._configuration import MultiapiCustomBaseUrlServiceClientConfiguration +from ._operations_mixin import MultiapiCustomBaseUrlServiceClientOperationsMixin class _SDKClient(object): def __init__(self, *args, **kwargs): """This is a fake class to support current implemetation of MultiApiClientMixin." diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/aio/_operations_mixin_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/aio/_operations_mixin.py similarity index 89% rename from test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/aio/_operations_mixin_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/aio/_operations_mixin.py index e1209a3f0cc..67e368c053c 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/aio/_operations_mixin_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/aio/_operations_mixin.py @@ -36,9 +36,9 @@ async def test( """ api_version = self._get_api_version('test') if api_version == '1.0.0': - from ..v1.aio.operations_async import MultiapiCustomBaseUrlServiceClientOperationsMixin as OperationClass + from ..v1.aio.operations import MultiapiCustomBaseUrlServiceClientOperationsMixin as OperationClass elif api_version == '2.0.0': - from ..v2.aio.operations_async import MultiapiCustomBaseUrlServiceClientOperationsMixin as OperationClass + from ..v2.aio.operations import MultiapiCustomBaseUrlServiceClientOperationsMixin as OperationClass else: raise NotImplementedError("APIVersion {} is not available".format(api_version)) mixin_instance = OperationClass() diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/aio/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/aio/__init__.py index f92dbe9db9a..25fe821f2ff 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/aio/__init__.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._multiapi_custom_base_url_service_client_async import MultiapiCustomBaseUrlServiceClient +from ._multiapi_custom_base_url_service_client import MultiapiCustomBaseUrlServiceClient __all__ = ['MultiapiCustomBaseUrlServiceClient'] diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/aio/_configuration.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/aio/_configuration_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/aio/_configuration.py diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/aio/_multiapi_custom_base_url_service_client_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/aio/_multiapi_custom_base_url_service_client.py similarity index 92% rename from test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/aio/_multiapi_custom_base_url_service_client_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/aio/_multiapi_custom_base_url_service_client.py index b978a9af00c..79a6840ec87 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/aio/_multiapi_custom_base_url_service_client_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/aio/_multiapi_custom_base_url_service_client.py @@ -15,8 +15,8 @@ # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials_async import AsyncTokenCredential -from ._configuration_async import MultiapiCustomBaseUrlServiceClientConfiguration -from .operations_async import MultiapiCustomBaseUrlServiceClientOperationsMixin +from ._configuration import MultiapiCustomBaseUrlServiceClientConfiguration +from .operations import MultiapiCustomBaseUrlServiceClientOperationsMixin from .. import models diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/aio/operations_async/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/aio/operations/__init__.py similarity index 81% rename from test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/aio/operations_async/__init__.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/aio/operations/__init__.py index 7a556025aa0..5e6c6df7afb 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/aio/operations_async/__init__.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._multiapi_custom_base_url_service_client_operations_async import MultiapiCustomBaseUrlServiceClientOperationsMixin +from ._multiapi_custom_base_url_service_client_operations import MultiapiCustomBaseUrlServiceClientOperationsMixin __all__ = [ 'MultiapiCustomBaseUrlServiceClientOperationsMixin', diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/aio/operations_async/_multiapi_custom_base_url_service_client_operations_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/aio/operations/_multiapi_custom_base_url_service_client_operations.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/aio/operations_async/_multiapi_custom_base_url_service_client_operations_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/aio/operations/_multiapi_custom_base_url_service_client_operations.py diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/aio/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/aio/__init__.py index f92dbe9db9a..25fe821f2ff 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/aio/__init__.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._multiapi_custom_base_url_service_client_async import MultiapiCustomBaseUrlServiceClient +from ._multiapi_custom_base_url_service_client import MultiapiCustomBaseUrlServiceClient __all__ = ['MultiapiCustomBaseUrlServiceClient'] diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/aio/_configuration.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/aio/_configuration_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/aio/_configuration.py diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/aio/_multiapi_custom_base_url_service_client_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/aio/_multiapi_custom_base_url_service_client.py similarity index 92% rename from test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/aio/_multiapi_custom_base_url_service_client_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/aio/_multiapi_custom_base_url_service_client.py index 9ecb9e3cc60..62518de5789 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/aio/_multiapi_custom_base_url_service_client_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/aio/_multiapi_custom_base_url_service_client.py @@ -15,8 +15,8 @@ # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials_async import AsyncTokenCredential -from ._configuration_async import MultiapiCustomBaseUrlServiceClientConfiguration -from .operations_async import MultiapiCustomBaseUrlServiceClientOperationsMixin +from ._configuration import MultiapiCustomBaseUrlServiceClientConfiguration +from .operations import MultiapiCustomBaseUrlServiceClientOperationsMixin from .. import models diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/aio/operations_async/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/aio/operations/__init__.py similarity index 81% rename from test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/aio/operations_async/__init__.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/aio/operations/__init__.py index 7a556025aa0..5e6c6df7afb 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/aio/operations_async/__init__.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._multiapi_custom_base_url_service_client_operations_async import MultiapiCustomBaseUrlServiceClientOperationsMixin +from ._multiapi_custom_base_url_service_client_operations import MultiapiCustomBaseUrlServiceClientOperationsMixin __all__ = [ 'MultiapiCustomBaseUrlServiceClientOperationsMixin', diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/aio/operations_async/_multiapi_custom_base_url_service_client_operations_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/aio/operations/_multiapi_custom_base_url_service_client_operations.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/aio/operations_async/_multiapi_custom_base_url_service_client_operations_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/aio/operations/_multiapi_custom_base_url_service_client_operations.py diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/aio/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/aio/__init__.py index ec341e1dd7e..c5088f7a288 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/aio/__init__.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._multiapi_service_client_async import MultiapiServiceClient +from ._multiapi_service_client import MultiapiServiceClient __all__ = ['MultiapiServiceClient'] diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/aio/_configuration.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/aio/_configuration_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/aio/_configuration.py 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.py similarity index 85% rename from test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/aio/_multiapi_service_client_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/aio/_multiapi_service_client.py index 379834d154f..f0d44463ad7 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.py @@ -14,8 +14,8 @@ from azure.profiles import KnownProfiles, ProfileDefinition from azure.profiles.multiapiclient import MultiApiClientMixin -from ._configuration_async import MultiapiServiceClientConfiguration -from ._operations_mixin_async import MultiapiServiceClientOperationsMixin +from ._configuration import MultiapiServiceClientConfiguration +from ._operations_mixin import MultiapiServiceClientOperationsMixin class _SDKClient(object): def __init__(self, *args, **kwargs): """This is a fake class to support current implemetation of MultiApiClientMixin." @@ -100,17 +100,17 @@ def models(cls, api_version=DEFAULT_API_VERSION): def operation_group_one(self): """Instance depends on the API version: - * 1.0.0: :class:`OperationGroupOneOperations` - * 2.0.0: :class:`OperationGroupOneOperations` - * 3.0.0: :class:`OperationGroupOneOperations` + * 1.0.0: :class:`OperationGroupOneOperations` + * 2.0.0: :class:`OperationGroupOneOperations` + * 3.0.0: :class:`OperationGroupOneOperations` """ api_version = self._get_api_version('operation_group_one') if api_version == '1.0.0': - from ..v1.aio.operations_async import OperationGroupOneOperations as OperationClass + from ..v1.aio.operations import OperationGroupOneOperations as OperationClass elif api_version == '2.0.0': - from ..v2.aio.operations_async import OperationGroupOneOperations as OperationClass + from ..v2.aio.operations import OperationGroupOneOperations as OperationClass elif api_version == '3.0.0': - from ..v3.aio.operations_async import OperationGroupOneOperations as OperationClass + from ..v3.aio.operations import OperationGroupOneOperations as OperationClass else: raise NotImplementedError("APIVersion {} is not available".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) @@ -119,14 +119,14 @@ def operation_group_one(self): def operation_group_two(self): """Instance depends on the API version: - * 2.0.0: :class:`OperationGroupTwoOperations` - * 3.0.0: :class:`OperationGroupTwoOperations` + * 2.0.0: :class:`OperationGroupTwoOperations` + * 3.0.0: :class:`OperationGroupTwoOperations` """ api_version = self._get_api_version('operation_group_two') if api_version == '2.0.0': - from ..v2.aio.operations_async import OperationGroupTwoOperations as OperationClass + from ..v2.aio.operations import OperationGroupTwoOperations as OperationClass elif api_version == '3.0.0': - from ..v3.aio.operations_async import OperationGroupTwoOperations as OperationClass + from ..v3.aio.operations import OperationGroupTwoOperations as OperationClass else: raise NotImplementedError("APIVersion {} is not available".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/aio/_operations_mixin_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/aio/_operations_mixin.py similarity index 93% rename from test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/aio/_operations_mixin_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/aio/_operations_mixin.py index ff24d601ec1..08feca82ba5 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/aio/_operations_mixin_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/aio/_operations_mixin.py @@ -43,7 +43,7 @@ async def begin_test_lro( """ api_version = self._get_api_version('begin_test_lro') if api_version == '1.0.0': - from ..v1.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass + from ..v1.aio.operations import MultiapiServiceClientOperationsMixin as OperationClass else: raise NotImplementedError("APIVersion {} is not available".format(api_version)) mixin_instance = OperationClass() @@ -77,7 +77,7 @@ def begin_test_lro_and_paging( """ api_version = self._get_api_version('begin_test_lro_and_paging') if api_version == '1.0.0': - from ..v1.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass + from ..v1.aio.operations import MultiapiServiceClientOperationsMixin as OperationClass else: raise NotImplementedError("APIVersion {} is not available".format(api_version)) mixin_instance = OperationClass() @@ -106,9 +106,9 @@ async def test_one( """ api_version = self._get_api_version('test_one') if api_version == '1.0.0': - from ..v1.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass + from ..v1.aio.operations import MultiapiServiceClientOperationsMixin as OperationClass elif api_version == '2.0.0': - from ..v2.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass + from ..v2.aio.operations import MultiapiServiceClientOperationsMixin as OperationClass else: raise NotImplementedError("APIVersion {} is not available".format(api_version)) mixin_instance = OperationClass() @@ -131,7 +131,7 @@ def test_paging( """ api_version = self._get_api_version('test_paging') if api_version == '3.0.0': - from ..v3.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass + from ..v3.aio.operations import MultiapiServiceClientOperationsMixin as OperationClass else: raise NotImplementedError("APIVersion {} is not available".format(api_version)) mixin_instance = OperationClass() diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/__init__.py index ec341e1dd7e..c5088f7a288 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/__init__.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._multiapi_service_client_async import MultiapiServiceClient +from ._multiapi_service_client import MultiapiServiceClient __all__ = ['MultiapiServiceClient'] diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/_configuration.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/_configuration_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/_configuration.py diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/_multiapi_service_client_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/_multiapi_service_client.py similarity index 91% rename from test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/_multiapi_service_client_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/_multiapi_service_client.py index 75245c40412..e4833ad3584 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/_multiapi_service_client_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/_multiapi_service_client.py @@ -15,9 +15,9 @@ # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials_async import AsyncTokenCredential -from ._configuration_async import MultiapiServiceClientConfiguration -from .operations_async import MultiapiServiceClientOperationsMixin -from .operations_async import OperationGroupOneOperations +from ._configuration import MultiapiServiceClientConfiguration +from .operations import MultiapiServiceClientOperationsMixin +from .operations import OperationGroupOneOperations from .. import models @@ -25,7 +25,7 @@ class MultiapiServiceClient(MultiapiServiceClientOperationsMixin): """Service client for multiapi client testing. :ivar operation_group_one: OperationGroupOneOperations operations - :vartype operation_group_one: multiapidataplane.v1.aio.operations_async.OperationGroupOneOperations + :vartype operation_group_one: multiapidataplane.v1.aio.operations.OperationGroupOneOperations :param credential: Credential needed for the client to connect to Azure. :type credential: ~azure.core.credentials_async.AsyncTokenCredential :param str base_url: Service URL diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/operations_async/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/operations/__init__.py similarity index 76% rename from test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/operations_async/__init__.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/operations/__init__.py index ec2cdbef519..1d9facfa368 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/operations_async/__init__.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/operations/__init__.py @@ -6,8 +6,8 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._multiapi_service_client_operations_async import MultiapiServiceClientOperationsMixin -from ._operation_group_one_operations_async import OperationGroupOneOperations +from ._multiapi_service_client_operations import MultiapiServiceClientOperationsMixin +from ._operation_group_one_operations import OperationGroupOneOperations __all__ = [ 'MultiapiServiceClientOperationsMixin', diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/operations_async/_multiapi_service_client_operations_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/operations/_multiapi_service_client_operations.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/operations_async/_multiapi_service_client_operations_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/operations/_multiapi_service_client_operations.py diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/operations_async/_operation_group_one_operations_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/operations/_operation_group_one_operations.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/operations_async/_operation_group_one_operations_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/operations/_operation_group_one_operations.py diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/__init__.py index ec341e1dd7e..c5088f7a288 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/__init__.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._multiapi_service_client_async import MultiapiServiceClient +from ._multiapi_service_client import MultiapiServiceClient __all__ = ['MultiapiServiceClient'] diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/_configuration.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/_configuration_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/_configuration.py diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/_multiapi_service_client_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/_multiapi_service_client.py similarity index 88% rename from test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/_multiapi_service_client_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/_multiapi_service_client.py index d8541ef273f..b6655abe472 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/_multiapi_service_client_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/_multiapi_service_client.py @@ -15,10 +15,10 @@ # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials_async import AsyncTokenCredential -from ._configuration_async import MultiapiServiceClientConfiguration -from .operations_async import MultiapiServiceClientOperationsMixin -from .operations_async import OperationGroupOneOperations -from .operations_async import OperationGroupTwoOperations +from ._configuration import MultiapiServiceClientConfiguration +from .operations import MultiapiServiceClientOperationsMixin +from .operations import OperationGroupOneOperations +from .operations import OperationGroupTwoOperations from .. import models @@ -26,9 +26,9 @@ class MultiapiServiceClient(MultiapiServiceClientOperationsMixin): """Service client for multiapi client testing. :ivar operation_group_one: OperationGroupOneOperations operations - :vartype operation_group_one: multiapidataplane.v2.aio.operations_async.OperationGroupOneOperations + :vartype operation_group_one: multiapidataplane.v2.aio.operations.OperationGroupOneOperations :ivar operation_group_two: OperationGroupTwoOperations operations - :vartype operation_group_two: multiapidataplane.v2.aio.operations_async.OperationGroupTwoOperations + :vartype operation_group_two: multiapidataplane.v2.aio.operations.OperationGroupTwoOperations :param credential: Credential needed for the client to connect to Azure. :type credential: ~azure.core.credentials_async.AsyncTokenCredential :param str base_url: Service URL diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/operations/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/operations/__init__.py new file mode 100644 index 00000000000..356f78798f2 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/operations/__init__.py @@ -0,0 +1,17 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from ._multiapi_service_client_operations import MultiapiServiceClientOperationsMixin +from ._operation_group_one_operations import OperationGroupOneOperations +from ._operation_group_two_operations import OperationGroupTwoOperations + +__all__ = [ + 'MultiapiServiceClientOperationsMixin', + 'OperationGroupOneOperations', + 'OperationGroupTwoOperations', +] diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/operations_async/_multiapi_service_client_operations_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/operations/_multiapi_service_client_operations.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/operations_async/_multiapi_service_client_operations_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/operations/_multiapi_service_client_operations.py diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/operations_async/_operation_group_one_operations_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/operations/_operation_group_one_operations.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/operations_async/_operation_group_one_operations_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/operations/_operation_group_one_operations.py diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/operations_async/_operation_group_two_operations_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/operations/_operation_group_two_operations.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/operations_async/_operation_group_two_operations_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/operations/_operation_group_two_operations.py diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/operations_async/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/operations_async/__init__.py deleted file mode 100644 index a627ee1aa5c..00000000000 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/operations_async/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- - -from ._multiapi_service_client_operations_async import MultiapiServiceClientOperationsMixin -from ._operation_group_one_operations_async import OperationGroupOneOperations -from ._operation_group_two_operations_async import OperationGroupTwoOperations - -__all__ = [ - 'MultiapiServiceClientOperationsMixin', - 'OperationGroupOneOperations', - 'OperationGroupTwoOperations', -] diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/__init__.py index ec341e1dd7e..c5088f7a288 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/__init__.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._multiapi_service_client_async import MultiapiServiceClient +from ._multiapi_service_client import MultiapiServiceClient __all__ = ['MultiapiServiceClient'] diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/_configuration.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/_configuration_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/_configuration.py diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/_multiapi_service_client_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/_multiapi_service_client.py similarity index 88% rename from test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/_multiapi_service_client_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/_multiapi_service_client.py index 250721ff7df..28f6b42e97b 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/_multiapi_service_client_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/_multiapi_service_client.py @@ -15,10 +15,10 @@ # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials_async import AsyncTokenCredential -from ._configuration_async import MultiapiServiceClientConfiguration -from .operations_async import MultiapiServiceClientOperationsMixin -from .operations_async import OperationGroupOneOperations -from .operations_async import OperationGroupTwoOperations +from ._configuration import MultiapiServiceClientConfiguration +from .operations import MultiapiServiceClientOperationsMixin +from .operations import OperationGroupOneOperations +from .operations import OperationGroupTwoOperations from .. import models @@ -26,9 +26,9 @@ class MultiapiServiceClient(MultiapiServiceClientOperationsMixin): """Service client for multiapi client testing. :ivar operation_group_one: OperationGroupOneOperations operations - :vartype operation_group_one: multiapidataplane.v3.aio.operations_async.OperationGroupOneOperations + :vartype operation_group_one: multiapidataplane.v3.aio.operations.OperationGroupOneOperations :ivar operation_group_two: OperationGroupTwoOperations operations - :vartype operation_group_two: multiapidataplane.v3.aio.operations_async.OperationGroupTwoOperations + :vartype operation_group_two: multiapidataplane.v3.aio.operations.OperationGroupTwoOperations :param credential: Credential needed for the client to connect to Azure. :type credential: ~azure.core.credentials_async.AsyncTokenCredential :param str base_url: Service URL diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations/__init__.py new file mode 100644 index 00000000000..356f78798f2 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations/__init__.py @@ -0,0 +1,17 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from ._multiapi_service_client_operations import MultiapiServiceClientOperationsMixin +from ._operation_group_one_operations import OperationGroupOneOperations +from ._operation_group_two_operations import OperationGroupTwoOperations + +__all__ = [ + 'MultiapiServiceClientOperationsMixin', + 'OperationGroupOneOperations', + 'OperationGroupTwoOperations', +] diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations_async/_multiapi_service_client_operations_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations/_multiapi_service_client_operations.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations_async/_multiapi_service_client_operations_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations/_multiapi_service_client_operations.py diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations_async/_operation_group_one_operations_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations/_operation_group_one_operations.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations_async/_operation_group_one_operations_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations/_operation_group_one_operations.py diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations_async/_operation_group_two_operations_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations/_operation_group_two_operations.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations_async/_operation_group_two_operations_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations/_operation_group_two_operations.py diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations_async/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations_async/__init__.py deleted file mode 100644 index a627ee1aa5c..00000000000 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations_async/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- - -from ._multiapi_service_client_operations_async import MultiapiServiceClientOperationsMixin -from ._operation_group_one_operations_async import OperationGroupOneOperations -from ._operation_group_two_operations_async import OperationGroupTwoOperations - -__all__ = [ - 'MultiapiServiceClientOperationsMixin', - 'OperationGroupOneOperations', - 'OperationGroupTwoOperations', -] diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/aio/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/aio/__init__.py index ec341e1dd7e..c5088f7a288 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/aio/__init__.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._multiapi_service_client_async import MultiapiServiceClient +from ._multiapi_service_client import MultiapiServiceClient __all__ = ['MultiapiServiceClient'] diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/aio/_configuration.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/aio/_configuration_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/aio/_configuration.py 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.py similarity index 85% rename from test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/aio/_multiapi_service_client_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/aio/_multiapi_service_client.py index 9028845aa92..9caddc0b9fa 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.py @@ -14,8 +14,8 @@ from azure.profiles import KnownProfiles, ProfileDefinition from azure.profiles.multiapiclient import MultiApiClientMixin -from ._configuration_async import MultiapiServiceClientConfiguration -from ._operations_mixin_async import MultiapiServiceClientOperationsMixin +from ._configuration import MultiapiServiceClientConfiguration +from ._operations_mixin import MultiapiServiceClientOperationsMixin class _SDKClient(object): def __init__(self, *args, **kwargs): """This is a fake class to support current implemetation of MultiApiClientMixin." @@ -100,17 +100,17 @@ def models(cls, api_version=DEFAULT_API_VERSION): def operation_group_one(self): """Instance depends on the API version: - * 1.0.0: :class:`OperationGroupOneOperations` - * 2.0.0: :class:`OperationGroupOneOperations` - * 3.0.0: :class:`OperationGroupOneOperations` + * 1.0.0: :class:`OperationGroupOneOperations` + * 2.0.0: :class:`OperationGroupOneOperations` + * 3.0.0: :class:`OperationGroupOneOperations` """ api_version = self._get_api_version('operation_group_one') if api_version == '1.0.0': - from ..v1.aio.operations_async import OperationGroupOneOperations as OperationClass + from ..v1.aio.operations import OperationGroupOneOperations as OperationClass elif api_version == '2.0.0': - from ..v2.aio.operations_async import OperationGroupOneOperations as OperationClass + from ..v2.aio.operations import OperationGroupOneOperations as OperationClass elif api_version == '3.0.0': - from ..v3.aio.operations_async import OperationGroupOneOperations as OperationClass + from ..v3.aio.operations import OperationGroupOneOperations as OperationClass else: raise NotImplementedError("APIVersion {} is not available".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) @@ -119,14 +119,14 @@ def operation_group_one(self): def operation_group_two(self): """Instance depends on the API version: - * 2.0.0: :class:`OperationGroupTwoOperations` - * 3.0.0: :class:`OperationGroupTwoOperations` + * 2.0.0: :class:`OperationGroupTwoOperations` + * 3.0.0: :class:`OperationGroupTwoOperations` """ api_version = self._get_api_version('operation_group_two') if api_version == '2.0.0': - from ..v2.aio.operations_async import OperationGroupTwoOperations as OperationClass + from ..v2.aio.operations import OperationGroupTwoOperations as OperationClass elif api_version == '3.0.0': - from ..v3.aio.operations_async import OperationGroupTwoOperations as OperationClass + from ..v3.aio.operations import OperationGroupTwoOperations as OperationClass else: raise NotImplementedError("APIVersion {} is not available".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) 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.py similarity index 93% rename from test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/aio/_operations_mixin_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/aio/_operations_mixin.py index 5e0598ec8cb..0602ffbfc47 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.py @@ -44,7 +44,7 @@ async def begin_test_lro( """ api_version = self._get_api_version('begin_test_lro') if api_version == '1.0.0': - from ..v1.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass + from ..v1.aio.operations import MultiapiServiceClientOperationsMixin as OperationClass else: raise NotImplementedError("APIVersion {} is not available".format(api_version)) mixin_instance = OperationClass() @@ -78,7 +78,7 @@ def begin_test_lro_and_paging( """ api_version = self._get_api_version('begin_test_lro_and_paging') if api_version == '1.0.0': - from ..v1.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass + from ..v1.aio.operations import MultiapiServiceClientOperationsMixin as OperationClass else: raise NotImplementedError("APIVersion {} is not available".format(api_version)) mixin_instance = OperationClass() @@ -107,9 +107,9 @@ async def test_one( """ api_version = self._get_api_version('test_one') if api_version == '1.0.0': - from ..v1.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass + from ..v1.aio.operations import MultiapiServiceClientOperationsMixin as OperationClass elif api_version == '2.0.0': - from ..v2.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass + from ..v2.aio.operations import MultiapiServiceClientOperationsMixin as OperationClass else: raise NotImplementedError("APIVersion {} is not available".format(api_version)) mixin_instance = OperationClass() @@ -132,7 +132,7 @@ def test_paging( """ api_version = self._get_api_version('test_paging') if api_version == '3.0.0': - from ..v3.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass + from ..v3.aio.operations import MultiapiServiceClientOperationsMixin as OperationClass else: raise NotImplementedError("APIVersion {} is not available".format(api_version)) mixin_instance = OperationClass() diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/__init__.py index ec341e1dd7e..c5088f7a288 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/__init__.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._multiapi_service_client_async import MultiapiServiceClient +from ._multiapi_service_client import MultiapiServiceClient __all__ = ['MultiapiServiceClient'] diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/_configuration.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/_configuration_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/_configuration.py diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/_multiapi_service_client_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/_multiapi_service_client.py similarity index 90% rename from test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/_multiapi_service_client_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/_multiapi_service_client.py index a7797960352..f7b738c8cca 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/_multiapi_service_client_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/_multiapi_service_client.py @@ -15,9 +15,9 @@ # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials_async import AsyncTokenCredential -from ._configuration_async import MultiapiServiceClientConfiguration -from .operations_async import MultiapiServiceClientOperationsMixin -from .operations_async import OperationGroupOneOperations +from ._configuration import MultiapiServiceClientConfiguration +from .operations import MultiapiServiceClientOperationsMixin +from .operations import OperationGroupOneOperations from .. import models @@ -25,7 +25,7 @@ class MultiapiServiceClient(MultiapiServiceClientOperationsMixin): """Service client for multiapi client testing. :ivar operation_group_one: OperationGroupOneOperations operations - :vartype operation_group_one: multiapiwithsubmodule.submodule.v1.aio.operations_async.OperationGroupOneOperations + :vartype operation_group_one: multiapiwithsubmodule.submodule.v1.aio.operations.OperationGroupOneOperations :param credential: Credential needed for the client to connect to Azure. :type credential: ~azure.core.credentials_async.AsyncTokenCredential :param str base_url: Service URL diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/operations_async/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/operations/__init__.py similarity index 76% rename from test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/operations_async/__init__.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/operations/__init__.py index ec2cdbef519..1d9facfa368 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/operations_async/__init__.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/operations/__init__.py @@ -6,8 +6,8 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._multiapi_service_client_operations_async import MultiapiServiceClientOperationsMixin -from ._operation_group_one_operations_async import OperationGroupOneOperations +from ._multiapi_service_client_operations import MultiapiServiceClientOperationsMixin +from ._operation_group_one_operations import OperationGroupOneOperations __all__ = [ 'MultiapiServiceClientOperationsMixin', diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/operations_async/_multiapi_service_client_operations_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/operations/_multiapi_service_client_operations.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/operations_async/_multiapi_service_client_operations_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/operations/_multiapi_service_client_operations.py diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/operations_async/_operation_group_one_operations_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/operations/_operation_group_one_operations.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/operations_async/_operation_group_one_operations_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/operations/_operation_group_one_operations.py diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/__init__.py index ec341e1dd7e..c5088f7a288 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/__init__.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._multiapi_service_client_async import MultiapiServiceClient +from ._multiapi_service_client import MultiapiServiceClient __all__ = ['MultiapiServiceClient'] diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/_configuration.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/_configuration_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/_configuration.py diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/_multiapi_service_client_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/_multiapi_service_client.py similarity index 87% rename from test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/_multiapi_service_client_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/_multiapi_service_client.py index aff50ad2aa2..8ffa701c36a 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/_multiapi_service_client_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/_multiapi_service_client.py @@ -15,10 +15,10 @@ # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials_async import AsyncTokenCredential -from ._configuration_async import MultiapiServiceClientConfiguration -from .operations_async import MultiapiServiceClientOperationsMixin -from .operations_async import OperationGroupOneOperations -from .operations_async import OperationGroupTwoOperations +from ._configuration import MultiapiServiceClientConfiguration +from .operations import MultiapiServiceClientOperationsMixin +from .operations import OperationGroupOneOperations +from .operations import OperationGroupTwoOperations from .. import models @@ -26,9 +26,9 @@ class MultiapiServiceClient(MultiapiServiceClientOperationsMixin): """Service client for multiapi client testing. :ivar operation_group_one: OperationGroupOneOperations operations - :vartype operation_group_one: multiapiwithsubmodule.submodule.v3.aio.operations_async.OperationGroupOneOperations + :vartype operation_group_one: multiapiwithsubmodule.submodule.v2.aio.operations.OperationGroupOneOperations :ivar operation_group_two: OperationGroupTwoOperations operations - :vartype operation_group_two: multiapiwithsubmodule.submodule.v3.aio.operations_async.OperationGroupTwoOperations + :vartype operation_group_two: multiapiwithsubmodule.submodule.v2.aio.operations.OperationGroupTwoOperations :param credential: Credential needed for the client to connect to Azure. :type credential: ~azure.core.credentials_async.AsyncTokenCredential :param str base_url: Service URL diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/operations/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/operations/__init__.py new file mode 100644 index 00000000000..356f78798f2 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/operations/__init__.py @@ -0,0 +1,17 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from ._multiapi_service_client_operations import MultiapiServiceClientOperationsMixin +from ._operation_group_one_operations import OperationGroupOneOperations +from ._operation_group_two_operations import OperationGroupTwoOperations + +__all__ = [ + 'MultiapiServiceClientOperationsMixin', + 'OperationGroupOneOperations', + 'OperationGroupTwoOperations', +] diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/operations_async/_multiapi_service_client_operations_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/operations/_multiapi_service_client_operations.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/operations_async/_multiapi_service_client_operations_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/operations/_multiapi_service_client_operations.py diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/operations_async/_operation_group_one_operations_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/operations/_operation_group_one_operations.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/operations_async/_operation_group_one_operations_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/operations/_operation_group_one_operations.py diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/operations_async/_operation_group_two_operations_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/operations/_operation_group_two_operations.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/operations_async/_operation_group_two_operations_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/operations/_operation_group_two_operations.py diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/operations_async/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/operations_async/__init__.py deleted file mode 100644 index a627ee1aa5c..00000000000 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/operations_async/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- - -from ._multiapi_service_client_operations_async import MultiapiServiceClientOperationsMixin -from ._operation_group_one_operations_async import OperationGroupOneOperations -from ._operation_group_two_operations_async import OperationGroupTwoOperations - -__all__ = [ - 'MultiapiServiceClientOperationsMixin', - 'OperationGroupOneOperations', - 'OperationGroupTwoOperations', -] diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/__init__.py index ec341e1dd7e..c5088f7a288 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/__init__.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._multiapi_service_client_async import MultiapiServiceClient +from ._multiapi_service_client import MultiapiServiceClient __all__ = ['MultiapiServiceClient'] diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/_configuration.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/_configuration_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/_configuration.py diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/_multiapi_service_client_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/_multiapi_service_client.py similarity index 87% rename from test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/_multiapi_service_client_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/_multiapi_service_client.py index 57c2332498b..078c08e21a5 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/_multiapi_service_client_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/_multiapi_service_client.py @@ -15,10 +15,10 @@ # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials_async import AsyncTokenCredential -from ._configuration_async import MultiapiServiceClientConfiguration -from .operations_async import MultiapiServiceClientOperationsMixin -from .operations_async import OperationGroupOneOperations -from .operations_async import OperationGroupTwoOperations +from ._configuration import MultiapiServiceClientConfiguration +from .operations import MultiapiServiceClientOperationsMixin +from .operations import OperationGroupOneOperations +from .operations import OperationGroupTwoOperations from .. import models @@ -26,9 +26,9 @@ class MultiapiServiceClient(MultiapiServiceClientOperationsMixin): """Service client for multiapi client testing. :ivar operation_group_one: OperationGroupOneOperations operations - :vartype operation_group_one: multiapiwithsubmodule.submodule.v2.aio.operations_async.OperationGroupOneOperations + :vartype operation_group_one: multiapiwithsubmodule.submodule.v3.aio.operations.OperationGroupOneOperations :ivar operation_group_two: OperationGroupTwoOperations operations - :vartype operation_group_two: multiapiwithsubmodule.submodule.v2.aio.operations_async.OperationGroupTwoOperations + :vartype operation_group_two: multiapiwithsubmodule.submodule.v3.aio.operations.OperationGroupTwoOperations :param credential: Credential needed for the client to connect to Azure. :type credential: ~azure.core.credentials_async.AsyncTokenCredential :param str base_url: Service URL diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations/__init__.py new file mode 100644 index 00000000000..356f78798f2 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations/__init__.py @@ -0,0 +1,17 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from ._multiapi_service_client_operations import MultiapiServiceClientOperationsMixin +from ._operation_group_one_operations import OperationGroupOneOperations +from ._operation_group_two_operations import OperationGroupTwoOperations + +__all__ = [ + 'MultiapiServiceClientOperationsMixin', + 'OperationGroupOneOperations', + 'OperationGroupTwoOperations', +] diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations_async/_multiapi_service_client_operations_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations/_multiapi_service_client_operations.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations_async/_multiapi_service_client_operations_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations/_multiapi_service_client_operations.py diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations_async/_operation_group_one_operations_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations/_operation_group_one_operations.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations_async/_operation_group_one_operations_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations/_operation_group_one_operations.py diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations_async/_operation_group_two_operations_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations/_operation_group_two_operations.py similarity index 100% rename from test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations_async/_operation_group_two_operations_async.py rename to test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations/_operation_group_two_operations.py diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations_async/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations_async/__init__.py deleted file mode 100644 index a627ee1aa5c..00000000000 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations_async/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- - -from ._multiapi_service_client_operations_async import MultiapiServiceClientOperationsMixin -from ._operation_group_one_operations_async import OperationGroupOneOperations -from ._operation_group_two_operations_async import OperationGroupTwoOperations - -__all__ = [ - 'MultiapiServiceClientOperationsMixin', - 'OperationGroupOneOperations', - 'OperationGroupTwoOperations', -] diff --git a/test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/__init__.py b/test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/__init__.py index d7c16b0c0e9..c2d27517a88 100644 --- a/test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._additional_properties_client_async import AdditionalPropertiesClient +from ._additional_properties_client import AdditionalPropertiesClient __all__ = ['AdditionalPropertiesClient'] diff --git a/test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/_additional_properties_client_async.py b/test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/_additional_properties_client.py similarity index 89% rename from test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/_additional_properties_client_async.py rename to test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/_additional_properties_client.py index f293551bc2f..ccd3101ad02 100644 --- a/test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/_additional_properties_client_async.py +++ b/test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/_additional_properties_client.py @@ -11,8 +11,8 @@ from azure.core import AsyncPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import AdditionalPropertiesClientConfiguration -from .operations_async import PetsOperations +from ._configuration import AdditionalPropertiesClientConfiguration +from .operations import PetsOperations from .. import models @@ -20,7 +20,7 @@ class AdditionalPropertiesClient(object): """Test Infrastructure for AutoRest. :ivar pets: PetsOperations operations - :vartype pets: additionalproperties.aio.operations_async.PetsOperations + :vartype pets: additionalproperties.aio.operations.PetsOperations :param str base_url: Service URL """ diff --git a/test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/_configuration.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/_configuration_async.py rename to test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/_configuration.py diff --git a/test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/operations_async/__init__.py b/test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/operations/__init__.py similarity index 90% rename from test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/operations_async/__init__.py rename to test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/operations/__init__.py index b60e179a238..194e6ef07bd 100644 --- a/test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/operations_async/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._pets_operations_async import PetsOperations +from ._pets_operations import PetsOperations __all__ = [ 'PetsOperations', diff --git a/test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/operations_async/_pets_operations_async.py b/test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/operations/_pets_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/operations_async/_pets_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/operations/_pets_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/aio/__init__.py b/test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/aio/__init__.py index fb146161416..74f52b70481 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/aio/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_swagger_bat_array_service_async import AutoRestSwaggerBATArrayService +from ._auto_rest_swagger_bat_array_service import AutoRestSwaggerBATArrayService __all__ = ['AutoRestSwaggerBATArrayService'] diff --git a/test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/aio/_auto_rest_swagger_bat_array_service_async.py b/test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/aio/_auto_rest_swagger_bat_array_service.py similarity index 90% rename from test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/aio/_auto_rest_swagger_bat_array_service_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/aio/_auto_rest_swagger_bat_array_service.py index 8e4de03fc7c..3a92a8e008b 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/aio/_auto_rest_swagger_bat_array_service_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/aio/_auto_rest_swagger_bat_array_service.py @@ -11,8 +11,8 @@ from azure.core import AsyncPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import AutoRestSwaggerBATArrayServiceConfiguration -from .operations_async import ArrayOperations +from ._configuration import AutoRestSwaggerBATArrayServiceConfiguration +from .operations import ArrayOperations from .. import models @@ -20,7 +20,7 @@ class AutoRestSwaggerBATArrayService(object): """Test Infrastructure for AutoRest Swagger BAT. :ivar array: ArrayOperations operations - :vartype array: bodyarray.aio.operations_async.ArrayOperations + :vartype array: bodyarray.aio.operations.ArrayOperations :param str base_url: Service URL """ diff --git a/test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/aio/_configuration.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/aio/_configuration_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/aio/_configuration.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/operations_async/__init__.py b/test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/aio/operations/__init__.py similarity index 90% rename from test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/operations_async/__init__.py rename to test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/aio/operations/__init__.py index d7ef70e49c3..704181d72a8 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/operations_async/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._array_operations_async import ArrayOperations +from ._array_operations import ArrayOperations __all__ = [ 'ArrayOperations', diff --git a/test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/aio/operations_async/_array_operations_async.py b/test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/aio/operations/_array_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/aio/operations_async/_array_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/aio/operations/_array_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/__init__.py b/test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/__init__.py index fb146161416..74f52b70481 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_swagger_bat_array_service_async import AutoRestSwaggerBATArrayService +from ._auto_rest_swagger_bat_array_service import AutoRestSwaggerBATArrayService __all__ = ['AutoRestSwaggerBATArrayService'] diff --git a/test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/_auto_rest_swagger_bat_array_service_async.py b/test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/_auto_rest_swagger_bat_array_service.py similarity index 89% rename from test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/_auto_rest_swagger_bat_array_service_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/_auto_rest_swagger_bat_array_service.py index c3e4bc6546b..2ac94bb1c66 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/_auto_rest_swagger_bat_array_service_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/_auto_rest_swagger_bat_array_service.py @@ -11,8 +11,8 @@ from azure.core import AsyncPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import AutoRestSwaggerBATArrayServiceConfiguration -from .operations_async import ArrayOperations +from ._configuration import AutoRestSwaggerBATArrayServiceConfiguration +from .operations import ArrayOperations from .. import models @@ -20,7 +20,7 @@ class AutoRestSwaggerBATArrayService(object): """Test Infrastructure for AutoRest Swagger BAT. :ivar array: ArrayOperations operations - :vartype array: vanilla.body.array.aio.operations_async.ArrayOperations + :vartype array: vanilla.body.array.aio.operations.ArrayOperations :param str base_url: Service URL """ diff --git a/test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/_configuration.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/_configuration_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/_configuration.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/aio/operations_async/__init__.py b/test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/operations/__init__.py similarity index 90% rename from test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/aio/operations_async/__init__.py rename to test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/operations/__init__.py index d7ef70e49c3..704181d72a8 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/aio/operations_async/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._array_operations_async import ArrayOperations +from ._array_operations import ArrayOperations __all__ = [ 'ArrayOperations', diff --git a/test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/operations_async/_array_operations_async.py b/test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/operations/_array_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/operations_async/_array_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/operations/_array_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/aio/__init__.py b/test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/aio/__init__.py index dd4b5f06e39..01f572c78da 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/aio/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_bool_test_service_async import AutoRestBoolTestService +from ._auto_rest_bool_test_service import AutoRestBoolTestService __all__ = ['AutoRestBoolTestService'] diff --git a/test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/aio/_auto_rest_bool_test_service_async.py b/test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/aio/_auto_rest_bool_test_service.py similarity index 90% rename from test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/aio/_auto_rest_bool_test_service_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/aio/_auto_rest_bool_test_service.py index 59af6580a7a..768512f3156 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/aio/_auto_rest_bool_test_service_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/aio/_auto_rest_bool_test_service.py @@ -11,8 +11,8 @@ from azure.core import AsyncPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import AutoRestBoolTestServiceConfiguration -from .operations_async import BoolOperations +from ._configuration import AutoRestBoolTestServiceConfiguration +from .operations import BoolOperations from .. import models @@ -20,7 +20,7 @@ class AutoRestBoolTestService(object): """Test Infrastructure for AutoRest. :ivar bool: BoolOperations operations - :vartype bool: bodyboolean.aio.operations_async.BoolOperations + :vartype bool: bodyboolean.aio.operations.BoolOperations :param str base_url: Service URL """ diff --git a/test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/aio/_configuration.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/aio/_configuration_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/aio/_configuration.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/aio/operations_async/__init__.py b/test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/aio/operations/__init__.py similarity index 90% rename from test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/aio/operations_async/__init__.py rename to test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/aio/operations/__init__.py index b6a09563bd4..2e89438bdde 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/aio/operations_async/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._bool_operations_async import BoolOperations +from ._bool_operations import BoolOperations __all__ = [ 'BoolOperations', diff --git a/test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/aio/operations_async/_bool_operations_async.py b/test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/aio/operations/_bool_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/aio/operations_async/_bool_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/aio/operations/_bool_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/aio/__init__.py b/test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/aio/__init__.py index 069ece47523..e5e0e3f5336 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/aio/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_swagger_bat_byte_service_async import AutoRestSwaggerBATByteService +from ._auto_rest_swagger_bat_byte_service import AutoRestSwaggerBATByteService __all__ = ['AutoRestSwaggerBATByteService'] diff --git a/test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/aio/_auto_rest_swagger_bat_byte_service_async.py b/test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/aio/_auto_rest_swagger_bat_byte_service.py similarity index 90% rename from test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/aio/_auto_rest_swagger_bat_byte_service_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/aio/_auto_rest_swagger_bat_byte_service.py index c0c58b0c0db..661fa3aea06 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/aio/_auto_rest_swagger_bat_byte_service_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/aio/_auto_rest_swagger_bat_byte_service.py @@ -11,8 +11,8 @@ from azure.core import AsyncPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import AutoRestSwaggerBATByteServiceConfiguration -from .operations_async import ByteOperations +from ._configuration import AutoRestSwaggerBATByteServiceConfiguration +from .operations import ByteOperations from .. import models @@ -20,7 +20,7 @@ class AutoRestSwaggerBATByteService(object): """Test Infrastructure for AutoRest Swagger BAT. :ivar byte: ByteOperations operations - :vartype byte: bodybyte.aio.operations_async.ByteOperations + :vartype byte: bodybyte.aio.operations.ByteOperations :param str base_url: Service URL """ diff --git a/test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/aio/_configuration.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/aio/_configuration_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/aio/_configuration.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/aio/operations_async/__init__.py b/test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/aio/operations/__init__.py similarity index 90% rename from test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/aio/operations_async/__init__.py rename to test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/aio/operations/__init__.py index 47b0dddb1c2..749f4f28fc2 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/aio/operations_async/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._byte_operations_async import ByteOperations +from ._byte_operations import ByteOperations __all__ = [ 'ByteOperations', diff --git a/test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/aio/operations_async/_byte_operations_async.py b/test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/aio/operations/_byte_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/aio/operations_async/_byte_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/aio/operations/_byte_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyByteWithPackageName/bodybytewithpackagename/aio/__init__.py b/test/vanilla/Expected/AcceptanceTests/BodyByteWithPackageName/bodybytewithpackagename/aio/__init__.py index 179f11a5c9c..de1053c9490 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyByteWithPackageName/bodybytewithpackagename/aio/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyByteWithPackageName/bodybytewithpackagename/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._class_name_async import ClassName +from ._class_name import ClassName __all__ = ['ClassName'] diff --git a/test/vanilla/Expected/AcceptanceTests/BodyByteWithPackageName/bodybytewithpackagename/aio/_class_name_async.py b/test/vanilla/Expected/AcceptanceTests/BodyByteWithPackageName/bodybytewithpackagename/aio/_class_name.py similarity index 90% rename from test/vanilla/Expected/AcceptanceTests/BodyByteWithPackageName/bodybytewithpackagename/aio/_class_name_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyByteWithPackageName/bodybytewithpackagename/aio/_class_name.py index ad884de58b3..2d7285d405c 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyByteWithPackageName/bodybytewithpackagename/aio/_class_name_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyByteWithPackageName/bodybytewithpackagename/aio/_class_name.py @@ -11,8 +11,8 @@ from azure.core import AsyncPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import ClassNameConfiguration -from .operations_async import ByteOperations +from ._configuration import ClassNameConfiguration +from .operations import ByteOperations from .. import models @@ -20,7 +20,7 @@ class ClassName(object): """Test Infrastructure for AutoRest Swagger BAT. :ivar byte: ByteOperations operations - :vartype byte: bodybytewithpackagename.aio.operations_async.ByteOperations + :vartype byte: bodybytewithpackagename.aio.operations.ByteOperations :param str base_url: Service URL """ diff --git a/test/vanilla/Expected/AcceptanceTests/BodyByteWithPackageName/bodybytewithpackagename/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyByteWithPackageName/bodybytewithpackagename/aio/_configuration.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyByteWithPackageName/bodybytewithpackagename/aio/_configuration_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyByteWithPackageName/bodybytewithpackagename/aio/_configuration.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyByteWithPackageName/bodybytewithpackagename/aio/operations_async/__init__.py b/test/vanilla/Expected/AcceptanceTests/BodyByteWithPackageName/bodybytewithpackagename/aio/operations/__init__.py similarity index 90% rename from test/vanilla/Expected/AcceptanceTests/BodyByteWithPackageName/bodybytewithpackagename/aio/operations_async/__init__.py rename to test/vanilla/Expected/AcceptanceTests/BodyByteWithPackageName/bodybytewithpackagename/aio/operations/__init__.py index 47b0dddb1c2..749f4f28fc2 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyByteWithPackageName/bodybytewithpackagename/aio/operations_async/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyByteWithPackageName/bodybytewithpackagename/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._byte_operations_async import ByteOperations +from ._byte_operations import ByteOperations __all__ = [ 'ByteOperations', diff --git a/test/vanilla/Expected/AcceptanceTests/BodyByteWithPackageName/bodybytewithpackagename/aio/operations_async/_byte_operations_async.py b/test/vanilla/Expected/AcceptanceTests/BodyByteWithPackageName/bodybytewithpackagename/aio/operations/_byte_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyByteWithPackageName/bodybytewithpackagename/aio/operations_async/_byte_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyByteWithPackageName/bodybytewithpackagename/aio/operations/_byte_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/__init__.py b/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/__init__.py index 87202d28399..a87d04c60e3 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_complex_test_service_async import AutoRestComplexTestService +from ._auto_rest_complex_test_service import AutoRestComplexTestService __all__ = ['AutoRestComplexTestService'] diff --git a/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/_auto_rest_complex_test_service_async.py b/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/_auto_rest_complex_test_service.py similarity index 71% rename from test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/_auto_rest_complex_test_service_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/_auto_rest_complex_test_service.py index 2a607d86785..b1f5319f32f 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/_auto_rest_complex_test_service_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/_auto_rest_complex_test_service.py @@ -11,16 +11,16 @@ from azure.core import AsyncPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import AutoRestComplexTestServiceConfiguration -from .operations_async import BasicOperations -from .operations_async import PrimitiveOperations -from .operations_async import ArrayOperations -from .operations_async import DictionaryOperations -from .operations_async import InheritanceOperations -from .operations_async import PolymorphismOperations -from .operations_async import PolymorphicrecursiveOperations -from .operations_async import ReadonlypropertyOperations -from .operations_async import FlattencomplexOperations +from ._configuration import AutoRestComplexTestServiceConfiguration +from .operations import BasicOperations +from .operations import PrimitiveOperations +from .operations import ArrayOperations +from .operations import DictionaryOperations +from .operations import InheritanceOperations +from .operations import PolymorphismOperations +from .operations import PolymorphicrecursiveOperations +from .operations import ReadonlypropertyOperations +from .operations import FlattencomplexOperations from .. import models @@ -28,23 +28,23 @@ class AutoRestComplexTestService(object): """Test Infrastructure for AutoRest. :ivar basic: BasicOperations operations - :vartype basic: bodycomplex.aio.operations_async.BasicOperations + :vartype basic: bodycomplex.aio.operations.BasicOperations :ivar primitive: PrimitiveOperations operations - :vartype primitive: bodycomplex.aio.operations_async.PrimitiveOperations + :vartype primitive: bodycomplex.aio.operations.PrimitiveOperations :ivar array: ArrayOperations operations - :vartype array: bodycomplex.aio.operations_async.ArrayOperations + :vartype array: bodycomplex.aio.operations.ArrayOperations :ivar dictionary: DictionaryOperations operations - :vartype dictionary: bodycomplex.aio.operations_async.DictionaryOperations + :vartype dictionary: bodycomplex.aio.operations.DictionaryOperations :ivar inheritance: InheritanceOperations operations - :vartype inheritance: bodycomplex.aio.operations_async.InheritanceOperations + :vartype inheritance: bodycomplex.aio.operations.InheritanceOperations :ivar polymorphism: PolymorphismOperations operations - :vartype polymorphism: bodycomplex.aio.operations_async.PolymorphismOperations + :vartype polymorphism: bodycomplex.aio.operations.PolymorphismOperations :ivar polymorphicrecursive: PolymorphicrecursiveOperations operations - :vartype polymorphicrecursive: bodycomplex.aio.operations_async.PolymorphicrecursiveOperations + :vartype polymorphicrecursive: bodycomplex.aio.operations.PolymorphicrecursiveOperations :ivar readonlyproperty: ReadonlypropertyOperations operations - :vartype readonlyproperty: bodycomplex.aio.operations_async.ReadonlypropertyOperations + :vartype readonlyproperty: bodycomplex.aio.operations.ReadonlypropertyOperations :ivar flattencomplex: FlattencomplexOperations operations - :vartype flattencomplex: bodycomplex.aio.operations_async.FlattencomplexOperations + :vartype flattencomplex: bodycomplex.aio.operations.FlattencomplexOperations :param str base_url: Service URL """ diff --git a/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/_configuration.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/_configuration_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/_configuration.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations_async/__init__.py b/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/__init__.py similarity index 55% rename from test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations_async/__init__.py rename to test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/__init__.py index fc3864615b2..84f771f755a 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations_async/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/__init__.py @@ -6,15 +6,15 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._basic_operations_async import BasicOperations -from ._primitive_operations_async import PrimitiveOperations -from ._array_operations_async import ArrayOperations -from ._dictionary_operations_async import DictionaryOperations -from ._inheritance_operations_async import InheritanceOperations -from ._polymorphism_operations_async import PolymorphismOperations -from ._polymorphicrecursive_operations_async import PolymorphicrecursiveOperations -from ._readonlyproperty_operations_async import ReadonlypropertyOperations -from ._flattencomplex_operations_async import FlattencomplexOperations +from ._basic_operations import BasicOperations +from ._primitive_operations import PrimitiveOperations +from ._array_operations import ArrayOperations +from ._dictionary_operations import DictionaryOperations +from ._inheritance_operations import InheritanceOperations +from ._polymorphism_operations import PolymorphismOperations +from ._polymorphicrecursive_operations import PolymorphicrecursiveOperations +from ._readonlyproperty_operations import ReadonlypropertyOperations +from ._flattencomplex_operations import FlattencomplexOperations __all__ = [ 'BasicOperations', diff --git a/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations_async/_array_operations_async.py b/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_array_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations_async/_array_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_array_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations_async/_basic_operations_async.py b/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_basic_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations_async/_basic_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_basic_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations_async/_dictionary_operations_async.py b/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_dictionary_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations_async/_dictionary_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_dictionary_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations_async/_flattencomplex_operations_async.py b/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_flattencomplex_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations_async/_flattencomplex_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_flattencomplex_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations_async/_inheritance_operations_async.py b/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_inheritance_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations_async/_inheritance_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_inheritance_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations_async/_polymorphicrecursive_operations_async.py b/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_polymorphicrecursive_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations_async/_polymorphicrecursive_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_polymorphicrecursive_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations_async/_polymorphism_operations_async.py b/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_polymorphism_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations_async/_polymorphism_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_polymorphism_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations_async/_primitive_operations_async.py b/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_primitive_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations_async/_primitive_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_primitive_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations_async/_readonlyproperty_operations_async.py b/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_readonlyproperty_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations_async/_readonlyproperty_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_readonlyproperty_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/aio/__init__.py b/test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/aio/__init__.py index 49c08438988..a3cc2bbf102 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/aio/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_date_test_service_async import AutoRestDateTestService +from ._auto_rest_date_test_service import AutoRestDateTestService __all__ = ['AutoRestDateTestService'] diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/aio/_auto_rest_date_test_service_async.py b/test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/aio/_auto_rest_date_test_service.py similarity index 90% rename from test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/aio/_auto_rest_date_test_service_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/aio/_auto_rest_date_test_service.py index 13c3ae48214..21d45ce01fb 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/aio/_auto_rest_date_test_service_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/aio/_auto_rest_date_test_service.py @@ -11,8 +11,8 @@ from azure.core import AsyncPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import AutoRestDateTestServiceConfiguration -from .operations_async import DateOperations +from ._configuration import AutoRestDateTestServiceConfiguration +from .operations import DateOperations from .. import models @@ -20,7 +20,7 @@ class AutoRestDateTestService(object): """Test Infrastructure for AutoRest. :ivar date: DateOperations operations - :vartype date: bodydate.aio.operations_async.DateOperations + :vartype date: bodydate.aio.operations.DateOperations :param str base_url: Service URL """ diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/aio/_configuration.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/aio/_configuration_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/aio/_configuration.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/aio/operations_async/__init__.py b/test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/aio/operations/__init__.py similarity index 90% rename from test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/aio/operations_async/__init__.py rename to test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/aio/operations/__init__.py index 23131d998d8..46f6d2d94f5 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/aio/operations_async/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._date_operations_async import DateOperations +from ._date_operations import DateOperations __all__ = [ 'DateOperations', diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/aio/operations_async/_date_operations_async.py b/test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/aio/operations/_date_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/aio/operations_async/_date_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/aio/operations/_date_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/aio/__init__.py b/test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/aio/__init__.py index d66c837827f..fe5eae74c4c 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/aio/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_date_time_test_service_async import AutoRestDateTimeTestService +from ._auto_rest_date_time_test_service import AutoRestDateTimeTestService __all__ = ['AutoRestDateTimeTestService'] diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/aio/_auto_rest_date_time_test_service_async.py b/test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/aio/_auto_rest_date_time_test_service.py similarity index 89% rename from test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/aio/_auto_rest_date_time_test_service_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/aio/_auto_rest_date_time_test_service.py index 59227e12a6f..bfb8e70ddcb 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/aio/_auto_rest_date_time_test_service_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/aio/_auto_rest_date_time_test_service.py @@ -11,8 +11,8 @@ from azure.core import AsyncPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import AutoRestDateTimeTestServiceConfiguration -from .operations_async import DatetimeOperations +from ._configuration import AutoRestDateTimeTestServiceConfiguration +from .operations import DatetimeOperations from .. import models @@ -20,7 +20,7 @@ class AutoRestDateTimeTestService(object): """Test Infrastructure for AutoRest. :ivar datetime: DatetimeOperations operations - :vartype datetime: bodydatetime.aio.operations_async.DatetimeOperations + :vartype datetime: bodydatetime.aio.operations.DatetimeOperations :param str base_url: Service URL """ diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/aio/_configuration.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/aio/_configuration_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/aio/_configuration.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/aio/operations_async/__init__.py b/test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/aio/operations/__init__.py similarity index 89% rename from test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/aio/operations_async/__init__.py rename to test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/aio/operations/__init__.py index 9538fc901f9..55e140b040f 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/aio/operations_async/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._datetime_operations_async import DatetimeOperations +from ._datetime_operations import DatetimeOperations __all__ = [ 'DatetimeOperations', diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/aio/operations_async/_datetime_operations_async.py b/test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/aio/operations/_datetime_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/aio/operations_async/_datetime_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/aio/operations/_datetime_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/aio/__init__.py b/test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/aio/__init__.py index ad1491696ee..8b7d913b8f8 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/aio/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_rfc1123_date_time_test_service_async import AutoRestRFC1123DateTimeTestService +from ._auto_rest_rfc1123_date_time_test_service import AutoRestRFC1123DateTimeTestService __all__ = ['AutoRestRFC1123DateTimeTestService'] diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/aio/_auto_rest_rfc1123_date_time_test_service_async.py b/test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/aio/_auto_rest_rfc1123_date_time_test_service.py similarity index 91% rename from test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/aio/_auto_rest_rfc1123_date_time_test_service_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/aio/_auto_rest_rfc1123_date_time_test_service.py index cd8baa23cad..d430a08b787 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/aio/_auto_rest_rfc1123_date_time_test_service_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/aio/_auto_rest_rfc1123_date_time_test_service.py @@ -11,8 +11,8 @@ from azure.core import AsyncPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import AutoRestRFC1123DateTimeTestServiceConfiguration -from .operations_async import Datetimerfc1123Operations +from ._configuration import AutoRestRFC1123DateTimeTestServiceConfiguration +from .operations import Datetimerfc1123Operations from .. import models @@ -20,7 +20,7 @@ class AutoRestRFC1123DateTimeTestService(object): """Test Infrastructure for AutoRest. :ivar datetimerfc1123: Datetimerfc1123Operations operations - :vartype datetimerfc1123: bodydatetimerfc1123.aio.operations_async.Datetimerfc1123Operations + :vartype datetimerfc1123: bodydatetimerfc1123.aio.operations.Datetimerfc1123Operations :param str base_url: Service URL """ diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/aio/_configuration.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/aio/_configuration_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/aio/_configuration.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/aio/operations_async/__init__.py b/test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/aio/operations/__init__.py similarity index 87% rename from test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/aio/operations_async/__init__.py rename to test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/aio/operations/__init__.py index ed823315d3e..7dc6c064240 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/aio/operations_async/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._datetimerfc1123_operations_async import Datetimerfc1123Operations +from ._datetimerfc1123_operations import Datetimerfc1123Operations __all__ = [ 'Datetimerfc1123Operations', diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/aio/operations_async/_datetimerfc1123_operations_async.py b/test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/aio/operations/_datetimerfc1123_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/aio/operations_async/_datetimerfc1123_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/aio/operations/_datetimerfc1123_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/__init__.py b/test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/__init__.py index 11709a25697..92ff7e41e83 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_swagger_ba_tdictionary_service_async import AutoRestSwaggerBATDictionaryService +from ._auto_rest_swagger_ba_tdictionary_service import AutoRestSwaggerBATDictionaryService __all__ = ['AutoRestSwaggerBATDictionaryService'] diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/_auto_rest_swagger_ba_tdictionary_service_async.py b/test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/_auto_rest_swagger_ba_tdictionary_service.py similarity index 89% rename from test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/_auto_rest_swagger_ba_tdictionary_service_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/_auto_rest_swagger_ba_tdictionary_service.py index e04b74d7d01..9c5e55a846f 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/_auto_rest_swagger_ba_tdictionary_service_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/_auto_rest_swagger_ba_tdictionary_service.py @@ -11,8 +11,8 @@ from azure.core import AsyncPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import AutoRestSwaggerBATDictionaryServiceConfiguration -from .operations_async import DictionaryOperations +from ._configuration import AutoRestSwaggerBATDictionaryServiceConfiguration +from .operations import DictionaryOperations from .. import models @@ -20,7 +20,7 @@ class AutoRestSwaggerBATDictionaryService(object): """Test Infrastructure for AutoRest Swagger BAT. :ivar dictionary: DictionaryOperations operations - :vartype dictionary: bodydictionary.aio.operations_async.DictionaryOperations + :vartype dictionary: bodydictionary.aio.operations.DictionaryOperations :param str base_url: Service URL """ diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/_configuration.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/_configuration_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/_configuration.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/operations_async/__init__.py b/test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/operations/__init__.py similarity index 89% rename from test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/operations_async/__init__.py rename to test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/operations/__init__.py index c9f77111840..591a41bdd0e 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/operations_async/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._dictionary_operations_async import DictionaryOperations +from ._dictionary_operations import DictionaryOperations __all__ = [ 'DictionaryOperations', diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/operations_async/_dictionary_operations_async.py b/test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/operations/_dictionary_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/operations_async/_dictionary_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/operations/_dictionary_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/aio/__init__.py b/test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/aio/__init__.py index 2834400134d..6d18bde12b7 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/aio/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_duration_test_service_async import AutoRestDurationTestService +from ._auto_rest_duration_test_service import AutoRestDurationTestService __all__ = ['AutoRestDurationTestService'] diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/aio/_auto_rest_duration_test_service_async.py b/test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/aio/_auto_rest_duration_test_service.py similarity index 89% rename from test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/aio/_auto_rest_duration_test_service_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/aio/_auto_rest_duration_test_service.py index df0a74c1e78..ec4a1a583f9 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/aio/_auto_rest_duration_test_service_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/aio/_auto_rest_duration_test_service.py @@ -11,8 +11,8 @@ from azure.core import AsyncPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import AutoRestDurationTestServiceConfiguration -from .operations_async import DurationOperations +from ._configuration import AutoRestDurationTestServiceConfiguration +from .operations import DurationOperations from .. import models @@ -20,7 +20,7 @@ class AutoRestDurationTestService(object): """Test Infrastructure for AutoRest. :ivar duration: DurationOperations operations - :vartype duration: bodyduration.aio.operations_async.DurationOperations + :vartype duration: bodyduration.aio.operations.DurationOperations :param str base_url: Service URL """ diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/aio/_configuration.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/aio/_configuration_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/aio/_configuration.py diff --git a/test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/aio/operations_async/__init__.py b/test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/aio/operations/__init__.py similarity index 89% rename from test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/aio/operations_async/__init__.py rename to test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/aio/operations/__init__.py index 881d8474599..6bb953af616 100644 --- a/test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/aio/operations_async/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._duration_operations_async import DurationOperations +from ._duration_operations import DurationOperations __all__ = [ 'DurationOperations', diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/aio/operations_async/_duration_operations_async.py b/test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/aio/operations/_duration_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/aio/operations_async/_duration_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/aio/operations/_duration_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/aio/__init__.py b/test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/aio/__init__.py index 06c60517f86..a17e8d162fb 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/aio/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_swagger_bat_file_service_async import AutoRestSwaggerBATFileService +from ._auto_rest_swagger_bat_file_service import AutoRestSwaggerBATFileService __all__ = ['AutoRestSwaggerBATFileService'] diff --git a/test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/aio/_auto_rest_swagger_bat_file_service_async.py b/test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/aio/_auto_rest_swagger_bat_file_service.py similarity index 90% rename from test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/aio/_auto_rest_swagger_bat_file_service_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/aio/_auto_rest_swagger_bat_file_service.py index d33437a6959..407b97e5edb 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/aio/_auto_rest_swagger_bat_file_service_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/aio/_auto_rest_swagger_bat_file_service.py @@ -11,8 +11,8 @@ from azure.core import AsyncPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import AutoRestSwaggerBATFileServiceConfiguration -from .operations_async import FilesOperations +from ._configuration import AutoRestSwaggerBATFileServiceConfiguration +from .operations import FilesOperations from .. import models @@ -20,7 +20,7 @@ class AutoRestSwaggerBATFileService(object): """Test Infrastructure for AutoRest Swagger BAT. :ivar files: FilesOperations operations - :vartype files: bodyfile.aio.operations_async.FilesOperations + :vartype files: bodyfile.aio.operations.FilesOperations :param str base_url: Service URL """ diff --git a/test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/aio/_configuration.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/aio/_configuration_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/aio/_configuration.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/aio/operations_async/__init__.py b/test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/aio/operations/__init__.py similarity index 90% rename from test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/aio/operations_async/__init__.py rename to test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/aio/operations/__init__.py index d6222c09bd4..43d9f44d66a 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/aio/operations_async/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._files_operations_async import FilesOperations +from ._files_operations import FilesOperations __all__ = [ 'FilesOperations', diff --git a/test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/aio/operations_async/_files_operations_async.py b/test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/aio/operations/_files_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/aio/operations_async/_files_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/aio/operations/_files_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyFormData/bodyformdata/aio/__init__.py b/test/vanilla/Expected/AcceptanceTests/BodyFormData/bodyformdata/aio/__init__.py index 290a7a360fd..a70b5305d1e 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyFormData/bodyformdata/aio/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyFormData/bodyformdata/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_swagger_bat_form_data_service_async import AutoRestSwaggerBATFormDataService +from ._auto_rest_swagger_bat_form_data_service import AutoRestSwaggerBATFormDataService __all__ = ['AutoRestSwaggerBATFormDataService'] diff --git a/test/vanilla/Expected/AcceptanceTests/BodyFormData/bodyformdata/aio/_auto_rest_swagger_bat_form_data_service_async.py b/test/vanilla/Expected/AcceptanceTests/BodyFormData/bodyformdata/aio/_auto_rest_swagger_bat_form_data_service.py similarity index 89% rename from test/vanilla/Expected/AcceptanceTests/BodyFormData/bodyformdata/aio/_auto_rest_swagger_bat_form_data_service_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyFormData/bodyformdata/aio/_auto_rest_swagger_bat_form_data_service.py index 648468c61b2..327ac2febbf 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyFormData/bodyformdata/aio/_auto_rest_swagger_bat_form_data_service_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyFormData/bodyformdata/aio/_auto_rest_swagger_bat_form_data_service.py @@ -11,8 +11,8 @@ from azure.core import AsyncPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import AutoRestSwaggerBATFormDataServiceConfiguration -from .operations_async import FormdataOperations +from ._configuration import AutoRestSwaggerBATFormDataServiceConfiguration +from .operations import FormdataOperations from .. import models @@ -20,7 +20,7 @@ class AutoRestSwaggerBATFormDataService(object): """Test Infrastructure for AutoRest Swagger BAT. :ivar formdata: FormdataOperations operations - :vartype formdata: bodyformdata.aio.operations_async.FormdataOperations + :vartype formdata: bodyformdata.aio.operations.FormdataOperations :param str base_url: Service URL """ diff --git a/test/vanilla/Expected/AcceptanceTests/BodyFormData/bodyformdata/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyFormData/bodyformdata/aio/_configuration.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyFormData/bodyformdata/aio/_configuration_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyFormData/bodyformdata/aio/_configuration.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyFormData/bodyformdata/aio/operations_async/__init__.py b/test/vanilla/Expected/AcceptanceTests/BodyFormData/bodyformdata/aio/operations/__init__.py similarity index 89% rename from test/vanilla/Expected/AcceptanceTests/BodyFormData/bodyformdata/aio/operations_async/__init__.py rename to test/vanilla/Expected/AcceptanceTests/BodyFormData/bodyformdata/aio/operations/__init__.py index 72fbc8186da..5d0ff2b3dda 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyFormData/bodyformdata/aio/operations_async/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyFormData/bodyformdata/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._formdata_operations_async import FormdataOperations +from ._formdata_operations import FormdataOperations __all__ = [ 'FormdataOperations', diff --git a/test/vanilla/Expected/AcceptanceTests/BodyFormData/bodyformdata/aio/operations_async/_formdata_operations_async.py b/test/vanilla/Expected/AcceptanceTests/BodyFormData/bodyformdata/aio/operations/_formdata_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyFormData/bodyformdata/aio/operations_async/_formdata_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyFormData/bodyformdata/aio/operations/_formdata_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/aio/__init__.py b/test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/aio/__init__.py index 357b3ecbc42..ed22be884c2 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/aio/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_integer_test_service_async import AutoRestIntegerTestService +from ._auto_rest_integer_test_service import AutoRestIntegerTestService __all__ = ['AutoRestIntegerTestService'] diff --git a/test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/aio/_auto_rest_integer_test_service_async.py b/test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/aio/_auto_rest_integer_test_service.py similarity index 90% rename from test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/aio/_auto_rest_integer_test_service_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/aio/_auto_rest_integer_test_service.py index 3a3ae3c8193..8eba312e8f5 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/aio/_auto_rest_integer_test_service_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/aio/_auto_rest_integer_test_service.py @@ -11,8 +11,8 @@ from azure.core import AsyncPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import AutoRestIntegerTestServiceConfiguration -from .operations_async import IntOperations +from ._configuration import AutoRestIntegerTestServiceConfiguration +from .operations import IntOperations from .. import models @@ -20,7 +20,7 @@ class AutoRestIntegerTestService(object): """Test Infrastructure for AutoRest. :ivar int: IntOperations operations - :vartype int: bodyinteger.aio.operations_async.IntOperations + :vartype int: bodyinteger.aio.operations.IntOperations :param str base_url: Service URL """ diff --git a/test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/aio/_configuration.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/aio/_configuration_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/aio/_configuration.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/aio/operations_async/__init__.py b/test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/aio/operations/__init__.py similarity index 91% rename from test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/aio/operations_async/__init__.py rename to test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/aio/operations/__init__.py index 3235cbe679b..938ee1d0c2b 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/aio/operations_async/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._int_operations_async import IntOperations +from ._int_operations import IntOperations __all__ = [ 'IntOperations', diff --git a/test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/aio/operations_async/_int_operations_async.py b/test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/aio/operations/_int_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/aio/operations_async/_int_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/aio/operations/_int_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/aio/__init__.py b/test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/aio/__init__.py index c02426aa598..08425e652cb 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/aio/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_number_test_service_async import AutoRestNumberTestService +from ._auto_rest_number_test_service import AutoRestNumberTestService __all__ = ['AutoRestNumberTestService'] diff --git a/test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/aio/_auto_rest_number_test_service_async.py b/test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/aio/_auto_rest_number_test_service.py similarity index 90% rename from test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/aio/_auto_rest_number_test_service_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/aio/_auto_rest_number_test_service.py index 09a684d6248..37ddb5811a9 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/aio/_auto_rest_number_test_service_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/aio/_auto_rest_number_test_service.py @@ -11,8 +11,8 @@ from azure.core import AsyncPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import AutoRestNumberTestServiceConfiguration -from .operations_async import NumberOperations +from ._configuration import AutoRestNumberTestServiceConfiguration +from .operations import NumberOperations from .. import models @@ -20,7 +20,7 @@ class AutoRestNumberTestService(object): """Test Infrastructure for AutoRest. :ivar number: NumberOperations operations - :vartype number: bodynumber.aio.operations_async.NumberOperations + :vartype number: bodynumber.aio.operations.NumberOperations :param str base_url: Service URL """ diff --git a/test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/aio/_configuration.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/aio/_configuration_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/aio/_configuration.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/aio/operations_async/__init__.py b/test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/aio/operations/__init__.py similarity index 90% rename from test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/aio/operations_async/__init__.py rename to test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/aio/operations/__init__.py index a4f6e3b4e07..186262af5a4 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/aio/operations_async/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._number_operations_async import NumberOperations +from ._number_operations import NumberOperations __all__ = [ 'NumberOperations', diff --git a/test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/aio/operations_async/_number_operations_async.py b/test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/aio/operations/_number_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/aio/operations_async/_number_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/aio/operations/_number_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/aio/__init__.py b/test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/aio/__init__.py index aa6e808ed0e..091a13fdd9b 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/aio/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_swagger_bat_service_async import AutoRestSwaggerBATService +from ._auto_rest_swagger_bat_service import AutoRestSwaggerBATService __all__ = ['AutoRestSwaggerBATService'] diff --git a/test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/aio/_auto_rest_swagger_bat_service_async.py b/test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/aio/_auto_rest_swagger_bat_service.py similarity index 86% rename from test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/aio/_auto_rest_swagger_bat_service_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/aio/_auto_rest_swagger_bat_service.py index f2304d1c15d..21618f21a74 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/aio/_auto_rest_swagger_bat_service_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/aio/_auto_rest_swagger_bat_service.py @@ -11,9 +11,9 @@ from azure.core import AsyncPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import AutoRestSwaggerBATServiceConfiguration -from .operations_async import StringOperations -from .operations_async import EnumOperations +from ._configuration import AutoRestSwaggerBATServiceConfiguration +from .operations import StringOperations +from .operations import EnumOperations from .. import models @@ -21,9 +21,9 @@ class AutoRestSwaggerBATService(object): """Test Infrastructure for AutoRest Swagger BAT. :ivar string: StringOperations operations - :vartype string: bodystring.aio.operations_async.StringOperations + :vartype string: bodystring.aio.operations.StringOperations :ivar enum: EnumOperations operations - :vartype enum: bodystring.aio.operations_async.EnumOperations + :vartype enum: bodystring.aio.operations.EnumOperations :param str base_url: Service URL """ diff --git a/test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/aio/_configuration.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/aio/_configuration_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/aio/_configuration.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/aio/operations_async/__init__.py b/test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/aio/operations/__init__.py similarity index 83% rename from test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/aio/operations_async/__init__.py rename to test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/aio/operations/__init__.py index 0a7698f44af..7fd1174a43c 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/aio/operations_async/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/aio/operations/__init__.py @@ -6,8 +6,8 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._string_operations_async import StringOperations -from ._enum_operations_async import EnumOperations +from ._string_operations import StringOperations +from ._enum_operations import EnumOperations __all__ = [ 'StringOperations', diff --git a/test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/aio/operations_async/_enum_operations_async.py b/test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/aio/operations/_enum_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/aio/operations_async/_enum_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/aio/operations/_enum_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/aio/operations_async/_string_operations_async.py b/test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/aio/operations/_string_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/aio/operations_async/_string_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/aio/operations/_string_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/aio/__init__.py b/test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/aio/__init__.py index 6af744e5d22..2a277743931 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/aio/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_time_test_service_async import AutoRestTimeTestService +from ._auto_rest_time_test_service import AutoRestTimeTestService __all__ = ['AutoRestTimeTestService'] diff --git a/test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/aio/_auto_rest_time_test_service_async.py b/test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/aio/_auto_rest_time_test_service.py similarity index 90% rename from test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/aio/_auto_rest_time_test_service_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/aio/_auto_rest_time_test_service.py index 9cdcd34f390..2499737360c 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/aio/_auto_rest_time_test_service_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/aio/_auto_rest_time_test_service.py @@ -11,8 +11,8 @@ from azure.core import AsyncPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import AutoRestTimeTestServiceConfiguration -from .operations_async import TimeOperations +from ._configuration import AutoRestTimeTestServiceConfiguration +from .operations import TimeOperations from .. import models @@ -20,7 +20,7 @@ class AutoRestTimeTestService(object): """Test Infrastructure for AutoRest. :ivar time: TimeOperations operations - :vartype time: bodytime.aio.operations_async.TimeOperations + :vartype time: bodytime.aio.operations.TimeOperations :param str base_url: Service URL """ diff --git a/test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/aio/_configuration.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/aio/_configuration_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/aio/_configuration.py diff --git a/test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/aio/operations_async/__init__.py b/test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/aio/operations/__init__.py similarity index 90% rename from test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/aio/operations_async/__init__.py rename to test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/aio/operations/__init__.py index f80b1817bab..07965659acf 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/aio/operations_async/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._time_operations_async import TimeOperations +from ._time_operations import TimeOperations __all__ = [ 'TimeOperations', diff --git a/test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/aio/operations_async/_time_operations_async.py b/test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/aio/operations/_time_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/aio/operations_async/_time_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/aio/operations/_time_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/Constants/constants/aio/__init__.py b/test/vanilla/Expected/AcceptanceTests/Constants/constants/aio/__init__.py index 0dbfd21932a..37cd56950e0 100644 --- a/test/vanilla/Expected/AcceptanceTests/Constants/constants/aio/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/Constants/constants/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_swagger_constant_service_async import AutoRestSwaggerConstantService +from ._auto_rest_swagger_constant_service import AutoRestSwaggerConstantService __all__ = ['AutoRestSwaggerConstantService'] diff --git a/test/vanilla/Expected/AcceptanceTests/Constants/constants/aio/_auto_rest_swagger_constant_service_async.py b/test/vanilla/Expected/AcceptanceTests/Constants/constants/aio/_auto_rest_swagger_constant_service.py similarity index 89% rename from test/vanilla/Expected/AcceptanceTests/Constants/constants/aio/_auto_rest_swagger_constant_service_async.py rename to test/vanilla/Expected/AcceptanceTests/Constants/constants/aio/_auto_rest_swagger_constant_service.py index 537bf1e1258..d41dc789ece 100644 --- a/test/vanilla/Expected/AcceptanceTests/Constants/constants/aio/_auto_rest_swagger_constant_service_async.py +++ b/test/vanilla/Expected/AcceptanceTests/Constants/constants/aio/_auto_rest_swagger_constant_service.py @@ -11,8 +11,8 @@ from azure.core import AsyncPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import AutoRestSwaggerConstantServiceConfiguration -from .operations_async import ContantsOperations +from ._configuration import AutoRestSwaggerConstantServiceConfiguration +from .operations import ContantsOperations from .. import models @@ -20,7 +20,7 @@ class AutoRestSwaggerConstantService(object): """Test Infrastructure for AutoRest Swagger Constant. :ivar contants: ContantsOperations operations - :vartype contants: constants.aio.operations_async.ContantsOperations + :vartype contants: constants.aio.operations.ContantsOperations :param str base_url: Service URL """ diff --git a/test/vanilla/Expected/AcceptanceTests/Constants/constants/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/Constants/constants/aio/_configuration.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/Constants/constants/aio/_configuration_async.py rename to test/vanilla/Expected/AcceptanceTests/Constants/constants/aio/_configuration.py diff --git a/test/vanilla/Expected/AcceptanceTests/Constants/constants/aio/operations_async/__init__.py b/test/vanilla/Expected/AcceptanceTests/Constants/constants/aio/operations/__init__.py similarity index 89% rename from test/vanilla/Expected/AcceptanceTests/Constants/constants/aio/operations_async/__init__.py rename to test/vanilla/Expected/AcceptanceTests/Constants/constants/aio/operations/__init__.py index 97028116f46..1ef6a2e07a5 100644 --- a/test/vanilla/Expected/AcceptanceTests/Constants/constants/aio/operations_async/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/Constants/constants/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._contants_operations_async import ContantsOperations +from ._contants_operations import ContantsOperations __all__ = [ 'ContantsOperations', diff --git a/test/vanilla/Expected/AcceptanceTests/Constants/constants/aio/operations_async/_contants_operations_async.py b/test/vanilla/Expected/AcceptanceTests/Constants/constants/aio/operations/_contants_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/Constants/constants/aio/operations_async/_contants_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/Constants/constants/aio/operations/_contants_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/__init__.py b/test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/__init__.py index 49f16ddc823..6f73fcb5690 100644 --- a/test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_parameterized_host_test_client_async import AutoRestParameterizedHostTestClient +from ._auto_rest_parameterized_host_test_client import AutoRestParameterizedHostTestClient __all__ = ['AutoRestParameterizedHostTestClient'] diff --git a/test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/_auto_rest_parameterized_host_test_client_async.py b/test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/_auto_rest_parameterized_host_test_client.py similarity index 90% rename from test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/_auto_rest_parameterized_host_test_client_async.py rename to test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/_auto_rest_parameterized_host_test_client.py index c3287ee2a9f..ea32c13082e 100644 --- a/test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/_auto_rest_parameterized_host_test_client_async.py +++ b/test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/_auto_rest_parameterized_host_test_client.py @@ -11,8 +11,8 @@ from azure.core import AsyncPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import AutoRestParameterizedHostTestClientConfiguration -from .operations_async import PathsOperations +from ._configuration import AutoRestParameterizedHostTestClientConfiguration +from .operations import PathsOperations from .. import models @@ -20,7 +20,7 @@ class AutoRestParameterizedHostTestClient(object): """Test Infrastructure for AutoRest. :ivar paths: PathsOperations operations - :vartype paths: custombaseurl.aio.operations_async.PathsOperations + :vartype paths: custombaseurl.aio.operations.PathsOperations :param host: A string value that is used as a global part of the parameterized host. :type host: str """ diff --git a/test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/_configuration.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/_configuration_async.py rename to test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/_configuration.py diff --git a/test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/operations_async/__init__.py b/test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/operations/__init__.py similarity index 90% rename from test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/operations_async/__init__.py rename to test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/operations/__init__.py index fd09bf0ca10..2f0d3b169c3 100644 --- a/test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/operations_async/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._paths_operations_async import PathsOperations +from ._paths_operations import PathsOperations __all__ = [ 'PathsOperations', diff --git a/test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/operations_async/_paths_operations_async.py b/test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/operations/_paths_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/operations_async/_paths_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/operations/_paths_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/aio/__init__.py b/test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/aio/__init__.py index fec2c1dbbe3..ea414a93c44 100644 --- a/test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/aio/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_parameterized_custom_host_test_client_async import AutoRestParameterizedCustomHostTestClient +from ._auto_rest_parameterized_custom_host_test_client import AutoRestParameterizedCustomHostTestClient __all__ = ['AutoRestParameterizedCustomHostTestClient'] diff --git a/test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/aio/_auto_rest_parameterized_custom_host_test_client_async.py b/test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/aio/_auto_rest_parameterized_custom_host_test_client.py similarity index 90% rename from test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/aio/_auto_rest_parameterized_custom_host_test_client_async.py rename to test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/aio/_auto_rest_parameterized_custom_host_test_client.py index c346d5aaf73..697f060d673 100644 --- a/test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/aio/_auto_rest_parameterized_custom_host_test_client_async.py +++ b/test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/aio/_auto_rest_parameterized_custom_host_test_client.py @@ -11,8 +11,8 @@ from azure.core import AsyncPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import AutoRestParameterizedCustomHostTestClientConfiguration -from .operations_async import PathsOperations +from ._configuration import AutoRestParameterizedCustomHostTestClientConfiguration +from .operations import PathsOperations from .. import models @@ -20,7 +20,7 @@ class AutoRestParameterizedCustomHostTestClient(object): """Test Infrastructure for AutoRest. :ivar paths: PathsOperations operations - :vartype paths: custombaseurlmoreoptions.aio.operations_async.PathsOperations + :vartype paths: custombaseurlmoreoptions.aio.operations.PathsOperations :param subscription_id: The subscription id with value 'test12'. :type subscription_id: str :param dns_suffix: A string value that is used as a global part of the parameterized host. Default value 'host'. diff --git a/test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/aio/_configuration.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/aio/_configuration_async.py rename to test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/aio/_configuration.py diff --git a/test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/aio/operations_async/__init__.py b/test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/aio/operations/__init__.py similarity index 90% rename from test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/aio/operations_async/__init__.py rename to test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/aio/operations/__init__.py index fd09bf0ca10..2f0d3b169c3 100644 --- a/test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/aio/operations_async/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._paths_operations_async import PathsOperations +from ._paths_operations import PathsOperations __all__ = [ 'PathsOperations', diff --git a/test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/aio/operations_async/_paths_operations_async.py b/test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/aio/operations/_paths_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/aio/operations_async/_paths_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/aio/operations/_paths_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/__init__.py b/test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/__init__.py index ca432b753ae..818cd0b7cf3 100644 --- a/test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._pet_store_inc_async import PetStoreInc +from ._pet_store_inc import PetStoreInc __all__ = ['PetStoreInc'] diff --git a/test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/_configuration.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/_configuration_async.py rename to test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/_configuration.py diff --git a/test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/_pet_store_inc_async.py b/test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/_pet_store_inc.py similarity index 90% rename from test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/_pet_store_inc_async.py rename to test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/_pet_store_inc.py index f9e9f8d30dc..93e37bf21d0 100644 --- a/test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/_pet_store_inc_async.py +++ b/test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/_pet_store_inc.py @@ -11,8 +11,8 @@ from azure.core import AsyncPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import PetStoreIncConfiguration -from .operations_async import PetOperations +from ._configuration import PetStoreIncConfiguration +from .operations import PetOperations from .. import models @@ -20,7 +20,7 @@ class PetStoreInc(object): """PetStore. :ivar pet: PetOperations operations - :vartype pet: extensibleenumsswagger.aio.operations_async.PetOperations + :vartype pet: extensibleenumsswagger.aio.operations.PetOperations :param str base_url: Service URL """ diff --git a/test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/operations_async/__init__.py b/test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/operations/__init__.py similarity index 91% rename from test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/operations_async/__init__.py rename to test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/operations/__init__.py index 2fbd49f98f6..5c1da84e7fb 100644 --- a/test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/operations_async/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._pet_operations_async import PetOperations +from ._pet_operations import PetOperations __all__ = [ 'PetOperations', diff --git a/test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/operations_async/_pet_operations_async.py b/test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/operations/_pet_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/operations_async/_pet_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/operations/_pet_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/Header/header/aio/__init__.py b/test/vanilla/Expected/AcceptanceTests/Header/header/aio/__init__.py index f42bf397ad6..4ab2508fd42 100644 --- a/test/vanilla/Expected/AcceptanceTests/Header/header/aio/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/Header/header/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_swagger_bat_header_service_async import AutoRestSwaggerBATHeaderService +from ._auto_rest_swagger_bat_header_service import AutoRestSwaggerBATHeaderService __all__ = ['AutoRestSwaggerBATHeaderService'] diff --git a/test/vanilla/Expected/AcceptanceTests/Header/header/aio/_auto_rest_swagger_bat_header_service_async.py b/test/vanilla/Expected/AcceptanceTests/Header/header/aio/_auto_rest_swagger_bat_header_service.py similarity index 90% rename from test/vanilla/Expected/AcceptanceTests/Header/header/aio/_auto_rest_swagger_bat_header_service_async.py rename to test/vanilla/Expected/AcceptanceTests/Header/header/aio/_auto_rest_swagger_bat_header_service.py index 82a6ade0ec4..7950269961e 100644 --- a/test/vanilla/Expected/AcceptanceTests/Header/header/aio/_auto_rest_swagger_bat_header_service_async.py +++ b/test/vanilla/Expected/AcceptanceTests/Header/header/aio/_auto_rest_swagger_bat_header_service.py @@ -11,8 +11,8 @@ from azure.core import AsyncPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import AutoRestSwaggerBATHeaderServiceConfiguration -from .operations_async import HeaderOperations +from ._configuration import AutoRestSwaggerBATHeaderServiceConfiguration +from .operations import HeaderOperations from .. import models @@ -20,7 +20,7 @@ class AutoRestSwaggerBATHeaderService(object): """Test Infrastructure for AutoRest. :ivar header: HeaderOperations operations - :vartype header: header.aio.operations_async.HeaderOperations + :vartype header: header.aio.operations.HeaderOperations :param str base_url: Service URL """ diff --git a/test/vanilla/Expected/AcceptanceTests/Header/header/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/Header/header/aio/_configuration.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/Header/header/aio/_configuration_async.py rename to test/vanilla/Expected/AcceptanceTests/Header/header/aio/_configuration.py diff --git a/test/vanilla/Expected/AcceptanceTests/Header/header/aio/operations_async/__init__.py b/test/vanilla/Expected/AcceptanceTests/Header/header/aio/operations/__init__.py similarity index 90% rename from test/vanilla/Expected/AcceptanceTests/Header/header/aio/operations_async/__init__.py rename to test/vanilla/Expected/AcceptanceTests/Header/header/aio/operations/__init__.py index 27627605db6..6201248980f 100644 --- a/test/vanilla/Expected/AcceptanceTests/Header/header/aio/operations_async/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/Header/header/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._header_operations_async import HeaderOperations +from ._header_operations import HeaderOperations __all__ = [ 'HeaderOperations', diff --git a/test/vanilla/Expected/AcceptanceTests/Header/header/aio/operations_async/_header_operations_async.py b/test/vanilla/Expected/AcceptanceTests/Header/header/aio/operations/_header_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/Header/header/aio/operations_async/_header_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/Header/header/aio/operations/_header_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/__init__.py b/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/__init__.py index 349318ed156..ab0e4f1e3ae 100644 --- a/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_http_infrastructure_test_service_async import AutoRestHttpInfrastructureTestService +from ._auto_rest_http_infrastructure_test_service import AutoRestHttpInfrastructureTestService __all__ = ['AutoRestHttpInfrastructureTestService'] diff --git a/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/_auto_rest_http_infrastructure_test_service_async.py b/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/_auto_rest_http_infrastructure_test_service.py similarity index 77% rename from test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/_auto_rest_http_infrastructure_test_service_async.py rename to test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/_auto_rest_http_infrastructure_test_service.py index 41e9ccf0e75..e8ae6351cd7 100644 --- a/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/_auto_rest_http_infrastructure_test_service_async.py +++ b/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/_auto_rest_http_infrastructure_test_service.py @@ -11,14 +11,14 @@ from azure.core import AsyncPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import AutoRestHttpInfrastructureTestServiceConfiguration -from .operations_async import HttpFailureOperations -from .operations_async import HttpSuccessOperations -from .operations_async import HttpRedirectsOperations -from .operations_async import HttpClientFailureOperations -from .operations_async import HttpServerFailureOperations -from .operations_async import HttpRetryOperations -from .operations_async import MultipleResponsesOperations +from ._configuration import AutoRestHttpInfrastructureTestServiceConfiguration +from .operations import HttpFailureOperations +from .operations import HttpSuccessOperations +from .operations import HttpRedirectsOperations +from .operations import HttpClientFailureOperations +from .operations import HttpServerFailureOperations +from .operations import HttpRetryOperations +from .operations import MultipleResponsesOperations from .. import models @@ -26,19 +26,19 @@ class AutoRestHttpInfrastructureTestService(object): """Test Infrastructure for AutoRest. :ivar http_failure: HttpFailureOperations operations - :vartype http_failure: httpinfrastructure.aio.operations_async.HttpFailureOperations + :vartype http_failure: httpinfrastructure.aio.operations.HttpFailureOperations :ivar http_success: HttpSuccessOperations operations - :vartype http_success: httpinfrastructure.aio.operations_async.HttpSuccessOperations + :vartype http_success: httpinfrastructure.aio.operations.HttpSuccessOperations :ivar http_redirects: HttpRedirectsOperations operations - :vartype http_redirects: httpinfrastructure.aio.operations_async.HttpRedirectsOperations + :vartype http_redirects: httpinfrastructure.aio.operations.HttpRedirectsOperations :ivar http_client_failure: HttpClientFailureOperations operations - :vartype http_client_failure: httpinfrastructure.aio.operations_async.HttpClientFailureOperations + :vartype http_client_failure: httpinfrastructure.aio.operations.HttpClientFailureOperations :ivar http_server_failure: HttpServerFailureOperations operations - :vartype http_server_failure: httpinfrastructure.aio.operations_async.HttpServerFailureOperations + :vartype http_server_failure: httpinfrastructure.aio.operations.HttpServerFailureOperations :ivar http_retry: HttpRetryOperations operations - :vartype http_retry: httpinfrastructure.aio.operations_async.HttpRetryOperations + :vartype http_retry: httpinfrastructure.aio.operations.HttpRetryOperations :ivar multiple_responses: MultipleResponsesOperations operations - :vartype multiple_responses: httpinfrastructure.aio.operations_async.MultipleResponsesOperations + :vartype multiple_responses: httpinfrastructure.aio.operations.MultipleResponsesOperations :param str base_url: Service URL """ diff --git a/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/_configuration.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/_configuration_async.py rename to test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/_configuration.py diff --git a/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations_async/__init__.py b/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/__init__.py similarity index 58% rename from test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations_async/__init__.py rename to test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/__init__.py index 626e99cf60e..1f97bc70675 100644 --- a/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations_async/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/__init__.py @@ -6,13 +6,13 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._http_failure_operations_async import HttpFailureOperations -from ._http_success_operations_async import HttpSuccessOperations -from ._http_redirects_operations_async import HttpRedirectsOperations -from ._http_client_failure_operations_async import HttpClientFailureOperations -from ._http_server_failure_operations_async import HttpServerFailureOperations -from ._http_retry_operations_async import HttpRetryOperations -from ._multiple_responses_operations_async import MultipleResponsesOperations +from ._http_failure_operations import HttpFailureOperations +from ._http_success_operations import HttpSuccessOperations +from ._http_redirects_operations import HttpRedirectsOperations +from ._http_client_failure_operations import HttpClientFailureOperations +from ._http_server_failure_operations import HttpServerFailureOperations +from ._http_retry_operations import HttpRetryOperations +from ._multiple_responses_operations import MultipleResponsesOperations __all__ = [ 'HttpFailureOperations', diff --git a/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations_async/_http_client_failure_operations_async.py b/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_http_client_failure_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations_async/_http_client_failure_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_http_client_failure_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations_async/_http_failure_operations_async.py b/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_http_failure_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations_async/_http_failure_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_http_failure_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations_async/_http_redirects_operations_async.py b/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_http_redirects_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations_async/_http_redirects_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_http_redirects_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations_async/_http_retry_operations_async.py b/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_http_retry_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations_async/_http_retry_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_http_retry_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations_async/_http_server_failure_operations_async.py b/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_http_server_failure_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations_async/_http_server_failure_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_http_server_failure_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations_async/_http_success_operations_async.py b/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_http_success_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations_async/_http_success_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_http_success_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations_async/_multiple_responses_operations_async.py b/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_multiple_responses_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations_async/_multiple_responses_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_multiple_responses_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/__init__.py b/test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/__init__.py index a6a10346e23..09f7eced74a 100644 --- a/test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._media_types_client_async import MediaTypesClient +from ._media_types_client import MediaTypesClient __all__ = ['MediaTypesClient'] diff --git a/test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/_configuration.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/_configuration_async.py rename to test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/_configuration.py diff --git a/test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/_media_types_client_async.py b/test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/_media_types_client.py similarity index 92% rename from test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/_media_types_client_async.py rename to test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/_media_types_client.py index 0afc06670df..b383cd1a530 100644 --- a/test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/_media_types_client_async.py +++ b/test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/_media_types_client.py @@ -11,8 +11,8 @@ from azure.core import AsyncPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import MediaTypesClientConfiguration -from .operations_async import MediaTypesClientOperationsMixin +from ._configuration import MediaTypesClientConfiguration +from .operations import MediaTypesClientOperationsMixin from .. import models diff --git a/test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/operations_async/__init__.py b/test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/operations/__init__.py similarity index 86% rename from test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/operations_async/__init__.py rename to test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/operations/__init__.py index 7fc28bf76f6..d4e70d11ab3 100644 --- a/test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/operations_async/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._media_types_client_operations_async import MediaTypesClientOperationsMixin +from ._media_types_client_operations import MediaTypesClientOperationsMixin __all__ = [ 'MediaTypesClientOperationsMixin', diff --git a/test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/operations_async/_media_types_client_operations_async.py b/test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/operations/_media_types_client_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/operations_async/_media_types_client_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/operations/_media_types_client_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/__init__.py b/test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/__init__.py index 5c5faeeb7d0..b376a737bd2 100644 --- a/test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_resource_flattening_test_service_async import AutoRestResourceFlatteningTestService +from ._auto_rest_resource_flattening_test_service import AutoRestResourceFlatteningTestService __all__ = ['AutoRestResourceFlatteningTestService'] diff --git a/test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/_auto_rest_resource_flattening_test_service_async.py b/test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/_auto_rest_resource_flattening_test_service.py similarity index 90% rename from test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/_auto_rest_resource_flattening_test_service_async.py rename to test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/_auto_rest_resource_flattening_test_service.py index a0b915218dd..8ad6a42d85c 100644 --- a/test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/_auto_rest_resource_flattening_test_service_async.py +++ b/test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/_auto_rest_resource_flattening_test_service.py @@ -11,8 +11,8 @@ from azure.core import AsyncPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import AutoRestResourceFlatteningTestServiceConfiguration -from .operations_async import AutoRestResourceFlatteningTestServiceOperationsMixin +from ._configuration import AutoRestResourceFlatteningTestServiceConfiguration +from .operations import AutoRestResourceFlatteningTestServiceOperationsMixin from .. import models diff --git a/test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/_configuration.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/_configuration_async.py rename to test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/_configuration.py diff --git a/test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/operations_async/__init__.py b/test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/operations/__init__.py similarity index 81% rename from test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/operations_async/__init__.py rename to test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/operations/__init__.py index af469cba2c0..97acfd337b3 100644 --- a/test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/operations_async/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_resource_flattening_test_service_operations_async import AutoRestResourceFlatteningTestServiceOperationsMixin +from ._auto_rest_resource_flattening_test_service_operations import AutoRestResourceFlatteningTestServiceOperationsMixin __all__ = [ 'AutoRestResourceFlatteningTestServiceOperationsMixin', diff --git a/test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/operations_async/_auto_rest_resource_flattening_test_service_operations_async.py b/test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/operations/_auto_rest_resource_flattening_test_service_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/operations_async/_auto_rest_resource_flattening_test_service_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/operations/_auto_rest_resource_flattening_test_service_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/__init__.py b/test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/__init__.py index e04768551ec..00d4d300d98 100644 --- a/test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._multiple_inheritance_service_client_async import MultipleInheritanceServiceClient +from ._multiple_inheritance_service_client import MultipleInheritanceServiceClient __all__ = ['MultipleInheritanceServiceClient'] diff --git a/test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/_configuration.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/_configuration_async.py rename to test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/_configuration.py diff --git a/test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/_multiple_inheritance_service_client_async.py b/test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/_multiple_inheritance_service_client.py similarity index 91% rename from test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/_multiple_inheritance_service_client_async.py rename to test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/_multiple_inheritance_service_client.py index 3c0a33a5b15..25d80a098ec 100644 --- a/test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/_multiple_inheritance_service_client_async.py +++ b/test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/_multiple_inheritance_service_client.py @@ -11,8 +11,8 @@ from azure.core import AsyncPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import MultipleInheritanceServiceClientConfiguration -from .operations_async import MultipleInheritanceServiceClientOperationsMixin +from ._configuration import MultipleInheritanceServiceClientConfiguration +from .operations import MultipleInheritanceServiceClientOperationsMixin from .. import models diff --git a/test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/operations_async/__init__.py b/test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/operations/__init__.py similarity index 82% rename from test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/operations_async/__init__.py rename to test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/operations/__init__.py index 2411f4731dd..4afee8c7842 100644 --- a/test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/operations_async/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._multiple_inheritance_service_client_operations_async import MultipleInheritanceServiceClientOperationsMixin +from ._multiple_inheritance_service_client_operations import MultipleInheritanceServiceClientOperationsMixin __all__ = [ 'MultipleInheritanceServiceClientOperationsMixin', diff --git a/test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/operations_async/_multiple_inheritance_service_client_operations_async.py b/test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/operations/_multiple_inheritance_service_client_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/operations_async/_multiple_inheritance_service_client_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/operations/_multiple_inheritance_service_client_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/__init__.py b/test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/__init__.py index dd777203d4d..0ab6b439dfe 100644 --- a/test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._non_string_enums_client_async import NonStringEnumsClient +from ._non_string_enums_client import NonStringEnumsClient __all__ = ['NonStringEnumsClient'] diff --git a/test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/_configuration.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/_configuration_async.py rename to test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/_configuration.py diff --git a/test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/_non_string_enums_client_async.py b/test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/_non_string_enums_client.py similarity index 86% rename from test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/_non_string_enums_client_async.py rename to test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/_non_string_enums_client.py index d0b6682cff5..771af9568fa 100644 --- a/test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/_non_string_enums_client_async.py +++ b/test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/_non_string_enums_client.py @@ -15,18 +15,18 @@ # pylint: disable=unused-import,ungrouped-imports from typing import Dict -from ._configuration_async import NonStringEnumsClientConfiguration -from .operations_async import IntOperations -from .operations_async import FloatOperations +from ._configuration import NonStringEnumsClientConfiguration +from .operations import IntOperations +from .operations import FloatOperations class NonStringEnumsClient(object): """Testing non-string enums. :ivar int: IntOperations operations - :vartype int: nonstringenums.aio.operations_async.IntOperations + :vartype int: nonstringenums.aio.operations.IntOperations :ivar float: FloatOperations operations - :vartype float: nonstringenums.aio.operations_async.FloatOperations + :vartype float: nonstringenums.aio.operations.FloatOperations :param str base_url: Service URL """ diff --git a/test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/operations_async/__init__.py b/test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/operations/__init__.py similarity index 83% rename from test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/operations_async/__init__.py rename to test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/operations/__init__.py index 752e7dd67a8..c2816987187 100644 --- a/test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/operations_async/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/operations/__init__.py @@ -6,8 +6,8 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._int_operations_async import IntOperations -from ._float_operations_async import FloatOperations +from ._int_operations import IntOperations +from ._float_operations import FloatOperations __all__ = [ 'IntOperations', diff --git a/test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/operations_async/_float_operations_async.py b/test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/operations/_float_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/operations_async/_float_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/operations/_float_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/operations_async/_int_operations_async.py b/test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/operations/_int_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/operations_async/_int_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/operations/_int_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/aio/__init__.py b/test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/aio/__init__.py index 90f2081c958..df9e8fe4fc2 100644 --- a/test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/aio/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._object_type_client_async import ObjectTypeClient +from ._object_type_client import ObjectTypeClient __all__ = ['ObjectTypeClient'] diff --git a/test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/aio/_configuration.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/aio/_configuration_async.py rename to test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/aio/_configuration.py diff --git a/test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/aio/_object_type_client_async.py b/test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/aio/_object_type_client.py similarity index 92% rename from test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/aio/_object_type_client_async.py rename to test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/aio/_object_type_client.py index 2dc76d17b95..74c2e3cd9d3 100644 --- a/test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/aio/_object_type_client_async.py +++ b/test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/aio/_object_type_client.py @@ -15,8 +15,8 @@ # pylint: disable=unused-import,ungrouped-imports from typing import Dict -from ._configuration_async import ObjectTypeClientConfiguration -from .operations_async import ObjectTypeClientOperationsMixin +from ._configuration import ObjectTypeClientConfiguration +from .operations import ObjectTypeClientOperationsMixin class ObjectTypeClient(ObjectTypeClientOperationsMixin): diff --git a/test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/aio/operations_async/__init__.py b/test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/aio/operations/__init__.py similarity index 86% rename from test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/aio/operations_async/__init__.py rename to test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/aio/operations/__init__.py index ba71759cba1..29266a8de5e 100644 --- a/test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/aio/operations_async/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._object_type_client_operations_async import ObjectTypeClientOperationsMixin +from ._object_type_client_operations import ObjectTypeClientOperationsMixin __all__ = [ 'ObjectTypeClientOperationsMixin', diff --git a/test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/aio/operations_async/_object_type_client_operations_async.py b/test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/aio/operations/_object_type_client_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/aio/operations_async/_object_type_client_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/aio/operations/_object_type_client_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/aio/__init__.py b/test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/aio/__init__.py index 1bb2aca7fd9..15c4423457f 100644 --- a/test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/aio/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_parameter_flattening_async import AutoRestParameterFlattening +from ._auto_rest_parameter_flattening import AutoRestParameterFlattening __all__ = ['AutoRestParameterFlattening'] diff --git a/test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/aio/_auto_rest_parameter_flattening_async.py b/test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/aio/_auto_rest_parameter_flattening.py similarity index 91% rename from test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/aio/_auto_rest_parameter_flattening_async.py rename to test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/aio/_auto_rest_parameter_flattening.py index d9d509ed76e..e50860cc3a7 100644 --- a/test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/aio/_auto_rest_parameter_flattening_async.py +++ b/test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/aio/_auto_rest_parameter_flattening.py @@ -11,8 +11,8 @@ from azure.core import AsyncPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import AutoRestParameterFlatteningConfiguration -from .operations_async import AvailabilitySetsOperations +from ._configuration import AutoRestParameterFlatteningConfiguration +from .operations import AvailabilitySetsOperations from .. import models @@ -20,7 +20,7 @@ class AutoRestParameterFlattening(object): """Resource Flattening for AutoRest. :ivar availability_sets: AvailabilitySetsOperations operations - :vartype availability_sets: parameterflattening.aio.operations_async.AvailabilitySetsOperations + :vartype availability_sets: parameterflattening.aio.operations.AvailabilitySetsOperations :param str base_url: Service URL """ diff --git a/test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/aio/_configuration.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/aio/_configuration_async.py rename to test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/aio/_configuration.py diff --git a/test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/aio/operations_async/__init__.py b/test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/aio/operations/__init__.py similarity index 87% rename from test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/aio/operations_async/__init__.py rename to test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/aio/operations/__init__.py index 25fdb19005b..953ac9ff0bb 100644 --- a/test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/aio/operations_async/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._availability_sets_operations_async import AvailabilitySetsOperations +from ._availability_sets_operations import AvailabilitySetsOperations __all__ = [ 'AvailabilitySetsOperations', diff --git a/test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/aio/operations_async/_availability_sets_operations_async.py b/test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/aio/operations/_availability_sets_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/aio/operations_async/_availability_sets_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/aio/operations/_availability_sets_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/Report/report/aio/__init__.py b/test/vanilla/Expected/AcceptanceTests/Report/report/aio/__init__.py index 9ca87ded800..bf5cdbf929e 100644 --- a/test/vanilla/Expected/AcceptanceTests/Report/report/aio/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/Report/report/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_report_service_async import AutoRestReportService +from ._auto_rest_report_service import AutoRestReportService __all__ = ['AutoRestReportService'] diff --git a/test/vanilla/Expected/AcceptanceTests/Report/report/aio/_auto_rest_report_service_async.py b/test/vanilla/Expected/AcceptanceTests/Report/report/aio/_auto_rest_report_service.py similarity index 92% rename from test/vanilla/Expected/AcceptanceTests/Report/report/aio/_auto_rest_report_service_async.py rename to test/vanilla/Expected/AcceptanceTests/Report/report/aio/_auto_rest_report_service.py index 6e84a9356e0..a63ff7c89f4 100644 --- a/test/vanilla/Expected/AcceptanceTests/Report/report/aio/_auto_rest_report_service_async.py +++ b/test/vanilla/Expected/AcceptanceTests/Report/report/aio/_auto_rest_report_service.py @@ -11,8 +11,8 @@ from azure.core import AsyncPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import AutoRestReportServiceConfiguration -from .operations_async import AutoRestReportServiceOperationsMixin +from ._configuration import AutoRestReportServiceConfiguration +from .operations import AutoRestReportServiceOperationsMixin from .. import models diff --git a/test/vanilla/Expected/AcceptanceTests/Report/report/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/Report/report/aio/_configuration.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/Report/report/aio/_configuration_async.py rename to test/vanilla/Expected/AcceptanceTests/Report/report/aio/_configuration.py diff --git a/test/vanilla/Expected/AcceptanceTests/Report/report/aio/operations_async/__init__.py b/test/vanilla/Expected/AcceptanceTests/Report/report/aio/operations/__init__.py similarity index 85% rename from test/vanilla/Expected/AcceptanceTests/Report/report/aio/operations_async/__init__.py rename to test/vanilla/Expected/AcceptanceTests/Report/report/aio/operations/__init__.py index e05c2499b57..00cb6f42dd3 100644 --- a/test/vanilla/Expected/AcceptanceTests/Report/report/aio/operations_async/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/Report/report/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_report_service_operations_async import AutoRestReportServiceOperationsMixin +from ._auto_rest_report_service_operations import AutoRestReportServiceOperationsMixin __all__ = [ 'AutoRestReportServiceOperationsMixin', diff --git a/test/vanilla/Expected/AcceptanceTests/Report/report/aio/operations_async/_auto_rest_report_service_operations_async.py b/test/vanilla/Expected/AcceptanceTests/Report/report/aio/operations/_auto_rest_report_service_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/Report/report/aio/operations_async/_auto_rest_report_service_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/Report/report/aio/operations/_auto_rest_report_service_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/__init__.py b/test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/__init__.py index 28cfe03b158..720aa32f913 100644 --- a/test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_required_optional_test_service_async import AutoRestRequiredOptionalTestService +from ._auto_rest_required_optional_test_service import AutoRestRequiredOptionalTestService __all__ = ['AutoRestRequiredOptionalTestService'] diff --git a/test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/_auto_rest_required_optional_test_service_async.py b/test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/_auto_rest_required_optional_test_service.py similarity index 87% rename from test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/_auto_rest_required_optional_test_service_async.py rename to test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/_auto_rest_required_optional_test_service.py index 57ed4e0cea0..29a4e7ab966 100644 --- a/test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/_auto_rest_required_optional_test_service_async.py +++ b/test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/_auto_rest_required_optional_test_service.py @@ -11,9 +11,9 @@ from azure.core import AsyncPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import AutoRestRequiredOptionalTestServiceConfiguration -from .operations_async import ImplicitOperations -from .operations_async import ExplicitOperations +from ._configuration import AutoRestRequiredOptionalTestServiceConfiguration +from .operations import ImplicitOperations +from .operations import ExplicitOperations from .. import models @@ -21,9 +21,9 @@ class AutoRestRequiredOptionalTestService(object): """Test Infrastructure for AutoRest. :ivar implicit: ImplicitOperations operations - :vartype implicit: requiredoptional.aio.operations_async.ImplicitOperations + :vartype implicit: requiredoptional.aio.operations.ImplicitOperations :ivar explicit: ExplicitOperations operations - :vartype explicit: requiredoptional.aio.operations_async.ExplicitOperations + :vartype explicit: requiredoptional.aio.operations.ExplicitOperations :param required_global_path: number of items to skip. :type required_global_path: str :param required_global_query: number of items to skip. diff --git a/test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/_configuration.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/_configuration_async.py rename to test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/_configuration.py diff --git a/test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/operations_async/__init__.py b/test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/operations/__init__.py similarity index 81% rename from test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/operations_async/__init__.py rename to test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/operations/__init__.py index 5ee3a02c891..d145a1fba4e 100644 --- a/test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/operations_async/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/operations/__init__.py @@ -6,8 +6,8 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._implicit_operations_async import ImplicitOperations -from ._explicit_operations_async import ExplicitOperations +from ._implicit_operations import ImplicitOperations +from ._explicit_operations import ExplicitOperations __all__ = [ 'ImplicitOperations', diff --git a/test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/operations_async/_explicit_operations_async.py b/test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/operations/_explicit_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/operations_async/_explicit_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/operations/_explicit_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/operations_async/_implicit_operations_async.py b/test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/operations/_implicit_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/operations_async/_implicit_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/operations/_implicit_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/Url/url/aio/__init__.py b/test/vanilla/Expected/AcceptanceTests/Url/url/aio/__init__.py index 63167d21112..01b02cf07cf 100644 --- a/test/vanilla/Expected/AcceptanceTests/Url/url/aio/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/Url/url/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_url_test_service_async import AutoRestUrlTestService +from ._auto_rest_url_test_service import AutoRestUrlTestService __all__ = ['AutoRestUrlTestService'] diff --git a/test/vanilla/Expected/AcceptanceTests/Url/url/aio/_auto_rest_url_test_service_async.py b/test/vanilla/Expected/AcceptanceTests/Url/url/aio/_auto_rest_url_test_service.py similarity index 85% rename from test/vanilla/Expected/AcceptanceTests/Url/url/aio/_auto_rest_url_test_service_async.py rename to test/vanilla/Expected/AcceptanceTests/Url/url/aio/_auto_rest_url_test_service.py index b32d35e2cb1..da057d78591 100644 --- a/test/vanilla/Expected/AcceptanceTests/Url/url/aio/_auto_rest_url_test_service_async.py +++ b/test/vanilla/Expected/AcceptanceTests/Url/url/aio/_auto_rest_url_test_service.py @@ -11,10 +11,10 @@ from azure.core import AsyncPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import AutoRestUrlTestServiceConfiguration -from .operations_async import PathsOperations -from .operations_async import QueriesOperations -from .operations_async import PathItemsOperations +from ._configuration import AutoRestUrlTestServiceConfiguration +from .operations import PathsOperations +from .operations import QueriesOperations +from .operations import PathItemsOperations from .. import models @@ -22,11 +22,11 @@ class AutoRestUrlTestService(object): """Test Infrastructure for AutoRest. :ivar paths: PathsOperations operations - :vartype paths: url.aio.operations_async.PathsOperations + :vartype paths: url.aio.operations.PathsOperations :ivar queries: QueriesOperations operations - :vartype queries: url.aio.operations_async.QueriesOperations + :vartype queries: url.aio.operations.QueriesOperations :ivar path_items: PathItemsOperations operations - :vartype path_items: url.aio.operations_async.PathItemsOperations + :vartype path_items: url.aio.operations.PathItemsOperations :param global_string_path: A string value 'globalItemStringPath' that appears in the path. :type global_string_path: str :param global_string_query: should contain value null. diff --git a/test/vanilla/Expected/AcceptanceTests/Url/url/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/Url/url/aio/_configuration.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/Url/url/aio/_configuration_async.py rename to test/vanilla/Expected/AcceptanceTests/Url/url/aio/_configuration.py diff --git a/test/vanilla/Expected/AcceptanceTests/Url/url/aio/operations_async/__init__.py b/test/vanilla/Expected/AcceptanceTests/Url/url/aio/operations/__init__.py similarity index 76% rename from test/vanilla/Expected/AcceptanceTests/Url/url/aio/operations_async/__init__.py rename to test/vanilla/Expected/AcceptanceTests/Url/url/aio/operations/__init__.py index 9e36eefe981..8d46687d7c1 100644 --- a/test/vanilla/Expected/AcceptanceTests/Url/url/aio/operations_async/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/Url/url/aio/operations/__init__.py @@ -6,9 +6,9 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._paths_operations_async import PathsOperations -from ._queries_operations_async import QueriesOperations -from ._path_items_operations_async import PathItemsOperations +from ._paths_operations import PathsOperations +from ._queries_operations import QueriesOperations +from ._path_items_operations import PathItemsOperations __all__ = [ 'PathsOperations', diff --git a/test/vanilla/Expected/AcceptanceTests/Url/url/aio/operations_async/_path_items_operations_async.py b/test/vanilla/Expected/AcceptanceTests/Url/url/aio/operations/_path_items_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/Url/url/aio/operations_async/_path_items_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/Url/url/aio/operations/_path_items_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/Url/url/aio/operations_async/_paths_operations_async.py b/test/vanilla/Expected/AcceptanceTests/Url/url/aio/operations/_paths_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/Url/url/aio/operations_async/_paths_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/Url/url/aio/operations/_paths_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/Url/url/aio/operations_async/_queries_operations_async.py b/test/vanilla/Expected/AcceptanceTests/Url/url/aio/operations/_queries_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/Url/url/aio/operations_async/_queries_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/Url/url/aio/operations/_queries_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/aio/__init__.py b/test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/aio/__init__.py index e8ac47b28c4..26c43a44a59 100644 --- a/test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/aio/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_url_mutli_collection_format_test_service_async import AutoRestUrlMutliCollectionFormatTestService +from ._auto_rest_url_mutli_collection_format_test_service import AutoRestUrlMutliCollectionFormatTestService __all__ = ['AutoRestUrlMutliCollectionFormatTestService'] diff --git a/test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/aio/_auto_rest_url_mutli_collection_format_test_service_async.py b/test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/aio/_auto_rest_url_mutli_collection_format_test_service.py similarity index 88% rename from test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/aio/_auto_rest_url_mutli_collection_format_test_service_async.py rename to test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/aio/_auto_rest_url_mutli_collection_format_test_service.py index c3ff1ce360e..b380915e9c2 100644 --- a/test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/aio/_auto_rest_url_mutli_collection_format_test_service_async.py +++ b/test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/aio/_auto_rest_url_mutli_collection_format_test_service.py @@ -11,8 +11,8 @@ from azure.core import AsyncPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import AutoRestUrlMutliCollectionFormatTestServiceConfiguration -from .operations_async import QueriesOperations +from ._configuration import AutoRestUrlMutliCollectionFormatTestServiceConfiguration +from .operations import QueriesOperations from .. import models @@ -20,7 +20,7 @@ class AutoRestUrlMutliCollectionFormatTestService(object): """Test Infrastructure for AutoRest. :ivar queries: QueriesOperations operations - :vartype queries: urlmulticollectionformat.aio.operations_async.QueriesOperations + :vartype queries: urlmulticollectionformat.aio.operations.QueriesOperations :param str base_url: Service URL """ diff --git a/test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/aio/_configuration.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/aio/_configuration_async.py rename to test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/aio/_configuration.py diff --git a/test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/aio/operations_async/__init__.py b/test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/aio/operations/__init__.py similarity index 89% rename from test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/aio/operations_async/__init__.py rename to test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/aio/operations/__init__.py index 1bbe8374dd0..0c8a12ca6b5 100644 --- a/test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/aio/operations_async/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._queries_operations_async import QueriesOperations +from ._queries_operations import QueriesOperations __all__ = [ 'QueriesOperations', diff --git a/test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/aio/operations_async/_queries_operations_async.py b/test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/aio/operations/_queries_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/aio/operations_async/_queries_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/aio/operations/_queries_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/Validation/validation/aio/__init__.py b/test/vanilla/Expected/AcceptanceTests/Validation/validation/aio/__init__.py index 12fad434961..0605ce50b52 100644 --- a/test/vanilla/Expected/AcceptanceTests/Validation/validation/aio/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/Validation/validation/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_validation_test_async import AutoRestValidationTest +from ._auto_rest_validation_test import AutoRestValidationTest __all__ = ['AutoRestValidationTest'] diff --git a/test/vanilla/Expected/AcceptanceTests/Validation/validation/aio/_auto_rest_validation_test_async.py b/test/vanilla/Expected/AcceptanceTests/Validation/validation/aio/_auto_rest_validation_test.py similarity index 92% rename from test/vanilla/Expected/AcceptanceTests/Validation/validation/aio/_auto_rest_validation_test_async.py rename to test/vanilla/Expected/AcceptanceTests/Validation/validation/aio/_auto_rest_validation_test.py index b179748256f..932d0efaf99 100644 --- a/test/vanilla/Expected/AcceptanceTests/Validation/validation/aio/_auto_rest_validation_test_async.py +++ b/test/vanilla/Expected/AcceptanceTests/Validation/validation/aio/_auto_rest_validation_test.py @@ -11,8 +11,8 @@ from azure.core import AsyncPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import AutoRestValidationTestConfiguration -from .operations_async import AutoRestValidationTestOperationsMixin +from ._configuration import AutoRestValidationTestConfiguration +from .operations import AutoRestValidationTestOperationsMixin from .. import models diff --git a/test/vanilla/Expected/AcceptanceTests/Validation/validation/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/Validation/validation/aio/_configuration.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/Validation/validation/aio/_configuration_async.py rename to test/vanilla/Expected/AcceptanceTests/Validation/validation/aio/_configuration.py diff --git a/test/vanilla/Expected/AcceptanceTests/Validation/validation/aio/operations_async/__init__.py b/test/vanilla/Expected/AcceptanceTests/Validation/validation/aio/operations/__init__.py similarity index 84% rename from test/vanilla/Expected/AcceptanceTests/Validation/validation/aio/operations_async/__init__.py rename to test/vanilla/Expected/AcceptanceTests/Validation/validation/aio/operations/__init__.py index 840f87c8d8b..aeac9b918e7 100644 --- a/test/vanilla/Expected/AcceptanceTests/Validation/validation/aio/operations_async/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/Validation/validation/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_validation_test_operations_async import AutoRestValidationTestOperationsMixin +from ._auto_rest_validation_test_operations import AutoRestValidationTestOperationsMixin __all__ = [ 'AutoRestValidationTestOperationsMixin', diff --git a/test/vanilla/Expected/AcceptanceTests/Validation/validation/aio/operations_async/_auto_rest_validation_test_operations_async.py b/test/vanilla/Expected/AcceptanceTests/Validation/validation/aio/operations/_auto_rest_validation_test_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/Validation/validation/aio/operations_async/_auto_rest_validation_test_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/Validation/validation/aio/operations/_auto_rest_validation_test_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/aio/__init__.py b/test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/aio/__init__.py index 0065c077b12..5c1c225f142 100644 --- a/test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/aio/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._auto_rest_swagger_batxml_service_async import AutoRestSwaggerBATXMLService +from ._auto_rest_swagger_batxml_service import AutoRestSwaggerBATXMLService __all__ = ['AutoRestSwaggerBATXMLService'] diff --git a/test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/aio/_auto_rest_swagger_batxml_service_async.py b/test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/aio/_auto_rest_swagger_batxml_service.py similarity index 90% rename from test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/aio/_auto_rest_swagger_batxml_service_async.py rename to test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/aio/_auto_rest_swagger_batxml_service.py index 3b29d8ff09d..600ee69945b 100644 --- a/test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/aio/_auto_rest_swagger_batxml_service_async.py +++ b/test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/aio/_auto_rest_swagger_batxml_service.py @@ -11,8 +11,8 @@ from azure.core import AsyncPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import AutoRestSwaggerBATXMLServiceConfiguration -from .operations_async import XmlOperations +from ._configuration import AutoRestSwaggerBATXMLServiceConfiguration +from .operations import XmlOperations from .. import models @@ -20,7 +20,7 @@ class AutoRestSwaggerBATXMLService(object): """Test Infrastructure for AutoRest Swagger BAT. :ivar xml: XmlOperations operations - :vartype xml: xmlservice.aio.operations_async.XmlOperations + :vartype xml: xmlservice.aio.operations.XmlOperations :param str base_url: Service URL """ diff --git a/test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/aio/_configuration.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/aio/_configuration_async.py rename to test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/aio/_configuration.py diff --git a/test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/aio/operations_async/__init__.py b/test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/aio/operations/__init__.py similarity index 91% rename from test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/aio/operations_async/__init__.py rename to test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/aio/operations/__init__.py index 0981940cf70..0189b1d89ef 100644 --- a/test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/aio/operations_async/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._xml_operations_async import XmlOperations +from ._xml_operations import XmlOperations __all__ = [ 'XmlOperations', diff --git a/test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/aio/operations_async/_xml_operations_async.py b/test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/aio/operations/_xml_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/aio/operations_async/_xml_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/aio/operations/_xml_operations.py diff --git a/test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/__init__.py b/test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/__init__.py index bbefa0659bf..fb13ebd1d3d 100644 --- a/test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/__init__.py @@ -6,5 +6,5 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._xms_error_response_extensions_async import XMSErrorResponseExtensions +from ._xms_error_response_extensions import XMSErrorResponseExtensions __all__ = ['XMSErrorResponseExtensions'] diff --git a/test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/_configuration.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/_configuration_async.py rename to test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/_configuration.py diff --git a/test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/_xms_error_response_extensions_async.py b/test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/_xms_error_response_extensions.py similarity index 90% rename from test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/_xms_error_response_extensions_async.py rename to test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/_xms_error_response_extensions.py index a38d01447e8..647de908213 100644 --- a/test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/_xms_error_response_extensions_async.py +++ b/test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/_xms_error_response_extensions.py @@ -11,8 +11,8 @@ from azure.core import AsyncPipelineClient from msrest import Deserializer, Serializer -from ._configuration_async import XMSErrorResponseExtensionsConfiguration -from .operations_async import PetOperations +from ._configuration import XMSErrorResponseExtensionsConfiguration +from .operations import PetOperations from .. import models @@ -20,7 +20,7 @@ class XMSErrorResponseExtensions(object): """XMS Error Response Extensions. :ivar pet: PetOperations operations - :vartype pet: xmserrorresponse.aio.operations_async.PetOperations + :vartype pet: xmserrorresponse.aio.operations.PetOperations :param str base_url: Service URL """ diff --git a/test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/operations_async/__init__.py b/test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/operations/__init__.py similarity index 91% rename from test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/operations_async/__init__.py rename to test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/operations/__init__.py index 2fbd49f98f6..5c1da84e7fb 100644 --- a/test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/operations_async/__init__.py +++ b/test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._pet_operations_async import PetOperations +from ._pet_operations import PetOperations __all__ = [ 'PetOperations', diff --git a/test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/operations_async/_pet_operations_async.py b/test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/operations/_pet_operations.py similarity index 100% rename from test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/operations_async/_pet_operations_async.py rename to test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/operations/_pet_operations.py diff --git a/test/vanilla/pytest.ini b/test/vanilla/pytest.ini index d6bacf50ecf..9a0fe2d9e94 100644 --- a/test/vanilla/pytest.ini +++ b/test/vanilla/pytest.ini @@ -1,3 +1,4 @@ [pytest] usefixtures = testserver -xfail_strict=true \ No newline at end of file +xfail_strict=true +python_files=test_*.py \ No newline at end of file