[AutoPR] signalr/resource-manager (#2835)

* Generated from 03e114d3a1f7e25099ec02d897257b49db4d196b (#2830) add a new tier * [AutoPR signalr/resource-manager] Add api to list usages of Azure SignalR resources (#3020) * Generated from 6ec3df9b7b3881359ed9687408ab6f6bd0fefed7 add api to list usages of Azure SignalR resources * Generated from 6ec3df9b7b3881359ed9687408ab6f6bd0fefed7 add api to list usages of Azure SignalR resources * Generated from e93d86167dc28119dd3ae4505c5dce528ad92ad6 (#3176) return version/connection string of SignalR * SignalR packaging * SignalR version changelog
Azure · Sep 4, 2018 · 8b6155f · 8b6155f
1 parent 4a76ec8
commit 8b6155f
Show file tree

Hide file tree

Showing 29 changed files with 493 additions and 47 deletions.
diff --git a/azure-mgmt-signalr/HISTORY.rst b/azure-mgmt-signalr/HISTORY.rst
@@ -3,6 +3,17 @@
 Release History
 ===============
 
+0.1.1 (2018-09-04)
+++++++++++++++++++
+
+**Features**
+
+- Model SignalRKeys has a new parameter secondary_connection_string
+- Model SignalRKeys has a new parameter primary_connection_string
+- Model MetricSpecification has a new parameter dimensions
+- Model SignalRResource has a new parameter version
+- Added operation group UsagesOperations
+
 0.1.0 (2018-05-07)
 ++++++++++++++++++
 

diff --git a/azure-mgmt-signalr/README.rst b/azure-mgmt-signalr/README.rst
@@ -6,7 +6,7 @@ This is the Microsoft Azure SignalR Client Library.
 Azure Resource Manager (ARM) is the next generation of management APIs that
 replace the old Azure Service Management (ASM).
 
-This package has been tested with Python 2.7, 3.4, 3.5 and 3.6.
+This package has been tested with Python 2.7, 3.4, 3.5, 3.6 and 3.7.
 
 For the older Azure Service Management (ASM) libraries, see
 `azure-servicemanagement-legacy <https://pypi.python.org/pypi/azure-servicemanagement-legacy>`__ library.
@@ -37,7 +37,7 @@ Usage
 =====
 
 For code examples, see `SignalR
-<https://docs.microsoft.com/python/azure/>`__
+<https://docs.microsoft.com/python/api/overview/azure/>`__
 on docs.microsoft.com.
 
 

diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/__init__.py b/azure-mgmt-signalr/azure/mgmt/signalr/models/__init__.py
@@ -11,6 +11,7 @@
 
 try:
     from .operation_display_py3 import OperationDisplay
+    from .dimension_py3 import Dimension
     from .metric_specification_py3 import MetricSpecification
     from .service_specification_py3 import ServiceSpecification
     from .operation_properties_py3 import OperationProperties
@@ -26,8 +27,11 @@
     from .regenerate_key_parameters_py3 import RegenerateKeyParameters
     from .signal_rcreate_parameters_py3 import SignalRCreateParameters
     from .signal_rupdate_parameters_py3 import SignalRUpdateParameters
+    from .signal_rusage_name_py3 import SignalRUsageName
+    from .signal_rusage_py3 import SignalRUsage
 except (SyntaxError, ImportError):
     from .operation_display import OperationDisplay
+    from .dimension import Dimension
     from .metric_specification import MetricSpecification
     from .service_specification import ServiceSpecification
     from .operation_properties import OperationProperties
@@ -43,8 +47,11 @@
     from .regenerate_key_parameters import RegenerateKeyParameters
     from .signal_rcreate_parameters import SignalRCreateParameters
     from .signal_rupdate_parameters import SignalRUpdateParameters
+    from .signal_rusage_name import SignalRUsageName
+    from .signal_rusage import SignalRUsage
 from .operation_paged import OperationPaged
 from .signal_rresource_paged import SignalRResourcePaged
+from .signal_rusage_paged import SignalRUsagePaged
 from .signal_rmanagement_client_enums import (
     SignalRSkuTier,
     ProvisioningState,
@@ -53,6 +60,7 @@
 
 __all__ = [
     'OperationDisplay',
+    'Dimension',
     'MetricSpecification',
     'ServiceSpecification',
     'OperationProperties',
@@ -68,8 +76,11 @@
     'RegenerateKeyParameters',
     'SignalRCreateParameters',
     'SignalRUpdateParameters',
+    'SignalRUsageName',
+    'SignalRUsage',
     'OperationPaged',
     'SignalRResourcePaged',
+    'SignalRUsagePaged',
     'SignalRSkuTier',
     'ProvisioningState',
     'KeyType',

diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/dimension.py b/azure-mgmt-signalr/azure/mgmt/signalr/models/dimension.py
@@ -0,0 +1,41 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class Dimension(Model):
+    """Specifications of the Dimension of metrics.
+
+    :param name: The public facing name of the dimension.
+    :type name: str
+    :param display_name: Localized friendly display name of the dimension.
+    :type display_name: str
+    :param internal_name: Name of the dimension as it appears in MDM.
+    :type internal_name: str
+    :param to_be_exported_for_shoebox: A Boolean flag indicating whether this
+     dimension should be included for the shoebox export scenario.
+    :type to_be_exported_for_shoebox: bool
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'display_name': {'key': 'displayName', 'type': 'str'},
+        'internal_name': {'key': 'internalName', 'type': 'str'},
+        'to_be_exported_for_shoebox': {'key': 'toBeExportedForShoebox', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(Dimension, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.display_name = kwargs.get('display_name', None)
+        self.internal_name = kwargs.get('internal_name', None)
+        self.to_be_exported_for_shoebox = kwargs.get('to_be_exported_for_shoebox', None)
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/dimension_py3.py b/azure-mgmt-signalr/azure/mgmt/signalr/models/dimension_py3.py
@@ -0,0 +1,41 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class Dimension(Model):
+    """Specifications of the Dimension of metrics.
+
+    :param name: The public facing name of the dimension.
+    :type name: str
+    :param display_name: Localized friendly display name of the dimension.
+    :type display_name: str
+    :param internal_name: Name of the dimension as it appears in MDM.
+    :type internal_name: str
+    :param to_be_exported_for_shoebox: A Boolean flag indicating whether this
+     dimension should be included for the shoebox export scenario.
+    :type to_be_exported_for_shoebox: bool
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'display_name': {'key': 'displayName', 'type': 'str'},
+        'internal_name': {'key': 'internalName', 'type': 'str'},
+        'to_be_exported_for_shoebox': {'key': 'toBeExportedForShoebox', 'type': 'bool'},
+    }
+
+    def __init__(self, *, name: str=None, display_name: str=None, internal_name: str=None, to_be_exported_for_shoebox: bool=None, **kwargs) -> None:
+        super(Dimension, self).__init__(**kwargs)
+        self.name = name
+        self.display_name = display_name
+        self.internal_name = internal_name
+        self.to_be_exported_for_shoebox = to_be_exported_for_shoebox
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/metric_specification.py b/azure-mgmt-signalr/azure/mgmt/signalr/models/metric_specification.py
@@ -36,6 +36,8 @@ class MetricSpecification(Model):
     :param category: The name of the metric category that the metric belongs
      to. A metric can only belong to a single category.
     :type category: str
+    :param dimensions: The dimensions of the metrics.
+    :type dimensions: list[~azure.mgmt.signalr.models.Dimension]
     """
 
     _attribute_map = {
@@ -46,6 +48,7 @@ class MetricSpecification(Model):
         'aggregation_type': {'key': 'aggregationType', 'type': 'str'},
         'fill_gap_with_zero': {'key': 'fillGapWithZero', 'type': 'str'},
         'category': {'key': 'category', 'type': 'str'},
+        'dimensions': {'key': 'dimensions', 'type': '[Dimension]'},
     }
 
     def __init__(self, **kwargs):
@@ -57,3 +60,4 @@ def __init__(self, **kwargs):
         self.aggregation_type = kwargs.get('aggregation_type', None)
         self.fill_gap_with_zero = kwargs.get('fill_gap_with_zero', None)
         self.category = kwargs.get('category', None)
+        self.dimensions = kwargs.get('dimensions', None)
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/metric_specification_py3.py b/azure-mgmt-signalr/azure/mgmt/signalr/models/metric_specification_py3.py
@@ -36,6 +36,8 @@ class MetricSpecification(Model):
     :param category: The name of the metric category that the metric belongs
      to. A metric can only belong to a single category.
     :type category: str
+    :param dimensions: The dimensions of the metrics.
+    :type dimensions: list[~azure.mgmt.signalr.models.Dimension]
     """
 
     _attribute_map = {
@@ -46,9 +48,10 @@ class MetricSpecification(Model):
         'aggregation_type': {'key': 'aggregationType', 'type': 'str'},
         'fill_gap_with_zero': {'key': 'fillGapWithZero', 'type': 'str'},
         'category': {'key': 'category', 'type': 'str'},
+        'dimensions': {'key': 'dimensions', 'type': '[Dimension]'},
     }
 
-    def __init__(self, *, name: str=None, display_name: str=None, display_description: str=None, unit: str=None, aggregation_type: str=None, fill_gap_with_zero: str=None, category: str=None, **kwargs) -> None:
+    def __init__(self, *, name: str=None, display_name: str=None, display_description: str=None, unit: str=None, aggregation_type: str=None, fill_gap_with_zero: str=None, category: str=None, dimensions=None, **kwargs) -> None:
         super(MetricSpecification, self).__init__(**kwargs)
         self.name = name
         self.display_name = display_name
@@ -57,3 +60,4 @@ def __init__(self, *, name: str=None, display_name: str=None, display_descriptio
         self.aggregation_type = aggregation_type
         self.fill_gap_with_zero = fill_gap_with_zero
         self.category = category
+        self.dimensions = dimensions
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/resource_sku.py b/azure-mgmt-signalr/azure/mgmt/signalr/models/resource_sku.py
@@ -20,8 +20,9 @@ class ResourceSku(Model):
     :param name: Required. The name of the SKU. This is typically a letter +
      number code, such as A0 or P3.  Required (if sku is specified)
     :type name: str
-    :param tier: The tier of this particular SKU. Optional. Possible values
-     include: 'Free', 'Basic', 'Premium'
+    :param tier: Optional tier of this particular SKU. `Basic` is deprecated,
+     use `Standard` instead for Basic tier. Possible values include: 'Free',
+     'Basic', 'Standard', 'Premium'
     :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.

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
@@ -20,8 +20,9 @@ class ResourceSku(Model):
     :param name: Required. The name of the SKU. This is typically a letter +
      number code, such as A0 or P3.  Required (if sku is specified)
     :type name: str
-    :param tier: The tier of this particular SKU. Optional. Possible values
-     include: 'Free', 'Basic', 'Premium'
+    :param tier: Optional tier of this particular SKU. `Basic` is deprecated,
+     use `Standard` instead for Basic tier. Possible values include: 'Free',
+     'Basic', 'Standard', 'Premium'
     :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.

diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rcreate_parameters_py3.py b/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rcreate_parameters_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .signal_rupdate_parameters import SignalRUpdateParameters
+from .signal_rupdate_parameters_py3 import SignalRUpdateParameters
 
 
 class SignalRCreateParameters(SignalRUpdateParameters):

diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rkeys.py b/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rkeys.py
@@ -19,14 +19,24 @@ class SignalRKeys(Model):
     :type primary_key: str
     :param secondary_key: The secondary access key.
     :type secondary_key: str
+    :param primary_connection_string: SignalR connection string constructed
+     via the primaryKey
+    :type primary_connection_string: str
+    :param secondary_connection_string: SignalR connection string constructed
+     via the secondaryKey
+    :type secondary_connection_string: str
     """
 
     _attribute_map = {
         'primary_key': {'key': 'primaryKey', 'type': 'str'},
         'secondary_key': {'key': 'secondaryKey', 'type': 'str'},
+        'primary_connection_string': {'key': 'primaryConnectionString', 'type': 'str'},
+        'secondary_connection_string': {'key': 'secondaryConnectionString', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
         super(SignalRKeys, self).__init__(**kwargs)
         self.primary_key = kwargs.get('primary_key', None)
         self.secondary_key = kwargs.get('secondary_key', None)
+        self.primary_connection_string = kwargs.get('primary_connection_string', None)
+        self.secondary_connection_string = kwargs.get('secondary_connection_string', None)
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rkeys_py3.py b/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rkeys_py3.py
@@ -19,14 +19,24 @@ class SignalRKeys(Model):
     :type primary_key: str
     :param secondary_key: The secondary access key.
     :type secondary_key: str
+    :param primary_connection_string: SignalR connection string constructed
+     via the primaryKey
+    :type primary_connection_string: str
+    :param secondary_connection_string: SignalR connection string constructed
+     via the secondaryKey
+    :type secondary_connection_string: str
     """
 
     _attribute_map = {
         'primary_key': {'key': 'primaryKey', 'type': 'str'},
         'secondary_key': {'key': 'secondaryKey', 'type': 'str'},
+        'primary_connection_string': {'key': 'primaryConnectionString', 'type': 'str'},
+        'secondary_connection_string': {'key': 'secondaryConnectionString', 'type': 'str'},
     }
 
-    def __init__(self, *, primary_key: str=None, secondary_key: str=None, **kwargs) -> None:
+    def __init__(self, *, primary_key: str=None, secondary_key: str=None, primary_connection_string: str=None, secondary_connection_string: str=None, **kwargs) -> None:
         super(SignalRKeys, self).__init__(**kwargs)
         self.primary_key = primary_key
         self.secondary_key = secondary_key
+        self.primary_connection_string = primary_connection_string
+        self.secondary_connection_string = secondary_connection_string
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rmanagement_client_enums.py b/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rmanagement_client_enums.py
@@ -16,6 +16,7 @@ class SignalRSkuTier(str, Enum):
 
     free = "Free"
     basic = "Basic"
+    standard = "Standard"
     premium = "Premium"
 
 

diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rresource.py b/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rresource.py
@@ -54,6 +54,9 @@ class SignalRResource(TrackedResource):
     :ivar server_port: The publicly accessibly port of the SignalR service
      which is designed for customer server side usage.
     :vartype server_port: int
+    :param version: Version of the SignalR resource. Probably you need the
+     same or higher version of client SDKs.
+    :type version: str
     """
 
     _validation = {
@@ -80,6 +83,7 @@ class SignalRResource(TrackedResource):
         'host_name': {'key': 'properties.hostName', 'type': 'str'},
         'public_port': {'key': 'properties.publicPort', 'type': 'int'},
         'server_port': {'key': 'properties.serverPort', 'type': 'int'},
+        'version': {'key': 'properties.version', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
@@ -91,3 +95,4 @@ def __init__(self, **kwargs):
         self.host_name = None
         self.public_port = None
         self.server_port = None
+        self.version = kwargs.get('version', None)
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rresource_py3.py b/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rresource_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .tracked_resource import TrackedResource
+from .tracked_resource_py3 import TrackedResource
 
 
 class SignalRResource(TrackedResource):
@@ -54,6 +54,9 @@ class SignalRResource(TrackedResource):
     :ivar server_port: The publicly accessibly port of the SignalR service
      which is designed for customer server side usage.
     :vartype server_port: int
+    :param version: Version of the SignalR resource. Probably you need the
+     same or higher version of client SDKs.
+    :type version: str
     """
 
     _validation = {
@@ -80,9 +83,10 @@ class SignalRResource(TrackedResource):
         'host_name': {'key': 'properties.hostName', 'type': 'str'},
         'public_port': {'key': 'properties.publicPort', 'type': 'int'},
         'server_port': {'key': 'properties.serverPort', 'type': 'int'},
+        'version': {'key': 'properties.version', 'type': 'str'},
     }
 
-    def __init__(self, *, location: str=None, tags=None, sku=None, host_name_prefix: str=None, **kwargs) -> None:
+    def __init__(self, *, location: str=None, tags=None, sku=None, host_name_prefix: str=None, version: str=None, **kwargs) -> None:
         super(SignalRResource, self).__init__(location=location, tags=tags, **kwargs)
         self.sku = sku
         self.host_name_prefix = host_name_prefix
@@ -91,3 +95,4 @@ def __init__(self, *, location: str=None, tags=None, sku=None, host_name_prefix:
         self.host_name = None
         self.public_port = None
         self.server_port = None
+        self.version = version