From cad07ce55b4c0190f7a289483ef1f3d6d6ed5adb Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Thu, 28 Jun 2018 07:48:47 -0700 Subject: [PATCH 1/5] Generated from 1a580a82a89f74ea070f1107aca66333250aab81 (#2825) added pendingReplicationOperationsCount to GeoDR --- .../azure/mgmt/eventhub/models/arm_disaster_recovery.py | 6 ++++++ .../mgmt/eventhub/models/arm_disaster_recovery_py3.py | 8 +++++++- .../azure/mgmt/eventhub/models/authorization_rule_py3.py | 2 +- .../azure/mgmt/eventhub/models/consumer_group_py3.py | 2 +- .../azure/mgmt/eventhub/models/eh_namespace_py3.py | 2 +- .../azure/mgmt/eventhub/models/eventhub_py3.py | 2 +- .../azure/mgmt/eventhub/models/messaging_plan_py3.py | 2 +- .../azure/mgmt/eventhub/models/messaging_regions_py3.py | 2 +- .../azure/mgmt/eventhub/models/tracked_resource_py3.py | 2 +- azure-mgmt-eventhub/azure/mgmt/eventhub/version.py | 2 +- 10 files changed, 21 insertions(+), 9 deletions(-) diff --git a/azure-mgmt-eventhub/azure/mgmt/eventhub/models/arm_disaster_recovery.py b/azure-mgmt-eventhub/azure/mgmt/eventhub/models/arm_disaster_recovery.py index 85004b863855..b269fb231c14 100644 --- a/azure-mgmt-eventhub/azure/mgmt/eventhub/models/arm_disaster_recovery.py +++ b/azure-mgmt-eventhub/azure/mgmt/eventhub/models/arm_disaster_recovery.py @@ -40,6 +40,9 @@ class ArmDisasterRecovery(Resource): 'PrimaryNotReplicating' or 'Secondary'. Possible values include: 'Primary', 'PrimaryNotReplicating', 'Secondary' :vartype role: str or ~azure.mgmt.eventhub.models.RoleDisasterRecovery + :ivar pending_replication_operations_count: Number of entities pending to + be replicated. + :vartype pending_replication_operations_count: long """ _validation = { @@ -48,6 +51,7 @@ class ArmDisasterRecovery(Resource): 'type': {'readonly': True}, 'provisioning_state': {'readonly': True}, 'role': {'readonly': True}, + 'pending_replication_operations_count': {'readonly': True}, } _attribute_map = { @@ -58,6 +62,7 @@ class ArmDisasterRecovery(Resource): 'partner_namespace': {'key': 'properties.partnerNamespace', 'type': 'str'}, 'alternate_name': {'key': 'properties.alternateName', 'type': 'str'}, 'role': {'key': 'properties.role', 'type': 'RoleDisasterRecovery'}, + 'pending_replication_operations_count': {'key': 'properties.pendingReplicationOperationsCount ', 'type': 'long'}, } def __init__(self, **kwargs): @@ -66,3 +71,4 @@ def __init__(self, **kwargs): self.partner_namespace = kwargs.get('partner_namespace', None) self.alternate_name = kwargs.get('alternate_name', None) self.role = None + self.pending_replication_operations_count = None diff --git a/azure-mgmt-eventhub/azure/mgmt/eventhub/models/arm_disaster_recovery_py3.py b/azure-mgmt-eventhub/azure/mgmt/eventhub/models/arm_disaster_recovery_py3.py index 21fe8f02e5f0..2988684a326b 100644 --- a/azure-mgmt-eventhub/azure/mgmt/eventhub/models/arm_disaster_recovery_py3.py +++ b/azure-mgmt-eventhub/azure/mgmt/eventhub/models/arm_disaster_recovery_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .resource import Resource +from .resource_py3 import Resource class ArmDisasterRecovery(Resource): @@ -40,6 +40,9 @@ class ArmDisasterRecovery(Resource): 'PrimaryNotReplicating' or 'Secondary'. Possible values include: 'Primary', 'PrimaryNotReplicating', 'Secondary' :vartype role: str or ~azure.mgmt.eventhub.models.RoleDisasterRecovery + :ivar pending_replication_operations_count: Number of entities pending to + be replicated. + :vartype pending_replication_operations_count: long """ _validation = { @@ -48,6 +51,7 @@ class ArmDisasterRecovery(Resource): 'type': {'readonly': True}, 'provisioning_state': {'readonly': True}, 'role': {'readonly': True}, + 'pending_replication_operations_count': {'readonly': True}, } _attribute_map = { @@ -58,6 +62,7 @@ class ArmDisasterRecovery(Resource): 'partner_namespace': {'key': 'properties.partnerNamespace', 'type': 'str'}, 'alternate_name': {'key': 'properties.alternateName', 'type': 'str'}, 'role': {'key': 'properties.role', 'type': 'RoleDisasterRecovery'}, + 'pending_replication_operations_count': {'key': 'properties.pendingReplicationOperationsCount ', 'type': 'long'}, } def __init__(self, *, partner_namespace: str=None, alternate_name: str=None, **kwargs) -> None: @@ -66,3 +71,4 @@ def __init__(self, *, partner_namespace: str=None, alternate_name: str=None, **k self.partner_namespace = partner_namespace self.alternate_name = alternate_name self.role = None + self.pending_replication_operations_count = None diff --git a/azure-mgmt-eventhub/azure/mgmt/eventhub/models/authorization_rule_py3.py b/azure-mgmt-eventhub/azure/mgmt/eventhub/models/authorization_rule_py3.py index 8204b0fce74f..289dfc39e8fe 100644 --- a/azure-mgmt-eventhub/azure/mgmt/eventhub/models/authorization_rule_py3.py +++ b/azure-mgmt-eventhub/azure/mgmt/eventhub/models/authorization_rule_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .resource import Resource +from .resource_py3 import Resource class AuthorizationRule(Resource): diff --git a/azure-mgmt-eventhub/azure/mgmt/eventhub/models/consumer_group_py3.py b/azure-mgmt-eventhub/azure/mgmt/eventhub/models/consumer_group_py3.py index f31c5b31a280..68fddac962ea 100644 --- a/azure-mgmt-eventhub/azure/mgmt/eventhub/models/consumer_group_py3.py +++ b/azure-mgmt-eventhub/azure/mgmt/eventhub/models/consumer_group_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .resource import Resource +from .resource_py3 import Resource class ConsumerGroup(Resource): diff --git a/azure-mgmt-eventhub/azure/mgmt/eventhub/models/eh_namespace_py3.py b/azure-mgmt-eventhub/azure/mgmt/eventhub/models/eh_namespace_py3.py index 7363aa26afc7..e12e521ea75c 100644 --- a/azure-mgmt-eventhub/azure/mgmt/eventhub/models/eh_namespace_py3.py +++ b/azure-mgmt-eventhub/azure/mgmt/eventhub/models/eh_namespace_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .tracked_resource import TrackedResource +from .tracked_resource_py3 import TrackedResource class EHNamespace(TrackedResource): diff --git a/azure-mgmt-eventhub/azure/mgmt/eventhub/models/eventhub_py3.py b/azure-mgmt-eventhub/azure/mgmt/eventhub/models/eventhub_py3.py index 434dc98b71d6..f9ba87581ba3 100644 --- a/azure-mgmt-eventhub/azure/mgmt/eventhub/models/eventhub_py3.py +++ b/azure-mgmt-eventhub/azure/mgmt/eventhub/models/eventhub_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .resource import Resource +from .resource_py3 import Resource class Eventhub(Resource): diff --git a/azure-mgmt-eventhub/azure/mgmt/eventhub/models/messaging_plan_py3.py b/azure-mgmt-eventhub/azure/mgmt/eventhub/models/messaging_plan_py3.py index 10e0d5c05233..d1aaf075ffc2 100644 --- a/azure-mgmt-eventhub/azure/mgmt/eventhub/models/messaging_plan_py3.py +++ b/azure-mgmt-eventhub/azure/mgmt/eventhub/models/messaging_plan_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .tracked_resource import TrackedResource +from .tracked_resource_py3 import TrackedResource class MessagingPlan(TrackedResource): diff --git a/azure-mgmt-eventhub/azure/mgmt/eventhub/models/messaging_regions_py3.py b/azure-mgmt-eventhub/azure/mgmt/eventhub/models/messaging_regions_py3.py index 50c8c28651aa..f2bc276f4625 100644 --- a/azure-mgmt-eventhub/azure/mgmt/eventhub/models/messaging_regions_py3.py +++ b/azure-mgmt-eventhub/azure/mgmt/eventhub/models/messaging_regions_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .tracked_resource import TrackedResource +from .tracked_resource_py3 import TrackedResource class MessagingRegions(TrackedResource): diff --git a/azure-mgmt-eventhub/azure/mgmt/eventhub/models/tracked_resource_py3.py b/azure-mgmt-eventhub/azure/mgmt/eventhub/models/tracked_resource_py3.py index 755602b9f9ad..303f166f8805 100644 --- a/azure-mgmt-eventhub/azure/mgmt/eventhub/models/tracked_resource_py3.py +++ b/azure-mgmt-eventhub/azure/mgmt/eventhub/models/tracked_resource_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .resource import Resource +from .resource_py3 import Resource class TrackedResource(Resource): diff --git a/azure-mgmt-eventhub/azure/mgmt/eventhub/version.py b/azure-mgmt-eventhub/azure/mgmt/eventhub/version.py index 53c4c7ea05e8..d24076f8d84b 100644 --- a/azure-mgmt-eventhub/azure/mgmt/eventhub/version.py +++ b/azure-mgmt-eventhub/azure/mgmt/eventhub/version.py @@ -9,5 +9,5 @@ # regenerated. # -------------------------------------------------------------------------- -VERSION = "2.0.0" +VERSION = "1.3.0" From 8dc2ea5801b060616f382925f6a9839c782a7941 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Thu, 28 Jun 2018 10:20:19 -0700 Subject: [PATCH 2/5] Generated from dd582a5729a5d6b14aae2bdd3db7ba3b1e847283 (#2806) EventHub 2018-01-01-Preview with VNet, IPFilter and EventHubCluster From c3d8ff9ad6a7f008c13a805807c615b96c7785d4 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Fri, 29 Jun 2018 16:08:07 -0700 Subject: [PATCH 3/5] Generated from bfe141048e0caecaaabf928de884d75c2605756a (#2844) removed extra space from pendingReplicationOperationsCount --- .../azure/mgmt/eventhub/models/arm_disaster_recovery.py | 2 +- .../azure/mgmt/eventhub/models/arm_disaster_recovery_py3.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-mgmt-eventhub/azure/mgmt/eventhub/models/arm_disaster_recovery.py b/azure-mgmt-eventhub/azure/mgmt/eventhub/models/arm_disaster_recovery.py index b269fb231c14..8ff2fcda3237 100644 --- a/azure-mgmt-eventhub/azure/mgmt/eventhub/models/arm_disaster_recovery.py +++ b/azure-mgmt-eventhub/azure/mgmt/eventhub/models/arm_disaster_recovery.py @@ -62,7 +62,7 @@ class ArmDisasterRecovery(Resource): 'partner_namespace': {'key': 'properties.partnerNamespace', 'type': 'str'}, 'alternate_name': {'key': 'properties.alternateName', 'type': 'str'}, 'role': {'key': 'properties.role', 'type': 'RoleDisasterRecovery'}, - 'pending_replication_operations_count': {'key': 'properties.pendingReplicationOperationsCount ', 'type': 'long'}, + 'pending_replication_operations_count': {'key': 'properties.pendingReplicationOperationsCount', 'type': 'long'}, } def __init__(self, **kwargs): diff --git a/azure-mgmt-eventhub/azure/mgmt/eventhub/models/arm_disaster_recovery_py3.py b/azure-mgmt-eventhub/azure/mgmt/eventhub/models/arm_disaster_recovery_py3.py index 2988684a326b..d80f9e32f7e9 100644 --- a/azure-mgmt-eventhub/azure/mgmt/eventhub/models/arm_disaster_recovery_py3.py +++ b/azure-mgmt-eventhub/azure/mgmt/eventhub/models/arm_disaster_recovery_py3.py @@ -62,7 +62,7 @@ class ArmDisasterRecovery(Resource): 'partner_namespace': {'key': 'properties.partnerNamespace', 'type': 'str'}, 'alternate_name': {'key': 'properties.alternateName', 'type': 'str'}, 'role': {'key': 'properties.role', 'type': 'RoleDisasterRecovery'}, - 'pending_replication_operations_count': {'key': 'properties.pendingReplicationOperationsCount ', 'type': 'long'}, + 'pending_replication_operations_count': {'key': 'properties.pendingReplicationOperationsCount', 'type': 'long'}, } def __init__(self, *, partner_namespace: str=None, alternate_name: str=None, **kwargs) -> None: From c18c2106fbd5af35a8db6d1cd61c936534e751f7 Mon Sep 17 00:00:00 2001 From: Laurent Mazuel Date: Tue, 31 Jul 2018 12:47:00 -0700 Subject: [PATCH 4/5] Packaging --- azure-mgmt-eventhub/README.rst | 2 +- azure-mgmt-eventhub/sdk_packaging.toml | 5 +++++ azure-mgmt-eventhub/setup.py | 6 ++++-- 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 azure-mgmt-eventhub/sdk_packaging.toml diff --git a/azure-mgmt-eventhub/README.rst b/azure-mgmt-eventhub/README.rst index 6bdcb30dac3d..ff223c1be5b2 100644 --- a/azure-mgmt-eventhub/README.rst +++ b/azure-mgmt-eventhub/README.rst @@ -6,7 +6,7 @@ This is the Microsoft Azure EventHub Management 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 `__ library. diff --git a/azure-mgmt-eventhub/sdk_packaging.toml b/azure-mgmt-eventhub/sdk_packaging.toml new file mode 100644 index 000000000000..13e2023be98c --- /dev/null +++ b/azure-mgmt-eventhub/sdk_packaging.toml @@ -0,0 +1,5 @@ +[packaging] +package_name = "azure-mgmt-eventhub" +package_pprint_name = "EventHub Management" +package_doc_id = "event-hub" +is_stable = true diff --git a/azure-mgmt-eventhub/setup.py b/azure-mgmt-eventhub/setup.py index e48ccd31a98a..08d1540be539 100644 --- a/azure-mgmt-eventhub/setup.py +++ b/azure-mgmt-eventhub/setup.py @@ -64,7 +64,7 @@ author_email='azpysdkhelp@microsoft.com', url='https://github.com/Azure/azure-sdk-for-python', classifiers=[ - 'Development Status :: 4 - Beta', + 'Development Status :: 5 - Production/Stable', 'Programming Language :: Python', 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.7', @@ -72,12 +72,14 @@ 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', 'License :: OSI Approved :: MIT License', ], zip_safe=False, packages=find_packages(exclude=["tests"]), install_requires=[ - 'msrestazure>=0.4.27,<2.0.0', + 'msrest>=0.5.0', + 'msrestazure>=0.4.32,<2.0.0', 'azure-common~=1.1', ], cmdclass=cmdclass From 16f6bf04df0f81ca522db8fdee7f80941e2e0aff Mon Sep 17 00:00:00 2001 From: Laurent Mazuel Date: Tue, 31 Jul 2018 12:48:20 -0700 Subject: [PATCH 5/5] EH 2.1.0 --- azure-mgmt-eventhub/HISTORY.rst | 13 ++++++++++++- azure-mgmt-eventhub/azure/mgmt/eventhub/version.py | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/azure-mgmt-eventhub/HISTORY.rst b/azure-mgmt-eventhub/HISTORY.rst index 1fcc76ecf482..8ba7504e3a2c 100644 --- a/azure-mgmt-eventhub/HISTORY.rst +++ b/azure-mgmt-eventhub/HISTORY.rst @@ -3,6 +3,17 @@ Release History =============== +2.1.0 (2018-07-31) +++++++++++++++++++ + +**Features** + +- Add pending_replication_operations_count support + +**Bugfixes** + +- Fix some Python3 models + 2.0.0 (2018-05-04) ++++++++++++++++++ @@ -24,7 +35,7 @@ This version uses a next-generation code generator that *might* introduce breaki - Return type changes from `msrestazure.azure_operation.AzureOperationPoller` to `msrest.polling.LROPoller`. External API is the same. - Return type is now **always** a `msrest.polling.LROPoller`, regardless of the optional parameters used. - - The behavior has changed when using `raw=True`. Instead of returning the initial call result as `ClientRawResponse`, + - The behavior has changed when using `raw=True`. Instead of returning the initial call result as `ClientRawResponse`, without polling, now this returns an LROPoller. After polling, the final resource will be returned as a `ClientRawResponse`. - New `polling` parameter. The default behavior is `Polling=True` which will poll using ARM algorithm. When `Polling=False`, the response of the initial call will be returned without polling. diff --git a/azure-mgmt-eventhub/azure/mgmt/eventhub/version.py b/azure-mgmt-eventhub/azure/mgmt/eventhub/version.py index d24076f8d84b..be75d8eae586 100644 --- a/azure-mgmt-eventhub/azure/mgmt/eventhub/version.py +++ b/azure-mgmt-eventhub/azure/mgmt/eventhub/version.py @@ -9,5 +9,5 @@ # regenerated. # -------------------------------------------------------------------------- -VERSION = "1.3.0" +VERSION = "2.1.0"