From 75dd3d717a82e941ab70f4a0fe4f9a422b8d5df0 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Wed, 21 Feb 2018 10:39:47 -0800 Subject: [PATCH] [AutoPR authorization/resource-manager] fix the hardcoding of api version for classicadmin in powershell (#1993) * Generated from 80afa52b390ebc93e528ab47d32fe4f95bae49cf fix the hardcoding of api version for classicadmin in sdk * Generated from 228c368e8b1956804f353314932a9a506630e8dd fix 2017 version preview file --- .../classic_administrators_operations.py | 9 +++--- .../operations/permissions_operations.py | 8 +++-- ...provider_operations_metadata_operations.py | 8 +++-- .../operations/role_assignments_operations.py | 32 ++++++++++++------- .../operations/role_definitions_operations.py | 17 ++++++---- 5 files changed, 47 insertions(+), 27 deletions(-) diff --git a/azure-mgmt-authorization/azure/mgmt/authorization/operations/classic_administrators_operations.py b/azure-mgmt-authorization/azure/mgmt/authorization/operations/classic_administrators_operations.py index f07a3ce078e5..fc4ed72a0995 100644 --- a/azure-mgmt-authorization/azure/mgmt/authorization/operations/classic_administrators_operations.py +++ b/azure-mgmt-authorization/azure/mgmt/authorization/operations/classic_administrators_operations.py @@ -22,8 +22,8 @@ class ClassicAdministratorsOperations(object): :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. - :param deserializer: An objec model deserializer. - :ivar api_version: The API version to use for this operation. Constant value: "2015-07-01". + :param deserializer: An object model deserializer. + :ivar api_version: The API version to use for this operation. Constant value: "2015-06-01". """ models = models @@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2015-07-01" + self.api_version = "2015-06-01" self.config = config @@ -56,7 +56,7 @@ def internal_paging(next_link=None, raw=False): if not next_link: # Construct URL - url = '/subscriptions/{subscriptionId}/providers/Microsoft.Authorization/classicAdministrators' + url = self.list.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') } @@ -101,3 +101,4 @@ def internal_paging(next_link=None, raw=False): return client_raw_response return deserialized + list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Authorization/classicAdministrators'} diff --git a/azure-mgmt-authorization/azure/mgmt/authorization/operations/permissions_operations.py b/azure-mgmt-authorization/azure/mgmt/authorization/operations/permissions_operations.py index 5437ee64a31d..95c4ffd59806 100644 --- a/azure-mgmt-authorization/azure/mgmt/authorization/operations/permissions_operations.py +++ b/azure-mgmt-authorization/azure/mgmt/authorization/operations/permissions_operations.py @@ -22,7 +22,7 @@ class PermissionsOperations(object): :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. - :param deserializer: An objec model deserializer. + :param deserializer: An object model deserializer. :ivar api_version: The API version to use for this operation. Constant value: "2018-01-01-preview". """ @@ -57,7 +57,7 @@ def internal_paging(next_link=None, raw=False): if not next_link: # Construct URL - url = '/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Authorization/permissions' + url = self.list_for_resource_group.metadata['url'] path_format_arguments = { 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -103,6 +103,7 @@ def internal_paging(next_link=None, raw=False): return client_raw_response return deserialized + list_for_resource_group.metadata = {'url': '/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Authorization/permissions'} def list_for_resource( self, resource_group_name, resource_provider_namespace, parent_resource_path, resource_type, resource_name, custom_headers=None, raw=False, **operation_config): @@ -134,7 +135,7 @@ def internal_paging(next_link=None, raw=False): if not next_link: # Construct URL - url = '/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{parentResourcePath}/{resourceType}/{resourceName}/providers/Microsoft.Authorization/permissions' + url = self.list_for_resource.metadata['url'] path_format_arguments = { 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), 'resourceProviderNamespace': self._serialize.url("resource_provider_namespace", resource_provider_namespace, 'str'), @@ -184,3 +185,4 @@ def internal_paging(next_link=None, raw=False): return client_raw_response return deserialized + list_for_resource.metadata = {'url': '/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{parentResourcePath}/{resourceType}/{resourceName}/providers/Microsoft.Authorization/permissions'} diff --git a/azure-mgmt-authorization/azure/mgmt/authorization/operations/provider_operations_metadata_operations.py b/azure-mgmt-authorization/azure/mgmt/authorization/operations/provider_operations_metadata_operations.py index f378b8732657..79b5f349aa78 100644 --- a/azure-mgmt-authorization/azure/mgmt/authorization/operations/provider_operations_metadata_operations.py +++ b/azure-mgmt-authorization/azure/mgmt/authorization/operations/provider_operations_metadata_operations.py @@ -22,7 +22,7 @@ class ProviderOperationsMetadataOperations(object): :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. - :param deserializer: An objec model deserializer. + :param deserializer: An object model deserializer. :ivar api_version: The API version to use for this operation. Constant value: "2018-01-01-preview". """ @@ -57,7 +57,7 @@ def get( :raises: :class:`CloudError` """ # Construct URL - url = '/providers/Microsoft.Authorization/providerOperations/{resourceProviderNamespace}' + url = self.get.metadata['url'] path_format_arguments = { 'resourceProviderNamespace': self._serialize.url("resource_provider_namespace", resource_provider_namespace, 'str') } @@ -98,6 +98,7 @@ def get( return client_raw_response return deserialized + get.metadata = {'url': '/providers/Microsoft.Authorization/providerOperations/{resourceProviderNamespace}'} def list( self, expand="resourceTypes", custom_headers=None, raw=False, **operation_config): @@ -119,7 +120,7 @@ def internal_paging(next_link=None, raw=False): if not next_link: # Construct URL - url = '/providers/Microsoft.Authorization/providerOperations' + url = self.list.metadata['url'] # Construct parameters query_parameters = {} @@ -162,3 +163,4 @@ def internal_paging(next_link=None, raw=False): return client_raw_response return deserialized + list.metadata = {'url': '/providers/Microsoft.Authorization/providerOperations'} diff --git a/azure-mgmt-authorization/azure/mgmt/authorization/operations/role_assignments_operations.py b/azure-mgmt-authorization/azure/mgmt/authorization/operations/role_assignments_operations.py index 510b7ebf4ba0..0e162d28c1ef 100644 --- a/azure-mgmt-authorization/azure/mgmt/authorization/operations/role_assignments_operations.py +++ b/azure-mgmt-authorization/azure/mgmt/authorization/operations/role_assignments_operations.py @@ -22,7 +22,7 @@ class RoleAssignmentsOperations(object): :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. - :param deserializer: An objec model deserializer. + :param deserializer: An object model deserializer. :ivar api_version: The API version to use for this operation. Constant value: "2018-01-01-preview". """ @@ -72,7 +72,7 @@ def internal_paging(next_link=None, raw=False): if not next_link: # Construct URL - url = '/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{parentResourcePath}/{resourceType}/{resourceName}/providers/Microsoft.Authorization/roleAssignments' + url = self.list_for_resource.metadata['url'] path_format_arguments = { 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), 'resourceProviderNamespace': self._serialize.url("resource_provider_namespace", resource_provider_namespace, 'str'), @@ -124,6 +124,7 @@ def internal_paging(next_link=None, raw=False): return client_raw_response return deserialized + list_for_resource.metadata = {'url': '/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{parentResourcePath}/{resourceType}/{resourceName}/providers/Microsoft.Authorization/roleAssignments'} def list_for_resource_group( self, resource_group_name, filter=None, custom_headers=None, raw=False, **operation_config): @@ -150,7 +151,7 @@ def internal_paging(next_link=None, raw=False): if not next_link: # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Authorization/roleAssignments' + url = self.list_for_resource_group.metadata['url'] path_format_arguments = { 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -198,6 +199,7 @@ def internal_paging(next_link=None, raw=False): return client_raw_response return deserialized + list_for_resource_group.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Authorization/roleAssignments'} def delete( self, scope, role_assignment_name, custom_headers=None, raw=False, **operation_config): @@ -219,7 +221,7 @@ def delete( :raises: :class:`CloudError` """ # Construct URL - url = '/{scope}/providers/Microsoft.Authorization/roleAssignments/{roleAssignmentName}' + url = self.delete.metadata['url'] path_format_arguments = { 'scope': self._serialize.url("scope", scope, 'str', skip_quote=True), 'roleAssignmentName': self._serialize.url("role_assignment_name", role_assignment_name, 'str') @@ -259,6 +261,7 @@ def delete( return client_raw_response return deserialized + delete.metadata = {'url': '/{scope}/providers/Microsoft.Authorization/roleAssignments/{roleAssignmentName}'} def create( self, scope, role_assignment_name, parameters, custom_headers=None, raw=False, **operation_config): @@ -289,7 +292,7 @@ def create( :raises: :class:`CloudError` """ # Construct URL - url = '/{scope}/providers/Microsoft.Authorization/roleAssignments/{roleAssignmentName}' + url = self.create.metadata['url'] path_format_arguments = { 'scope': self._serialize.url("scope", scope, 'str', skip_quote=True), 'roleAssignmentName': self._serialize.url("role_assignment_name", role_assignment_name, 'str') @@ -333,6 +336,7 @@ def create( return client_raw_response return deserialized + create.metadata = {'url': '/{scope}/providers/Microsoft.Authorization/roleAssignments/{roleAssignmentName}'} def get( self, scope, role_assignment_name, custom_headers=None, raw=False, **operation_config): @@ -353,7 +357,7 @@ def get( :raises: :class:`CloudError` """ # Construct URL - url = '/{scope}/providers/Microsoft.Authorization/roleAssignments/{roleAssignmentName}' + url = self.get.metadata['url'] path_format_arguments = { 'scope': self._serialize.url("scope", scope, 'str', skip_quote=True), 'roleAssignmentName': self._serialize.url("role_assignment_name", role_assignment_name, 'str') @@ -393,6 +397,7 @@ def get( return client_raw_response return deserialized + get.metadata = {'url': '/{scope}/providers/Microsoft.Authorization/roleAssignments/{roleAssignmentName}'} def delete_by_id( self, role_id, custom_headers=None, raw=False, **operation_config): @@ -411,7 +416,7 @@ def delete_by_id( :raises: :class:`CloudError` """ # Construct URL - url = '/{roleId}' + url = self.delete_by_id.metadata['url'] path_format_arguments = { 'roleId': self._serialize.url("role_id", role_id, 'str', skip_quote=True) } @@ -450,6 +455,7 @@ def delete_by_id( return client_raw_response return deserialized + delete_by_id.metadata = {'url': '/{roleId}'} def create_by_id( self, role_id, parameters, custom_headers=None, raw=False, **operation_config): @@ -471,7 +477,7 @@ def create_by_id( :raises: :class:`CloudError` """ # Construct URL - url = '/{roleId}' + url = self.create_by_id.metadata['url'] path_format_arguments = { 'roleId': self._serialize.url("role_id", role_id, 'str', skip_quote=True) } @@ -514,6 +520,7 @@ def create_by_id( return client_raw_response return deserialized + create_by_id.metadata = {'url': '/{roleId}'} def get_by_id( self, role_id, custom_headers=None, raw=False, **operation_config): @@ -532,7 +539,7 @@ def get_by_id( :raises: :class:`CloudError` """ # Construct URL - url = '/{roleId}' + url = self.get_by_id.metadata['url'] path_format_arguments = { 'roleId': self._serialize.url("role_id", role_id, 'str', skip_quote=True) } @@ -571,6 +578,7 @@ def get_by_id( return client_raw_response return deserialized + get_by_id.metadata = {'url': '/{roleId}'} def list( self, filter=None, custom_headers=None, raw=False, **operation_config): @@ -595,7 +603,7 @@ def internal_paging(next_link=None, raw=False): if not next_link: # Construct URL - url = '/subscriptions/{subscriptionId}/providers/Microsoft.Authorization/roleAssignments' + url = self.list.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') } @@ -642,6 +650,7 @@ def internal_paging(next_link=None, raw=False): return client_raw_response return deserialized + list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Authorization/roleAssignments'} def list_for_scope( self, scope, filter=None, custom_headers=None, raw=False, **operation_config): @@ -668,7 +677,7 @@ def internal_paging(next_link=None, raw=False): if not next_link: # Construct URL - url = '/{scope}/providers/Microsoft.Authorization/roleAssignments' + url = self.list_for_scope.metadata['url'] path_format_arguments = { 'scope': self._serialize.url("scope", scope, 'str', skip_quote=True) } @@ -715,3 +724,4 @@ def internal_paging(next_link=None, raw=False): return client_raw_response return deserialized + list_for_scope.metadata = {'url': '/{scope}/providers/Microsoft.Authorization/roleAssignments'} diff --git a/azure-mgmt-authorization/azure/mgmt/authorization/operations/role_definitions_operations.py b/azure-mgmt-authorization/azure/mgmt/authorization/operations/role_definitions_operations.py index e6e1e474a139..0a20d15ca218 100644 --- a/azure-mgmt-authorization/azure/mgmt/authorization/operations/role_definitions_operations.py +++ b/azure-mgmt-authorization/azure/mgmt/authorization/operations/role_definitions_operations.py @@ -22,7 +22,7 @@ class RoleDefinitionsOperations(object): :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. - :param deserializer: An objec model deserializer. + :param deserializer: An object model deserializer. :ivar api_version: The API version to use for this operation. Constant value: "2018-01-01-preview". """ @@ -56,7 +56,7 @@ def delete( :raises: :class:`CloudError` """ # Construct URL - url = '/{scope}/providers/Microsoft.Authorization/roleDefinitions/{roleDefinitionId}' + url = self.delete.metadata['url'] path_format_arguments = { 'scope': self._serialize.url("scope", scope, 'str', skip_quote=True), 'roleDefinitionId': self._serialize.url("role_definition_id", role_definition_id, 'str') @@ -96,6 +96,7 @@ def delete( return client_raw_response return deserialized + delete.metadata = {'url': '/{scope}/providers/Microsoft.Authorization/roleDefinitions/{roleDefinitionId}'} def get( self, scope, role_definition_id, custom_headers=None, raw=False, **operation_config): @@ -116,7 +117,7 @@ def get( :raises: :class:`CloudError` """ # Construct URL - url = '/{scope}/providers/Microsoft.Authorization/roleDefinitions/{roleDefinitionId}' + url = self.get.metadata['url'] path_format_arguments = { 'scope': self._serialize.url("scope", scope, 'str', skip_quote=True), 'roleDefinitionId': self._serialize.url("role_definition_id", role_definition_id, 'str') @@ -156,6 +157,7 @@ def get( return client_raw_response return deserialized + get.metadata = {'url': '/{scope}/providers/Microsoft.Authorization/roleDefinitions/{roleDefinitionId}'} def create_or_update( self, scope, role_definition_id, role_definition, custom_headers=None, raw=False, **operation_config): @@ -178,7 +180,7 @@ def create_or_update( :raises: :class:`CloudError` """ # Construct URL - url = '/{scope}/providers/Microsoft.Authorization/roleDefinitions/{roleDefinitionId}' + url = self.create_or_update.metadata['url'] path_format_arguments = { 'scope': self._serialize.url("scope", scope, 'str', skip_quote=True), 'roleDefinitionId': self._serialize.url("role_definition_id", role_definition_id, 'str') @@ -222,6 +224,7 @@ def create_or_update( return client_raw_response return deserialized + create_or_update.metadata = {'url': '/{scope}/providers/Microsoft.Authorization/roleDefinitions/{roleDefinitionId}'} def list( self, scope, filter=None, custom_headers=None, raw=False, **operation_config): @@ -246,7 +249,7 @@ def internal_paging(next_link=None, raw=False): if not next_link: # Construct URL - url = '/{scope}/providers/Microsoft.Authorization/roleDefinitions' + url = self.list.metadata['url'] path_format_arguments = { 'scope': self._serialize.url("scope", scope, 'str', skip_quote=True) } @@ -293,6 +296,7 @@ def internal_paging(next_link=None, raw=False): return client_raw_response return deserialized + list.metadata = {'url': '/{scope}/providers/Microsoft.Authorization/roleDefinitions'} def get_by_id( self, role_id, custom_headers=None, raw=False, **operation_config): @@ -316,7 +320,7 @@ def get_by_id( :raises: :class:`CloudError` """ # Construct URL - url = '/{roleId}' + url = self.get_by_id.metadata['url'] path_format_arguments = { 'roleId': self._serialize.url("role_id", role_id, 'str', skip_quote=True) } @@ -355,3 +359,4 @@ def get_by_id( return client_raw_response return deserialized + get_by_id.metadata = {'url': '/{roleId}'}