From b717e4a36b3a325c6e669c6577418ad318f2df01 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Tue, 30 Nov 2021 06:58:58 +0000 Subject: [PATCH] CodeGen from PR 16906 in Azure/azure-rest-api-specs Merge da655edb55978fde7dfcb59ebafd97e111a1361f into cea6492a1e41b3f3b4f8b4f69bdcc10431e79c0e --- sdk/webpubsub/azure-mgmt-webpubsub/_meta.json | 2 +- .../azure/mgmt/webpubsub/_version.py | 2 +- .../azure/mgmt/webpubsub/models/_models.py | 61 +++++++++---------- .../mgmt/webpubsub/models/_models_py3.py | 61 +++++++++---------- .../_web_pub_sub_management_client_enums.py | 11 ++-- 5 files changed, 63 insertions(+), 74 deletions(-) diff --git a/sdk/webpubsub/azure-mgmt-webpubsub/_meta.json b/sdk/webpubsub/azure-mgmt-webpubsub/_meta.json index 9d70c84fc90a..83ca9c964163 100644 --- a/sdk/webpubsub/azure-mgmt-webpubsub/_meta.json +++ b/sdk/webpubsub/azure-mgmt-webpubsub/_meta.json @@ -4,7 +4,7 @@ "@autorest/python@5.8.4", "@autorest/modelerfour@4.19.2" ], - "commit": "f6de239922d6b23e97750ca3f508ac55c1d2f235", + "commit": "1531476f7968db701f4345933d91f825eb971a63", "repository_url": "https://github.com/Azure/azure-rest-api-specs", "autorest_command": "autorest specification/webpubsub/resource-manager/readme.md --multiapi --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --track2 --use=@autorest/python@5.8.4 --use=@autorest/modelerfour@4.19.2 --version=3.4.5", "readme": "specification/webpubsub/resource-manager/readme.md" diff --git a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/_version.py b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/_version.py index c47f66669f1b..eae7c95b6fbd 100644 --- a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/_version.py +++ b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/_version.py @@ -6,4 +6,4 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -VERSION = "1.0.0" +VERSION = "0.1.0" diff --git a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/models/_models.py b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/models/_models.py index 94b32a08f4b2..1cbc29629985 100644 --- a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/models/_models.py +++ b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/models/_models.py @@ -159,7 +159,7 @@ class EventHandler(msrest.serialization.Model): :type user_event_pattern: str :param system_events: Gets ot sets the list of system events. :type system_events: list[str] - :param auth: Gets or sets the auth settings for an event handler. If not set, no auth is used. + :param auth: Upstream auth settings. If not set, no auth is used for upstream messages. :type auth: ~azure.mgmt.webpubsub.models.UpstreamAuthSettings """ @@ -268,7 +268,7 @@ class ManagedIdentity(msrest.serialization.Model): Variables are only populated by the server, and will be ignored when sending a request. - :param type: Represent the identity type: systemAssigned, userAssigned, None. Possible values + :param type: Represents the identity type: systemAssigned, userAssigned, None. Possible values include: "None", "SystemAssigned", "UserAssigned". :type type: str or ~azure.mgmt.webpubsub.models.ManagedIdentityType :param user_assigned_identities: Get or set the user assigned identities. @@ -469,12 +469,12 @@ class Operation(msrest.serialization.Model): :type name: str :param is_data_action: If the operation is a data action. (for data plane rbac). :type is_data_action: bool - :param display: The object that describes the operation. + :param display: The object that describes a operation. :type display: ~azure.mgmt.webpubsub.models.OperationDisplay :param origin: Optional. The intended executor of the operation; governs the display of the operation in the RBAC UX and the audit logs UX. :type origin: str - :param properties: Extra properties for the operation. + :param properties: Extra Operation properties. :type properties: ~azure.mgmt.webpubsub.models.OperationProperties """ @@ -557,7 +557,7 @@ def __init__( class OperationProperties(msrest.serialization.Model): """Extra Operation properties. - :param service_specification: The service specifications. + :param service_specification: An object that describes a specification. :type service_specification: ~azure.mgmt.webpubsub.models.ServiceSpecification """ @@ -705,15 +705,16 @@ class PrivateEndpointConnection(ProxyResource): :vartype type: str :ivar system_data: Metadata pertaining to creation and last modification of the resource. :vartype system_data: ~azure.mgmt.webpubsub.models.SystemData - :ivar provisioning_state: Provisioning state of the private endpoint connection. Possible - values include: "Unknown", "Succeeded", "Failed", "Canceled", "Running", "Creating", - "Updating", "Deleting", "Moving". + :ivar provisioning_state: Provisioning state of the resource. Possible values include: + "Unknown", "Succeeded", "Failed", "Canceled", "Running", "Creating", "Updating", "Deleting", + "Moving". :vartype provisioning_state: str or ~azure.mgmt.webpubsub.models.ProvisioningState - :param private_endpoint: Private endpoint associated with the private endpoint connection. + :param private_endpoint: Private endpoint. :type private_endpoint: ~azure.mgmt.webpubsub.models.PrivateEndpoint :ivar group_ids: Group IDs. :vartype group_ids: list[str] - :param private_link_service_connection_state: Connection state. + :param private_link_service_connection_state: Connection state of the private endpoint + connection. :type private_link_service_connection_state: ~azure.mgmt.webpubsub.models.PrivateLinkServiceConnectionState """ @@ -882,8 +883,8 @@ def __init__( class RegenerateKeyParameters(msrest.serialization.Model): """Parameters describes the request to regenerate access keys. - :param key_type: The keyType to regenerate. Must be either 'primary' or - 'secondary'(case-insensitive). Possible values include: "Primary", "Secondary", "Salt". + :param key_type: The type of access key. Possible values include: "Primary", "Secondary", + "Salt". :type key_type: str or ~azure.mgmt.webpubsub.models.KeyType """ @@ -1095,9 +1096,9 @@ class SharedPrivateLinkResource(ProxyResource): :param private_link_resource_id: The resource id of the resource the shared private link resource is for. :type private_link_resource_id: str - :ivar provisioning_state: Provisioning state of the shared private link resource. Possible - values include: "Unknown", "Succeeded", "Failed", "Canceled", "Running", "Creating", - "Updating", "Deleting", "Moving". + :ivar provisioning_state: Provisioning state of the resource. Possible values include: + "Unknown", "Succeeded", "Failed", "Canceled", "Running", "Creating", "Updating", "Deleting", + "Moving". :vartype provisioning_state: str or ~azure.mgmt.webpubsub.models.ProvisioningState :param request_message: The request message for requesting approval of the shared private link resource. @@ -1258,9 +1259,9 @@ class Sku(msrest.serialization.Model): :ivar resource_type: The resource type that this object applies to. :vartype resource_type: str - :ivar sku: The exact set of keys that define this sku. + :ivar sku: The billing information of the resource. :vartype sku: ~azure.mgmt.webpubsub.models.ResourceSku - :ivar capacity: Specifies the unit of the resource. + :ivar capacity: Describes scaling information of a sku. :vartype capacity: ~azure.mgmt.webpubsub.models.SkuCapacity """ @@ -1447,13 +1448,11 @@ def __init__( class UpstreamAuthSettings(msrest.serialization.Model): - """Upstream auth settings. + """Upstream auth settings. If not set, no auth is used for upstream messages. - :param type: Gets or sets the type of auth. None or ManagedIdentity is supported now. Possible - values include: "None", "ManagedIdentity". + :param type: Upstream auth type enum. Possible values include: "None", "ManagedIdentity". :type type: str or ~azure.mgmt.webpubsub.models.UpstreamAuthType - :param managed_identity: Gets or sets the managed identity settings. It's required if the auth - type is set to ManagedIdentity. + :param managed_identity: Managed identity settings for upstream. :type managed_identity: ~azure.mgmt.webpubsub.models.ManagedIdentitySettings """ @@ -1516,7 +1515,7 @@ class WebPubSubHub(ProxyResource): :vartype type: str :ivar system_data: Metadata pertaining to creation and last modification of the resource. :vartype system_data: ~azure.mgmt.webpubsub.models.SystemData - :param properties: Required. Properties of the hub setting. + :param properties: Required. Properties of a hub. :type properties: ~azure.mgmt.webpubsub.models.WebPubSubHubProperties """ @@ -1633,10 +1632,9 @@ def __init__( class WebPubSubNetworkACLs(msrest.serialization.Model): """Network ACLs for the resource. - :param default_action: Default action when no other rule matches. Possible values include: - "Allow", "Deny". + :param default_action: Azure Networking ACL Action. Possible values include: "Allow", "Deny". :type default_action: str or ~azure.mgmt.webpubsub.models.ACLAction - :param public_network: ACL for requests from public network. + :param public_network: Network ACL. :type public_network: ~azure.mgmt.webpubsub.models.NetworkACL :param private_endpoints: ACLs for requests from private endpoints. :type private_endpoints: list[~azure.mgmt.webpubsub.models.PrivateEndpointACL] @@ -1675,9 +1673,9 @@ class WebPubSubResource(TrackedResource): :param tags: A set of tags. Tags of the service which is a list of key value pairs that describe the resource. :type tags: dict[str, str] - :param sku: The billing information of the resource.(e.g. Free, Standard). + :param sku: The billing information of the resource. :type sku: ~azure.mgmt.webpubsub.models.ResourceSku - :param identity: The managed identity response. + :param identity: A class represent managed identities used for request and response. :type identity: ~azure.mgmt.webpubsub.models.ManagedIdentity :ivar system_data: Metadata pertaining to creation and last modification of the resource. :vartype system_data: ~azure.mgmt.webpubsub.models.SystemData @@ -1704,7 +1702,7 @@ class WebPubSubResource(TrackedResource): :ivar shared_private_link_resources: The list of shared private link resources. :vartype shared_private_link_resources: list[~azure.mgmt.webpubsub.models.SharedPrivateLinkResource] - :param tls: TLS settings. + :param tls: TLS settings for the resource. :type tls: ~azure.mgmt.webpubsub.models.WebPubSubTlsSettings :ivar host_name_prefix: Deprecated. :vartype host_name_prefix: str @@ -1713,11 +1711,8 @@ class WebPubSubResource(TrackedResource): :type live_trace_configuration: ~azure.mgmt.webpubsub.models.LiveTraceConfiguration :param resource_log_configuration: Resource log configuration of a Microsoft.SignalRService resource. - If resourceLogConfiguration isn't null or empty, it will override options - "EnableConnectivityLog" and "EnableMessagingLogs" in features. - Otherwise, use options "EnableConnectivityLog" and "EnableMessagingLogs" in features. :type resource_log_configuration: ~azure.mgmt.webpubsub.models.ResourceLogConfiguration - :param network_ac_ls: Network ACLs. + :param network_ac_ls: Network ACLs for the resource. :type network_ac_ls: ~azure.mgmt.webpubsub.models.WebPubSubNetworkACLs :param public_network_access: Enable or disable public network access. Default to "Enabled". When it's Enabled, network ACLs still apply. diff --git a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/models/_models_py3.py b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/models/_models_py3.py index 8597ca4899ab..d347d529d741 100644 --- a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/models/_models_py3.py +++ b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/models/_models_py3.py @@ -171,7 +171,7 @@ class EventHandler(msrest.serialization.Model): :type user_event_pattern: str :param system_events: Gets ot sets the list of system events. :type system_events: list[str] - :param auth: Gets or sets the auth settings for an event handler. If not set, no auth is used. + :param auth: Upstream auth settings. If not set, no auth is used for upstream messages. :type auth: ~azure.mgmt.webpubsub.models.UpstreamAuthSettings """ @@ -294,7 +294,7 @@ class ManagedIdentity(msrest.serialization.Model): Variables are only populated by the server, and will be ignored when sending a request. - :param type: Represent the identity type: systemAssigned, userAssigned, None. Possible values + :param type: Represents the identity type: systemAssigned, userAssigned, None. Possible values include: "None", "SystemAssigned", "UserAssigned". :type type: str or ~azure.mgmt.webpubsub.models.ManagedIdentityType :param user_assigned_identities: Get or set the user assigned identities. @@ -519,12 +519,12 @@ class Operation(msrest.serialization.Model): :type name: str :param is_data_action: If the operation is a data action. (for data plane rbac). :type is_data_action: bool - :param display: The object that describes the operation. + :param display: The object that describes a operation. :type display: ~azure.mgmt.webpubsub.models.OperationDisplay :param origin: Optional. The intended executor of the operation; governs the display of the operation in the RBAC UX and the audit logs UX. :type origin: str - :param properties: Extra properties for the operation. + :param properties: Extra Operation properties. :type properties: ~azure.mgmt.webpubsub.models.OperationProperties """ @@ -621,7 +621,7 @@ def __init__( class OperationProperties(msrest.serialization.Model): """Extra Operation properties. - :param service_specification: The service specifications. + :param service_specification: An object that describes a specification. :type service_specification: ~azure.mgmt.webpubsub.models.ServiceSpecification """ @@ -777,15 +777,16 @@ class PrivateEndpointConnection(ProxyResource): :vartype type: str :ivar system_data: Metadata pertaining to creation and last modification of the resource. :vartype system_data: ~azure.mgmt.webpubsub.models.SystemData - :ivar provisioning_state: Provisioning state of the private endpoint connection. Possible - values include: "Unknown", "Succeeded", "Failed", "Canceled", "Running", "Creating", - "Updating", "Deleting", "Moving". + :ivar provisioning_state: Provisioning state of the resource. Possible values include: + "Unknown", "Succeeded", "Failed", "Canceled", "Running", "Creating", "Updating", "Deleting", + "Moving". :vartype provisioning_state: str or ~azure.mgmt.webpubsub.models.ProvisioningState - :param private_endpoint: Private endpoint associated with the private endpoint connection. + :param private_endpoint: Private endpoint. :type private_endpoint: ~azure.mgmt.webpubsub.models.PrivateEndpoint :ivar group_ids: Group IDs. :vartype group_ids: list[str] - :param private_link_service_connection_state: Connection state. + :param private_link_service_connection_state: Connection state of the private endpoint + connection. :type private_link_service_connection_state: ~azure.mgmt.webpubsub.models.PrivateLinkServiceConnectionState """ @@ -972,8 +973,8 @@ def __init__( class RegenerateKeyParameters(msrest.serialization.Model): """Parameters describes the request to regenerate access keys. - :param key_type: The keyType to regenerate. Must be either 'primary' or - 'secondary'(case-insensitive). Possible values include: "Primary", "Secondary", "Salt". + :param key_type: The type of access key. Possible values include: "Primary", "Secondary", + "Salt". :type key_type: str or ~azure.mgmt.webpubsub.models.KeyType """ @@ -1206,9 +1207,9 @@ class SharedPrivateLinkResource(ProxyResource): :param private_link_resource_id: The resource id of the resource the shared private link resource is for. :type private_link_resource_id: str - :ivar provisioning_state: Provisioning state of the shared private link resource. Possible - values include: "Unknown", "Succeeded", "Failed", "Canceled", "Running", "Creating", - "Updating", "Deleting", "Moving". + :ivar provisioning_state: Provisioning state of the resource. Possible values include: + "Unknown", "Succeeded", "Failed", "Canceled", "Running", "Creating", "Updating", "Deleting", + "Moving". :vartype provisioning_state: str or ~azure.mgmt.webpubsub.models.ProvisioningState :param request_message: The request message for requesting approval of the shared private link resource. @@ -1388,9 +1389,9 @@ class Sku(msrest.serialization.Model): :ivar resource_type: The resource type that this object applies to. :vartype resource_type: str - :ivar sku: The exact set of keys that define this sku. + :ivar sku: The billing information of the resource. :vartype sku: ~azure.mgmt.webpubsub.models.ResourceSku - :ivar capacity: Specifies the unit of the resource. + :ivar capacity: Describes scaling information of a sku. :vartype capacity: ~azure.mgmt.webpubsub.models.SkuCapacity """ @@ -1587,13 +1588,11 @@ def __init__( class UpstreamAuthSettings(msrest.serialization.Model): - """Upstream auth settings. + """Upstream auth settings. If not set, no auth is used for upstream messages. - :param type: Gets or sets the type of auth. None or ManagedIdentity is supported now. Possible - values include: "None", "ManagedIdentity". + :param type: Upstream auth type enum. Possible values include: "None", "ManagedIdentity". :type type: str or ~azure.mgmt.webpubsub.models.UpstreamAuthType - :param managed_identity: Gets or sets the managed identity settings. It's required if the auth - type is set to ManagedIdentity. + :param managed_identity: Managed identity settings for upstream. :type managed_identity: ~azure.mgmt.webpubsub.models.ManagedIdentitySettings """ @@ -1659,7 +1658,7 @@ class WebPubSubHub(ProxyResource): :vartype type: str :ivar system_data: Metadata pertaining to creation and last modification of the resource. :vartype system_data: ~azure.mgmt.webpubsub.models.SystemData - :param properties: Required. Properties of the hub setting. + :param properties: Required. Properties of a hub. :type properties: ~azure.mgmt.webpubsub.models.WebPubSubHubProperties """ @@ -1788,10 +1787,9 @@ def __init__( class WebPubSubNetworkACLs(msrest.serialization.Model): """Network ACLs for the resource. - :param default_action: Default action when no other rule matches. Possible values include: - "Allow", "Deny". + :param default_action: Azure Networking ACL Action. Possible values include: "Allow", "Deny". :type default_action: str or ~azure.mgmt.webpubsub.models.ACLAction - :param public_network: ACL for requests from public network. + :param public_network: Network ACL. :type public_network: ~azure.mgmt.webpubsub.models.NetworkACL :param private_endpoints: ACLs for requests from private endpoints. :type private_endpoints: list[~azure.mgmt.webpubsub.models.PrivateEndpointACL] @@ -1834,9 +1832,9 @@ class WebPubSubResource(TrackedResource): :param tags: A set of tags. Tags of the service which is a list of key value pairs that describe the resource. :type tags: dict[str, str] - :param sku: The billing information of the resource.(e.g. Free, Standard). + :param sku: The billing information of the resource. :type sku: ~azure.mgmt.webpubsub.models.ResourceSku - :param identity: The managed identity response. + :param identity: A class represent managed identities used for request and response. :type identity: ~azure.mgmt.webpubsub.models.ManagedIdentity :ivar system_data: Metadata pertaining to creation and last modification of the resource. :vartype system_data: ~azure.mgmt.webpubsub.models.SystemData @@ -1863,7 +1861,7 @@ class WebPubSubResource(TrackedResource): :ivar shared_private_link_resources: The list of shared private link resources. :vartype shared_private_link_resources: list[~azure.mgmt.webpubsub.models.SharedPrivateLinkResource] - :param tls: TLS settings. + :param tls: TLS settings for the resource. :type tls: ~azure.mgmt.webpubsub.models.WebPubSubTlsSettings :ivar host_name_prefix: Deprecated. :vartype host_name_prefix: str @@ -1872,11 +1870,8 @@ class WebPubSubResource(TrackedResource): :type live_trace_configuration: ~azure.mgmt.webpubsub.models.LiveTraceConfiguration :param resource_log_configuration: Resource log configuration of a Microsoft.SignalRService resource. - If resourceLogConfiguration isn't null or empty, it will override options - "EnableConnectivityLog" and "EnableMessagingLogs" in features. - Otherwise, use options "EnableConnectivityLog" and "EnableMessagingLogs" in features. :type resource_log_configuration: ~azure.mgmt.webpubsub.models.ResourceLogConfiguration - :param network_ac_ls: Network ACLs. + :param network_ac_ls: Network ACLs for the resource. :type network_ac_ls: ~azure.mgmt.webpubsub.models.WebPubSubNetworkACLs :param public_network_access: Enable or disable public network access. Default to "Enabled". When it's Enabled, network ACLs still apply. diff --git a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/models/_web_pub_sub_management_client_enums.py b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/models/_web_pub_sub_management_client_enums.py index 04e396fef8a6..9e94ee8f7045 100644 --- a/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/models/_web_pub_sub_management_client_enums.py +++ b/sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/models/_web_pub_sub_management_client_enums.py @@ -27,7 +27,7 @@ def __getattr__(cls, name): class ACLAction(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): - """Default action when no other rule matches + """Azure Networking ACL Action. """ ALLOW = "Allow" @@ -43,7 +43,7 @@ class CreatedByType(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): KEY = "Key" class KeyType(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): - """The keyType to regenerate. Must be either 'primary' or 'secondary'(case-insensitive). + """The type of access key. """ PRIMARY = "Primary" @@ -51,7 +51,7 @@ class KeyType(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): SALT = "Salt" class ManagedIdentityType(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): - """Represent the identity type: systemAssigned, userAssigned, None + """Represents the identity type: systemAssigned, userAssigned, None """ NONE = "None" @@ -101,15 +101,14 @@ class SharedPrivateLinkResourceStatus(with_metaclass(_CaseInsensitiveEnumMeta, s TIMEOUT = "Timeout" class UpstreamAuthType(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): - """Gets or sets the type of auth. None or ManagedIdentity is supported now. + """Upstream auth type enum. """ NONE = "None" MANAGED_IDENTITY = "ManagedIdentity" class WebPubSubRequestType(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): - """Allowed request types. The value can be one or more of: ClientConnection, ServerConnection, - RESTAPI. + """The incoming request type to the service """ CLIENT_CONNECTION = "ClientConnection"