diff --git a/sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/_authorization_management_client.py b/sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/_authorization_management_client.py index 9cab7b0e4768..5661b57e0ad0 100644 --- a/sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/_authorization_management_client.py +++ b/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` + * 2015-07-01: :class:`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` + * 2015-07-01: :class:`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))) diff --git a/sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/models.py b/sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/models.py index dceaa8552a97..67d7145b417b 100644 --- a/sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/models.py +++ b/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 * diff --git a/sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_07_01/_authorization_management_client.py b/sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_07_01/_authorization_management_client.py index 6b2fdb716e61..ff1aa7b74037 100644 --- a/sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_07_01/_authorization_management_client.py +++ b/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) diff --git a/sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_07_01/models/__init__.py b/sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_07_01/models/__init__.py index f4da65616dc7..fb1c4770e5ee 100644 --- a/sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_07_01/models/__init__.py +++ b/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', ] diff --git a/sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_07_01/models/_models.py b/sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_07_01/models/_models.py index 6a03d7d4f0ad..96194e05896a 100644 --- a/sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_07_01/models/_models.py +++ b/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,7 +333,11 @@ 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): @@ -301,7 +345,11 @@ def __init__(self, **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) diff --git a/sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_07_01/models/_models_py3.py b/sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_07_01/models/_models_py3.py index 8ddbb235c601..9587447a649b 100644 --- a/sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_07_01/models/_models_py3.py +++ b/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 diff --git a/sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_07_01/models/_paged_models.py b/sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_07_01/models/_paged_models.py index 94999c098b24..2fd2e9e174ee 100644 --- a/sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_07_01/models/_paged_models.py +++ b/sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_07_01/models/_paged_models.py @@ -25,6 +25,19 @@ class PermissionPaged(Paged): def __init__(self, *args, **kwargs): super(PermissionPaged, self).__init__(*args, **kwargs) +class RoleDefinitionPaged(Paged): + """ + A paging container for iterating over a list of :class:`RoleDefinition ` object + """ + + _attribute_map = { + 'next_link': {'key': 'nextLink', 'type': 'str'}, + 'current_page': {'key': 'value', 'type': '[RoleDefinition]'} + } + + def __init__(self, *args, **kwargs): + + super(RoleDefinitionPaged, self).__init__(*args, **kwargs) class ProviderOperationsMetadataPaged(Paged): """ A paging container for iterating over a list of :class:`ProviderOperationsMetadata ` object @@ -51,16 +64,16 @@ class RoleAssignmentPaged(Paged): def __init__(self, *args, **kwargs): super(RoleAssignmentPaged, self).__init__(*args, **kwargs) -class RoleDefinitionPaged(Paged): +class ClassicAdministratorPaged(Paged): """ - A paging container for iterating over a list of :class:`RoleDefinition ` object + A paging container for iterating over a list of :class:`ClassicAdministrator ` object """ _attribute_map = { 'next_link': {'key': 'nextLink', 'type': 'str'}, - 'current_page': {'key': 'value', 'type': '[RoleDefinition]'} + 'current_page': {'key': 'value', 'type': '[ClassicAdministrator]'} } def __init__(self, *args, **kwargs): - super(RoleDefinitionPaged, self).__init__(*args, **kwargs) + super(ClassicAdministratorPaged, self).__init__(*args, **kwargs) diff --git a/sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_07_01/operations/__init__.py b/sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_07_01/operations/__init__.py index d02f00723f7e..0c0b3d27eb40 100644 --- a/sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_07_01/operations/__init__.py +++ b/sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_07_01/operations/__init__.py @@ -10,15 +10,17 @@ # -------------------------------------------------------------------------- from ._permissions_operations import PermissionsOperations +from ._role_definitions_operations import RoleDefinitionsOperations from ._provider_operations_metadata_operations import ProviderOperationsMetadataOperations +from ._global_administrator_operations import GlobalAdministratorOperations from ._role_assignments_operations import RoleAssignmentsOperations -from ._role_definitions_operations import RoleDefinitionsOperations -from ._elevate_access_operations import ElevateAccessOperations +from ._classic_administrators_operations import ClassicAdministratorsOperations __all__ = [ 'PermissionsOperations', + 'RoleDefinitionsOperations', 'ProviderOperationsMetadataOperations', + 'GlobalAdministratorOperations', 'RoleAssignmentsOperations', - 'RoleDefinitionsOperations', - 'ElevateAccessOperations', + 'ClassicAdministratorsOperations', ] diff --git a/sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_07_01/operations/_classic_administrators_operations.py b/sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_07_01/operations/_classic_administrators_operations.py new file mode 100644 index 000000000000..ebfa6a4c84e5 --- /dev/null +++ b/sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_07_01/operations/_classic_administrators_operations.py @@ -0,0 +1,107 @@ +# 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. +# -------------------------------------------------------------------------- + +import uuid +from msrest.pipeline import ClientRawResponse +from msrestazure.azure_exceptions import CloudError + +from .. import models + + +class ClassicAdministratorsOperations(object): + """ClassicAdministratorsOperations operations. + + You should not instantiate directly this class, but create a Client instance that will create it for you and attach it as attribute. + + :param client: Client for service requests. + :param config: Configuration of service client. + :param serializer: An object model serializer. + :param deserializer: An object model deserializer. + """ + + models = models + + def __init__(self, client, config, serializer, deserializer): + + self._client = client + self._serialize = serializer + self._deserialize = deserializer + + self.config = config + + def list( + self, api_version, custom_headers=None, raw=False, **operation_config): + """Gets service administrator, account administrator, and + co-administrators for the subscription. + + :param api_version: The API version to use for this operation. + :type api_version: str + :param dict custom_headers: headers that will be added to the request + :param bool raw: returns the direct response alongside the + deserialized response + :param operation_config: :ref:`Operation configuration + overrides`. + :return: An iterator like instance of ClassicAdministrator + :rtype: + ~azure.mgmt.authorization.v2015_07_01.models.ClassicAdministratorPaged[~azure.mgmt.authorization.v2015_07_01.models.ClassicAdministrator] + :raises: :class:`CloudError` + """ + def prepare_request(next_link=None): + if not next_link: + # Construct URL + url = self.list.metadata['url'] + path_format_arguments = { + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str') + + else: + url = next_link + query_parameters = {} + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct and send request + request = self._client.get(url, query_parameters, header_parameters) + return request + + def internal_paging(next_link=None): + request = prepare_request(next_link) + + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp + + return response + + # Deserialize response + header_dict = None + if raw: + header_dict = {} + deserialized = models.ClassicAdministratorPaged(internal_paging, self._deserialize.dependencies, header_dict) + + return deserialized + list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Authorization/classicAdministrators'} diff --git a/sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_07_01/operations/_elevate_access_operations.py b/sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_07_01/operations/_global_administrator_operations.py similarity index 92% rename from sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_07_01/operations/_elevate_access_operations.py rename to sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_07_01/operations/_global_administrator_operations.py index a03c45f5a843..78b1739ca7a7 100644 --- a/sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_07_01/operations/_elevate_access_operations.py +++ b/sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_07_01/operations/_global_administrator_operations.py @@ -16,8 +16,8 @@ from .. import models -class ElevateAccessOperations(object): - """ElevateAccessOperations operations. +class GlobalAdministratorOperations(object): + """GlobalAdministratorOperations operations. You should not instantiate directly this class, but create a Client instance that will create it for you and attach it as attribute. @@ -39,7 +39,7 @@ def __init__(self, client, config, serializer, deserializer): self.config = config - def post( + def elevate_access( self, custom_headers=None, raw=False, **operation_config): """Elevates access for a Global Administrator. @@ -53,7 +53,7 @@ def post( :raises: :class:`CloudError` """ # Construct URL - url = self.post.metadata['url'] + url = self.elevate_access.metadata['url'] # Construct parameters query_parameters = {} @@ -80,4 +80,4 @@ def post( if raw: client_raw_response = ClientRawResponse(None, response) return client_raw_response - post.metadata = {'url': '/providers/Microsoft.Authorization/elevateAccess'} + elevate_access.metadata = {'url': '/providers/Microsoft.Authorization/elevateAccess'} diff --git a/sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_07_01/operations/_role_definitions_operations.py b/sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_07_01/operations/_role_definitions_operations.py index 71c00b582014..3af909bb9218 100644 --- a/sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_07_01/operations/_role_definitions_operations.py +++ b/sdk/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_07_01/operations/_role_definitions_operations.py @@ -160,16 +160,16 @@ def get( get.metadata = {'url': '/{scope}/providers/Microsoft.Authorization/roleDefinitions/{roleDefinitionId}'} def create_or_update( - self, scope, role_definition_id, properties=None, custom_headers=None, raw=False, **operation_config): + self, scope, role_definition_id, role_definition, custom_headers=None, raw=False, **operation_config): """Creates or updates a role definition. :param scope: The scope of the role definition. :type scope: str :param role_definition_id: The ID of the role definition. :type role_definition_id: str - :param properties: Role definition properties. - :type properties: - ~azure.mgmt.authorization.v2015_07_01.models.RoleDefinitionProperties + :param role_definition: The values for the role definition. + :type role_definition: + ~azure.mgmt.authorization.v2015_07_01.models.RoleDefinition :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -180,8 +180,6 @@ def create_or_update( ~msrest.pipeline.ClientRawResponse :raises: :class:`CloudError` """ - role_definition = models.RoleDefinition(properties=properties) - # Construct URL url = self.create_or_update.metadata['url'] path_format_arguments = {