[AutoPR authorization/resource-manager] Authorization cleaning

sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/_authorization_management_client.py

@@ -51,9 +51,9 @@ class AuthorizationManagementClient(MultiApiClientMixin, SDKClient):
     LATEST_PROFILE = ProfileDefinition({
         _PROFILE_TAG: {
             None: DEFAULT_API_VERSION,
-            'classic_administrators': '2015-06-01',
+            'classic_administrators': '2015-07-01',
             'deny_assignments': '2018-07-01-preview',
-            'elevate_access': '2015-07-01',
+            'global_administrator': '2015-07-01',
             'permissions': '2018-01-01-preview',
             'provider_operations_metadata': '2018-01-01-preview',
             'role_definitions': '2018-01-01-preview',
@@ -106,10 +106,13 @@ def classic_administrators(self):
         """Instance depends on the API version:
 
            * 2015-06-01: :class:`ClassicAdministratorsOperations<azure.mgmt.authorization.v2015_06_01.operations.ClassicAdministratorsOperations>`
+           * 2015-07-01: :class:`ClassicAdministratorsOperations<azure.mgmt.authorization.v2015_07_01.operations.ClassicAdministratorsOperations>`
         """
         api_version = self._get_api_version('classic_administrators')
         if api_version == '2015-06-01':
             from .v2015_06_01.operations import ClassicAdministratorsOperations as OperationClass
+        elif api_version == '2015-07-01':
+            from .v2015_07_01.operations import ClassicAdministratorsOperations as OperationClass
         else:
             raise NotImplementedError("APIVersion {} is not available".format(api_version))
         return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
@@ -128,14 +131,14 @@ def deny_assignments(self):
         return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
 
     @property
-    def elevate_access(self):
+    def global_administrator(self):
         """Instance depends on the API version:
 
-           * 2015-07-01: :class:`ElevateAccessOperations<azure.mgmt.authorization.v2015_07_01.operations.ElevateAccessOperations>`
+           * 2015-07-01: :class:`GlobalAdministratorOperations<azure.mgmt.authorization.v2015_07_01.operations.GlobalAdministratorOperations>`
         """
-        api_version = self._get_api_version('elevate_access')
+        api_version = self._get_api_version('global_administrator')
         if api_version == '2015-07-01':
-            from .v2015_07_01.operations import ElevateAccessOperations as OperationClass
+            from .v2015_07_01.operations import GlobalAdministratorOperations as OperationClass
         else:
             raise NotImplementedError("APIVersion {} is not available".format(api_version))
         return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))

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

@@ -4,7 +4,6 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-from .v2015_06_01.models import *
 from .v2015_07_01.models import *
 from .v2018_01_01_preview.models import *
 from .v2018_07_01_preview.models import *

sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_07_01/_authorization_management_client.py

@@ -14,10 +14,11 @@
 
 from ._configuration import AuthorizationManagementClientConfiguration
 from .operations import PermissionsOperations
+from .operations import RoleDefinitionsOperations
 from .operations import ProviderOperationsMetadataOperations
+from .operations import GlobalAdministratorOperations
 from .operations import RoleAssignmentsOperations
-from .operations import RoleDefinitionsOperations
-from .operations import ElevateAccessOperations
+from .operations import ClassicAdministratorsOperations
 from . import models
 
 
@@ -29,14 +30,16 @@ class AuthorizationManagementClient(SDKClient):
 
     :ivar permissions: Permissions operations
     :vartype permissions: azure.mgmt.authorization.v2015_07_01.operations.PermissionsOperations
+    :ivar role_definitions: RoleDefinitions operations
+    :vartype role_definitions: azure.mgmt.authorization.v2015_07_01.operations.RoleDefinitionsOperations
     :ivar provider_operations_metadata: ProviderOperationsMetadata operations
     :vartype provider_operations_metadata: azure.mgmt.authorization.v2015_07_01.operations.ProviderOperationsMetadataOperations
+    :ivar global_administrator: GlobalAdministrator operations
+    :vartype global_administrator: azure.mgmt.authorization.v2015_07_01.operations.GlobalAdministratorOperations
     :ivar role_assignments: RoleAssignments operations
     :vartype role_assignments: azure.mgmt.authorization.v2015_07_01.operations.RoleAssignmentsOperations
-    :ivar role_definitions: RoleDefinitions operations
-    :vartype role_definitions: azure.mgmt.authorization.v2015_07_01.operations.RoleDefinitionsOperations
-    :ivar elevate_access: ElevateAccess operations
-    :vartype elevate_access: azure.mgmt.authorization.v2015_07_01.operations.ElevateAccessOperations
+    :ivar classic_administrators: ClassicAdministrators operations
+    :vartype classic_administrators: azure.mgmt.authorization.v2015_07_01.operations.ClassicAdministratorsOperations
 
     :param credentials: Credentials needed for the client to connect to Azure.
     :type credentials: :mod:`A msrestazure Credentials
@@ -59,11 +62,13 @@ def __init__(
 
         self.permissions = PermissionsOperations(
             self._client, self.config, self._serialize, self._deserialize)
+        self.role_definitions = RoleDefinitionsOperations(
+            self._client, self.config, self._serialize, self._deserialize)
         self.provider_operations_metadata = ProviderOperationsMetadataOperations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.role_assignments = RoleAssignmentsOperations(
+        self.global_administrator = GlobalAdministratorOperations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.role_definitions = RoleDefinitionsOperations(
+        self.role_assignments = RoleAssignmentsOperations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.elevate_access = ElevateAccessOperations(
+        self.classic_administrators = ClassicAdministratorsOperations(
             self._client, self.config, self._serialize, self._deserialize)

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

@@ -10,6 +10,7 @@
 # --------------------------------------------------------------------------
 
 try:
+    from ._models_py3 import ClassicAdministrator
     from ._models_py3 import Permission
     from ._models_py3 import ProviderOperation
     from ._models_py3 import ProviderOperationsMetadata
@@ -21,8 +22,8 @@
     from ._models_py3 import RoleAssignmentPropertiesWithScope
     from ._models_py3 import RoleDefinition
     from ._models_py3 import RoleDefinitionFilter
-    from ._models_py3 import RoleDefinitionProperties
 except (SyntaxError, ImportError):
+    from ._models import ClassicAdministrator
     from ._models import Permission
     from ._models import ProviderOperation
     from ._models import ProviderOperationsMetadata
@@ -34,13 +35,14 @@
     from ._models import RoleAssignmentPropertiesWithScope
     from ._models import RoleDefinition
     from ._models import RoleDefinitionFilter
-    from ._models import RoleDefinitionProperties
+from ._paged_models import ClassicAdministratorPaged
 from ._paged_models import PermissionPaged
 from ._paged_models import ProviderOperationsMetadataPaged
 from ._paged_models import RoleAssignmentPaged
 from ._paged_models import RoleDefinitionPaged
 
 __all__ = [
+    'ClassicAdministrator',
     'Permission',
     'ProviderOperation',
     'ProviderOperationsMetadata',
@@ -52,9 +54,9 @@
     'RoleAssignmentPropertiesWithScope',
     'RoleDefinition',
     'RoleDefinitionFilter',
-    'RoleDefinitionProperties',
     'PermissionPaged',
+    'RoleDefinitionPaged',
     'ProviderOperationsMetadataPaged',
     'RoleAssignmentPaged',
-    'RoleDefinitionPaged',
+    'ClassicAdministratorPaged',
 ]

sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_07_01/models/_models.py

@@ -12,6 +12,38 @@
 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, **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)
+
+
 class CloudError(Model):
     """CloudError.
     """
@@ -278,9 +310,17 @@ class RoleDefinition(Model):
     :vartype name: str
     :ivar type: The role definition type.
     :vartype type: str
-    :param properties: Role definition properties.
-    :type properties:
-     ~azure.mgmt.authorization.v2015_07_01.models.RoleDefinitionProperties
+    :param role_name: The role name.
+    :type role_name: str
+    :param description: The role definition description.
+    :type description: str
+    :param role_type: The role type.
+    :type role_type: str
+    :param permissions: Role definition permissions.
+    :type permissions:
+     list[~azure.mgmt.authorization.v2015_07_01.models.Permission]
+    :param assignable_scopes: Role definition assignable scopes.
+    :type assignable_scopes: list[str]
     """
 
     _validation = {
@@ -293,15 +333,23 @@ class RoleDefinition(Model):
         'id': {'key': 'id', 'type': 'str'},
         'name': {'key': 'name', 'type': 'str'},
         'type': {'key': 'type', 'type': 'str'},
-        'properties': {'key': 'properties', 'type': 'RoleDefinitionProperties'},
+        'role_name': {'key': 'properties.roleName', 'type': 'str'},
+        'description': {'key': 'properties.description', 'type': 'str'},
+        'role_type': {'key': 'properties.type', 'type': 'str'},
+        'permissions': {'key': 'properties.permissions', 'type': '[Permission]'},
+        'assignable_scopes': {'key': 'properties.assignableScopes', 'type': '[str]'},
     }
 
     def __init__(self, **kwargs):
         super(RoleDefinition, self).__init__(**kwargs)
         self.id = None
         self.name = None
         self.type = None
-        self.properties = kwargs.get('properties', None)
+        self.role_name = kwargs.get('role_name', None)
+        self.description = kwargs.get('description', None)
+        self.role_type = kwargs.get('role_type', None)
+        self.permissions = kwargs.get('permissions', None)
+        self.assignable_scopes = kwargs.get('assignable_scopes', None)
 
 
 class RoleDefinitionFilter(Model):
@@ -318,36 +366,3 @@ class RoleDefinitionFilter(Model):
     def __init__(self, **kwargs):
         super(RoleDefinitionFilter, self).__init__(**kwargs)
         self.role_name = kwargs.get('role_name', None)
-
-
-class RoleDefinitionProperties(Model):
-    """Role definition properties.
-
-    :param role_name: The role name.
-    :type role_name: str
-    :param description: The role definition description.
-    :type description: str
-    :param type: The role type.
-    :type type: str
-    :param permissions: Role definition permissions.
-    :type permissions:
-     list[~azure.mgmt.authorization.v2015_07_01.models.Permission]
-    :param assignable_scopes: Role definition assignable scopes.
-    :type assignable_scopes: list[str]
-    """
-
-    _attribute_map = {
-        'role_name': {'key': 'roleName', 'type': 'str'},
-        'description': {'key': 'description', 'type': 'str'},
-        'type': {'key': 'type', 'type': 'str'},
-        'permissions': {'key': 'permissions', 'type': '[Permission]'},
-        'assignable_scopes': {'key': 'assignableScopes', 'type': '[str]'},
-    }
-
-    def __init__(self, **kwargs):
-        super(RoleDefinitionProperties, self).__init__(**kwargs)
-        self.role_name = kwargs.get('role_name', None)
-        self.description = kwargs.get('description', None)
-        self.type = kwargs.get('type', None)
-        self.permissions = kwargs.get('permissions', None)
-        self.assignable_scopes = kwargs.get('assignable_scopes', None)

sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_07_01/models/_models_py3.py

@@ -12,6 +12,38 @@
 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
+
+
 class CloudError(Model):
     """CloudError.
     """
@@ -278,9 +310,17 @@ class RoleDefinition(Model):
     :vartype name: str
     :ivar type: The role definition type.
     :vartype type: str
-    :param properties: Role definition properties.
-    :type properties:
-     ~azure.mgmt.authorization.v2015_07_01.models.RoleDefinitionProperties
+    :param role_name: The role name.
+    :type role_name: str
+    :param description: The role definition description.
+    :type description: str
+    :param role_type: The role type.
+    :type role_type: str
+    :param permissions: Role definition permissions.
+    :type permissions:
+     list[~azure.mgmt.authorization.v2015_07_01.models.Permission]
+    :param assignable_scopes: Role definition assignable scopes.
+    :type assignable_scopes: list[str]
     """
 
     _validation = {
@@ -293,15 +333,23 @@ class RoleDefinition(Model):
         'id': {'key': 'id', 'type': 'str'},
         'name': {'key': 'name', 'type': 'str'},
         'type': {'key': 'type', 'type': 'str'},
-        'properties': {'key': 'properties', 'type': 'RoleDefinitionProperties'},
+        'role_name': {'key': 'properties.roleName', 'type': 'str'},
+        'description': {'key': 'properties.description', 'type': 'str'},
+        'role_type': {'key': 'properties.type', 'type': 'str'},
+        'permissions': {'key': 'properties.permissions', 'type': '[Permission]'},
+        'assignable_scopes': {'key': 'properties.assignableScopes', 'type': '[str]'},
     }
 
-    def __init__(self, *, properties=None, **kwargs) -> None:
+    def __init__(self, *, role_name: str=None, description: str=None, role_type: str=None, permissions=None, assignable_scopes=None, **kwargs) -> None:
         super(RoleDefinition, self).__init__(**kwargs)
         self.id = None
         self.name = None
         self.type = None
-        self.properties = properties
+        self.role_name = role_name
+        self.description = description
+        self.role_type = role_type
+        self.permissions = permissions
+        self.assignable_scopes = assignable_scopes
 
 
 class RoleDefinitionFilter(Model):
@@ -318,36 +366,3 @@ class RoleDefinitionFilter(Model):
     def __init__(self, *, role_name: str=None, **kwargs) -> None:
         super(RoleDefinitionFilter, self).__init__(**kwargs)
         self.role_name = role_name
-
-
-class RoleDefinitionProperties(Model):
-    """Role definition properties.
-
-    :param role_name: The role name.
-    :type role_name: str
-    :param description: The role definition description.
-    :type description: str
-    :param type: The role type.
-    :type type: str
-    :param permissions: Role definition permissions.
-    :type permissions:
-     list[~azure.mgmt.authorization.v2015_07_01.models.Permission]
-    :param assignable_scopes: Role definition assignable scopes.
-    :type assignable_scopes: list[str]
-    """
-
-    _attribute_map = {
-        'role_name': {'key': 'roleName', 'type': 'str'},
-        'description': {'key': 'description', 'type': 'str'},
-        'type': {'key': 'type', 'type': 'str'},
-        'permissions': {'key': 'permissions', 'type': '[Permission]'},
-        'assignable_scopes': {'key': 'assignableScopes', 'type': '[str]'},
-    }
-
-    def __init__(self, *, role_name: str=None, description: str=None, type: str=None, permissions=None, assignable_scopes=None, **kwargs) -> None:
-        super(RoleDefinitionProperties, self).__init__(**kwargs)
-        self.role_name = role_name
-        self.description = description
-        self.type = type
-        self.permissions = permissions
-        self.assignable_scopes = assignable_scopes