[AutoPR servicebus/resource-manager] ServiceBus: added 'properties' to CorrelationFilter

azure-mgmt-servicebus/azure/mgmt/servicebus/models/__init__.py

@@ -9,36 +9,68 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .tracked_resource import TrackedResource
-from .resource import Resource
-from .resource_namespace_patch import ResourceNamespacePatch
-from .sb_sku import SBSku
-from .sb_namespace import SBNamespace
-from .sb_namespace_update_parameters import SBNamespaceUpdateParameters
-from .sb_authorization_rule import SBAuthorizationRule
-from .authorization_rule_properties import AuthorizationRuleProperties
-from .access_keys import AccessKeys
-from .regenerate_access_key_parameters import RegenerateAccessKeyParameters
-from .message_count_details import MessageCountDetails
-from .sb_queue import SBQueue
-from .sb_topic import SBTopic
-from .sb_subscription import SBSubscription
-from .check_name_availability import CheckNameAvailability
-from .check_name_availability_result import CheckNameAvailabilityResult
-from .operation_display import OperationDisplay
-from .operation import Operation
-from .error_response import ErrorResponse, ErrorResponseException
-from .action import Action
-from .sql_filter import SqlFilter
-from .correlation_filter import CorrelationFilter
-from .rule import Rule
-from .sql_rule_action import SqlRuleAction
-from .premium_messaging_regions_properties import PremiumMessagingRegionsProperties
-from .premium_messaging_regions import PremiumMessagingRegions
-from .destination import Destination
-from .capture_description import CaptureDescription
-from .eventhub import Eventhub
-from .arm_disaster_recovery import ArmDisasterRecovery
+try:
+    from .tracked_resource_py3 import TrackedResource
+    from .resource_py3 import Resource
+    from .resource_namespace_patch_py3 import ResourceNamespacePatch
+    from .sb_sku_py3 import SBSku
+    from .sb_namespace_py3 import SBNamespace
+    from .sb_namespace_update_parameters_py3 import SBNamespaceUpdateParameters
+    from .sb_authorization_rule_py3 import SBAuthorizationRule
+    from .authorization_rule_properties_py3 import AuthorizationRuleProperties
+    from .access_keys_py3 import AccessKeys
+    from .regenerate_access_key_parameters_py3 import RegenerateAccessKeyParameters
+    from .message_count_details_py3 import MessageCountDetails
+    from .sb_queue_py3 import SBQueue
+    from .sb_topic_py3 import SBTopic
+    from .sb_subscription_py3 import SBSubscription
+    from .check_name_availability_py3 import CheckNameAvailability
+    from .check_name_availability_result_py3 import CheckNameAvailabilityResult
+    from .operation_display_py3 import OperationDisplay
+    from .operation_py3 import Operation
+    from .error_response_py3 import ErrorResponse, ErrorResponseException
+    from .action_py3 import Action
+    from .sql_filter_py3 import SqlFilter
+    from .correlation_filter_py3 import CorrelationFilter
+    from .rule_py3 import Rule
+    from .sql_rule_action_py3 import SqlRuleAction
+    from .premium_messaging_regions_properties_py3 import PremiumMessagingRegionsProperties
+    from .premium_messaging_regions_py3 import PremiumMessagingRegions
+    from .destination_py3 import Destination
+    from .capture_description_py3 import CaptureDescription
+    from .eventhub_py3 import Eventhub
+    from .arm_disaster_recovery_py3 import ArmDisasterRecovery
+except (SyntaxError, ImportError):
+    from .tracked_resource import TrackedResource
+    from .resource import Resource
+    from .resource_namespace_patch import ResourceNamespacePatch
+    from .sb_sku import SBSku
+    from .sb_namespace import SBNamespace
+    from .sb_namespace_update_parameters import SBNamespaceUpdateParameters
+    from .sb_authorization_rule import SBAuthorizationRule
+    from .authorization_rule_properties import AuthorizationRuleProperties
+    from .access_keys import AccessKeys
+    from .regenerate_access_key_parameters import RegenerateAccessKeyParameters
+    from .message_count_details import MessageCountDetails
+    from .sb_queue import SBQueue
+    from .sb_topic import SBTopic
+    from .sb_subscription import SBSubscription
+    from .check_name_availability import CheckNameAvailability
+    from .check_name_availability_result import CheckNameAvailabilityResult
+    from .operation_display import OperationDisplay
+    from .operation import Operation
+    from .error_response import ErrorResponse, ErrorResponseException
+    from .action import Action
+    from .sql_filter import SqlFilter
+    from .correlation_filter import CorrelationFilter
+    from .rule import Rule
+    from .sql_rule_action import SqlRuleAction
+    from .premium_messaging_regions_properties import PremiumMessagingRegionsProperties
+    from .premium_messaging_regions import PremiumMessagingRegions
+    from .destination import Destination
+    from .capture_description import CaptureDescription
+    from .eventhub import Eventhub
+    from .arm_disaster_recovery import ArmDisasterRecovery
 from .operation_paged import OperationPaged
 from .sb_namespace_paged import SBNamespacePaged
 from .sb_authorization_rule_paged import SBAuthorizationRulePaged

azure-mgmt-servicebus/azure/mgmt/servicebus/models/access_keys.py

@@ -60,8 +60,8 @@ class AccessKeys(Model):
         'key_name': {'key': 'keyName', 'type': 'str'},
     }
 
-    def __init__(self):
-        super(AccessKeys, self).__init__()
+    def __init__(self, **kwargs):
+        super(AccessKeys, self).__init__(**kwargs)
         self.primary_connection_string = None
         self.secondary_connection_string = None
         self.alias_primary_connection_string = None

azure-mgmt-servicebus/azure/mgmt/servicebus/models/access_keys_py3.py

@@ -0,0 +1,71 @@
+# 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 AccessKeys(Model):
+    """Namespace/ServiceBus Connection String.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar primary_connection_string: Primary connection string of the created
+     namespace authorization rule.
+    :vartype primary_connection_string: str
+    :ivar secondary_connection_string: Secondary connection string of the
+     created namespace authorization rule.
+    :vartype secondary_connection_string: str
+    :ivar alias_primary_connection_string: Primary connection string of the
+     alias if GEO DR is enabled
+    :vartype alias_primary_connection_string: str
+    :ivar alias_secondary_connection_string: Secondary  connection string of
+     the alias if GEO DR is enabled
+    :vartype alias_secondary_connection_string: str
+    :ivar primary_key: A base64-encoded 256-bit primary key for signing and
+     validating the SAS token.
+    :vartype primary_key: str
+    :ivar secondary_key: A base64-encoded 256-bit primary key for signing and
+     validating the SAS token.
+    :vartype secondary_key: str
+    :ivar key_name: A string that describes the authorization rule.
+    :vartype key_name: str
+    """
+
+    _validation = {
+        'primary_connection_string': {'readonly': True},
+        'secondary_connection_string': {'readonly': True},
+        'alias_primary_connection_string': {'readonly': True},
+        'alias_secondary_connection_string': {'readonly': True},
+        'primary_key': {'readonly': True},
+        'secondary_key': {'readonly': True},
+        'key_name': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'primary_connection_string': {'key': 'primaryConnectionString', 'type': 'str'},
+        'secondary_connection_string': {'key': 'secondaryConnectionString', 'type': 'str'},
+        'alias_primary_connection_string': {'key': 'aliasPrimaryConnectionString', 'type': 'str'},
+        'alias_secondary_connection_string': {'key': 'aliasSecondaryConnectionString', 'type': 'str'},
+        'primary_key': {'key': 'primaryKey', 'type': 'str'},
+        'secondary_key': {'key': 'secondaryKey', 'type': 'str'},
+        'key_name': {'key': 'keyName', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(AccessKeys, self).__init__(**kwargs)
+        self.primary_connection_string = None
+        self.secondary_connection_string = None
+        self.alias_primary_connection_string = None
+        self.alias_secondary_connection_string = None
+        self.primary_key = None
+        self.secondary_key = None
+        self.key_name = None

azure-mgmt-servicebus/azure/mgmt/servicebus/models/action.py

@@ -32,8 +32,8 @@ class Action(Model):
         'requires_preprocessing': {'key': 'requiresPreprocessing', 'type': 'bool'},
     }
 
-    def __init__(self, sql_expression=None, compatibility_level=None, requires_preprocessing=True):
-        super(Action, self).__init__()
-        self.sql_expression = sql_expression
-        self.compatibility_level = compatibility_level
-        self.requires_preprocessing = requires_preprocessing
+    def __init__(self, **kwargs):
+        super(Action, self).__init__(**kwargs)
+        self.sql_expression = kwargs.get('sql_expression', None)
+        self.compatibility_level = kwargs.get('compatibility_level', None)
+        self.requires_preprocessing = kwargs.get('requires_preprocessing', True)

azure-mgmt-servicebus/azure/mgmt/servicebus/models/action_py3.py

@@ -0,0 +1,39 @@
+# 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 Action(Model):
+    """Represents the filter actions which are allowed for the transformation of a
+    message that have been matched by a filter expression.
+
+    :param sql_expression: SQL expression. e.g. MyProperty='ABC'
+    :type sql_expression: str
+    :param compatibility_level: This property is reserved for future use. An
+     integer value showing the compatibility level, currently hard-coded to 20.
+    :type compatibility_level: int
+    :param requires_preprocessing: Value that indicates whether the rule
+     action requires preprocessing. Default value: True .
+    :type requires_preprocessing: bool
+    """
+
+    _attribute_map = {
+        'sql_expression': {'key': 'sqlExpression', 'type': 'str'},
+        'compatibility_level': {'key': 'compatibilityLevel', 'type': 'int'},
+        'requires_preprocessing': {'key': 'requiresPreprocessing', 'type': 'bool'},
+    }
+
+    def __init__(self, *, sql_expression: str=None, compatibility_level: int=None, requires_preprocessing: bool=True, **kwargs) -> None:
+        super(Action, self).__init__(**kwargs)
+        self.sql_expression = sql_expression
+        self.compatibility_level = compatibility_level
+        self.requires_preprocessing = requires_preprocessing

azure-mgmt-servicebus/azure/mgmt/servicebus/models/arm_disaster_recovery.py

@@ -60,9 +60,9 @@ class ArmDisasterRecovery(Resource):
         'role': {'key': 'properties.role', 'type': 'RoleDisasterRecovery'},
     }
 
-    def __init__(self, partner_namespace=None, alternate_name=None):
-        super(ArmDisasterRecovery, self).__init__()
+    def __init__(self, **kwargs):
+        super(ArmDisasterRecovery, self).__init__(**kwargs)
         self.provisioning_state = None
-        self.partner_namespace = partner_namespace
-        self.alternate_name = alternate_name
+        self.partner_namespace = kwargs.get('partner_namespace', None)
+        self.alternate_name = kwargs.get('alternate_name', None)
         self.role = None

azure-mgmt-servicebus/azure/mgmt/servicebus/models/arm_disaster_recovery_py3.py

@@ -0,0 +1,68 @@
+# 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 .resource import Resource
+
+
+class ArmDisasterRecovery(Resource):
+    """Single item in List or Get Alias(Disaster Recovery configuration)
+    operation.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Resource Id
+    :vartype id: str
+    :ivar name: Resource name
+    :vartype name: str
+    :ivar type: Resource type
+    :vartype type: str
+    :ivar provisioning_state: Provisioning state of the Alias(Disaster
+     Recovery configuration) - possible values 'Accepted' or 'Succeeded' or
+     'Failed'. Possible values include: 'Accepted', 'Succeeded', 'Failed'
+    :vartype provisioning_state: str or
+     ~azure.mgmt.servicebus.models.ProvisioningStateDR
+    :param partner_namespace: ARM Id of the Primary/Secondary eventhub
+     namespace name, which is part of GEO DR pairning
+    :type partner_namespace: str
+    :param alternate_name: Primary/Secondary eventhub namespace name, which is
+     part of GEO DR pairning
+    :type alternate_name: str
+    :ivar role: role of namespace in GEO DR - possible values 'Primary' or
+     'PrimaryNotReplicating' or 'Secondary'. Possible values include:
+     'Primary', 'PrimaryNotReplicating', 'Secondary'
+    :vartype role: str or ~azure.mgmt.servicebus.models.RoleDisasterRecovery
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'provisioning_state': {'readonly': True},
+        'role': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'ProvisioningStateDR'},
+        'partner_namespace': {'key': 'properties.partnerNamespace', 'type': 'str'},
+        'alternate_name': {'key': 'properties.alternateName', 'type': 'str'},
+        'role': {'key': 'properties.role', 'type': 'RoleDisasterRecovery'},
+    }
+
+    def __init__(self, *, partner_namespace: str=None, alternate_name: str=None, **kwargs) -> None:
+        super(ArmDisasterRecovery, self).__init__(, **kwargs)
+        self.provisioning_state = None
+        self.partner_namespace = partner_namespace
+        self.alternate_name = alternate_name
+        self.role = None

azure-mgmt-servicebus/azure/mgmt/servicebus/models/authorization_rule_properties.py

@@ -15,7 +15,9 @@
 class AuthorizationRuleProperties(Model):
     """AuthorizationRule properties.
 
-    :param rights: The rights associated with the rule.
+    All required parameters must be populated in order to send to Azure.
+
+    :param rights: Required. The rights associated with the rule.
     :type rights: list[str or ~azure.mgmt.servicebus.models.AccessRights]
     """
 
@@ -27,6 +29,6 @@ class AuthorizationRuleProperties(Model):
         'rights': {'key': 'rights', 'type': '[AccessRights]'},
     }
 
-    def __init__(self, rights):
-        super(AuthorizationRuleProperties, self).__init__()
-        self.rights = rights
+    def __init__(self, **kwargs):
+        super(AuthorizationRuleProperties, self).__init__(**kwargs)
+        self.rights = kwargs.get('rights', None)

azure-mgmt-servicebus/azure/mgmt/servicebus/models/authorization_rule_properties_py3.py

@@ -0,0 +1,34 @@
+# 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 AuthorizationRuleProperties(Model):
+    """AuthorizationRule properties.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param rights: Required. The rights associated with the rule.
+    :type rights: list[str or ~azure.mgmt.servicebus.models.AccessRights]
+    """
+
+    _validation = {
+        'rights': {'required': True},
+    }
+
+    _attribute_map = {
+        'rights': {'key': 'rights', 'type': '[AccessRights]'},
+    }
+
+    def __init__(self, *, rights, **kwargs) -> None:
+        super(AuthorizationRuleProperties, self).__init__(**kwargs)
+        self.rights = rights

azure-mgmt-servicebus/azure/mgmt/servicebus/models/capture_description.py

@@ -48,10 +48,10 @@ class CaptureDescription(Model):
         'destination': {'key': 'destination', 'type': 'Destination'},
     }
 
-    def __init__(self, enabled=None, encoding=None, interval_in_seconds=None, size_limit_in_bytes=None, destination=None):
-        super(CaptureDescription, self).__init__()
-        self.enabled = enabled
-        self.encoding = encoding
-        self.interval_in_seconds = interval_in_seconds
-        self.size_limit_in_bytes = size_limit_in_bytes
-        self.destination = destination
+    def __init__(self, **kwargs):
+        super(CaptureDescription, self).__init__(**kwargs)
+        self.enabled = kwargs.get('enabled', None)
+        self.encoding = kwargs.get('encoding', None)
+        self.interval_in_seconds = kwargs.get('interval_in_seconds', None)
+        self.size_limit_in_bytes = kwargs.get('size_limit_in_bytes', None)
+        self.destination = kwargs.get('destination', None)