[AutoPR authorization/resource-manager] update roledefinition filters to be in sync with the filters present in service

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

@@ -9,16 +9,28 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .classic_administrator import ClassicAdministrator
-from .provider_operation import ProviderOperation
-from .resource_type import ResourceType
-from .provider_operations_metadata import ProviderOperationsMetadata
-from .permission import Permission
-from .role_definition_filter import RoleDefinitionFilter
-from .role_definition import RoleDefinition
-from .role_assignment_filter import RoleAssignmentFilter
-from .role_assignment import RoleAssignment
-from .role_assignment_create_parameters import RoleAssignmentCreateParameters
+try:
+    from .classic_administrator_py3 import ClassicAdministrator
+    from .provider_operation_py3 import ProviderOperation
+    from .resource_type_py3 import ResourceType
+    from .provider_operations_metadata_py3 import ProviderOperationsMetadata
+    from .permission_py3 import Permission
+    from .role_definition_filter_py3 import RoleDefinitionFilter
+    from .role_definition_py3 import RoleDefinition
+    from .role_assignment_filter_py3 import RoleAssignmentFilter
+    from .role_assignment_py3 import RoleAssignment
+    from .role_assignment_create_parameters_py3 import RoleAssignmentCreateParameters
+except (SyntaxError, ImportError):
+    from .classic_administrator import ClassicAdministrator
+    from .provider_operation import ProviderOperation
+    from .resource_type import ResourceType
+    from .provider_operations_metadata import ProviderOperationsMetadata
+    from .permission import Permission
+    from .role_definition_filter import RoleDefinitionFilter
+    from .role_definition import RoleDefinition
+    from .role_assignment_filter import RoleAssignmentFilter
+    from .role_assignment import RoleAssignment
+    from .role_assignment_create_parameters import RoleAssignmentCreateParameters
 from .classic_administrator_paged import ClassicAdministratorPaged
 from .provider_operations_metadata_paged import ProviderOperationsMetadataPaged
 from .permission_paged import PermissionPaged

azure-mgmt-authorization/azure/mgmt/authorization/models/classic_administrator.py

@@ -35,10 +35,10 @@ class ClassicAdministrator(Model):
         'role': {'key': 'properties.role', 'type': 'str'},
     }
 
-    def __init__(self, id=None, name=None, type=None, email_address=None, role=None):
-        super(ClassicAdministrator, self).__init__()
-        self.id = id
-        self.name = name
-        self.type = type
-        self.email_address = email_address
-        self.role = role
+    def __init__(self, **kwargs):
+        super(ClassicAdministrator, self).__init__(**kwargs)
+        self.id = kwargs.get('id', None)
+        self.name = kwargs.get('name', None)
+        self.type = kwargs.get('type', None)
+        self.email_address = kwargs.get('email_address', None)
+        self.role = kwargs.get('role', None)

azure-mgmt-authorization/azure/mgmt/authorization/models/classic_administrator_py3.py

@@ -0,0 +1,44 @@
+# 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 ClassicAdministrator(Model):
+    """Classic Administrators.
+
+    :param id: The ID of the administrator.
+    :type id: str
+    :param name: The name of the administrator.
+    :type name: str
+    :param type: The type of the administrator.
+    :type type: str
+    :param email_address: The email address of the administrator.
+    :type email_address: str
+    :param role: The role of the administrator.
+    :type role: str
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'email_address': {'key': 'properties.emailAddress', 'type': 'str'},
+        'role': {'key': 'properties.role', 'type': 'str'},
+    }
+
+    def __init__(self, *, id: str=None, name: str=None, type: str=None, email_address: str=None, role: str=None, **kwargs) -> None:
+        super(ClassicAdministrator, self).__init__(**kwargs)
+        self.id = id
+        self.name = name
+        self.type = type
+        self.email_address = email_address
+        self.role = role

azure-mgmt-authorization/azure/mgmt/authorization/models/permission.py

@@ -32,9 +32,9 @@ class Permission(Model):
         'not_data_actions': {'key': 'notDataActions', 'type': '[str]'},
     }
 
-    def __init__(self, actions=None, not_actions=None, data_actions=None, not_data_actions=None):
-        super(Permission, self).__init__()
-        self.actions = actions
-        self.not_actions = not_actions
-        self.data_actions = data_actions
-        self.not_data_actions = not_data_actions
+    def __init__(self, **kwargs):
+        super(Permission, self).__init__(**kwargs)
+        self.actions = kwargs.get('actions', None)
+        self.not_actions = kwargs.get('not_actions', None)
+        self.data_actions = kwargs.get('data_actions', None)
+        self.not_data_actions = kwargs.get('not_data_actions', None)

azure-mgmt-authorization/azure/mgmt/authorization/models/permission_py3.py

@@ -0,0 +1,40 @@
+# 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 Permission(Model):
+    """Role definition permissions.
+
+    :param actions: Allowed actions.
+    :type actions: list[str]
+    :param not_actions: Denied actions.
+    :type not_actions: list[str]
+    :param data_actions: Allowed Data actions.
+    :type data_actions: list[str]
+    :param not_data_actions: Denied Data actions.
+    :type not_data_actions: list[str]
+    """
+
+    _attribute_map = {
+        'actions': {'key': 'actions', 'type': '[str]'},
+        'not_actions': {'key': 'notActions', 'type': '[str]'},
+        'data_actions': {'key': 'dataActions', 'type': '[str]'},
+        'not_data_actions': {'key': 'notDataActions', 'type': '[str]'},
+    }
+
+    def __init__(self, *, actions=None, not_actions=None, data_actions=None, not_data_actions=None, **kwargs) -> None:
+        super(Permission, self).__init__(**kwargs)
+        self.actions = actions
+        self.not_actions = not_actions
+        self.data_actions = data_actions
+        self.not_data_actions = not_data_actions

azure-mgmt-authorization/azure/mgmt/authorization/models/provider_operation.py

@@ -38,11 +38,11 @@ class ProviderOperation(Model):
         'is_data_action': {'key': 'isDataAction', 'type': 'bool'},
     }
 
-    def __init__(self, name=None, display_name=None, description=None, origin=None, properties=None, is_data_action=None):
-        super(ProviderOperation, self).__init__()
-        self.name = name
-        self.display_name = display_name
-        self.description = description
-        self.origin = origin
-        self.properties = properties
-        self.is_data_action = is_data_action
+    def __init__(self, **kwargs):
+        super(ProviderOperation, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.display_name = kwargs.get('display_name', None)
+        self.description = kwargs.get('description', None)
+        self.origin = kwargs.get('origin', None)
+        self.properties = kwargs.get('properties', None)
+        self.is_data_action = kwargs.get('is_data_action', None)

azure-mgmt-authorization/azure/mgmt/authorization/models/provider_operation_py3.py

@@ -0,0 +1,48 @@
+# 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 ProviderOperation(Model):
+    """Operation.
+
+    :param name: The operation name.
+    :type name: str
+    :param display_name: The operation display name.
+    :type display_name: str
+    :param description: The operation description.
+    :type description: str
+    :param origin: The operation origin.
+    :type origin: str
+    :param properties: The operation properties.
+    :type properties: object
+    :param is_data_action: The dataAction flag to specify the operation type.
+    :type is_data_action: bool
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'display_name': {'key': 'displayName', 'type': 'str'},
+        'description': {'key': 'description', 'type': 'str'},
+        'origin': {'key': 'origin', 'type': 'str'},
+        'properties': {'key': 'properties', 'type': 'object'},
+        'is_data_action': {'key': 'isDataAction', 'type': 'bool'},
+    }
+
+    def __init__(self, *, name: str=None, display_name: str=None, description: str=None, origin: str=None, properties=None, is_data_action: bool=None, **kwargs) -> None:
+        super(ProviderOperation, self).__init__(**kwargs)
+        self.name = name
+        self.display_name = display_name
+        self.description = description
+        self.origin = origin
+        self.properties = properties
+        self.is_data_action = is_data_action

azure-mgmt-authorization/azure/mgmt/authorization/models/provider_operations_metadata.py

@@ -38,11 +38,11 @@ class ProviderOperationsMetadata(Model):
         'operations': {'key': 'operations', 'type': '[ProviderOperation]'},
     }
 
-    def __init__(self, id=None, name=None, type=None, display_name=None, resource_types=None, operations=None):
-        super(ProviderOperationsMetadata, self).__init__()
-        self.id = id
-        self.name = name
-        self.type = type
-        self.display_name = display_name
-        self.resource_types = resource_types
-        self.operations = operations
+    def __init__(self, **kwargs):
+        super(ProviderOperationsMetadata, self).__init__(**kwargs)
+        self.id = kwargs.get('id', None)
+        self.name = kwargs.get('name', None)
+        self.type = kwargs.get('type', None)
+        self.display_name = kwargs.get('display_name', None)
+        self.resource_types = kwargs.get('resource_types', None)
+        self.operations = kwargs.get('operations', None)

azure-mgmt-authorization/azure/mgmt/authorization/models/provider_operations_metadata_py3.py

@@ -0,0 +1,48 @@
+# 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 ProviderOperationsMetadata(Model):
+    """Provider Operations metadata.
+
+    :param id: The provider id.
+    :type id: str
+    :param name: The provider name.
+    :type name: str
+    :param type: The provider type.
+    :type type: str
+    :param display_name: The provider display name.
+    :type display_name: str
+    :param resource_types: The provider resource types
+    :type resource_types: list[~azure.mgmt.authorization.models.ResourceType]
+    :param operations: The provider operations.
+    :type operations: list[~azure.mgmt.authorization.models.ProviderOperation]
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'display_name': {'key': 'displayName', 'type': 'str'},
+        'resource_types': {'key': 'resourceTypes', 'type': '[ResourceType]'},
+        'operations': {'key': 'operations', 'type': '[ProviderOperation]'},
+    }
+
+    def __init__(self, *, id: str=None, name: str=None, type: str=None, display_name: str=None, resource_types=None, operations=None, **kwargs) -> None:
+        super(ProviderOperationsMetadata, self).__init__(**kwargs)
+        self.id = id
+        self.name = name
+        self.type = type
+        self.display_name = display_name
+        self.resource_types = resource_types
+        self.operations = operations

azure-mgmt-authorization/azure/mgmt/authorization/models/resource_type.py

@@ -29,8 +29,8 @@ class ResourceType(Model):
         'operations': {'key': 'operations', 'type': '[ProviderOperation]'},
     }
 
-    def __init__(self, name=None, display_name=None, operations=None):
-        super(ResourceType, self).__init__()
-        self.name = name
-        self.display_name = display_name
-        self.operations = operations
+    def __init__(self, **kwargs):
+        super(ResourceType, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.display_name = kwargs.get('display_name', None)
+        self.operations = kwargs.get('operations', None)

azure-mgmt-authorization/azure/mgmt/authorization/models/resource_type_py3.py

@@ -0,0 +1,36 @@
+# 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 ResourceType(Model):
+    """Resource Type.
+
+    :param name: The resource type name.
+    :type name: str
+    :param display_name: The resource type display name.
+    :type display_name: str
+    :param operations: The resource type operations.
+    :type operations: list[~azure.mgmt.authorization.models.ProviderOperation]
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'display_name': {'key': 'displayName', 'type': 'str'},
+        'operations': {'key': 'operations', 'type': '[ProviderOperation]'},
+    }
+
+    def __init__(self, *, name: str=None, display_name: str=None, operations=None, **kwargs) -> None:
+        super(ResourceType, self).__init__(**kwargs)
+        self.name = name
+        self.display_name = display_name
+        self.operations = operations

azure-mgmt-authorization/azure/mgmt/authorization/models/role_assignment.py

@@ -50,12 +50,12 @@ class RoleAssignment(Model):
         'can_delegate': {'key': 'properties.canDelegate', 'type': 'bool'},
     }
 
-    def __init__(self, scope=None, role_definition_id=None, principal_id=None, can_delegate=None):
-        super(RoleAssignment, self).__init__()
+    def __init__(self, **kwargs):
+        super(RoleAssignment, self).__init__(**kwargs)
         self.id = None
         self.name = None
         self.type = None
-        self.scope = scope
-        self.role_definition_id = role_definition_id
-        self.principal_id = principal_id
-        self.can_delegate = can_delegate
+        self.scope = kwargs.get('scope', None)
+        self.role_definition_id = kwargs.get('role_definition_id', None)
+        self.principal_id = kwargs.get('principal_id', None)
+        self.can_delegate = kwargs.get('can_delegate', None)

azure-mgmt-authorization/azure/mgmt/authorization/models/role_assignment_create_parameters.py

@@ -33,8 +33,8 @@ class RoleAssignmentCreateParameters(Model):
         'can_delegate': {'key': 'properties.canDelegate', 'type': 'bool'},
     }
 
-    def __init__(self, role_definition_id=None, principal_id=None, can_delegate=None):
-        super(RoleAssignmentCreateParameters, self).__init__()
-        self.role_definition_id = role_definition_id
-        self.principal_id = principal_id
-        self.can_delegate = can_delegate
+    def __init__(self, **kwargs):
+        super(RoleAssignmentCreateParameters, self).__init__(**kwargs)
+        self.role_definition_id = kwargs.get('role_definition_id', None)
+        self.principal_id = kwargs.get('principal_id', None)
+        self.can_delegate = kwargs.get('can_delegate', None)