From 4ee7207d8548985b3245cb7df3144f76ec6f3d30 Mon Sep 17 00:00:00 2001 From: SDK Automation Date: Sun, 28 Jun 2020 09:06:22 +0000 Subject: [PATCH 1/2] Generated from 731e0f172a862f27f5ee240291aa54406ac20801 Add app sku as part of update request --- sdk/iothub/azure-mgmt-iotcentral/README.md | 2 +- .../azure/mgmt/iotcentral/models/_models.py | 4 ++++ .../azure/mgmt/iotcentral/models/_models_py3.py | 6 +++++- sdk/iothub/azure-mgmt-iotcentral/setup.py | 4 +++- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/sdk/iothub/azure-mgmt-iotcentral/README.md b/sdk/iothub/azure-mgmt-iotcentral/README.md index 4a2c0b7292bf..1041ea93b6da 100644 --- a/sdk/iothub/azure-mgmt-iotcentral/README.md +++ b/sdk/iothub/azure-mgmt-iotcentral/README.md @@ -2,7 +2,7 @@ This is the Microsoft Azure IoTCentral Management Client Library. This package has been tested with Python 2.7, 3.5, 3.6, 3.7 and 3.8. -For a more complete view of Azure libraries, see the [Github repo](https://github.com/Azure/azure-sdk-for-python/sdk) +For a more complete view of Azure libraries, see the [Github repo](https://github.com/Azure/azure-sdk-for-python/) # Usage diff --git a/sdk/iothub/azure-mgmt-iotcentral/azure/mgmt/iotcentral/models/_models.py b/sdk/iothub/azure-mgmt-iotcentral/azure/mgmt/iotcentral/models/_models.py index 0ab6e3d4113e..a7a8b7b045bb 100644 --- a/sdk/iothub/azure-mgmt-iotcentral/azure/mgmt/iotcentral/models/_models.py +++ b/sdk/iothub/azure-mgmt-iotcentral/azure/mgmt/iotcentral/models/_models.py @@ -164,6 +164,8 @@ class AppPatch(Model): :param tags: Instance tags :type tags: dict[str, str] + :param sku: A valid instance SKU. + :type sku: ~azure.mgmt.iotcentral.models.AppSkuInfo :ivar application_id: The ID of the application. :vartype application_id: str :param display_name: The display name of the application. @@ -183,6 +185,7 @@ class AppPatch(Model): _attribute_map = { 'tags': {'key': 'tags', 'type': '{str}'}, + 'sku': {'key': 'sku', 'type': 'AppSkuInfo'}, 'application_id': {'key': 'properties.applicationId', 'type': 'str'}, 'display_name': {'key': 'properties.displayName', 'type': 'str'}, 'subdomain': {'key': 'properties.subdomain', 'type': 'str'}, @@ -192,6 +195,7 @@ class AppPatch(Model): def __init__(self, **kwargs): super(AppPatch, self).__init__(**kwargs) self.tags = kwargs.get('tags', None) + self.sku = kwargs.get('sku', None) self.application_id = None self.display_name = kwargs.get('display_name', None) self.subdomain = kwargs.get('subdomain', None) diff --git a/sdk/iothub/azure-mgmt-iotcentral/azure/mgmt/iotcentral/models/_models_py3.py b/sdk/iothub/azure-mgmt-iotcentral/azure/mgmt/iotcentral/models/_models_py3.py index 603a076e9104..4f66adae3400 100644 --- a/sdk/iothub/azure-mgmt-iotcentral/azure/mgmt/iotcentral/models/_models_py3.py +++ b/sdk/iothub/azure-mgmt-iotcentral/azure/mgmt/iotcentral/models/_models_py3.py @@ -164,6 +164,8 @@ class AppPatch(Model): :param tags: Instance tags :type tags: dict[str, str] + :param sku: A valid instance SKU. + :type sku: ~azure.mgmt.iotcentral.models.AppSkuInfo :ivar application_id: The ID of the application. :vartype application_id: str :param display_name: The display name of the application. @@ -183,15 +185,17 @@ class AppPatch(Model): _attribute_map = { 'tags': {'key': 'tags', 'type': '{str}'}, + 'sku': {'key': 'sku', 'type': 'AppSkuInfo'}, 'application_id': {'key': 'properties.applicationId', 'type': 'str'}, 'display_name': {'key': 'properties.displayName', 'type': 'str'}, 'subdomain': {'key': 'properties.subdomain', 'type': 'str'}, 'template': {'key': 'properties.template', 'type': 'str'}, } - def __init__(self, *, tags=None, display_name: str=None, subdomain: str=None, template: str=None, **kwargs) -> None: + def __init__(self, *, tags=None, sku=None, display_name: str=None, subdomain: str=None, template: str=None, **kwargs) -> None: super(AppPatch, self).__init__(**kwargs) self.tags = tags + self.sku = sku self.application_id = None self.display_name = display_name self.subdomain = subdomain diff --git a/sdk/iothub/azure-mgmt-iotcentral/setup.py b/sdk/iothub/azure-mgmt-iotcentral/setup.py index 792352922827..34099afd1a52 100644 --- a/sdk/iothub/azure-mgmt-iotcentral/setup.py +++ b/sdk/iothub/azure-mgmt-iotcentral/setup.py @@ -36,7 +36,9 @@ pass # Version extraction inspired from 'requests' -with open(os.path.join(package_folder_path, 'version.py'), 'r') as fd: +with open(os.path.join(package_folder_path, 'version.py') + if os.path.exists(os.path.join(package_folder_path, 'version.py')) + else os.path.join(package_folder_path, '_version.py'), 'r') as fd: version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]', fd.read(), re.MULTILINE).group(1) From 0cf15f90d9bd9e7a6fa76fb8452521b316565e6f Mon Sep 17 00:00:00 2001 From: xichen Date: Tue, 30 Jun 2020 10:26:40 +0800 Subject: [PATCH 2/2] generate sdk and update version --- sdk/iothub/azure-mgmt-iotcentral/CHANGELOG.md | 6 ++++++ .../azure-mgmt-iotcentral/azure/mgmt/iotcentral/version.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/sdk/iothub/azure-mgmt-iotcentral/CHANGELOG.md b/sdk/iothub/azure-mgmt-iotcentral/CHANGELOG.md index 9cd268f3fbb4..f72c5ad3838a 100644 --- a/sdk/iothub/azure-mgmt-iotcentral/CHANGELOG.md +++ b/sdk/iothub/azure-mgmt-iotcentral/CHANGELOG.md @@ -1,5 +1,11 @@ # Release History +## 3.1.0 (2020-06-30) + +**Features** + + - Model AppPatch has a new parameter sku + ## 3.0.0 (2020-03-09) **Breaking changes** diff --git a/sdk/iothub/azure-mgmt-iotcentral/azure/mgmt/iotcentral/version.py b/sdk/iothub/azure-mgmt-iotcentral/azure/mgmt/iotcentral/version.py index 7f225c6aab41..9797f3dd0011 100644 --- a/sdk/iothub/azure-mgmt-iotcentral/azure/mgmt/iotcentral/version.py +++ b/sdk/iothub/azure-mgmt-iotcentral/azure/mgmt/iotcentral/version.py @@ -9,5 +9,5 @@ # regenerated. # -------------------------------------------------------------------------- -VERSION = "3.0.0" +VERSION = "3.1.0"