diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/__init__.py b/azure-mgmt-signalr/azure/mgmt/signalr/__init__.py index 9a9b15f10c6b..1c51685a6ff4 100644 --- a/azure-mgmt-signalr/azure/mgmt/signalr/__init__.py +++ b/azure-mgmt-signalr/azure/mgmt/signalr/__init__.py @@ -9,10 +9,10 @@ # regenerated. # -------------------------------------------------------------------------- -from .signal_rmanagement_client import SignalRManagementClient +from .signalr_management_client import SignalrManagementClient from .version import VERSION -__all__ = ['SignalRManagementClient'] +__all__ = ['SignalrManagementClient'] __version__ = VERSION diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/__init__.py b/azure-mgmt-signalr/azure/mgmt/signalr/models/__init__.py index 6605edb1e93e..c1de41a9eb59 100644 --- a/azure-mgmt-signalr/azure/mgmt/signalr/models/__init__.py +++ b/azure-mgmt-signalr/azure/mgmt/signalr/models/__init__.py @@ -18,14 +18,14 @@ from .name_availability_parameters_py3 import NameAvailabilityParameters from .name_availability_py3 import NameAvailability from .resource_sku_py3 import ResourceSku - from .signal_rresource_py3 import SignalRResource + from .signalr_resource_py3 import SignalrResource from .tracked_resource_py3 import TrackedResource from .resource_py3 import Resource - from .signal_rcreate_or_update_properties_py3 import SignalRCreateOrUpdateProperties - from .signal_rkeys_py3 import SignalRKeys + from .signalr_create_or_update_properties_py3 import SignalrCreateOrUpdateProperties + from .signalr_keys_py3 import SignalrKeys from .regenerate_key_parameters_py3 import RegenerateKeyParameters - from .signal_rcreate_parameters_py3 import SignalRCreateParameters - from .signal_rupdate_parameters_py3 import SignalRUpdateParameters + from .signalr_create_parameters_py3 import SignalrCreateParameters + from .signalr_update_parameters_py3 import SignalrUpdateParameters except (SyntaxError, ImportError): from .operation_display import OperationDisplay from .metric_specification import MetricSpecification @@ -35,18 +35,18 @@ from .name_availability_parameters import NameAvailabilityParameters from .name_availability import NameAvailability from .resource_sku import ResourceSku - from .signal_rresource import SignalRResource + from .signalr_resource import SignalrResource from .tracked_resource import TrackedResource from .resource import Resource - from .signal_rcreate_or_update_properties import SignalRCreateOrUpdateProperties - from .signal_rkeys import SignalRKeys + from .signalr_create_or_update_properties import SignalrCreateOrUpdateProperties + from .signalr_keys import SignalrKeys from .regenerate_key_parameters import RegenerateKeyParameters - from .signal_rcreate_parameters import SignalRCreateParameters - from .signal_rupdate_parameters import SignalRUpdateParameters + from .signalr_create_parameters import SignalrCreateParameters + from .signalr_update_parameters import SignalrUpdateParameters from .operation_paged import OperationPaged -from .signal_rresource_paged import SignalRResourcePaged -from .signal_rmanagement_client_enums import ( - SignalRSkuTier, +from .signalr_resource_paged import SignalrResourcePaged +from .signalr_management_client_enums import ( + SignalrSkuTier, ProvisioningState, KeyType, ) @@ -60,17 +60,17 @@ 'NameAvailabilityParameters', 'NameAvailability', 'ResourceSku', - 'SignalRResource', + 'SignalrResource', 'TrackedResource', 'Resource', - 'SignalRCreateOrUpdateProperties', - 'SignalRKeys', + 'SignalrCreateOrUpdateProperties', + 'SignalrKeys', 'RegenerateKeyParameters', - 'SignalRCreateParameters', - 'SignalRUpdateParameters', + 'SignalrCreateParameters', + 'SignalrUpdateParameters', 'OperationPaged', - 'SignalRResourcePaged', - 'SignalRSkuTier', + 'SignalrResourcePaged', + 'SignalrSkuTier', 'ProvisioningState', 'KeyType', ] diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/resource_sku.py b/azure-mgmt-signalr/azure/mgmt/signalr/models/resource_sku.py index 18cebb3dcfa9..e7b725d7bc29 100644 --- a/azure-mgmt-signalr/azure/mgmt/signalr/models/resource_sku.py +++ b/azure-mgmt-signalr/azure/mgmt/signalr/models/resource_sku.py @@ -22,7 +22,7 @@ class ResourceSku(Model): :type name: str :param tier: The tier of this particular SKU. Optional. Possible values include: 'Free', 'Basic', 'Premium' - :type tier: str or ~azure.mgmt.signalr.models.SignalRSkuTier + :type tier: str or ~azure.mgmt.signalr.models.SignalrSkuTier :param size: Optional, string. When the name field is the combination of tier and some other value, this would be the standalone code. :type size: str diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/resource_sku_py3.py b/azure-mgmt-signalr/azure/mgmt/signalr/models/resource_sku_py3.py index fb2ead5223c3..c5cc7dbda8f3 100644 --- a/azure-mgmt-signalr/azure/mgmt/signalr/models/resource_sku_py3.py +++ b/azure-mgmt-signalr/azure/mgmt/signalr/models/resource_sku_py3.py @@ -22,7 +22,7 @@ class ResourceSku(Model): :type name: str :param tier: The tier of this particular SKU. Optional. Possible values include: 'Free', 'Basic', 'Premium' - :type tier: str or ~azure.mgmt.signalr.models.SignalRSkuTier + :type tier: str or ~azure.mgmt.signalr.models.SignalrSkuTier :param size: Optional, string. When the name field is the combination of tier and some other value, this would be the standalone code. :type size: str diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rcreate_or_update_properties.py b/azure-mgmt-signalr/azure/mgmt/signalr/models/signalr_create_or_update_properties.py similarity index 90% rename from azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rcreate_or_update_properties.py rename to azure-mgmt-signalr/azure/mgmt/signalr/models/signalr_create_or_update_properties.py index 4735f85fd6b2..3706ec655cd2 100644 --- a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rcreate_or_update_properties.py +++ b/azure-mgmt-signalr/azure/mgmt/signalr/models/signalr_create_or_update_properties.py @@ -12,7 +12,7 @@ from msrest.serialization import Model -class SignalRCreateOrUpdateProperties(Model): +class SignalrCreateOrUpdateProperties(Model): """Settings used to provision or configure the resource. :param host_name_prefix: Prefix for the hostName of the SignalR service. @@ -27,5 +27,5 @@ class SignalRCreateOrUpdateProperties(Model): } def __init__(self, **kwargs): - super(SignalRCreateOrUpdateProperties, self).__init__(**kwargs) + super(SignalrCreateOrUpdateProperties, self).__init__(**kwargs) self.host_name_prefix = kwargs.get('host_name_prefix', None) diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rcreate_or_update_properties_py3.py b/azure-mgmt-signalr/azure/mgmt/signalr/models/signalr_create_or_update_properties_py3.py similarity index 90% rename from azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rcreate_or_update_properties_py3.py rename to azure-mgmt-signalr/azure/mgmt/signalr/models/signalr_create_or_update_properties_py3.py index dd051d50d0af..0b9d4b1d91b1 100644 --- a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rcreate_or_update_properties_py3.py +++ b/azure-mgmt-signalr/azure/mgmt/signalr/models/signalr_create_or_update_properties_py3.py @@ -12,7 +12,7 @@ from msrest.serialization import Model -class SignalRCreateOrUpdateProperties(Model): +class SignalrCreateOrUpdateProperties(Model): """Settings used to provision or configure the resource. :param host_name_prefix: Prefix for the hostName of the SignalR service. @@ -27,5 +27,5 @@ class SignalRCreateOrUpdateProperties(Model): } def __init__(self, *, host_name_prefix: str=None, **kwargs) -> None: - super(SignalRCreateOrUpdateProperties, self).__init__(**kwargs) + super(SignalrCreateOrUpdateProperties, self).__init__(**kwargs) self.host_name_prefix = host_name_prefix diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rcreate_parameters.py b/azure-mgmt-signalr/azure/mgmt/signalr/models/signalr_create_parameters.py similarity index 84% rename from azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rcreate_parameters.py rename to azure-mgmt-signalr/azure/mgmt/signalr/models/signalr_create_parameters.py index 69ee100c20c8..80e95248f154 100644 --- a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rcreate_parameters.py +++ b/azure-mgmt-signalr/azure/mgmt/signalr/models/signalr_create_parameters.py @@ -9,10 +9,10 @@ # regenerated. # -------------------------------------------------------------------------- -from .signal_rupdate_parameters import SignalRUpdateParameters +from .signalr_update_parameters import SignalrUpdateParameters -class SignalRCreateParameters(SignalRUpdateParameters): +class SignalrCreateParameters(SignalrUpdateParameters): """Parameters for SignalR service create/update operation. Keep the same schema as AzSignalR.Models.SignalRResource. @@ -25,7 +25,7 @@ class SignalRCreateParameters(SignalRUpdateParameters): :type sku: ~azure.mgmt.signalr.models.ResourceSku :param properties: Settings used to provision or configure the resource :type properties: - ~azure.mgmt.signalr.models.SignalRCreateOrUpdateProperties + ~azure.mgmt.signalr.models.SignalrCreateOrUpdateProperties :param location: Required. Azure GEO region: e.g. West US | East US | North Central US | South Central US | West Europe | North Europe | East Asia | Southeast Asia | etc. @@ -40,10 +40,10 @@ class SignalRCreateParameters(SignalRUpdateParameters): _attribute_map = { 'tags': {'key': 'tags', 'type': '{str}'}, 'sku': {'key': 'sku', 'type': 'ResourceSku'}, - 'properties': {'key': 'properties', 'type': 'SignalRCreateOrUpdateProperties'}, + 'properties': {'key': 'properties', 'type': 'SignalrCreateOrUpdateProperties'}, 'location': {'key': 'location', 'type': 'str'}, } def __init__(self, **kwargs): - super(SignalRCreateParameters, self).__init__(**kwargs) + super(SignalrCreateParameters, self).__init__(**kwargs) self.location = kwargs.get('location', None) diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rcreate_parameters_py3.py b/azure-mgmt-signalr/azure/mgmt/signalr/models/signalr_create_parameters_py3.py similarity index 84% rename from azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rcreate_parameters_py3.py rename to azure-mgmt-signalr/azure/mgmt/signalr/models/signalr_create_parameters_py3.py index f58bd64a8877..965bf0a8ab8f 100644 --- a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rcreate_parameters_py3.py +++ b/azure-mgmt-signalr/azure/mgmt/signalr/models/signalr_create_parameters_py3.py @@ -9,10 +9,10 @@ # regenerated. # -------------------------------------------------------------------------- -from .signal_rupdate_parameters import SignalRUpdateParameters +from .signalr_update_parameters import SignalrUpdateParameters -class SignalRCreateParameters(SignalRUpdateParameters): +class SignalrCreateParameters(SignalrUpdateParameters): """Parameters for SignalR service create/update operation. Keep the same schema as AzSignalR.Models.SignalRResource. @@ -25,7 +25,7 @@ class SignalRCreateParameters(SignalRUpdateParameters): :type sku: ~azure.mgmt.signalr.models.ResourceSku :param properties: Settings used to provision or configure the resource :type properties: - ~azure.mgmt.signalr.models.SignalRCreateOrUpdateProperties + ~azure.mgmt.signalr.models.SignalrCreateOrUpdateProperties :param location: Required. Azure GEO region: e.g. West US | East US | North Central US | South Central US | West Europe | North Europe | East Asia | Southeast Asia | etc. @@ -40,10 +40,10 @@ class SignalRCreateParameters(SignalRUpdateParameters): _attribute_map = { 'tags': {'key': 'tags', 'type': '{str}'}, 'sku': {'key': 'sku', 'type': 'ResourceSku'}, - 'properties': {'key': 'properties', 'type': 'SignalRCreateOrUpdateProperties'}, + 'properties': {'key': 'properties', 'type': 'SignalrCreateOrUpdateProperties'}, 'location': {'key': 'location', 'type': 'str'}, } def __init__(self, *, location: str, tags=None, sku=None, properties=None, **kwargs) -> None: - super(SignalRCreateParameters, self).__init__(tags=tags, sku=sku, properties=properties, **kwargs) + super(SignalrCreateParameters, self).__init__(tags=tags, sku=sku, properties=properties, **kwargs) self.location = location diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rkeys.py b/azure-mgmt-signalr/azure/mgmt/signalr/models/signalr_keys.py similarity index 93% rename from azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rkeys.py rename to azure-mgmt-signalr/azure/mgmt/signalr/models/signalr_keys.py index 8549853cbc44..cdf4bb4cd201 100644 --- a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rkeys.py +++ b/azure-mgmt-signalr/azure/mgmt/signalr/models/signalr_keys.py @@ -12,7 +12,7 @@ from msrest.serialization import Model -class SignalRKeys(Model): +class SignalrKeys(Model): """A class represents the access keys of SignalR service. :param primary_key: The primary access key. @@ -27,6 +27,6 @@ class SignalRKeys(Model): } def __init__(self, **kwargs): - super(SignalRKeys, self).__init__(**kwargs) + super(SignalrKeys, self).__init__(**kwargs) self.primary_key = kwargs.get('primary_key', None) self.secondary_key = kwargs.get('secondary_key', None) diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rkeys_py3.py b/azure-mgmt-signalr/azure/mgmt/signalr/models/signalr_keys_py3.py similarity index 93% rename from azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rkeys_py3.py rename to azure-mgmt-signalr/azure/mgmt/signalr/models/signalr_keys_py3.py index 2ca3ca658857..71a677f9654a 100644 --- a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rkeys_py3.py +++ b/azure-mgmt-signalr/azure/mgmt/signalr/models/signalr_keys_py3.py @@ -12,7 +12,7 @@ from msrest.serialization import Model -class SignalRKeys(Model): +class SignalrKeys(Model): """A class represents the access keys of SignalR service. :param primary_key: The primary access key. @@ -27,6 +27,6 @@ class SignalRKeys(Model): } def __init__(self, *, primary_key: str=None, secondary_key: str=None, **kwargs) -> None: - super(SignalRKeys, self).__init__(**kwargs) + super(SignalrKeys, self).__init__(**kwargs) self.primary_key = primary_key self.secondary_key = secondary_key diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rmanagement_client_enums.py b/azure-mgmt-signalr/azure/mgmt/signalr/models/signalr_management_client_enums.py similarity index 91% rename from azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rmanagement_client_enums.py rename to azure-mgmt-signalr/azure/mgmt/signalr/models/signalr_management_client_enums.py index dd453a5b02ac..ac002b0f99bb 100644 --- a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rmanagement_client_enums.py +++ b/azure-mgmt-signalr/azure/mgmt/signalr/models/signalr_management_client_enums.py @@ -12,7 +12,7 @@ from enum import Enum -class SignalRSkuTier(str, Enum): +class SignalrSkuTier(str, Enum): free = "Free" basic = "Basic" @@ -21,9 +21,11 @@ class SignalRSkuTier(str, Enum): class ProvisioningState(str, Enum): + unknown = "Unknown" succeeded = "Succeeded" failed = "Failed" canceled = "Canceled" + running = "Running" creating = "Creating" updating = "Updating" deleting = "Deleting" diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rresource.py b/azure-mgmt-signalr/azure/mgmt/signalr/models/signalr_resource.py similarity index 89% rename from azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rresource.py rename to azure-mgmt-signalr/azure/mgmt/signalr/models/signalr_resource.py index 327b24e977eb..c1a6fa217f5d 100644 --- a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rresource.py +++ b/azure-mgmt-signalr/azure/mgmt/signalr/models/signalr_resource.py @@ -12,7 +12,7 @@ from .tracked_resource import TrackedResource -class SignalRResource(TrackedResource): +class SignalrResource(TrackedResource): """A class represent a SignalR service resource. Variables are only populated by the server, and will be ignored when @@ -31,16 +31,16 @@ class SignalRResource(TrackedResource): :param tags: Tags of the service which is a list of key value pairs that describe the resource. :type tags: dict[str, str] - :param signalrsku: SKU of the service. - :type signalrsku: ~azure.mgmt.signalr.models.ResourceSku + :param sku: SKU of the service. + :type sku: ~azure.mgmt.signalr.models.ResourceSku :param host_name_prefix: Prefix for the hostName of the SignalR service. Retained for future use. The hostname will be of format: <hostNamePrefix>.service.signalr.net. :type host_name_prefix: str :ivar provisioning_state: Provisioning state of the resource. Possible - values include: 'Succeeded', 'Failed', 'Canceled', 'Creating', 'Updating', - 'Deleting', 'Moving' + values include: 'Unknown', 'Succeeded', 'Failed', 'Canceled', 'Running', + 'Creating', 'Updating', 'Deleting', 'Moving' :vartype provisioning_state: str or ~azure.mgmt.signalr.models.ProvisioningState :ivar external_ip: The publicly accessible IP of the SignalR service. @@ -73,7 +73,7 @@ class SignalRResource(TrackedResource): 'type': {'key': 'type', 'type': 'str'}, 'location': {'key': 'location', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, - 'signalrsku': {'key': 'sku', 'type': 'ResourceSku'}, + 'sku': {'key': 'sku', 'type': 'ResourceSku'}, 'host_name_prefix': {'key': 'properties.hostNamePrefix', 'type': 'str'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'external_ip': {'key': 'properties.externalIP', 'type': 'str'}, @@ -83,8 +83,8 @@ class SignalRResource(TrackedResource): } def __init__(self, **kwargs): - super(SignalRResource, self).__init__(**kwargs) - self.signalrsku = kwargs.get('signalrsku', None) + super(SignalrResource, self).__init__(**kwargs) + self.sku = kwargs.get('sku', None) self.host_name_prefix = kwargs.get('host_name_prefix', None) self.provisioning_state = None self.external_ip = None diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rresource_paged.py b/azure-mgmt-signalr/azure/mgmt/signalr/models/signalr_resource_paged.py similarity index 76% rename from azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rresource_paged.py rename to azure-mgmt-signalr/azure/mgmt/signalr/models/signalr_resource_paged.py index 98b0225b9fa0..309bffa66563 100644 --- a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rresource_paged.py +++ b/azure-mgmt-signalr/azure/mgmt/signalr/models/signalr_resource_paged.py @@ -12,16 +12,16 @@ from msrest.paging import Paged -class SignalRResourcePaged(Paged): +class SignalrResourcePaged(Paged): """ - A paging container for iterating over a list of :class:`SignalRResource ` object + A paging container for iterating over a list of :class:`SignalrResource ` object """ _attribute_map = { 'next_link': {'key': 'nextLink', 'type': 'str'}, - 'current_page': {'key': 'value', 'type': '[SignalRResource]'} + 'current_page': {'key': 'value', 'type': '[SignalrResource]'} } def __init__(self, *args, **kwargs): - super(SignalRResourcePaged, self).__init__(*args, **kwargs) + super(SignalrResourcePaged, self).__init__(*args, **kwargs) diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rresource_py3.py b/azure-mgmt-signalr/azure/mgmt/signalr/models/signalr_resource_py3.py similarity index 86% rename from azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rresource_py3.py rename to azure-mgmt-signalr/azure/mgmt/signalr/models/signalr_resource_py3.py index 8556910a71c9..319ba40ec540 100644 --- a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rresource_py3.py +++ b/azure-mgmt-signalr/azure/mgmt/signalr/models/signalr_resource_py3.py @@ -12,7 +12,7 @@ from .tracked_resource import TrackedResource -class SignalRResource(TrackedResource): +class SignalrResource(TrackedResource): """A class represent a SignalR service resource. Variables are only populated by the server, and will be ignored when @@ -31,16 +31,16 @@ class SignalRResource(TrackedResource): :param tags: Tags of the service which is a list of key value pairs that describe the resource. :type tags: dict[str, str] - :param signalrsku: SKU of the service. - :type signalrsku: ~azure.mgmt.signalr.models.ResourceSku + :param sku: SKU of the service. + :type sku: ~azure.mgmt.signalr.models.ResourceSku :param host_name_prefix: Prefix for the hostName of the SignalR service. Retained for future use. The hostname will be of format: <hostNamePrefix>.service.signalr.net. :type host_name_prefix: str :ivar provisioning_state: Provisioning state of the resource. Possible - values include: 'Succeeded', 'Failed', 'Canceled', 'Creating', 'Updating', - 'Deleting', 'Moving' + values include: 'Unknown', 'Succeeded', 'Failed', 'Canceled', 'Running', + 'Creating', 'Updating', 'Deleting', 'Moving' :vartype provisioning_state: str or ~azure.mgmt.signalr.models.ProvisioningState :ivar external_ip: The publicly accessible IP of the SignalR service. @@ -73,7 +73,7 @@ class SignalRResource(TrackedResource): 'type': {'key': 'type', 'type': 'str'}, 'location': {'key': 'location', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, - 'signalrsku': {'key': 'sku', 'type': 'ResourceSku'}, + 'sku': {'key': 'sku', 'type': 'ResourceSku'}, 'host_name_prefix': {'key': 'properties.hostNamePrefix', 'type': 'str'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'external_ip': {'key': 'properties.externalIP', 'type': 'str'}, @@ -82,9 +82,9 @@ class SignalRResource(TrackedResource): 'server_port': {'key': 'properties.serverPort', 'type': 'int'}, } - def __init__(self, *, location: str=None, tags=None, signalrsku=None, host_name_prefix: str=None, **kwargs) -> None: - super(SignalRResource, self).__init__(location=location, tags=tags, **kwargs) - self.signalrsku = signalrsku + def __init__(self, *, location: str=None, tags=None, sku=None, host_name_prefix: str=None, **kwargs) -> None: + super(SignalrResource, self).__init__(location=location, tags=tags, **kwargs) + self.sku = sku self.host_name_prefix = host_name_prefix self.provisioning_state = None self.external_ip = None diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rupdate_parameters.py b/azure-mgmt-signalr/azure/mgmt/signalr/models/signalr_update_parameters.py similarity index 84% rename from azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rupdate_parameters.py rename to azure-mgmt-signalr/azure/mgmt/signalr/models/signalr_update_parameters.py index 2f177255176b..acd51ff8fcab 100644 --- a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rupdate_parameters.py +++ b/azure-mgmt-signalr/azure/mgmt/signalr/models/signalr_update_parameters.py @@ -12,7 +12,7 @@ from msrest.serialization import Model -class SignalRUpdateParameters(Model): +class SignalrUpdateParameters(Model): """Parameters for SignalR service update operation. :param tags: A list of key value pairs that describe the resource. @@ -22,17 +22,17 @@ class SignalRUpdateParameters(Model): :type sku: ~azure.mgmt.signalr.models.ResourceSku :param properties: Settings used to provision or configure the resource :type properties: - ~azure.mgmt.signalr.models.SignalRCreateOrUpdateProperties + ~azure.mgmt.signalr.models.SignalrCreateOrUpdateProperties """ _attribute_map = { 'tags': {'key': 'tags', 'type': '{str}'}, 'sku': {'key': 'sku', 'type': 'ResourceSku'}, - 'properties': {'key': 'properties', 'type': 'SignalRCreateOrUpdateProperties'}, + 'properties': {'key': 'properties', 'type': 'SignalrCreateOrUpdateProperties'}, } def __init__(self, **kwargs): - super(SignalRUpdateParameters, self).__init__(**kwargs) + super(SignalrUpdateParameters, self).__init__(**kwargs) self.tags = kwargs.get('tags', None) self.sku = kwargs.get('sku', None) self.properties = kwargs.get('properties', None) diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rupdate_parameters_py3.py b/azure-mgmt-signalr/azure/mgmt/signalr/models/signalr_update_parameters_py3.py similarity index 84% rename from azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rupdate_parameters_py3.py rename to azure-mgmt-signalr/azure/mgmt/signalr/models/signalr_update_parameters_py3.py index da20f519dd5d..0e9731f3759a 100644 --- a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rupdate_parameters_py3.py +++ b/azure-mgmt-signalr/azure/mgmt/signalr/models/signalr_update_parameters_py3.py @@ -12,7 +12,7 @@ from msrest.serialization import Model -class SignalRUpdateParameters(Model): +class SignalrUpdateParameters(Model): """Parameters for SignalR service update operation. :param tags: A list of key value pairs that describe the resource. @@ -22,17 +22,17 @@ class SignalRUpdateParameters(Model): :type sku: ~azure.mgmt.signalr.models.ResourceSku :param properties: Settings used to provision or configure the resource :type properties: - ~azure.mgmt.signalr.models.SignalRCreateOrUpdateProperties + ~azure.mgmt.signalr.models.SignalrCreateOrUpdateProperties """ _attribute_map = { 'tags': {'key': 'tags', 'type': '{str}'}, 'sku': {'key': 'sku', 'type': 'ResourceSku'}, - 'properties': {'key': 'properties', 'type': 'SignalRCreateOrUpdateProperties'}, + 'properties': {'key': 'properties', 'type': 'SignalrCreateOrUpdateProperties'}, } def __init__(self, *, tags=None, sku=None, properties=None, **kwargs) -> None: - super(SignalRUpdateParameters, self).__init__(**kwargs) + super(SignalrUpdateParameters, self).__init__(**kwargs) self.tags = tags self.sku = sku self.properties = properties diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/operations/__init__.py b/azure-mgmt-signalr/azure/mgmt/signalr/operations/__init__.py index 3373f0c0adf6..9cffb62215ca 100644 --- a/azure-mgmt-signalr/azure/mgmt/signalr/operations/__init__.py +++ b/azure-mgmt-signalr/azure/mgmt/signalr/operations/__init__.py @@ -9,8 +9,10 @@ # regenerated. # -------------------------------------------------------------------------- +from .operations import Operations from .signalr_operations import SignalrOperations __all__ = [ + 'Operations', 'SignalrOperations', ] diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/operations/operations.py b/azure-mgmt-signalr/azure/mgmt/signalr/operations/operations.py new file mode 100644 index 000000000000..e04d3eee4058 --- /dev/null +++ b/azure-mgmt-signalr/azure/mgmt/signalr/operations/operations.py @@ -0,0 +1,100 @@ +# 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. +# -------------------------------------------------------------------------- + +import uuid +from msrest.pipeline import ClientRawResponse +from msrestazure.azure_exceptions import CloudError + +from .. import models + + +class Operations(object): + """Operations operations. + + :param client: Client for service requests. + :param config: Configuration of service client. + :param serializer: An object model serializer. + :param deserializer: An object model deserializer. + :ivar api_version: Client Api Version. Constant value: "2018-03-01-preview". + """ + + models = models + + def __init__(self, client, config, serializer, deserializer): + + self._client = client + self._serialize = serializer + self._deserialize = deserializer + self.api_version = "2018-03-01-preview" + + self.config = config + + def list( + self, custom_headers=None, raw=False, **operation_config): + """Lists all of the available REST API operations of the + Microsoft.SignalRService provider. + + :param dict custom_headers: headers that will be added to the request + :param bool raw: returns the direct response alongside the + deserialized response + :param operation_config: :ref:`Operation configuration + overrides`. + :return: An iterator like instance of Operation + :rtype: + ~azure.mgmt.signalr.models.OperationPaged[~azure.mgmt.signalr.models.Operation] + :raises: :class:`CloudError` + """ + def internal_paging(next_link=None, raw=False): + + if not next_link: + # Construct URL + url = self.list.metadata['url'] + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + else: + url = next_link + query_parameters = {} + + # Construct headers + header_parameters = {} + header_parameters['Content-Type'] = 'application/json; charset=utf-8' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct and send request + request = self._client.get(url, query_parameters) + response = self._client.send( + request, header_parameters, stream=False, **operation_config) + + if response.status_code not in [200]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp + + return response + + # Deserialize response + deserialized = models.OperationPaged(internal_paging, self._deserialize.dependencies) + + if raw: + header_dict = {} + client_raw_response = models.OperationPaged(internal_paging, self._deserialize.dependencies, header_dict) + return client_raw_response + + return deserialized + list.metadata = {'url': '/providers/Microsoft.SignalRService/operations'} diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/operations/signalr_operations.py b/azure-mgmt-signalr/azure/mgmt/signalr/operations/signalr_operations.py index 1421af8ae2e5..118d5f20b601 100644 --- a/azure-mgmt-signalr/azure/mgmt/signalr/operations/signalr_operations.py +++ b/azure-mgmt-signalr/azure/mgmt/signalr/operations/signalr_operations.py @@ -39,68 +39,6 @@ def __init__(self, client, config, serializer, deserializer): self.config = config - def list_operations( - self, custom_headers=None, raw=False, **operation_config): - """Lists all of the available REST API operations of the - Microsoft.SignalRService provider. - - :param dict custom_headers: headers that will be added to the request - :param bool raw: returns the direct response alongside the - deserialized response - :param operation_config: :ref:`Operation configuration - overrides`. - :return: An iterator like instance of Operation - :rtype: - ~azure.mgmt.signalr.models.OperationPaged[~azure.mgmt.signalr.models.Operation] - :raises: :class:`CloudError` - """ - def internal_paging(next_link=None, raw=False): - - if not next_link: - # Construct URL - url = self.list_operations.metadata['url'] - - # Construct parameters - query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') - - else: - url = next_link - query_parameters = {} - - # Construct headers - header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' - if self.config.generate_client_request_id: - header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) - if custom_headers: - header_parameters.update(custom_headers) - if self.config.accept_language is not None: - header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') - - # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) - - if response.status_code not in [200]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp - - return response - - # Deserialize response - deserialized = models.OperationPaged(internal_paging, self._deserialize.dependencies) - - if raw: - header_dict = {} - client_raw_response = models.OperationPaged(internal_paging, self._deserialize.dependencies, header_dict) - return client_raw_response - - return deserialized - list_operations.metadata = {'url': '/providers/Microsoft.SignalRService/operations'} - def check_name_availability( self, type, name, custom_headers=None, raw=False, **operation_config): """Checks that the SignalR name is valid and is not already in use. @@ -183,9 +121,9 @@ def list_by_subscription( deserialized response :param operation_config: :ref:`Operation configuration overrides`. - :return: An iterator like instance of SignalRResource + :return: An iterator like instance of SignalrResource :rtype: - ~azure.mgmt.signalr.models.SignalRResourcePaged[~azure.mgmt.signalr.models.SignalRResource] + ~azure.mgmt.signalr.models.SignalrResourcePaged[~azure.mgmt.signalr.models.SignalrResource] :raises: :class:`CloudError` """ def internal_paging(next_link=None, raw=False): @@ -229,11 +167,11 @@ def internal_paging(next_link=None, raw=False): return response # Deserialize response - deserialized = models.SignalRResourcePaged(internal_paging, self._deserialize.dependencies) + deserialized = models.SignalrResourcePaged(internal_paging, self._deserialize.dependencies) if raw: header_dict = {} - client_raw_response = models.SignalRResourcePaged(internal_paging, self._deserialize.dependencies, header_dict) + client_raw_response = models.SignalrResourcePaged(internal_paging, self._deserialize.dependencies, header_dict) return client_raw_response return deserialized @@ -252,9 +190,9 @@ def list_by_resource_group( deserialized response :param operation_config: :ref:`Operation configuration overrides`. - :return: An iterator like instance of SignalRResource + :return: An iterator like instance of SignalrResource :rtype: - ~azure.mgmt.signalr.models.SignalRResourcePaged[~azure.mgmt.signalr.models.SignalRResource] + ~azure.mgmt.signalr.models.SignalrResourcePaged[~azure.mgmt.signalr.models.SignalrResource] :raises: :class:`CloudError` """ def internal_paging(next_link=None, raw=False): @@ -299,11 +237,11 @@ def internal_paging(next_link=None, raw=False): return response # Deserialize response - deserialized = models.SignalRResourcePaged(internal_paging, self._deserialize.dependencies) + deserialized = models.SignalrResourcePaged(internal_paging, self._deserialize.dependencies) if raw: header_dict = {} - client_raw_response = models.SignalRResourcePaged(internal_paging, self._deserialize.dependencies, header_dict) + client_raw_response = models.SignalrResourcePaged(internal_paging, self._deserialize.dependencies, header_dict) return client_raw_response return deserialized @@ -324,8 +262,8 @@ def list_keys( deserialized response :param operation_config: :ref:`Operation configuration overrides`. - :return: SignalRKeys or ClientRawResponse if raw=true - :rtype: ~azure.mgmt.signalr.models.SignalRKeys or + :return: SignalrKeys or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.signalr.models.SignalrKeys or ~msrest.pipeline.ClientRawResponse :raises: :class:`CloudError` """ @@ -364,7 +302,7 @@ def list_keys( deserialized = None if response.status_code == 200: - deserialized = self._deserialize('SignalRKeys', response) + deserialized = self._deserialize('SignalrKeys', response) if raw: client_raw_response = ClientRawResponse(deserialized, response) @@ -422,7 +360,7 @@ def _regenerate_key_initial( deserialized = None if response.status_code == 201: - deserialized = self._deserialize('SignalRKeys', response) + deserialized = self._deserialize('SignalrKeys', response) if raw: client_raw_response = ClientRawResponse(deserialized, response) @@ -450,12 +388,12 @@ def regenerate_key( direct response alongside the deserialized response :param polling: True for ARMPolling, False for no polling, or a polling object for personal polling strategy - :return: An instance of LROPoller that returns SignalRKeys or - ClientRawResponse if raw==True + :return: An instance of LROPoller that returns SignalrKeys or + ClientRawResponse if raw==True :rtype: - ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.signalr.models.SignalRKeys] + ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.signalr.models.SignalrKeys] or - ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.signalr.models.SignalRKeys]] + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.signalr.models.SignalrKeys]] :raises: :class:`CloudError` """ raw_result = self._regenerate_key_initial( @@ -468,7 +406,7 @@ def regenerate_key( ) def get_long_running_output(response): - deserialized = self._deserialize('SignalRKeys', response) + deserialized = self._deserialize('SignalrKeys', response) if raw: client_raw_response = ClientRawResponse(deserialized, response) @@ -500,8 +438,8 @@ def get( deserialized response :param operation_config: :ref:`Operation configuration overrides`. - :return: SignalRResource or ClientRawResponse if raw=true - :rtype: ~azure.mgmt.signalr.models.SignalRResource or + :return: SignalrResource or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.signalr.models.SignalrResource or ~msrest.pipeline.ClientRawResponse :raises: :class:`CloudError` """ @@ -540,7 +478,7 @@ def get( deserialized = None if response.status_code == 200: - deserialized = self._deserialize('SignalRResource', response) + deserialized = self._deserialize('SignalrResource', response) if raw: client_raw_response = ClientRawResponse(deserialized, response) @@ -577,7 +515,7 @@ def _create_or_update_initial( # Construct body if parameters is not None: - body_content = self._serialize.body(parameters, 'SignalRCreateParameters') + body_content = self._serialize.body(parameters, 'SignalrCreateParameters') else: body_content = None @@ -594,7 +532,7 @@ def _create_or_update_initial( deserialized = None if response.status_code == 201: - deserialized = self._deserialize('SignalRResource', response) + deserialized = self._deserialize('SignalrResource', response) if raw: client_raw_response = ClientRawResponse(deserialized, response) @@ -613,18 +551,18 @@ def create_or_update( :param resource_name: The name of the SignalR resource. :type resource_name: str :param parameters: Parameters for the create or update operation - :type parameters: ~azure.mgmt.signalr.models.SignalRCreateParameters + :type parameters: ~azure.mgmt.signalr.models.SignalrCreateParameters :param dict custom_headers: headers that will be added to the request :param bool raw: The poller return type is ClientRawResponse, the direct response alongside the deserialized response :param polling: True for ARMPolling, False for no polling, or a polling object for personal polling strategy - :return: An instance of LROPoller that returns SignalRResource or - ClientRawResponse if raw==True + :return: An instance of LROPoller that returns SignalrResource or + ClientRawResponse if raw==True :rtype: - ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.signalr.models.SignalRResource] + ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.signalr.models.SignalrResource] or - ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.signalr.models.SignalRResource]] + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.signalr.models.SignalrResource]] :raises: :class:`CloudError` """ raw_result = self._create_or_update_initial( @@ -637,7 +575,7 @@ def create_or_update( ) def get_long_running_output(response): - deserialized = self._deserialize('SignalRResource', response) + deserialized = self._deserialize('SignalrResource', response) if raw: client_raw_response = ClientRawResponse(deserialized, response) @@ -764,7 +702,7 @@ def _update_initial( # Construct body if parameters is not None: - body_content = self._serialize.body(parameters, 'SignalRUpdateParameters') + body_content = self._serialize.body(parameters, 'SignalrUpdateParameters') else: body_content = None @@ -781,7 +719,7 @@ def _update_initial( deserialized = None if response.status_code == 200: - deserialized = self._deserialize('SignalRResource', response) + deserialized = self._deserialize('SignalrResource', response) if raw: client_raw_response = ClientRawResponse(deserialized, response) @@ -800,18 +738,18 @@ def update( :param resource_name: The name of the SignalR resource. :type resource_name: str :param parameters: Parameters for the update operation - :type parameters: ~azure.mgmt.signalr.models.SignalRUpdateParameters + :type parameters: ~azure.mgmt.signalr.models.SignalrUpdateParameters :param dict custom_headers: headers that will be added to the request :param bool raw: The poller return type is ClientRawResponse, the direct response alongside the deserialized response :param polling: True for ARMPolling, False for no polling, or a polling object for personal polling strategy - :return: An instance of LROPoller that returns SignalRResource or - ClientRawResponse if raw==True + :return: An instance of LROPoller that returns SignalrResource or + ClientRawResponse if raw==True :rtype: - ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.signalr.models.SignalRResource] + ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.signalr.models.SignalrResource] or - ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.signalr.models.SignalRResource]] + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.signalr.models.SignalrResource]] :raises: :class:`CloudError` """ raw_result = self._update_initial( @@ -824,7 +762,7 @@ def update( ) def get_long_running_output(response): - deserialized = self._deserialize('SignalRResource', response) + deserialized = self._deserialize('SignalrResource', response) if raw: client_raw_response = ClientRawResponse(deserialized, response) diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/signal_rmanagement_client.py b/azure-mgmt-signalr/azure/mgmt/signalr/signalr_management_client.py similarity index 83% rename from azure-mgmt-signalr/azure/mgmt/signalr/signal_rmanagement_client.py rename to azure-mgmt-signalr/azure/mgmt/signalr/signalr_management_client.py index 12d7fac3ec45..3d2828b31615 100644 --- a/azure-mgmt-signalr/azure/mgmt/signalr/signal_rmanagement_client.py +++ b/azure-mgmt-signalr/azure/mgmt/signalr/signalr_management_client.py @@ -13,12 +13,13 @@ from msrest import Serializer, Deserializer from msrestazure import AzureConfiguration from .version import VERSION +from .operations.operations import Operations from .operations.signalr_operations import SignalrOperations from . import models -class SignalRManagementClientConfiguration(AzureConfiguration): - """Configuration for SignalRManagementClient +class SignalrManagementClientConfiguration(AzureConfiguration): + """Configuration for SignalrManagementClient Note that all parameters used to create this instance are saved as instance attributes. @@ -42,7 +43,7 @@ def __init__( if not base_url: base_url = 'https://management.azure.com' - super(SignalRManagementClientConfiguration, self).__init__(base_url) + super(SignalrManagementClientConfiguration, self).__init__(base_url) self.add_user_agent('azure-mgmt-signalr/{}'.format(VERSION)) self.add_user_agent('Azure-SDK-For-Python') @@ -51,12 +52,14 @@ def __init__( self.subscription_id = subscription_id -class SignalRManagementClient(object): +class SignalrManagementClient(object): """REST API for Azure SignalR Service :ivar config: Configuration for client. - :vartype config: SignalRManagementClientConfiguration + :vartype config: SignalrManagementClientConfiguration + :ivar operations: Operations operations + :vartype operations: azure.mgmt.signalr.operations.Operations :ivar signalr: Signalr operations :vartype signalr: azure.mgmt.signalr.operations.SignalrOperations @@ -73,7 +76,7 @@ class SignalRManagementClient(object): def __init__( self, credentials, subscription_id, base_url=None): - self.config = SignalRManagementClientConfiguration(credentials, subscription_id, base_url) + self.config = SignalrManagementClientConfiguration(credentials, subscription_id, base_url) self._client = ServiceClient(self.config.credentials, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} @@ -81,5 +84,7 @@ def __init__( self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) + self.operations = Operations( + self._client, self.config, self._serialize, self._deserialize) self.signalr = SignalrOperations( self._client, self.config, self._serialize, self._deserialize)