From 3531571c4f68bfba2531bf6876cf17305270f86c Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Tue, 6 Jun 2023 01:04:54 +0000 Subject: [PATCH] CodeGen from PR 24297 in Azure/azure-rest-api-specs Merge 6454bad3e6455ec9ee8486c0051e5071a2c3d9db into 8ca661876ff89fa54a704e1314a505acc897f529 --- .../azure-mgmt-voiceservices/_meta.json | 6 +- .../mgmt/voiceservices/_configuration.py | 4 +- .../_voice_services_mgmt_client.py | 2 +- .../mgmt/voiceservices/aio/_configuration.py | 4 +- .../aio/_voice_services_mgmt_client.py | 2 +- .../_communications_gateways_operations.py | 5 +- .../_name_availability_operations.py | 3 +- .../aio/operations/_test_lines_operations.py | 5 +- .../mgmt/voiceservices/models/__init__.py | 6 + .../mgmt/voiceservices/models/_models_py3.py | 120 +++++++++++++++++- .../_voice_services_mgmt_client_enums.py | 11 ++ .../_communications_gateways_operations.py | 17 +-- .../_name_availability_operations.py | 5 +- .../voiceservices/operations/_operations.py | 2 +- .../operations/_test_lines_operations.py | 17 +-- ...ommunications_gateways_create_or_update.py | 2 +- .../communications_gateways_delete.py | 5 +- .../communications_gateways_get.py | 2 +- ...cations_gateways_list_by_resource_group.py | 2 +- ...nications_gateways_list_by_subscription.py | 2 +- .../name_availability_check_local.py | 2 +- .../generated_samples/operations_list.py | 2 +- .../test_lines_create_or_update.py | 2 +- .../generated_samples/test_lines_delete.py | 5 +- .../generated_samples/test_lines_get.py | 2 +- ...st_lines_list_by_communications_gateway.py | 2 +- 26 files changed, 188 insertions(+), 49 deletions(-) diff --git a/sdk/voiceservices/azure-mgmt-voiceservices/_meta.json b/sdk/voiceservices/azure-mgmt-voiceservices/_meta.json index c487f2861490..1915b3e8f427 100644 --- a/sdk/voiceservices/azure-mgmt-voiceservices/_meta.json +++ b/sdk/voiceservices/azure-mgmt-voiceservices/_meta.json @@ -1,11 +1,11 @@ { - "commit": "84113e300ebbd2e804f000b73b522ffd8acedd4a", + "commit": "d1f290a77a9e11d1e9baccba127e2712203cfdc5", "repository_url": "https://github.com/Azure/azure-rest-api-specs", "autorest": "3.9.2", "use": [ - "@autorest/python@6.4.8", + "@autorest/python@6.4.12", "@autorest/modelerfour@4.24.3" ], - "autorest_command": "autorest specification/voiceservices/resource-manager/readme.md --generate-sample=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --use=@autorest/python@6.4.8 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False", + "autorest_command": "autorest specification/voiceservices/resource-manager/readme.md --generate-sample=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-python/sdk --use=@autorest/python@6.4.12 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False", "readme": "specification/voiceservices/resource-manager/readme.md" } \ No newline at end of file diff --git a/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/_configuration.py b/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/_configuration.py index ed98daf6ce73..183dd741ee4e 100644 --- a/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/_configuration.py +++ b/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/_configuration.py @@ -29,14 +29,14 @@ class VoiceServicesMgmtClientConfiguration(Configuration): # pylint: disable=to :type credential: ~azure.core.credentials.TokenCredential :param subscription_id: The ID of the target subscription. Required. :type subscription_id: str - :keyword api_version: Api Version. Default value is "2023-01-31". Note that overriding this + :keyword api_version: Api Version. Default value is "2023-04-03". Note that overriding this default value may result in unsupported behavior. :paramtype api_version: str """ def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None: super(VoiceServicesMgmtClientConfiguration, self).__init__(**kwargs) - api_version: str = kwargs.pop("api_version", "2023-01-31") + api_version: str = kwargs.pop("api_version", "2023-04-03") if credential is None: raise ValueError("Parameter 'credential' must not be None.") diff --git a/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/_voice_services_mgmt_client.py b/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/_voice_services_mgmt_client.py index c8596a24e024..063dada29cba 100644 --- a/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/_voice_services_mgmt_client.py +++ b/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/_voice_services_mgmt_client.py @@ -40,7 +40,7 @@ class VoiceServicesMgmtClient: # pylint: disable=client-accepts-api-version-key :type subscription_id: str :param base_url: Service URL. Default value is "https://management.azure.com". :type base_url: str - :keyword api_version: Api Version. Default value is "2023-01-31". Note that overriding this + :keyword api_version: Api Version. Default value is "2023-04-03". Note that overriding this default value may result in unsupported behavior. :paramtype api_version: str :keyword int polling_interval: Default waiting time between two polls for LRO operations if no diff --git a/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/aio/_configuration.py b/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/aio/_configuration.py index 958f3be52f44..e624756cf9f0 100644 --- a/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/aio/_configuration.py +++ b/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/aio/_configuration.py @@ -29,14 +29,14 @@ class VoiceServicesMgmtClientConfiguration(Configuration): # pylint: disable=to :type credential: ~azure.core.credentials_async.AsyncTokenCredential :param subscription_id: The ID of the target subscription. Required. :type subscription_id: str - :keyword api_version: Api Version. Default value is "2023-01-31". Note that overriding this + :keyword api_version: Api Version. Default value is "2023-04-03". Note that overriding this default value may result in unsupported behavior. :paramtype api_version: str """ def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None: super(VoiceServicesMgmtClientConfiguration, self).__init__(**kwargs) - api_version: str = kwargs.pop("api_version", "2023-01-31") + api_version: str = kwargs.pop("api_version", "2023-04-03") if credential is None: raise ValueError("Parameter 'credential' must not be None.") diff --git a/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/aio/_voice_services_mgmt_client.py b/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/aio/_voice_services_mgmt_client.py index 1965854412ab..d26743bd544f 100644 --- a/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/aio/_voice_services_mgmt_client.py +++ b/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/aio/_voice_services_mgmt_client.py @@ -40,7 +40,7 @@ class VoiceServicesMgmtClient: # pylint: disable=client-accepts-api-version-key :type subscription_id: str :param base_url: Service URL. Default value is "https://management.azure.com". :type base_url: str - :keyword api_version: Api Version. Default value is "2023-01-31". Note that overriding this + :keyword api_version: Api Version. Default value is "2023-04-03". Note that overriding this default value may result in unsupported behavior. :paramtype api_version: str :keyword int polling_interval: Default waiting time between two polls for LRO operations if no diff --git a/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/aio/operations/_communications_gateways_operations.py b/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/aio/operations/_communications_gateways_operations.py index 0b12a5b0de81..84ce5cfc9051 100644 --- a/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/aio/operations/_communications_gateways_operations.py +++ b/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/aio/operations/_communications_gateways_operations.py @@ -6,6 +6,7 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from io import IOBase from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload import urllib.parse @@ -328,7 +329,7 @@ async def _create_or_update_initial( content_type = content_type or "application/json" _json = None _content = None - if isinstance(resource, (IO, bytes)): + if isinstance(resource, (IOBase, bytes)): _content = resource else: _json = self._serialize.body(resource, "CommunicationsGateway") @@ -759,7 +760,7 @@ async def update( content_type = content_type or "application/json" _json = None _content = None - if isinstance(properties, (IO, bytes)): + if isinstance(properties, (IOBase, bytes)): _content = properties else: _json = self._serialize.body(properties, "CommunicationsGatewayUpdate") diff --git a/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/aio/operations/_name_availability_operations.py b/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/aio/operations/_name_availability_operations.py index 99fdf5c75226..2f5bed2aa44c 100644 --- a/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/aio/operations/_name_availability_operations.py +++ b/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/aio/operations/_name_availability_operations.py @@ -6,6 +6,7 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from io import IOBase from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload from azure.core.exceptions import ( @@ -130,7 +131,7 @@ async def check_local( content_type = content_type or "application/json" _json = None _content = None - if isinstance(body, (IO, bytes)): + if isinstance(body, (IOBase, bytes)): _content = body else: _json = self._serialize.body(body, "CheckNameAvailabilityRequest") diff --git a/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/aio/operations/_test_lines_operations.py b/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/aio/operations/_test_lines_operations.py index 4567e2ca22cb..bdb35ed93c13 100644 --- a/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/aio/operations/_test_lines_operations.py +++ b/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/aio/operations/_test_lines_operations.py @@ -6,6 +6,7 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from io import IOBase from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload import urllib.parse @@ -247,7 +248,7 @@ async def _create_or_update_initial( content_type = content_type or "application/json" _json = None _content = None - if isinstance(resource, (IO, bytes)): + if isinstance(resource, (IOBase, bytes)): _content = resource else: _json = self._serialize.body(resource, "TestLine") @@ -698,7 +699,7 @@ async def update( content_type = content_type or "application/json" _json = None _content = None - if isinstance(properties, (IO, bytes)): + if isinstance(properties, (IOBase, bytes)): _content = properties else: _json = self._serialize.body(properties, "TestLineUpdate") diff --git a/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/models/__init__.py b/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/models/__init__.py index ee84c9bd2f66..d53695383d32 100644 --- a/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/models/__init__.py +++ b/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/models/__init__.py @@ -14,6 +14,7 @@ from ._models_py3 import ErrorAdditionalInfo from ._models_py3 import ErrorDetail from ._models_py3 import ErrorResponse +from ._models_py3 import ManagedServiceIdentity from ._models_py3 import Operation from ._models_py3 import OperationDisplay from ._models_py3 import OperationListResult @@ -25,6 +26,7 @@ from ._models_py3 import TestLineListResult from ._models_py3 import TestLineUpdate from ._models_py3 import TrackedResource +from ._models_py3 import UserAssignedIdentity from ._voice_services_mgmt_client_enums import ActionType from ._voice_services_mgmt_client_enums import AutoGeneratedDomainNameLabelScope @@ -33,6 +35,7 @@ from ._voice_services_mgmt_client_enums import Connectivity from ._voice_services_mgmt_client_enums import CreatedByType from ._voice_services_mgmt_client_enums import E911Type +from ._voice_services_mgmt_client_enums import ManagedServiceIdentityType from ._voice_services_mgmt_client_enums import Origin from ._voice_services_mgmt_client_enums import ProvisioningState from ._voice_services_mgmt_client_enums import Status @@ -51,6 +54,7 @@ "ErrorAdditionalInfo", "ErrorDetail", "ErrorResponse", + "ManagedServiceIdentity", "Operation", "OperationDisplay", "OperationListResult", @@ -62,6 +66,7 @@ "TestLineListResult", "TestLineUpdate", "TrackedResource", + "UserAssignedIdentity", "ActionType", "AutoGeneratedDomainNameLabelScope", "CheckNameAvailabilityReason", @@ -69,6 +74,7 @@ "Connectivity", "CreatedByType", "E911Type", + "ManagedServiceIdentityType", "Origin", "ProvisioningState", "Status", diff --git a/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/models/_models_py3.py b/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/models/_models_py3.py index 78c017a1bb0c..827e3709fee4 100644 --- a/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/models/_models_py3.py +++ b/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/models/_models_py3.py @@ -208,6 +208,8 @@ class CommunicationsGateway(TrackedResource): # pylint: disable=too-many-instan :vartype tags: dict[str, str] :ivar location: The geo-location where the resource lives. Required. :vartype location: str + :ivar identity: The managed service identities assigned to this resource. + :vartype identity: ~azure.mgmt.voiceservices.models.ManagedServiceIdentity :ivar provisioning_state: Resource provisioning state. Known values are: "Succeeded", "Failed", and "Canceled". :vartype provisioning_state: str or ~azure.mgmt.voiceservices.models.ProvisioningState @@ -239,6 +241,8 @@ class CommunicationsGateway(TrackedResource): # pylint: disable=too-many-instan :vartype teams_voicemail_pilot_number: str :ivar on_prem_mcp_enabled: Whether an on-premises Mobile Control Point is in use. :vartype on_prem_mcp_enabled: bool + :ivar integrated_mcp_enabled: Whether an integrated Mobile Control Point is in use. + :vartype integrated_mcp_enabled: bool :ivar emergency_dial_strings: A list of dial strings used for emergency calling. :vartype emergency_dial_strings: list[str] """ @@ -262,6 +266,7 @@ class CommunicationsGateway(TrackedResource): # pylint: disable=too-many-instan "system_data": {"key": "systemData", "type": "SystemData"}, "tags": {"key": "tags", "type": "{str}"}, "location": {"key": "location", "type": "str"}, + "identity": {"key": "identity", "type": "ManagedServiceIdentity"}, "provisioning_state": {"key": "properties.provisioningState", "type": "str"}, "status": {"key": "properties.status", "type": "str"}, "service_locations": {"key": "properties.serviceLocations", "type": "[ServiceRegionProperties]"}, @@ -277,6 +282,7 @@ class CommunicationsGateway(TrackedResource): # pylint: disable=too-many-instan "auto_generated_domain_name_label": {"key": "properties.autoGeneratedDomainNameLabel", "type": "str"}, "teams_voicemail_pilot_number": {"key": "properties.teamsVoicemailPilotNumber", "type": "str"}, "on_prem_mcp_enabled": {"key": "properties.onPremMcpEnabled", "type": "bool"}, + "integrated_mcp_enabled": {"key": "properties.integratedMcpEnabled", "type": "bool"}, "emergency_dial_strings": {"key": "properties.emergencyDialStrings", "type": "[str]"}, } @@ -285,6 +291,7 @@ def __init__( *, location: str, tags: Optional[Dict[str, str]] = None, + identity: Optional["_models.ManagedServiceIdentity"] = None, service_locations: Optional[List["_models.ServiceRegionProperties"]] = None, connectivity: Optional[Union[str, "_models.Connectivity"]] = None, codecs: Optional[List[Union[str, "_models.TeamsCodecs"]]] = None, @@ -296,6 +303,7 @@ def __init__( ] = None, teams_voicemail_pilot_number: Optional[str] = None, on_prem_mcp_enabled: bool = False, + integrated_mcp_enabled: bool = False, emergency_dial_strings: List[str] = ["911", "933"], **kwargs: Any ) -> None: @@ -304,6 +312,8 @@ def __init__( :paramtype tags: dict[str, str] :keyword location: The geo-location where the resource lives. Required. :paramtype location: str + :keyword identity: The managed service identities assigned to this resource. + :paramtype identity: ~azure.mgmt.voiceservices.models.ManagedServiceIdentity :keyword service_locations: The regions in which to deploy the resources needed for Teams Calling. :paramtype service_locations: list[~azure.mgmt.voiceservices.models.ServiceRegionProperties] @@ -327,10 +337,13 @@ def __init__( :paramtype teams_voicemail_pilot_number: str :keyword on_prem_mcp_enabled: Whether an on-premises Mobile Control Point is in use. :paramtype on_prem_mcp_enabled: bool + :keyword integrated_mcp_enabled: Whether an integrated Mobile Control Point is in use. + :paramtype integrated_mcp_enabled: bool :keyword emergency_dial_strings: A list of dial strings used for emergency calling. :paramtype emergency_dial_strings: list[str] """ super().__init__(tags=tags, location=location, **kwargs) + self.identity = identity self.provisioning_state = None self.status = None self.service_locations = service_locations @@ -343,6 +356,7 @@ def __init__( self.auto_generated_domain_name_label = None self.teams_voicemail_pilot_number = teams_voicemail_pilot_number self.on_prem_mcp_enabled = on_prem_mcp_enabled + self.integrated_mcp_enabled = integrated_mcp_enabled self.emergency_dial_strings = emergency_dial_strings @@ -383,20 +397,32 @@ def __init__( class CommunicationsGatewayUpdate(_serialization.Model): """The type used for update operations of the CommunicationsGateway. + :ivar identity: The managed service identities assigned to this resource. + :vartype identity: ~azure.mgmt.voiceservices.models.ManagedServiceIdentity :ivar tags: Resource tags. :vartype tags: dict[str, str] """ _attribute_map = { + "identity": {"key": "identity", "type": "ManagedServiceIdentity"}, "tags": {"key": "tags", "type": "{str}"}, } - def __init__(self, *, tags: Optional[Dict[str, str]] = None, **kwargs: Any) -> None: + def __init__( + self, + *, + identity: Optional["_models.ManagedServiceIdentity"] = None, + tags: Optional[Dict[str, str]] = None, + **kwargs: Any + ) -> None: """ + :keyword identity: The managed service identities assigned to this resource. + :paramtype identity: ~azure.mgmt.voiceservices.models.ManagedServiceIdentity :keyword tags: Resource tags. :paramtype tags: dict[str, str] """ super().__init__(**kwargs) + self.identity = identity self.tags = tags @@ -492,6 +518,70 @@ def __init__(self, *, error: Optional["_models.ErrorDetail"] = None, **kwargs: A self.error = error +class ManagedServiceIdentity(_serialization.Model): + """Managed service identity (system assigned and/or user assigned identities). + + Variables are only populated by the server, and will be ignored when sending a request. + + All required parameters must be populated in order to send to Azure. + + :ivar principal_id: The service principal ID of the system assigned identity. This property + will only be provided for a system assigned identity. + :vartype principal_id: str + :ivar tenant_id: The tenant ID of the system assigned identity. This property will only be + provided for a system assigned identity. + :vartype tenant_id: str + :ivar type: Type of managed service identity (where both SystemAssigned and UserAssigned types + are allowed). Required. Known values are: "None", "SystemAssigned", "UserAssigned", and + "SystemAssigned, UserAssigned". + :vartype type: str or ~azure.mgmt.voiceservices.models.ManagedServiceIdentityType + :ivar user_assigned_identities: The set of user assigned identities associated with the + resource. The userAssignedIdentities dictionary keys will be ARM resource ids in the form: + '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}. + The dictionary values can be empty objects ({}) in requests. + :vartype user_assigned_identities: dict[str, + ~azure.mgmt.voiceservices.models.UserAssignedIdentity] + """ + + _validation = { + "principal_id": {"readonly": True}, + "tenant_id": {"readonly": True}, + "type": {"required": True}, + } + + _attribute_map = { + "principal_id": {"key": "principalId", "type": "str"}, + "tenant_id": {"key": "tenantId", "type": "str"}, + "type": {"key": "type", "type": "str"}, + "user_assigned_identities": {"key": "userAssignedIdentities", "type": "{UserAssignedIdentity}"}, + } + + def __init__( + self, + *, + type: Union[str, "_models.ManagedServiceIdentityType"], + user_assigned_identities: Optional[Dict[str, "_models.UserAssignedIdentity"]] = None, + **kwargs: Any + ) -> None: + """ + :keyword type: Type of managed service identity (where both SystemAssigned and UserAssigned + types are allowed). Required. Known values are: "None", "SystemAssigned", "UserAssigned", and + "SystemAssigned, UserAssigned". + :paramtype type: str or ~azure.mgmt.voiceservices.models.ManagedServiceIdentityType + :keyword user_assigned_identities: The set of user assigned identities associated with the + resource. The userAssignedIdentities dictionary keys will be ARM resource ids in the form: + '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}. + The dictionary values can be empty objects ({}) in requests. + :paramtype user_assigned_identities: dict[str, + ~azure.mgmt.voiceservices.models.UserAssignedIdentity] + """ + super().__init__(**kwargs) + self.principal_id = None + self.tenant_id = None + self.type = type + self.user_assigned_identities = user_assigned_identities + + class Operation(_serialization.Model): """Details of a REST API operation, returned from the Resource Provider Operations API. @@ -903,3 +993,31 @@ def __init__(self, *, tags: Optional[Dict[str, str]] = None, **kwargs: Any) -> N """ super().__init__(**kwargs) self.tags = tags + + +class UserAssignedIdentity(_serialization.Model): + """User assigned identity properties. + + Variables are only populated by the server, and will be ignored when sending a request. + + :ivar principal_id: The principal ID of the assigned identity. + :vartype principal_id: str + :ivar client_id: The client ID of the assigned identity. + :vartype client_id: str + """ + + _validation = { + "principal_id": {"readonly": True}, + "client_id": {"readonly": True}, + } + + _attribute_map = { + "principal_id": {"key": "principalId", "type": "str"}, + "client_id": {"key": "clientId", "type": "str"}, + } + + def __init__(self, **kwargs: Any) -> None: + """ """ + super().__init__(**kwargs) + self.principal_id = None + self.client_id = None diff --git a/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/models/_voice_services_mgmt_client_enums.py b/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/models/_voice_services_mgmt_client_enums.py index 94235ad88fac..6d2dee43c363 100644 --- a/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/models/_voice_services_mgmt_client_enums.py +++ b/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/models/_voice_services_mgmt_client_enums.py @@ -65,6 +65,17 @@ class E911Type(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Emergency calls are routed directly to the ESRP""" +class ManagedServiceIdentityType(str, Enum, metaclass=CaseInsensitiveEnumMeta): + """Type of managed service identity (where both SystemAssigned and UserAssigned types are + allowed). + """ + + NONE = "None" + SYSTEM_ASSIGNED = "SystemAssigned" + USER_ASSIGNED = "UserAssigned" + SYSTEM_ASSIGNED_USER_ASSIGNED = "SystemAssigned, UserAssigned" + + class Origin(str, Enum, metaclass=CaseInsensitiveEnumMeta): """The intended executor of the operation; as in Resource Based Access Control (RBAC) and audit logs UX. Default value is "user,system". diff --git a/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/operations/_communications_gateways_operations.py b/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/operations/_communications_gateways_operations.py index c78f510683db..e5478beafc7e 100644 --- a/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/operations/_communications_gateways_operations.py +++ b/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/operations/_communications_gateways_operations.py @@ -6,6 +6,7 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from io import IOBase from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, cast, overload import urllib.parse @@ -42,7 +43,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-04-03")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -68,7 +69,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-04-03")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -100,7 +101,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-04-03")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -135,7 +136,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-04-03")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -173,7 +174,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-04-03")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -208,7 +209,7 @@ def build_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-04-03")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -523,7 +524,7 @@ def _create_or_update_initial( content_type = content_type or "application/json" _json = None _content = None - if isinstance(resource, (IO, bytes)): + if isinstance(resource, (IOBase, bytes)): _content = resource else: _json = self._serialize.body(resource, "CommunicationsGateway") @@ -949,7 +950,7 @@ def update( content_type = content_type or "application/json" _json = None _content = None - if isinstance(properties, (IO, bytes)): + if isinstance(properties, (IOBase, bytes)): _content = properties else: _json = self._serialize.body(properties, "CommunicationsGatewayUpdate") diff --git a/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/operations/_name_availability_operations.py b/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/operations/_name_availability_operations.py index 6e59550721e8..fb82f0b0e5a8 100644 --- a/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/operations/_name_availability_operations.py +++ b/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/operations/_name_availability_operations.py @@ -6,6 +6,7 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from io import IOBase from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload from azure.core.exceptions import ( @@ -38,7 +39,7 @@ def build_check_local_request(location: str, subscription_id: str, **kwargs: Any _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-04-03")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -164,7 +165,7 @@ def check_local( content_type = content_type or "application/json" _json = None _content = None - if isinstance(body, (IO, bytes)): + if isinstance(body, (IOBase, bytes)): _content = body else: _json = self._serialize.body(body, "CheckNameAvailabilityRequest") diff --git a/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/operations/_operations.py b/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/operations/_operations.py index d725a5d34195..da4925bf2754 100644 --- a/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/operations/_operations.py +++ b/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/operations/_operations.py @@ -40,7 +40,7 @@ def build_list_request(**kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-04-03")) accept = _headers.pop("Accept", "application/json") # Construct URL diff --git a/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/operations/_test_lines_operations.py b/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/operations/_test_lines_operations.py index 5c9a3df7727e..02cb1c9a1dca 100644 --- a/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/operations/_test_lines_operations.py +++ b/sdk/voiceservices/azure-mgmt-voiceservices/azure/mgmt/voiceservices/operations/_test_lines_operations.py @@ -6,6 +6,7 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from io import IOBase from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, cast, overload import urllib.parse @@ -38,13 +39,13 @@ _SERIALIZER.client_side_validation = False -def build_list_by_communications_gateway_request( # pylint: disable=name-too-long +def build_list_by_communications_gateway_request( resource_group_name: str, communications_gateway_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-04-03")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -79,7 +80,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-04-03")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -115,7 +116,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-04-03")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -154,7 +155,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-04-03")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -190,7 +191,7 @@ def build_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-04-03")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -428,7 +429,7 @@ def _create_or_update_initial( content_type = content_type or "application/json" _json = None _content = None - if isinstance(resource, (IO, bytes)): + if isinstance(resource, (IOBase, bytes)): _content = resource else: _json = self._serialize.body(resource, "TestLine") @@ -874,7 +875,7 @@ def update( content_type = content_type or "application/json" _json = None _content = None - if isinstance(properties, (IO, bytes)): + if isinstance(properties, (IOBase, bytes)): _content = properties else: _json = self._serialize.body(properties, "TestLineUpdate") diff --git a/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/communications_gateways_create_or_update.py b/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/communications_gateways_create_or_update.py index eea99989d9b5..8c241d3a12a1 100644 --- a/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/communications_gateways_create_or_update.py +++ b/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/communications_gateways_create_or_update.py @@ -65,6 +65,6 @@ def main(): print(response) -# x-ms-original-file: specification/voiceservices/resource-manager/Microsoft.VoiceServices/stable/2023-01-31/examples/CommunicationsGateways_CreateOrUpdate.json +# x-ms-original-file: specification/voiceservices/resource-manager/Microsoft.VoiceServices/stable/2023-04-03/examples/CommunicationsGateways_CreateOrUpdate.json if __name__ == "__main__": main() diff --git a/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/communications_gateways_delete.py b/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/communications_gateways_delete.py index 3639192bdccc..e20b31b29fbc 100644 --- a/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/communications_gateways_delete.py +++ b/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/communications_gateways_delete.py @@ -29,13 +29,12 @@ def main(): subscription_id="00000000-0000-0000-0000-000000000000", ) - response = client.communications_gateways.begin_delete( + client.communications_gateways.begin_delete( resource_group_name="testrg", communications_gateway_name="myname", ).result() - print(response) -# x-ms-original-file: specification/voiceservices/resource-manager/Microsoft.VoiceServices/stable/2023-01-31/examples/CommunicationsGateways_Delete.json +# x-ms-original-file: specification/voiceservices/resource-manager/Microsoft.VoiceServices/stable/2023-04-03/examples/CommunicationsGateways_Delete.json if __name__ == "__main__": main() diff --git a/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/communications_gateways_get.py b/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/communications_gateways_get.py index 5d2db1c6002f..18dbf3f60b67 100644 --- a/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/communications_gateways_get.py +++ b/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/communications_gateways_get.py @@ -36,6 +36,6 @@ def main(): print(response) -# x-ms-original-file: specification/voiceservices/resource-manager/Microsoft.VoiceServices/stable/2023-01-31/examples/CommunicationsGateways_Get.json +# x-ms-original-file: specification/voiceservices/resource-manager/Microsoft.VoiceServices/stable/2023-04-03/examples/CommunicationsGateways_Get.json if __name__ == "__main__": main() diff --git a/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/communications_gateways_list_by_resource_group.py b/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/communications_gateways_list_by_resource_group.py index 58795a29ba40..6d9b3ec75011 100644 --- a/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/communications_gateways_list_by_resource_group.py +++ b/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/communications_gateways_list_by_resource_group.py @@ -36,6 +36,6 @@ def main(): print(item) -# x-ms-original-file: specification/voiceservices/resource-manager/Microsoft.VoiceServices/stable/2023-01-31/examples/CommunicationsGateways_ListByResourceGroup.json +# x-ms-original-file: specification/voiceservices/resource-manager/Microsoft.VoiceServices/stable/2023-04-03/examples/CommunicationsGateways_ListByResourceGroup.json if __name__ == "__main__": main() diff --git a/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/communications_gateways_list_by_subscription.py b/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/communications_gateways_list_by_subscription.py index d6b5c78ca602..cb41e1d0bc1d 100644 --- a/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/communications_gateways_list_by_subscription.py +++ b/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/communications_gateways_list_by_subscription.py @@ -34,6 +34,6 @@ def main(): print(item) -# x-ms-original-file: specification/voiceservices/resource-manager/Microsoft.VoiceServices/stable/2023-01-31/examples/CommunicationsGateways_ListBySubscription.json +# x-ms-original-file: specification/voiceservices/resource-manager/Microsoft.VoiceServices/stable/2023-04-03/examples/CommunicationsGateways_ListBySubscription.json if __name__ == "__main__": main() diff --git a/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/name_availability_check_local.py b/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/name_availability_check_local.py index 84674bccb453..a1f1240d958d 100644 --- a/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/name_availability_check_local.py +++ b/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/name_availability_check_local.py @@ -36,6 +36,6 @@ def main(): print(response) -# x-ms-original-file: specification/voiceservices/resource-manager/Microsoft.VoiceServices/stable/2023-01-31/examples/NameAvailability_CheckLocal.json +# x-ms-original-file: specification/voiceservices/resource-manager/Microsoft.VoiceServices/stable/2023-04-03/examples/NameAvailability_CheckLocal.json if __name__ == "__main__": main() diff --git a/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/operations_list.py b/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/operations_list.py index 01a47a6c1d50..caa7dafb0e92 100644 --- a/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/operations_list.py +++ b/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/operations_list.py @@ -34,6 +34,6 @@ def main(): print(item) -# x-ms-original-file: specification/voiceservices/resource-manager/Microsoft.VoiceServices/stable/2023-01-31/examples/Operations_List.json +# x-ms-original-file: specification/voiceservices/resource-manager/Microsoft.VoiceServices/stable/2023-04-03/examples/Operations_List.json if __name__ == "__main__": main() diff --git a/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/test_lines_create_or_update.py b/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/test_lines_create_or_update.py index 4680aa6271f4..3fdeb089df13 100644 --- a/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/test_lines_create_or_update.py +++ b/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/test_lines_create_or_update.py @@ -38,6 +38,6 @@ def main(): print(response) -# x-ms-original-file: specification/voiceservices/resource-manager/Microsoft.VoiceServices/stable/2023-01-31/examples/TestLines_CreateOrUpdate.json +# x-ms-original-file: specification/voiceservices/resource-manager/Microsoft.VoiceServices/stable/2023-04-03/examples/TestLines_CreateOrUpdate.json if __name__ == "__main__": main() diff --git a/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/test_lines_delete.py b/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/test_lines_delete.py index 8868b7893b38..35ee7fded673 100644 --- a/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/test_lines_delete.py +++ b/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/test_lines_delete.py @@ -29,14 +29,13 @@ def main(): subscription_id="00000000-0000-0000-0000-000000000000", ) - response = client.test_lines.begin_delete( + client.test_lines.begin_delete( resource_group_name="testrg", communications_gateway_name="myname", test_line_name="myline", ).result() - print(response) -# x-ms-original-file: specification/voiceservices/resource-manager/Microsoft.VoiceServices/stable/2023-01-31/examples/TestLines_Delete.json +# x-ms-original-file: specification/voiceservices/resource-manager/Microsoft.VoiceServices/stable/2023-04-03/examples/TestLines_Delete.json if __name__ == "__main__": main() diff --git a/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/test_lines_get.py b/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/test_lines_get.py index 341192676a08..47fae7086942 100644 --- a/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/test_lines_get.py +++ b/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/test_lines_get.py @@ -37,6 +37,6 @@ def main(): print(response) -# x-ms-original-file: specification/voiceservices/resource-manager/Microsoft.VoiceServices/stable/2023-01-31/examples/TestLines_Get.json +# x-ms-original-file: specification/voiceservices/resource-manager/Microsoft.VoiceServices/stable/2023-04-03/examples/TestLines_Get.json if __name__ == "__main__": main() diff --git a/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/test_lines_list_by_communications_gateway.py b/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/test_lines_list_by_communications_gateway.py index 4903d0f57c0a..7fc981105693 100644 --- a/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/test_lines_list_by_communications_gateway.py +++ b/sdk/voiceservices/azure-mgmt-voiceservices/generated_samples/test_lines_list_by_communications_gateway.py @@ -37,6 +37,6 @@ def main(): print(item) -# x-ms-original-file: specification/voiceservices/resource-manager/Microsoft.VoiceServices/stable/2023-01-31/examples/TestLines_ListByCommunicationsGateway.json +# x-ms-original-file: specification/voiceservices/resource-manager/Microsoft.VoiceServices/stable/2023-04-03/examples/TestLines_ListByCommunicationsGateway.json if __name__ == "__main__": main()