diff --git a/README.md b/README.md index ec93a02ab..2b00e21dc 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ See documentation [here](doc/00-overview.md) python: reason: 'make sure python flag exists to load config in python.md' +azure-arm: true output-folder: $(az-output-folder) debug-output-folder: $(az-output-folder)/_az_debug diff --git a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/__init__.py b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/__init__.py index 5328ebc59..b420c0b6e 100644 --- a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/__init__.py +++ b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/__init__.py @@ -7,9 +7,6 @@ # -------------------------------------------------------------------------- from ._attestation_management_client import AttestationManagementClient -from ._version import VERSION - -__version__ = VERSION __all__ = ['AttestationManagementClient'] try: diff --git a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/_attestation_management_client.py b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/_attestation_management_client.py index 1bd9372cd..e60879788 100644 --- a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/_attestation_management_client.py +++ b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/_attestation_management_client.py @@ -15,6 +15,8 @@ # pylint: disable=unused-import,ungrouped-imports from typing import Any, Optional + from azure.core.credentials import TokenCredential + from ._configuration import AttestationManagementClientConfiguration from .operations import OperationOperations from .operations import AttestationProviderOperations @@ -25,9 +27,9 @@ class AttestationManagementClient(object): """Various APIs for managing resources in attestation service. This primarily encompasses per-tenant instance management. :ivar operation: OperationOperations operations - :vartype operation: azure.mgmt.attestation.operations.OperationOperations + :vartype operation: attestation_management_client.operations.OperationOperations :ivar attestation_provider: AttestationProviderOperations operations - :vartype attestation_provider: azure.mgmt.attestation.operations.AttestationProviderOperations + :vartype attestation_provider: attestation_management_client.operations.AttestationProviderOperations :param credential: Credential needed for the client to connect to Azure. :type credential: ~azure.core.credentials.TokenCredential :param subscription_id: The ID of the target subscription. diff --git a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/_configuration.py b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/_configuration.py index 300325461..b58410a6e 100644 --- a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/_configuration.py +++ b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/_configuration.py @@ -11,14 +11,13 @@ from azure.core.configuration import Configuration from azure.core.pipeline import policies -from ._version import VERSION - if TYPE_CHECKING: # pylint: disable=unused-import,ungrouped-imports from typing import Any from azure.core.credentials import TokenCredential +VERSION = "unknown" class AttestationManagementClientConfiguration(Configuration): """Configuration for AttestationManagementClient. @@ -50,7 +49,7 @@ def __init__( self.api_version = "2018-09-01-preview" self.credential_scopes = ['https://management.azure.com/.default'] self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) - kwargs.setdefault('sdk_moniker', 'mgmt-attestation/{}'.format(VERSION)) + kwargs.setdefault('sdk_moniker', 'attestationmanagementclient/{}'.format(VERSION)) self._configure(**kwargs) def _configure( diff --git a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/_version.py b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/_version.py deleted file mode 100644 index eae7c95b6..000000000 --- a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/_version.py +++ /dev/null @@ -1,9 +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. -# -------------------------------------------------------------------------- - -VERSION = "0.1.0" diff --git a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/aio/_attestation_management_client_async.py b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/aio/_attestation_management_client_async.py index b37b017cb..42dd842e4 100644 --- a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/aio/_attestation_management_client_async.py +++ b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/aio/_attestation_management_client_async.py @@ -6,11 +6,15 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, Optional +from typing import Any, Optional, TYPE_CHECKING from azure.mgmt.core import AsyncARMPipelineClient from msrest import Deserializer, Serializer +if TYPE_CHECKING: + # pylint: disable=unused-import,ungrouped-imports + from azure.core.credentials_async import AsyncTokenCredential + from ._configuration_async import AttestationManagementClientConfiguration from .operations_async import OperationOperations from .operations_async import AttestationProviderOperations @@ -21,9 +25,9 @@ class AttestationManagementClient(object): """Various APIs for managing resources in attestation service. This primarily encompasses per-tenant instance management. :ivar operation: OperationOperations operations - :vartype operation: azure.mgmt.attestation.aio.operations_async.OperationOperations + :vartype operation: attestation_management_client.aio.operations_async.OperationOperations :ivar attestation_provider: AttestationProviderOperations operations - :vartype attestation_provider: azure.mgmt.attestation.aio.operations_async.AttestationProviderOperations + :vartype attestation_provider: attestation_management_client.aio.operations_async.AttestationProviderOperations :param credential: Credential needed for the client to connect to Azure. :type credential: ~azure.core.credentials_async.AsyncTokenCredential :param subscription_id: The ID of the target subscription. diff --git a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/aio/_configuration_async.py b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/aio/_configuration_async.py index 282434a61..679b61fc8 100644 --- a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/aio/_configuration_async.py +++ b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/aio/_configuration_async.py @@ -11,12 +11,11 @@ from azure.core.configuration import Configuration from azure.core.pipeline import policies -from .._version import VERSION - if TYPE_CHECKING: # pylint: disable=unused-import,ungrouped-imports - from azure.core.credentials import TokenCredential + from azure.core.credentials_async import AsyncTokenCredential +VERSION = "unknown" class AttestationManagementClientConfiguration(Configuration): """Configuration for AttestationManagementClient. @@ -47,7 +46,7 @@ def __init__( self.api_version = "2018-09-01-preview" self.credential_scopes = ['https://management.azure.com/.default'] self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) - kwargs.setdefault('sdk_moniker', 'mgmt-attestation/{}'.format(VERSION)) + kwargs.setdefault('sdk_moniker', 'attestationmanagementclient/{}'.format(VERSION)) self._configure(**kwargs) def _configure( diff --git a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/aio/operations_async/_attestation_provider_operations_async.py b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/aio/operations_async/_attestation_provider_operations_async.py index 284828ea1..be3bc8409 100644 --- a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/aio/operations_async/_attestation_provider_operations_async.py +++ b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/aio/operations_async/_attestation_provider_operations_async.py @@ -25,7 +25,7 @@ class AttestationProviderOperations: instantiates it for you and attaches it as an attribute. :ivar models: Alias to model classes used in this operation group. - :type models: ~azure.mgmt.attestation.models + :type models: ~attestation_management_client.models :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. @@ -53,8 +53,8 @@ async def get( :param provider_name: Name of the attestation service instance. :type provider_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: AttestationProvider or the result of cls(response) - :rtype: ~azure.mgmt.attestation.models.AttestationProvider + :return: AttestationProvider, or the result of cls(response) + :rtype: ~attestation_management_client.models.AttestationProvider :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.AttestationProvider"] @@ -91,7 +91,7 @@ async def get( deserialized = self._deserialize('AttestationProvider', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Attestation/attestationProviders/{providerName}'} # type: ignore @@ -124,10 +124,10 @@ async def create( an order of preference among them, although applications of JWK Sets can choose to assign a meaning to the order for their purposes, if desired. - :type keys: list[~azure.mgmt.attestation.models.JsonWebKey] + :type keys: list[~attestation_management_client.models.JsonWebKey] :keyword callable cls: A custom type or function that will be passed the direct response - :return: AttestationProvider or the result of cls(response) - :rtype: ~azure.mgmt.attestation.models.AttestationProvider + :return: AttestationProvider, or the result of cls(response) + :rtype: ~attestation_management_client.models.AttestationProvider :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.AttestationProvider"] @@ -177,7 +177,7 @@ async def create( deserialized = self._deserialize('AttestationProvider', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized create.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Attestation/attestationProviders/{providerName}'} # type: ignore @@ -198,8 +198,8 @@ async def update( :param tags: The tags that will be assigned to the attestation service instance. :type tags: dict[str, str] :keyword callable cls: A custom type or function that will be passed the direct response - :return: AttestationProvider or the result of cls(response) - :rtype: ~azure.mgmt.attestation.models.AttestationProvider + :return: AttestationProvider, or the result of cls(response) + :rtype: ~attestation_management_client.models.AttestationProvider :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.AttestationProvider"] @@ -244,7 +244,7 @@ async def update( deserialized = self._deserialize('AttestationProvider', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Attestation/attestationProviders/{providerName}'} # type: ignore @@ -262,7 +262,7 @@ async def delete( :param provider_name: Name of the attestation service. :type provider_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: None or the result of cls(response) + :return: None, or the result of cls(response) :rtype: None :raises: ~azure.core.exceptions.HttpResponseError """ @@ -297,7 +297,7 @@ async def delete( raise HttpResponseError(response=response, error_format=ARMErrorFormat) if cls: - return cls(pipeline_response, None, {}) + return cls(pipeline_response, None, {}) delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Attestation/attestationProviders/{providerName}'} # type: ignore @@ -308,8 +308,8 @@ async def list( """Returns a list of attestation providers in a subscription. :keyword callable cls: A custom type or function that will be passed the direct response - :return: AttestationProviderListResult or the result of cls(response) - :rtype: ~azure.mgmt.attestation.models.AttestationProviderListResult + :return: AttestationProviderListResult, or the result of cls(response) + :rtype: ~attestation_management_client.models.AttestationProviderListResult :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.AttestationProviderListResult"] @@ -344,7 +344,7 @@ async def list( deserialized = self._deserialize('AttestationProviderListResult', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Attestation/attestationProviders'} # type: ignore @@ -359,8 +359,8 @@ async def list_by_resource_group( :param resource_group_name: The name of the resource group. The name is case insensitive. :type resource_group_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: AttestationProviderListResult or the result of cls(response) - :rtype: ~azure.mgmt.attestation.models.AttestationProviderListResult + :return: AttestationProviderListResult, or the result of cls(response) + :rtype: ~attestation_management_client.models.AttestationProviderListResult :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.AttestationProviderListResult"] @@ -396,7 +396,7 @@ async def list_by_resource_group( deserialized = self._deserialize('AttestationProviderListResult', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized list_by_resource_group.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Attestation/attestationProviders'} # type: ignore diff --git a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/aio/operations_async/_operation_operations_async.py b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/aio/operations_async/_operation_operations_async.py index 8578e3864..2591e1020 100644 --- a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/aio/operations_async/_operation_operations_async.py +++ b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/aio/operations_async/_operation_operations_async.py @@ -25,7 +25,7 @@ class OperationOperations: instantiates it for you and attaches it as an attribute. :ivar models: Alias to model classes used in this operation group. - :type models: ~azure.mgmt.attestation.models + :type models: ~attestation_management_client.models :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. @@ -47,8 +47,8 @@ async def list( """Lists all of the available Azure attestation operations. :keyword callable cls: A custom type or function that will be passed the direct response - :return: OperationList or the result of cls(response) - :rtype: ~azure.mgmt.attestation.models.OperationList + :return: OperationList, or the result of cls(response) + :rtype: ~attestation_management_client.models.OperationList :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.OperationList"] @@ -79,7 +79,7 @@ async def list( deserialized = self._deserialize('OperationList', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized list.metadata = {'url': '/providers/Microsoft.Attestation/operations'} # type: ignore diff --git a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/models/_models.py b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/models/_models.py index 4250390ae..67f429cca 100644 --- a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/models/_models.py +++ b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/models/_models.py @@ -114,7 +114,7 @@ class AttestationProvider(TrackedResource): :type trust_model: str :param status: Required. Status of attestation service. Possible values include: "Ready", "NotReady", "Error". - :type status: str or ~azure.mgmt.attestation.models.AttestationServiceStatus + :type status: str or ~attestation_management_client.models.AttestationServiceStatus :param attest_uri: Gets the uri of attestation service. :type attest_uri: str """ @@ -152,7 +152,7 @@ class AttestationProviderListResult(msrest.serialization.Model): """Attestation Providers List. :param value: Attestation Provider array. - :type value: list[~azure.mgmt.attestation.models.AttestationProvider] + :type value: list[~attestation_management_client.models.AttestationProvider] """ _attribute_map = { @@ -184,7 +184,7 @@ class AttestationServiceCreationParams(msrest.serialization.Model): an order of preference among them, although applications of JWK Sets can choose to assign a meaning to the order for their purposes, if desired. - :type keys: list[~azure.mgmt.attestation.models.JsonWebKey] + :type keys: list[~attestation_management_client.models.JsonWebKey] """ _validation = { @@ -374,7 +374,7 @@ class OperationList(msrest.serialization.Model): """List of supported operations. :param value: List of supported operations. - :type value: list[~azure.mgmt.attestation.models.OperationsDefinition] + :type value: list[~attestation_management_client.models.OperationsDefinition] """ _attribute_map = { @@ -395,7 +395,7 @@ class OperationsDefinition(msrest.serialization.Model): :param name: Name of the operation. :type name: str :param display: Display object with properties of the operation. - :type display: ~azure.mgmt.attestation.models.OperationsDisplayDefinition + :type display: ~attestation_management_client.models.OperationsDisplayDefinition """ _attribute_map = { diff --git a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/models/_models_py3.py b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/models/_models_py3.py index 4a9b96c89..41ceb554a 100644 --- a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/models/_models_py3.py +++ b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/models/_models_py3.py @@ -121,7 +121,7 @@ class AttestationProvider(TrackedResource): :type trust_model: str :param status: Required. Status of attestation service. Possible values include: "Ready", "NotReady", "Error". - :type status: str or ~azure.mgmt.attestation.models.AttestationServiceStatus + :type status: str or ~attestation_management_client.models.AttestationServiceStatus :param attest_uri: Gets the uri of attestation service. :type attest_uri: str """ @@ -165,7 +165,7 @@ class AttestationProviderListResult(msrest.serialization.Model): """Attestation Providers List. :param value: Attestation Provider array. - :type value: list[~azure.mgmt.attestation.models.AttestationProvider] + :type value: list[~attestation_management_client.models.AttestationProvider] """ _attribute_map = { @@ -199,7 +199,7 @@ class AttestationServiceCreationParams(msrest.serialization.Model): an order of preference among them, although applications of JWK Sets can choose to assign a meaning to the order for their purposes, if desired. - :type keys: list[~azure.mgmt.attestation.models.JsonWebKey] + :type keys: list[~attestation_management_client.models.JsonWebKey] """ _validation = { @@ -417,7 +417,7 @@ class OperationList(msrest.serialization.Model): """List of supported operations. :param value: List of supported operations. - :type value: list[~azure.mgmt.attestation.models.OperationsDefinition] + :type value: list[~attestation_management_client.models.OperationsDefinition] """ _attribute_map = { @@ -440,7 +440,7 @@ class OperationsDefinition(msrest.serialization.Model): :param name: Name of the operation. :type name: str :param display: Display object with properties of the operation. - :type display: ~azure.mgmt.attestation.models.OperationsDisplayDefinition + :type display: ~attestation_management_client.models.OperationsDisplayDefinition """ _attribute_map = { diff --git a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/operations/_attestation_provider_operations.py b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/operations/_attestation_provider_operations.py index b697e785f..ba09638ee 100644 --- a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/operations/_attestation_provider_operations.py +++ b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/operations/_attestation_provider_operations.py @@ -29,7 +29,7 @@ class AttestationProviderOperations(object): instantiates it for you and attaches it as an attribute. :ivar models: Alias to model classes used in this operation group. - :type models: ~azure.mgmt.attestation.models + :type models: ~attestation_management_client.models :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. @@ -58,8 +58,8 @@ def get( :param provider_name: Name of the attestation service instance. :type provider_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: AttestationProvider or the result of cls(response) - :rtype: ~azure.mgmt.attestation.models.AttestationProvider + :return: AttestationProvider, or the result of cls(response) + :rtype: ~attestation_management_client.models.AttestationProvider :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.AttestationProvider"] @@ -96,7 +96,7 @@ def get( deserialized = self._deserialize('AttestationProvider', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Attestation/attestationProviders/{providerName}'} # type: ignore @@ -130,10 +130,10 @@ def create( an order of preference among them, although applications of JWK Sets can choose to assign a meaning to the order for their purposes, if desired. - :type keys: list[~azure.mgmt.attestation.models.JsonWebKey] + :type keys: list[~attestation_management_client.models.JsonWebKey] :keyword callable cls: A custom type or function that will be passed the direct response - :return: AttestationProvider or the result of cls(response) - :rtype: ~azure.mgmt.attestation.models.AttestationProvider + :return: AttestationProvider, or the result of cls(response) + :rtype: ~attestation_management_client.models.AttestationProvider :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.AttestationProvider"] @@ -183,7 +183,7 @@ def create( deserialized = self._deserialize('AttestationProvider', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized create.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Attestation/attestationProviders/{providerName}'} # type: ignore @@ -205,8 +205,8 @@ def update( :param tags: The tags that will be assigned to the attestation service instance. :type tags: dict[str, str] :keyword callable cls: A custom type or function that will be passed the direct response - :return: AttestationProvider or the result of cls(response) - :rtype: ~azure.mgmt.attestation.models.AttestationProvider + :return: AttestationProvider, or the result of cls(response) + :rtype: ~attestation_management_client.models.AttestationProvider :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.AttestationProvider"] @@ -251,7 +251,7 @@ def update( deserialized = self._deserialize('AttestationProvider', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Attestation/attestationProviders/{providerName}'} # type: ignore @@ -270,7 +270,7 @@ def delete( :param provider_name: Name of the attestation service. :type provider_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: None or the result of cls(response) + :return: None, or the result of cls(response) :rtype: None :raises: ~azure.core.exceptions.HttpResponseError """ @@ -305,7 +305,7 @@ def delete( raise HttpResponseError(response=response, error_format=ARMErrorFormat) if cls: - return cls(pipeline_response, None, {}) + return cls(pipeline_response, None, {}) delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Attestation/attestationProviders/{providerName}'} # type: ignore @@ -317,8 +317,8 @@ def list( """Returns a list of attestation providers in a subscription. :keyword callable cls: A custom type or function that will be passed the direct response - :return: AttestationProviderListResult or the result of cls(response) - :rtype: ~azure.mgmt.attestation.models.AttestationProviderListResult + :return: AttestationProviderListResult, or the result of cls(response) + :rtype: ~attestation_management_client.models.AttestationProviderListResult :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.AttestationProviderListResult"] @@ -353,7 +353,7 @@ def list( deserialized = self._deserialize('AttestationProviderListResult', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Attestation/attestationProviders'} # type: ignore @@ -369,8 +369,8 @@ def list_by_resource_group( :param resource_group_name: The name of the resource group. The name is case insensitive. :type resource_group_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: AttestationProviderListResult or the result of cls(response) - :rtype: ~azure.mgmt.attestation.models.AttestationProviderListResult + :return: AttestationProviderListResult, or the result of cls(response) + :rtype: ~attestation_management_client.models.AttestationProviderListResult :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.AttestationProviderListResult"] @@ -406,7 +406,7 @@ def list_by_resource_group( deserialized = self._deserialize('AttestationProviderListResult', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized list_by_resource_group.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Attestation/attestationProviders'} # type: ignore diff --git a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/operations/_operation_operations.py b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/operations/_operation_operations.py index 074762d7e..2f84e63e1 100644 --- a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/operations/_operation_operations.py +++ b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/operations/_operation_operations.py @@ -29,7 +29,7 @@ class OperationOperations(object): instantiates it for you and attaches it as an attribute. :ivar models: Alias to model classes used in this operation group. - :type models: ~azure.mgmt.attestation.models + :type models: ~attestation_management_client.models :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. @@ -52,8 +52,8 @@ def list( """Lists all of the available Azure attestation operations. :keyword callable cls: A custom type or function that will be passed the direct response - :return: OperationList or the result of cls(response) - :rtype: ~azure.mgmt.attestation.models.OperationList + :return: OperationList, or the result of cls(response) + :rtype: ~attestation_management_client.models.OperationList :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.OperationList"] @@ -84,7 +84,7 @@ def list( deserialized = self._deserialize('OperationList', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized list.metadata = {'url': '/providers/Microsoft.Attestation/operations'} # type: ignore diff --git a/src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/vendored_sdks/datafactory/__init__.py b/src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/vendored_sdks/datafactory/__init__.py index 21bda343f..4e569e56a 100644 --- a/src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/vendored_sdks/datafactory/__init__.py +++ b/src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/vendored_sdks/datafactory/__init__.py @@ -7,9 +7,6 @@ # -------------------------------------------------------------------------- from ._dfaz_management_client import DFAZManagementClient -from ._version import VERSION - -__version__ = VERSION __all__ = ['DFAZManagementClient'] try: diff --git a/src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/vendored_sdks/datafactory/_configuration.py b/src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/vendored_sdks/datafactory/_configuration.py index dad07254a..aca1ced7b 100644 --- a/src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/vendored_sdks/datafactory/_configuration.py +++ b/src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/vendored_sdks/datafactory/_configuration.py @@ -11,14 +11,13 @@ from azure.core.configuration import Configuration from azure.core.pipeline import policies -from ._version import VERSION - if TYPE_CHECKING: # pylint: disable=unused-import,ungrouped-imports from typing import Any from azure.core.credentials import TokenCredential +VERSION = "unknown" class DFAZManagementClientConfiguration(Configuration): """Configuration for DFAZManagementClient. @@ -50,7 +49,7 @@ def __init__( self.api_version = "2018-06-01" self.credential_scopes = ['https://management.azure.com/.default'] self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) - kwargs.setdefault('sdk_moniker', 'mgmt-datafactory/{}'.format(VERSION)) + kwargs.setdefault('sdk_moniker', 'dfazmanagementclient/{}'.format(VERSION)) self._configure(**kwargs) def _configure( diff --git a/src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/vendored_sdks/datafactory/_dfaz_management_client.py b/src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/vendored_sdks/datafactory/_dfaz_management_client.py index c815114f4..3f107f9c1 100644 --- a/src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/vendored_sdks/datafactory/_dfaz_management_client.py +++ b/src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/vendored_sdks/datafactory/_dfaz_management_client.py @@ -15,6 +15,8 @@ # pylint: disable=unused-import,ungrouped-imports from typing import Any, Optional + from azure.core.credentials import TokenCredential + from ._configuration import DFAZManagementClientConfiguration from .operations import FactoryOperations from .operations import TriggerOperations diff --git a/src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/vendored_sdks/datafactory/_version.py b/src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/vendored_sdks/datafactory/_version.py deleted file mode 100644 index eae7c95b6..000000000 --- a/src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/vendored_sdks/datafactory/_version.py +++ /dev/null @@ -1,9 +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. -# -------------------------------------------------------------------------- - -VERSION = "0.1.0" diff --git a/src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/vendored_sdks/datafactory/aio/_configuration_async.py b/src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/vendored_sdks/datafactory/aio/_configuration_async.py index 00da06361..40e133592 100644 --- a/src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/vendored_sdks/datafactory/aio/_configuration_async.py +++ b/src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/vendored_sdks/datafactory/aio/_configuration_async.py @@ -11,12 +11,11 @@ from azure.core.configuration import Configuration from azure.core.pipeline import policies -from .._version import VERSION - if TYPE_CHECKING: # pylint: disable=unused-import,ungrouped-imports - from azure.core.credentials import TokenCredential + from azure.core.credentials_async import AsyncTokenCredential +VERSION = "unknown" class DFAZManagementClientConfiguration(Configuration): """Configuration for DFAZManagementClient. @@ -47,7 +46,7 @@ def __init__( self.api_version = "2018-06-01" self.credential_scopes = ['https://management.azure.com/.default'] self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) - kwargs.setdefault('sdk_moniker', 'mgmt-datafactory/{}'.format(VERSION)) + kwargs.setdefault('sdk_moniker', 'dfazmanagementclient/{}'.format(VERSION)) self._configure(**kwargs) def _configure( diff --git a/src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/vendored_sdks/datafactory/aio/_dfaz_management_client_async.py b/src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/vendored_sdks/datafactory/aio/_dfaz_management_client_async.py index fd731f545..082718f63 100644 --- a/src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/vendored_sdks/datafactory/aio/_dfaz_management_client_async.py +++ b/src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/vendored_sdks/datafactory/aio/_dfaz_management_client_async.py @@ -6,11 +6,15 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, Optional +from typing import Any, Optional, TYPE_CHECKING from azure.mgmt.core import AsyncARMPipelineClient from msrest import Deserializer, Serializer +if TYPE_CHECKING: + # pylint: disable=unused-import,ungrouped-imports + from azure.core.credentials_async import AsyncTokenCredential + from ._configuration_async import DFAZManagementClientConfiguration from .operations_async import FactoryOperations from .operations_async import TriggerOperations diff --git a/src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/vendored_sdks/datafactory/aio/operations_async/_factory_operations_async.py b/src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/vendored_sdks/datafactory/aio/operations_async/_factory_operations_async.py index a94fde969..16aec1a9c 100644 --- a/src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/vendored_sdks/datafactory/aio/operations_async/_factory_operations_async.py +++ b/src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/vendored_sdks/datafactory/aio/operations_async/_factory_operations_async.py @@ -26,7 +26,7 @@ class FactoryOperations: instantiates it for you and attaches it as an attribute. :ivar models: Alias to model classes used in this operation group. - :type models: ~azure.mgmt.datafactory.models + :type models: ~dfaz_management_client.models :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. @@ -48,8 +48,8 @@ def list( """Lists factories under the specified subscription. :keyword callable cls: A custom type or function that will be passed the direct response - :return: An iterator like instance of FactoryListResponse or the result of cls(response) - :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.datafactory.models.FactoryListResponse] + :return: An iterator like instance of either FactoryListResponse or the result of cls(response) + :rtype: ~azure.core.async_paging.AsyncItemPaged[~dfaz_management_client.models.FactoryListResponse] :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.FactoryListResponse"] @@ -118,10 +118,10 @@ async def configure_factory_repo( :param factory_resource_id: The factory resource id. :type factory_resource_id: str :param repo_configuration: Git repo information of the factory. - :type repo_configuration: ~azure.mgmt.datafactory.models.FactoryRepoConfiguration + :type repo_configuration: ~dfaz_management_client.models.FactoryRepoConfiguration :keyword callable cls: A custom type or function that will be passed the direct response - :return: Factory or the result of cls(response) - :rtype: ~azure.mgmt.datafactory.models.Factory + :return: Factory, or the result of cls(response) + :rtype: ~dfaz_management_client.models.Factory :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.Factory"] @@ -165,7 +165,7 @@ async def configure_factory_repo( deserialized = self._deserialize('Factory', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized configure_factory_repo.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.DataFactory/locations/{locationId}/configureFactoryRepo'} # type: ignore @@ -180,8 +180,8 @@ def list_by_resource_group( :param resource_group_name: The resource group name. :type resource_group_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: An iterator like instance of FactoryListResponse or the result of cls(response) - :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.datafactory.models.FactoryListResponse] + :return: An iterator like instance of either FactoryListResponse or the result of cls(response) + :rtype: ~azure.core.async_paging.AsyncItemPaged[~dfaz_management_client.models.FactoryListResponse] :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.FactoryListResponse"] @@ -264,16 +264,16 @@ async def create_or_update( :param tags: The resource tags. :type tags: dict[str, str] :param identity: Managed service identity of the factory. - :type identity: ~azure.mgmt.datafactory.models.FactoryIdentity + :type identity: ~dfaz_management_client.models.FactoryIdentity :param repo_configuration: Git repo information of the factory. - :type repo_configuration: ~azure.mgmt.datafactory.models.FactoryRepoConfiguration + :type repo_configuration: ~dfaz_management_client.models.FactoryRepoConfiguration :param fake_identity: This is only for az test. - :type fake_identity: ~azure.mgmt.datafactory.models.FakeFactoryIdentity + :type fake_identity: ~dfaz_management_client.models.FakeFactoryIdentity :param zones: This is only for az test. :type zones: list[str] :keyword callable cls: A custom type or function that will be passed the direct response - :return: Factory or the result of cls(response) - :rtype: ~azure.mgmt.datafactory.models.Factory + :return: Factory, or the result of cls(response) + :rtype: ~dfaz_management_client.models.Factory :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.Factory"] @@ -320,7 +320,7 @@ async def create_or_update( deserialized = self._deserialize('Factory', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}'} # type: ignore @@ -342,10 +342,10 @@ async def update( :param tags: The resource tags. :type tags: dict[str, str] :param identity: Managed service identity of the factory. - :type identity: ~azure.mgmt.datafactory.models.FactoryIdentity + :type identity: ~dfaz_management_client.models.FactoryIdentity :keyword callable cls: A custom type or function that will be passed the direct response - :return: Factory or the result of cls(response) - :rtype: ~azure.mgmt.datafactory.models.Factory + :return: Factory, or the result of cls(response) + :rtype: ~dfaz_management_client.models.Factory :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.Factory"] @@ -390,7 +390,7 @@ async def update( deserialized = self._deserialize('Factory', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}'} # type: ignore @@ -412,8 +412,8 @@ async def get( matches the existing entity tag, or if * was provided, then no content will be returned. :type if_none_match: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: Factory or the result of cls(response) - :rtype: ~azure.mgmt.datafactory.models.Factory or None + :return: Factory, or the result of cls(response) + :rtype: ~dfaz_management_client.models.Factory or None :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.Factory"] @@ -454,7 +454,7 @@ async def get( deserialized = self._deserialize('Factory', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}'} # type: ignore @@ -472,7 +472,7 @@ async def delete( :param factory_name: The factory name. :type factory_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: None or the result of cls(response) + :return: None, or the result of cls(response) :rtype: None :raises: ~azure.core.exceptions.HttpResponseError """ @@ -507,7 +507,7 @@ async def delete( raise HttpResponseError(response=response, error_format=ARMErrorFormat) if cls: - return cls(pipeline_response, None, {}) + return cls(pipeline_response, None, {}) delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}'} # type: ignore @@ -533,8 +533,8 @@ async def get_git_hub_access_token( :param git_hub_client_id: GitHub application client ID. :type git_hub_client_id: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: GitHubAccessTokenResponse or the result of cls(response) - :rtype: ~azure.mgmt.datafactory.models.GitHubAccessTokenResponse + :return: GitHubAccessTokenResponse, or the result of cls(response) + :rtype: ~dfaz_management_client.models.GitHubAccessTokenResponse :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.GitHubAccessTokenResponse"] @@ -579,7 +579,7 @@ async def get_git_hub_access_token( deserialized = self._deserialize('GitHubAccessTokenResponse', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized get_git_hub_access_token.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/getGitHubAccessToken'} # type: ignore @@ -616,8 +616,8 @@ async def get_data_plane_access( hours and by default the token will expire in eight hours. :type expire_time: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: AccessPolicyResponse or the result of cls(response) - :rtype: ~azure.mgmt.datafactory.models.AccessPolicyResponse + :return: AccessPolicyResponse, or the result of cls(response) + :rtype: ~dfaz_management_client.models.AccessPolicyResponse :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.AccessPolicyResponse"] @@ -662,7 +662,7 @@ async def get_data_plane_access( deserialized = self._deserialize('AccessPolicyResponse', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized get_data_plane_access.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/getDataPlaneAccess'} # type: ignore diff --git a/src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/vendored_sdks/datafactory/models/_models.py b/src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/vendored_sdks/datafactory/models/_models.py index 016566c63..8c5fd7528 100644 --- a/src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/vendored_sdks/datafactory/models/_models.py +++ b/src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/vendored_sdks/datafactory/models/_models.py @@ -13,7 +13,7 @@ class AccessPolicyResponse(msrest.serialization.Model): """Get Data Plane read only token response definition. :param policy: The user access policy. - :type policy: ~azure.mgmt.datafactory.models.UserAccessPolicy + :type policy: ~dfaz_management_client.models.UserAccessPolicy :param access_token: Data Plane read only access token. :type access_token: str :param data_plane_url: Data Plane service base URL. @@ -346,7 +346,7 @@ class CloudError(msrest.serialization.Model): :param target: Property name/path in request associated with error. :type target: str :param details: Array with additional error details. - :type details: list[~azure.mgmt.datafactory.models.CloudError] + :type details: list[~dfaz_management_client.models.CloudError] """ _validation = { @@ -3495,8 +3495,13 @@ class TriggerListResponse(msrest.serialization.Model): All required parameters must be populated in order to send to Azure. +<<<<<<< HEAD :param value: Required. List of triggers. :type value: list[~azure.mgmt.datafactory.models.TriggerResource] +======= + :param value: Required. List of factories. + :type value: list[~dfaz_management_client.models.Factory] +>>>>>>> 0a1c66d... add azure-arm to set default mgmt credential scope :param next_link: The link to the next page of results, if any remaining results exist. :type next_link: str """ @@ -3522,10 +3527,17 @@ def __init__( class TriggerPipelineReference(msrest.serialization.Model): """Pipeline that needs to be triggered with the given parameters. +<<<<<<< HEAD :param pipeline_reference: Pipeline reference. :type pipeline_reference: ~azure.mgmt.datafactory.models.PipelineReference :param parameters: Pipeline parameters. :type parameters: dict[str, object] +======= + :param factory_resource_id: The factory resource id. + :type factory_resource_id: str + :param repo_configuration: Git repo information of the factory. + :type repo_configuration: ~dfaz_management_client.models.FactoryRepoConfiguration +>>>>>>> 0a1c66d... add azure-arm to set default mgmt credential scope """ _attribute_map = { @@ -3545,6 +3557,7 @@ def __init__( class TriggerQueryResponse(msrest.serialization.Model): """A query of triggers. +<<<<<<< HEAD All required parameters must be populated in order to send to Azure. :param value: Required. List of triggers. @@ -3552,6 +3565,12 @@ class TriggerQueryResponse(msrest.serialization.Model): :param continuation_token: The continuation token for getting the next page of results, if any remaining results exist, null otherwise. :type continuation_token: str +======= + :param tags: A set of tags. The resource tags. + :type tags: dict[str, str] + :param identity: Managed service identity of the factory. + :type identity: ~dfaz_management_client.models.FactoryIdentity +>>>>>>> 0a1c66d... add azure-arm to set default mgmt credential scope """ _validation = { diff --git a/src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/vendored_sdks/datafactory/models/_models_py3.py b/src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/vendored_sdks/datafactory/models/_models_py3.py index 9a88cf941..3ce063acf 100644 --- a/src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/vendored_sdks/datafactory/models/_models_py3.py +++ b/src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/vendored_sdks/datafactory/models/_models_py3.py @@ -18,7 +18,7 @@ class AccessPolicyResponse(msrest.serialization.Model): """Get Data Plane read only token response definition. :param policy: The user access policy. - :type policy: ~azure.mgmt.datafactory.models.UserAccessPolicy + :type policy: ~dfaz_management_client.models.UserAccessPolicy :param access_token: Data Plane read only access token. :type access_token: str :param data_plane_url: Data Plane service base URL. @@ -170,6 +170,7 @@ class BlobEventsTrigger(MultiplePipelineTrigger): :param additional_properties: Unmatched properties from the message are deserialized to this collection. :type additional_properties: dict[str, object] +<<<<<<< HEAD :param type: Required. Trigger type.Constant filled by server. :type type: str :param description: Trigger description. @@ -196,6 +197,22 @@ class BlobEventsTrigger(MultiplePipelineTrigger): :type events: list[str or ~azure.mgmt.datafactory.models.BlobEventTypes] :param scope: Required. The ARM resource ID of the Storage Account. :type scope: str +======= + :param identity: Managed service identity of the factory. + :type identity: ~dfaz_management_client.models.FactoryIdentity + :ivar provisioning_state: Factory provisioning state, example Succeeded. + :vartype provisioning_state: str + :ivar create_time: Time the factory was created in ISO8601 format. + :vartype create_time: ~datetime.datetime + :ivar version: Version of the factory. + :vartype version: str + :param repo_configuration: Git repo information of the factory. + :type repo_configuration: ~dfaz_management_client.models.FactoryRepoConfiguration + :param fake_identity: This is only for az test. + :type fake_identity: ~dfaz_management_client.models.FakeFactoryIdentity + :param zones: This is only for az test. + :type zones: list[str] +>>>>>>> 0a1c66d... add azure-arm to set default mgmt credential scope """ _validation = { @@ -3825,8 +3842,13 @@ class TriggerListResponse(msrest.serialization.Model): All required parameters must be populated in order to send to Azure. +<<<<<<< HEAD :param value: Required. List of triggers. :type value: list[~azure.mgmt.datafactory.models.TriggerResource] +======= + :param value: Required. List of factories. + :type value: list[~dfaz_management_client.models.Factory] +>>>>>>> 0a1c66d... add azure-arm to set default mgmt credential scope :param next_link: The link to the next page of results, if any remaining results exist. :type next_link: str """ @@ -3855,10 +3877,17 @@ def __init__( class TriggerPipelineReference(msrest.serialization.Model): """Pipeline that needs to be triggered with the given parameters. +<<<<<<< HEAD :param pipeline_reference: Pipeline reference. :type pipeline_reference: ~azure.mgmt.datafactory.models.PipelineReference :param parameters: Pipeline parameters. :type parameters: dict[str, object] +======= + :param factory_resource_id: The factory resource id. + :type factory_resource_id: str + :param repo_configuration: Git repo information of the factory. + :type repo_configuration: ~dfaz_management_client.models.FactoryRepoConfiguration +>>>>>>> 0a1c66d... add azure-arm to set default mgmt credential scope """ _attribute_map = { @@ -3881,6 +3910,7 @@ def __init__( class TriggerQueryResponse(msrest.serialization.Model): """A query of triggers. +<<<<<<< HEAD All required parameters must be populated in order to send to Azure. :param value: Required. List of triggers. @@ -3888,6 +3918,12 @@ class TriggerQueryResponse(msrest.serialization.Model): :param continuation_token: The continuation token for getting the next page of results, if any remaining results exist, null otherwise. :type continuation_token: str +======= + :param tags: A set of tags. The resource tags. + :type tags: dict[str, str] + :param identity: Managed service identity of the factory. + :type identity: ~dfaz_management_client.models.FactoryIdentity +>>>>>>> 0a1c66d... add azure-arm to set default mgmt credential scope """ _validation = { diff --git a/src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/vendored_sdks/datafactory/operations/_factory_operations.py b/src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/vendored_sdks/datafactory/operations/_factory_operations.py index a0bbae5ed..636d7a054 100644 --- a/src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/vendored_sdks/datafactory/operations/_factory_operations.py +++ b/src/test/scenarios/datafactory/output/src/datafactory/azext_datafactory/vendored_sdks/datafactory/operations/_factory_operations.py @@ -30,7 +30,7 @@ class FactoryOperations(object): instantiates it for you and attaches it as an attribute. :ivar models: Alias to model classes used in this operation group. - :type models: ~azure.mgmt.datafactory.models + :type models: ~dfaz_management_client.models :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. @@ -53,8 +53,8 @@ def list( """Lists factories under the specified subscription. :keyword callable cls: A custom type or function that will be passed the direct response - :return: An iterator like instance of FactoryListResponse or the result of cls(response) - :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.datafactory.models.FactoryListResponse] + :return: An iterator like instance of either FactoryListResponse or the result of cls(response) + :rtype: ~azure.core.paging.ItemPaged[~dfaz_management_client.models.FactoryListResponse] :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.FactoryListResponse"] @@ -124,10 +124,10 @@ def configure_factory_repo( :param factory_resource_id: The factory resource id. :type factory_resource_id: str :param repo_configuration: Git repo information of the factory. - :type repo_configuration: ~azure.mgmt.datafactory.models.FactoryRepoConfiguration + :type repo_configuration: ~dfaz_management_client.models.FactoryRepoConfiguration :keyword callable cls: A custom type or function that will be passed the direct response - :return: Factory or the result of cls(response) - :rtype: ~azure.mgmt.datafactory.models.Factory + :return: Factory, or the result of cls(response) + :rtype: ~dfaz_management_client.models.Factory :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.Factory"] @@ -171,7 +171,7 @@ def configure_factory_repo( deserialized = self._deserialize('Factory', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized configure_factory_repo.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.DataFactory/locations/{locationId}/configureFactoryRepo'} # type: ignore @@ -187,8 +187,8 @@ def list_by_resource_group( :param resource_group_name: The resource group name. :type resource_group_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: An iterator like instance of FactoryListResponse or the result of cls(response) - :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.datafactory.models.FactoryListResponse] + :return: An iterator like instance of either FactoryListResponse or the result of cls(response) + :rtype: ~azure.core.paging.ItemPaged[~dfaz_management_client.models.FactoryListResponse] :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.FactoryListResponse"] @@ -272,16 +272,16 @@ def create_or_update( :param tags: The resource tags. :type tags: dict[str, str] :param identity: Managed service identity of the factory. - :type identity: ~azure.mgmt.datafactory.models.FactoryIdentity + :type identity: ~dfaz_management_client.models.FactoryIdentity :param repo_configuration: Git repo information of the factory. - :type repo_configuration: ~azure.mgmt.datafactory.models.FactoryRepoConfiguration + :type repo_configuration: ~dfaz_management_client.models.FactoryRepoConfiguration :param fake_identity: This is only for az test. - :type fake_identity: ~azure.mgmt.datafactory.models.FakeFactoryIdentity + :type fake_identity: ~dfaz_management_client.models.FakeFactoryIdentity :param zones: This is only for az test. :type zones: list[str] :keyword callable cls: A custom type or function that will be passed the direct response - :return: Factory or the result of cls(response) - :rtype: ~azure.mgmt.datafactory.models.Factory + :return: Factory, or the result of cls(response) + :rtype: ~dfaz_management_client.models.Factory :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.Factory"] @@ -328,7 +328,7 @@ def create_or_update( deserialized = self._deserialize('Factory', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}'} # type: ignore @@ -351,10 +351,10 @@ def update( :param tags: The resource tags. :type tags: dict[str, str] :param identity: Managed service identity of the factory. - :type identity: ~azure.mgmt.datafactory.models.FactoryIdentity + :type identity: ~dfaz_management_client.models.FactoryIdentity :keyword callable cls: A custom type or function that will be passed the direct response - :return: Factory or the result of cls(response) - :rtype: ~azure.mgmt.datafactory.models.Factory + :return: Factory, or the result of cls(response) + :rtype: ~dfaz_management_client.models.Factory :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.Factory"] @@ -399,7 +399,7 @@ def update( deserialized = self._deserialize('Factory', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}'} # type: ignore @@ -422,8 +422,8 @@ def get( matches the existing entity tag, or if * was provided, then no content will be returned. :type if_none_match: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: Factory or the result of cls(response) - :rtype: ~azure.mgmt.datafactory.models.Factory or None + :return: Factory, or the result of cls(response) + :rtype: ~dfaz_management_client.models.Factory or None :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.Factory"] @@ -464,7 +464,7 @@ def get( deserialized = self._deserialize('Factory', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}'} # type: ignore @@ -483,7 +483,7 @@ def delete( :param factory_name: The factory name. :type factory_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: None or the result of cls(response) + :return: None, or the result of cls(response) :rtype: None :raises: ~azure.core.exceptions.HttpResponseError """ @@ -518,7 +518,7 @@ def delete( raise HttpResponseError(response=response, error_format=ARMErrorFormat) if cls: - return cls(pipeline_response, None, {}) + return cls(pipeline_response, None, {}) delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}'} # type: ignore @@ -545,8 +545,8 @@ def get_git_hub_access_token( :param git_hub_client_id: GitHub application client ID. :type git_hub_client_id: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: GitHubAccessTokenResponse or the result of cls(response) - :rtype: ~azure.mgmt.datafactory.models.GitHubAccessTokenResponse + :return: GitHubAccessTokenResponse, or the result of cls(response) + :rtype: ~dfaz_management_client.models.GitHubAccessTokenResponse :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.GitHubAccessTokenResponse"] @@ -591,7 +591,7 @@ def get_git_hub_access_token( deserialized = self._deserialize('GitHubAccessTokenResponse', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized get_git_hub_access_token.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/getGitHubAccessToken'} # type: ignore @@ -629,8 +629,8 @@ def get_data_plane_access( hours and by default the token will expire in eight hours. :type expire_time: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: AccessPolicyResponse or the result of cls(response) - :rtype: ~azure.mgmt.datafactory.models.AccessPolicyResponse + :return: AccessPolicyResponse, or the result of cls(response) + :rtype: ~dfaz_management_client.models.AccessPolicyResponse :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["models.AccessPolicyResponse"] @@ -675,7 +675,7 @@ def get_data_plane_access( deserialized = self._deserialize('AccessPolicyResponse', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized get_data_plane_access.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/getDataPlaneAccess'} # type: ignore diff --git a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/_configuration.py b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/_configuration.py index 830653582..4681009a1 100644 --- a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/_configuration.py +++ b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/_configuration.py @@ -49,7 +49,7 @@ def __init__( self.api_version = "2019-06-01-preview" self.credential_scopes = ['https://management.azure.com/.default'] self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) - kwargs.setdefault('sdk_moniker', 'mgmt-managednetwork/{}'.format(VERSION)) + kwargs.setdefault('sdk_moniker', 'managednetworkmanagementclient/{}'.format(VERSION)) self._configure(**kwargs) def _configure( diff --git a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/_managed_network_management_client.py b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/_managed_network_management_client.py index e358655b1..2c3a6d5e7 100644 --- a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/_managed_network_management_client.py +++ b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/_managed_network_management_client.py @@ -15,6 +15,8 @@ # pylint: disable=unused-import,ungrouped-imports from typing import Any, Optional + from azure.core.credentials import TokenCredential + from ._configuration import ManagedNetworkManagementClientConfiguration from .operations import ManagedNetworkOperations from .operations import ScopeAssignmentOperations diff --git a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/_configuration_async.py b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/_configuration_async.py index e4378683f..d4495b90a 100644 --- a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/_configuration_async.py +++ b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/_configuration_async.py @@ -13,7 +13,7 @@ if TYPE_CHECKING: # pylint: disable=unused-import,ungrouped-imports - from azure.core.credentials import TokenCredential + from azure.core.credentials_async import AsyncTokenCredential VERSION = "unknown" @@ -46,7 +46,7 @@ def __init__( self.api_version = "2019-06-01-preview" self.credential_scopes = ['https://management.azure.com/.default'] self.credential_scopes.extend(kwargs.pop('credential_scopes', [])) - kwargs.setdefault('sdk_moniker', 'mgmt-managednetwork/{}'.format(VERSION)) + kwargs.setdefault('sdk_moniker', 'managednetworkmanagementclient/{}'.format(VERSION)) self._configure(**kwargs) def _configure( diff --git a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/_managed_network_management_client_async.py b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/_managed_network_management_client_async.py index fbcfb1f13..e2269a3c2 100644 --- a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/_managed_network_management_client_async.py +++ b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/_managed_network_management_client_async.py @@ -6,11 +6,15 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, Optional +from typing import Any, Optional, TYPE_CHECKING from azure.mgmt.core import AsyncARMPipelineClient from msrest import Deserializer, Serializer +if TYPE_CHECKING: + # pylint: disable=unused-import,ungrouped-imports + from azure.core.credentials_async import AsyncTokenCredential + from ._configuration_async import ManagedNetworkManagementClientConfiguration from .operations_async import ManagedNetworkOperations from .operations_async import ScopeAssignmentOperations diff --git a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations_async/_managed_network_group_operations_async.py b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations_async/_managed_network_group_operations_async.py index 4d3825522..ee702bfbf 100644 --- a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations_async/_managed_network_group_operations_async.py +++ b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations_async/_managed_network_group_operations_async.py @@ -59,7 +59,7 @@ async def get( :param managed_network_group_name: The name of the Managed Network Group. :type managed_network_group_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: ManagedNetworkGroup or the result of cls(response) + :return: ManagedNetworkGroup, or the result of cls(response) :rtype: ~managed_network_management_client.models.ManagedNetworkGroup :raises: ~azure.core.exceptions.HttpResponseError """ @@ -99,7 +99,7 @@ async def get( deserialized = self._deserialize('ManagedNetworkGroup', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedNetwork/managedNetworks/{managedNetworkName}/managedNetworkGroups/{managedNetworkGroupName}'} # type: ignore @@ -165,7 +165,7 @@ async def _create_or_update_initial( deserialized = self._deserialize('ManagedNetworkGroup', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized _create_or_update_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedNetwork/managedNetworks/{managedNetworkName}/managedNetworkGroups/{managedNetworkGroupName}'} # type: ignore @@ -205,7 +205,7 @@ async def create_or_update( polling object for personal polling strategy :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. - :return: ManagedNetworkGroup + :return: ManagedNetworkGroup, or the result of cls(response) :rtype: ~managed_network_management_client.models.ManagedNetworkGroup :raises ~azure.core.exceptions.HttpResponseError: """ @@ -228,6 +228,9 @@ async def create_or_update( **kwargs ) + kwargs.pop('error_map', None) + kwargs.pop('content_type', None) + def get_long_running_output(pipeline_response): deserialized = self._deserialize('ManagedNetworkGroup', pipeline_response) @@ -281,7 +284,7 @@ async def _delete_initial( raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: - return cls(pipeline_response, None, {}) + return cls(pipeline_response, None, {}) _delete_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedNetwork/managedNetworks/{managedNetworkName}/managedNetworkGroups/{managedNetworkGroupName}'} # type: ignore @@ -305,7 +308,7 @@ async def delete( polling object for personal polling strategy :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. - :return: None + :return: None, or the result of cls(response) :rtype: None :raises ~azure.core.exceptions.HttpResponseError: """ @@ -323,6 +326,9 @@ async def delete( **kwargs ) + kwargs.pop('error_map', None) + kwargs.pop('content_type', None) + def get_long_running_output(pipeline_response): if cls: return cls(pipeline_response, None, {}) @@ -354,7 +360,7 @@ def list_by_managed_network( a skiptoken parameter that specifies a starting point to use for subsequent calls. :type skiptoken: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: An iterator like instance of ManagedNetworkGroupListResult or the result of cls(response) + :return: An iterator like instance of either ManagedNetworkGroupListResult or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~managed_network_management_client.models.ManagedNetworkGroupListResult] :raises: ~azure.core.exceptions.HttpResponseError """ diff --git a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations_async/_managed_network_operations_async.py b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations_async/_managed_network_operations_async.py index 9880c083c..c41095274 100644 --- a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations_async/_managed_network_operations_async.py +++ b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations_async/_managed_network_operations_async.py @@ -56,7 +56,7 @@ async def get_modify( :param managed_network_name: The name of the Managed Network. :type managed_network_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: ManagedNetwork or the result of cls(response) + :return: ManagedNetwork, or the result of cls(response) :rtype: ~managed_network_management_client.models.ManagedNetwork :raises: ~azure.core.exceptions.HttpResponseError """ @@ -95,7 +95,7 @@ async def get_modify( deserialized = self._deserialize('ManagedNetwork', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized get_modify.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedNetwork/managedNetworks/{managedNetworkName}'} # type: ignore @@ -122,7 +122,7 @@ async def create_or_update( :param properties: The MNC properties. :type properties: ~managed_network_management_client.models.ManagedNetworkProperties :keyword callable cls: A custom type or function that will be passed the direct response - :return: ManagedNetwork or the result of cls(response) + :return: ManagedNetwork, or the result of cls(response) :rtype: ~managed_network_management_client.models.ManagedNetwork :raises: ~azure.core.exceptions.HttpResponseError """ @@ -174,7 +174,7 @@ async def create_or_update( deserialized = self._deserialize('ManagedNetwork', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedNetwork/managedNetworks/{managedNetworkName}'} # type: ignore @@ -217,7 +217,7 @@ async def _delete_initial( raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: - return cls(pipeline_response, None, {}) + return cls(pipeline_response, None, {}) _delete_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedNetwork/managedNetworks/{managedNetworkName}'} # type: ignore @@ -238,7 +238,7 @@ async def delete( polling object for personal polling strategy :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. - :return: None + :return: None, or the result of cls(response) :rtype: None :raises ~azure.core.exceptions.HttpResponseError: """ @@ -255,6 +255,9 @@ async def delete( **kwargs ) + kwargs.pop('error_map', None) + kwargs.pop('content_type', None) + def get_long_running_output(pipeline_response): if cls: return cls(pipeline_response, None, {}) @@ -320,7 +323,7 @@ async def _update_initial( deserialized = self._deserialize('ManagedNetwork', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized _update_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedNetwork/managedNetworks/{managedNetworkName}'} # type: ignore @@ -345,7 +348,7 @@ async def update( polling object for personal polling strategy :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. - :return: ManagedNetwork + :return: ManagedNetwork, or the result of cls(response) :rtype: ~managed_network_management_client.models.ManagedNetwork :raises ~azure.core.exceptions.HttpResponseError: """ @@ -363,6 +366,9 @@ async def update( **kwargs ) + kwargs.pop('error_map', None) + kwargs.pop('content_type', None) + def get_long_running_output(pipeline_response): deserialized = self._deserialize('ManagedNetwork', pipeline_response) @@ -394,7 +400,7 @@ def list_by_resource_group( a skiptoken parameter that specifies a starting point to use for subsequent calls. :type skiptoken: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: An iterator like instance of ManagedNetworkListResult or the result of cls(response) + :return: An iterator like instance of either ManagedNetworkListResult or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~managed_network_management_client.models.ManagedNetworkListResult] :raises: ~azure.core.exceptions.HttpResponseError """ @@ -471,7 +477,7 @@ def list_by_subscription( a skiptoken parameter that specifies a starting point to use for subsequent calls. :type skiptoken: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: An iterator like instance of ManagedNetworkListResult or the result of cls(response) + :return: An iterator like instance of either ManagedNetworkListResult or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~managed_network_management_client.models.ManagedNetworkListResult] :raises: ~azure.core.exceptions.HttpResponseError """ diff --git a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations_async/_managed_network_peering_policy_operations_async.py b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations_async/_managed_network_peering_policy_operations_async.py index 40a3e6d68..552a57999 100644 --- a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations_async/_managed_network_peering_policy_operations_async.py +++ b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations_async/_managed_network_peering_policy_operations_async.py @@ -59,7 +59,7 @@ async def get( :param managed_network_peering_policy_name: The name of the Managed Network Peering Policy. :type managed_network_peering_policy_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: ManagedNetworkPeeringPolicy or the result of cls(response) + :return: ManagedNetworkPeeringPolicy, or the result of cls(response) :rtype: ~managed_network_management_client.models.ManagedNetworkPeeringPolicy :raises: ~azure.core.exceptions.HttpResponseError """ @@ -99,7 +99,7 @@ async def get( deserialized = self._deserialize('ManagedNetworkPeeringPolicy', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedNetwork/managedNetworks/{managedNetworkName}/managedNetworkPeeringPolicies/{managedNetworkPeeringPolicyName}'} # type: ignore @@ -162,7 +162,7 @@ async def _create_or_update_initial( deserialized = self._deserialize('ManagedNetworkPeeringPolicy', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized _create_or_update_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedNetwork/managedNetworks/{managedNetworkName}/managedNetworkPeeringPolicies/{managedNetworkPeeringPolicyName}'} # type: ignore @@ -193,7 +193,7 @@ async def create_or_update( polling object for personal polling strategy :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. - :return: ManagedNetworkPeeringPolicy + :return: ManagedNetworkPeeringPolicy, or the result of cls(response) :rtype: ~managed_network_management_client.models.ManagedNetworkPeeringPolicy :raises ~azure.core.exceptions.HttpResponseError: """ @@ -213,6 +213,9 @@ async def create_or_update( **kwargs ) + kwargs.pop('error_map', None) + kwargs.pop('content_type', None) + def get_long_running_output(pipeline_response): deserialized = self._deserialize('ManagedNetworkPeeringPolicy', pipeline_response) @@ -266,7 +269,7 @@ async def _delete_initial( raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: - return cls(pipeline_response, None, {}) + return cls(pipeline_response, None, {}) _delete_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedNetwork/managedNetworks/{managedNetworkName}/managedNetworkPeeringPolicies/{managedNetworkPeeringPolicyName}'} # type: ignore @@ -290,7 +293,7 @@ async def delete( polling object for personal polling strategy :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. - :return: None + :return: None, or the result of cls(response) :rtype: None :raises ~azure.core.exceptions.HttpResponseError: """ @@ -308,6 +311,9 @@ async def delete( **kwargs ) + kwargs.pop('error_map', None) + kwargs.pop('content_type', None) + def get_long_running_output(pipeline_response): if cls: return cls(pipeline_response, None, {}) @@ -339,7 +345,7 @@ def list_by_managed_network( a skiptoken parameter that specifies a starting point to use for subsequent calls. :type skiptoken: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: An iterator like instance of ManagedNetworkPeeringPolicyListResult or the result of cls(response) + :return: An iterator like instance of either ManagedNetworkPeeringPolicyListResult or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~managed_network_management_client.models.ManagedNetworkPeeringPolicyListResult] :raises: ~azure.core.exceptions.HttpResponseError """ diff --git a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations_async/_operation_operations_async.py b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations_async/_operation_operations_async.py index 88034e6fe..bb6ece3ac 100644 --- a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations_async/_operation_operations_async.py +++ b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations_async/_operation_operations_async.py @@ -48,7 +48,7 @@ def list( """Lists all of the available MNC operations. :keyword callable cls: A custom type or function that will be passed the direct response - :return: An iterator like instance of OperationListResult or the result of cls(response) + :return: An iterator like instance of either OperationListResult or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~managed_network_management_client.models.OperationListResult] :raises: ~azure.core.exceptions.HttpResponseError """ diff --git a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations_async/_scope_assignment_operations_async.py b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations_async/_scope_assignment_operations_async.py index b0c96891e..8a4113dec 100644 --- a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations_async/_scope_assignment_operations_async.py +++ b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations_async/_scope_assignment_operations_async.py @@ -54,7 +54,7 @@ async def get( :param scope_assignment_name: The name of the scope assignment to get. :type scope_assignment_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: ScopeAssignment or the result of cls(response) + :return: ScopeAssignment, or the result of cls(response) :rtype: ~managed_network_management_client.models.ScopeAssignment :raises: ~azure.core.exceptions.HttpResponseError """ @@ -92,7 +92,7 @@ async def get( deserialized = self._deserialize('ScopeAssignment', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized get.metadata = {'url': '/{scope}/providers/Microsoft.ManagedNetwork/scopeAssignments/{scopeAssignmentName}'} # type: ignore @@ -120,7 +120,7 @@ async def create_or_update( :param assigned_managed_network: The managed network ID with scope will be assigned to. :type assigned_managed_network: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: ScopeAssignment or the result of cls(response) + :return: ScopeAssignment, or the result of cls(response) :rtype: ~managed_network_management_client.models.ScopeAssignment :raises: ~azure.core.exceptions.HttpResponseError """ @@ -171,7 +171,7 @@ async def create_or_update( deserialized = self._deserialize('ScopeAssignment', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized create_or_update.metadata = {'url': '/{scope}/providers/Microsoft.ManagedNetwork/scopeAssignments/{scopeAssignmentName}'} # type: ignore @@ -189,7 +189,7 @@ async def delete( :param scope_assignment_name: The name of the scope assignment to delete. :type scope_assignment_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: None or the result of cls(response) + :return: None, or the result of cls(response) :rtype: None :raises: ~azure.core.exceptions.HttpResponseError """ @@ -223,7 +223,7 @@ async def delete( raise HttpResponseError(response=response, error_format=ARMErrorFormat) if cls: - return cls(pipeline_response, None, {}) + return cls(pipeline_response, None, {}) delete.metadata = {'url': '/{scope}/providers/Microsoft.ManagedNetwork/scopeAssignments/{scopeAssignmentName}'} # type: ignore @@ -237,7 +237,7 @@ def list( :param scope: The base resource of the scope assignment. :type scope: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: An iterator like instance of ScopeAssignmentListResult or the result of cls(response) + :return: An iterator like instance of either ScopeAssignmentListResult or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~managed_network_management_client.models.ScopeAssignmentListResult] :raises: ~azure.core.exceptions.HttpResponseError """ diff --git a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_managed_network_group_operations.py b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_managed_network_group_operations.py index 69b62c606..6fdfb9069 100644 --- a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_managed_network_group_operations.py +++ b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_managed_network_group_operations.py @@ -64,7 +64,7 @@ def get( :param managed_network_group_name: The name of the Managed Network Group. :type managed_network_group_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: ManagedNetworkGroup or the result of cls(response) + :return: ManagedNetworkGroup, or the result of cls(response) :rtype: ~managed_network_management_client.models.ManagedNetworkGroup :raises: ~azure.core.exceptions.HttpResponseError """ @@ -104,7 +104,7 @@ def get( deserialized = self._deserialize('ManagedNetworkGroup', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedNetwork/managedNetworks/{managedNetworkName}/managedNetworkGroups/{managedNetworkGroupName}'} # type: ignore @@ -171,7 +171,7 @@ def _create_or_update_initial( deserialized = self._deserialize('ManagedNetworkGroup', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized _create_or_update_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedNetwork/managedNetworks/{managedNetworkName}/managedNetworkGroups/{managedNetworkGroupName}'} # type: ignore @@ -212,7 +212,7 @@ def begin_create_or_update( polling object for personal polling strategy :paramtype polling: bool or ~azure.core.polling.PollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. - :return: An instance of LROPoller that returns ManagedNetworkGroup + :return: An instance of LROPoller that returns either ManagedNetworkGroup or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[~managed_network_management_client.models.ManagedNetworkGroup] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -235,6 +235,9 @@ def begin_create_or_update( **kwargs ) + kwargs.pop('error_map', None) + kwargs.pop('content_type', None) + def get_long_running_output(pipeline_response): deserialized = self._deserialize('ManagedNetworkGroup', pipeline_response) @@ -289,7 +292,7 @@ def _delete_initial( raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: - return cls(pipeline_response, None, {}) + return cls(pipeline_response, None, {}) _delete_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedNetwork/managedNetworks/{managedNetworkName}/managedNetworkGroups/{managedNetworkGroupName}'} # type: ignore @@ -314,7 +317,7 @@ def begin_delete( polling object for personal polling strategy :paramtype polling: bool or ~azure.core.polling.PollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. - :return: An instance of LROPoller that returns None + :return: An instance of LROPoller that returns either None or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[None] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -332,6 +335,9 @@ def begin_delete( **kwargs ) + kwargs.pop('error_map', None) + kwargs.pop('content_type', None) + def get_long_running_output(pipeline_response): if cls: return cls(pipeline_response, None, {}) @@ -364,7 +370,7 @@ def list_by_managed_network( a skiptoken parameter that specifies a starting point to use for subsequent calls. :type skiptoken: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: An iterator like instance of ManagedNetworkGroupListResult or the result of cls(response) + :return: An iterator like instance of either ManagedNetworkGroupListResult or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~managed_network_management_client.models.ManagedNetworkGroupListResult] :raises: ~azure.core.exceptions.HttpResponseError """ diff --git a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_managed_network_operations.py b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_managed_network_operations.py index eaeda9700..b71f725bc 100644 --- a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_managed_network_operations.py +++ b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_managed_network_operations.py @@ -61,7 +61,7 @@ def get_modify( :param managed_network_name: The name of the Managed Network. :type managed_network_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: ManagedNetwork or the result of cls(response) + :return: ManagedNetwork, or the result of cls(response) :rtype: ~managed_network_management_client.models.ManagedNetwork :raises: ~azure.core.exceptions.HttpResponseError """ @@ -100,7 +100,7 @@ def get_modify( deserialized = self._deserialize('ManagedNetwork', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized get_modify.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedNetwork/managedNetworks/{managedNetworkName}'} # type: ignore @@ -128,7 +128,7 @@ def create_or_update( :param properties: The MNC properties. :type properties: ~managed_network_management_client.models.ManagedNetworkProperties :keyword callable cls: A custom type or function that will be passed the direct response - :return: ManagedNetwork or the result of cls(response) + :return: ManagedNetwork, or the result of cls(response) :rtype: ~managed_network_management_client.models.ManagedNetwork :raises: ~azure.core.exceptions.HttpResponseError """ @@ -180,7 +180,7 @@ def create_or_update( deserialized = self._deserialize('ManagedNetwork', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedNetwork/managedNetworks/{managedNetworkName}'} # type: ignore @@ -224,7 +224,7 @@ def _delete_initial( raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: - return cls(pipeline_response, None, {}) + return cls(pipeline_response, None, {}) _delete_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedNetwork/managedNetworks/{managedNetworkName}'} # type: ignore @@ -246,7 +246,7 @@ def begin_delete( polling object for personal polling strategy :paramtype polling: bool or ~azure.core.polling.PollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. - :return: An instance of LROPoller that returns None + :return: An instance of LROPoller that returns either None or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[None] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -263,6 +263,9 @@ def begin_delete( **kwargs ) + kwargs.pop('error_map', None) + kwargs.pop('content_type', None) + def get_long_running_output(pipeline_response): if cls: return cls(pipeline_response, None, {}) @@ -329,7 +332,7 @@ def _update_initial( deserialized = self._deserialize('ManagedNetwork', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized _update_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedNetwork/managedNetworks/{managedNetworkName}'} # type: ignore @@ -355,7 +358,7 @@ def begin_update( polling object for personal polling strategy :paramtype polling: bool or ~azure.core.polling.PollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. - :return: An instance of LROPoller that returns ManagedNetwork + :return: An instance of LROPoller that returns either ManagedNetwork or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[~managed_network_management_client.models.ManagedNetwork] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -373,6 +376,9 @@ def begin_update( **kwargs ) + kwargs.pop('error_map', None) + kwargs.pop('content_type', None) + def get_long_running_output(pipeline_response): deserialized = self._deserialize('ManagedNetwork', pipeline_response) @@ -405,7 +411,7 @@ def list_by_resource_group( a skiptoken parameter that specifies a starting point to use for subsequent calls. :type skiptoken: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: An iterator like instance of ManagedNetworkListResult or the result of cls(response) + :return: An iterator like instance of either ManagedNetworkListResult or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~managed_network_management_client.models.ManagedNetworkListResult] :raises: ~azure.core.exceptions.HttpResponseError """ @@ -483,7 +489,7 @@ def list_by_subscription( a skiptoken parameter that specifies a starting point to use for subsequent calls. :type skiptoken: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: An iterator like instance of ManagedNetworkListResult or the result of cls(response) + :return: An iterator like instance of either ManagedNetworkListResult or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~managed_network_management_client.models.ManagedNetworkListResult] :raises: ~azure.core.exceptions.HttpResponseError """ diff --git a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_managed_network_peering_policy_operations.py b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_managed_network_peering_policy_operations.py index e3f72f451..6c8aa47fb 100644 --- a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_managed_network_peering_policy_operations.py +++ b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_managed_network_peering_policy_operations.py @@ -64,7 +64,7 @@ def get( :param managed_network_peering_policy_name: The name of the Managed Network Peering Policy. :type managed_network_peering_policy_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: ManagedNetworkPeeringPolicy or the result of cls(response) + :return: ManagedNetworkPeeringPolicy, or the result of cls(response) :rtype: ~managed_network_management_client.models.ManagedNetworkPeeringPolicy :raises: ~azure.core.exceptions.HttpResponseError """ @@ -104,7 +104,7 @@ def get( deserialized = self._deserialize('ManagedNetworkPeeringPolicy', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedNetwork/managedNetworks/{managedNetworkName}/managedNetworkPeeringPolicies/{managedNetworkPeeringPolicyName}'} # type: ignore @@ -168,7 +168,7 @@ def _create_or_update_initial( deserialized = self._deserialize('ManagedNetworkPeeringPolicy', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized _create_or_update_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedNetwork/managedNetworks/{managedNetworkName}/managedNetworkPeeringPolicies/{managedNetworkPeeringPolicyName}'} # type: ignore @@ -200,7 +200,7 @@ def begin_create_or_update( polling object for personal polling strategy :paramtype polling: bool or ~azure.core.polling.PollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. - :return: An instance of LROPoller that returns ManagedNetworkPeeringPolicy + :return: An instance of LROPoller that returns either ManagedNetworkPeeringPolicy or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[~managed_network_management_client.models.ManagedNetworkPeeringPolicy] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -220,6 +220,9 @@ def begin_create_or_update( **kwargs ) + kwargs.pop('error_map', None) + kwargs.pop('content_type', None) + def get_long_running_output(pipeline_response): deserialized = self._deserialize('ManagedNetworkPeeringPolicy', pipeline_response) @@ -274,7 +277,7 @@ def _delete_initial( raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: - return cls(pipeline_response, None, {}) + return cls(pipeline_response, None, {}) _delete_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedNetwork/managedNetworks/{managedNetworkName}/managedNetworkPeeringPolicies/{managedNetworkPeeringPolicyName}'} # type: ignore @@ -299,7 +302,7 @@ def begin_delete( polling object for personal polling strategy :paramtype polling: bool or ~azure.core.polling.PollingMethod :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. - :return: An instance of LROPoller that returns None + :return: An instance of LROPoller that returns either None or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[None] :raises ~azure.core.exceptions.HttpResponseError: """ @@ -317,6 +320,9 @@ def begin_delete( **kwargs ) + kwargs.pop('error_map', None) + kwargs.pop('content_type', None) + def get_long_running_output(pipeline_response): if cls: return cls(pipeline_response, None, {}) @@ -349,7 +355,7 @@ def list_by_managed_network( a skiptoken parameter that specifies a starting point to use for subsequent calls. :type skiptoken: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: An iterator like instance of ManagedNetworkPeeringPolicyListResult or the result of cls(response) + :return: An iterator like instance of either ManagedNetworkPeeringPolicyListResult or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~managed_network_management_client.models.ManagedNetworkPeeringPolicyListResult] :raises: ~azure.core.exceptions.HttpResponseError """ diff --git a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_operation_operations.py b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_operation_operations.py index 0a06523da..dc86bf524 100644 --- a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_operation_operations.py +++ b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_operation_operations.py @@ -53,7 +53,7 @@ def list( """Lists all of the available MNC operations. :keyword callable cls: A custom type or function that will be passed the direct response - :return: An iterator like instance of OperationListResult or the result of cls(response) + :return: An iterator like instance of either OperationListResult or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~managed_network_management_client.models.OperationListResult] :raises: ~azure.core.exceptions.HttpResponseError """ diff --git a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_scope_assignment_operations.py b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_scope_assignment_operations.py index ca3756cec..ee8feae7c 100644 --- a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_scope_assignment_operations.py +++ b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_scope_assignment_operations.py @@ -59,7 +59,7 @@ def get( :param scope_assignment_name: The name of the scope assignment to get. :type scope_assignment_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: ScopeAssignment or the result of cls(response) + :return: ScopeAssignment, or the result of cls(response) :rtype: ~managed_network_management_client.models.ScopeAssignment :raises: ~azure.core.exceptions.HttpResponseError """ @@ -97,7 +97,7 @@ def get( deserialized = self._deserialize('ScopeAssignment', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized get.metadata = {'url': '/{scope}/providers/Microsoft.ManagedNetwork/scopeAssignments/{scopeAssignmentName}'} # type: ignore @@ -126,7 +126,7 @@ def create_or_update( :param assigned_managed_network: The managed network ID with scope will be assigned to. :type assigned_managed_network: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: ScopeAssignment or the result of cls(response) + :return: ScopeAssignment, or the result of cls(response) :rtype: ~managed_network_management_client.models.ScopeAssignment :raises: ~azure.core.exceptions.HttpResponseError """ @@ -177,7 +177,7 @@ def create_or_update( deserialized = self._deserialize('ScopeAssignment', pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) return deserialized create_or_update.metadata = {'url': '/{scope}/providers/Microsoft.ManagedNetwork/scopeAssignments/{scopeAssignmentName}'} # type: ignore @@ -196,7 +196,7 @@ def delete( :param scope_assignment_name: The name of the scope assignment to delete. :type scope_assignment_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: None or the result of cls(response) + :return: None, or the result of cls(response) :rtype: None :raises: ~azure.core.exceptions.HttpResponseError """ @@ -230,7 +230,7 @@ def delete( raise HttpResponseError(response=response, error_format=ARMErrorFormat) if cls: - return cls(pipeline_response, None, {}) + return cls(pipeline_response, None, {}) delete.metadata = {'url': '/{scope}/providers/Microsoft.ManagedNetwork/scopeAssignments/{scopeAssignmentName}'} # type: ignore @@ -245,7 +245,7 @@ def list( :param scope: The base resource of the scope assignment. :type scope: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: An iterator like instance of ScopeAssignmentListResult or the result of cls(response) + :return: An iterator like instance of either ScopeAssignmentListResult or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~managed_network_management_client.models.ScopeAssignmentListResult] :raises: ~azure.core.exceptions.HttpResponseError """