From 35956ea1a04e12e979bb667c87cc01ea096c6284 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Fri, 20 Jul 2018 03:51:36 +0000 Subject: [PATCH 1/2] Generated from 7882bc39a752f3adf4c47186c926094ab65cedc9 [Storage] Set the SignedResource as optional in ListServiceSAS --- .../azure/mgmt/storage/v2017_06_01/models/restriction.py | 4 ++-- .../mgmt/storage/v2017_06_01/models/restriction_py3.py | 4 ++-- .../azure/mgmt/storage/v2017_10_01/models/restriction.py | 4 ++-- .../mgmt/storage/v2017_10_01/models/restriction_py3.py | 4 ++-- .../azure/mgmt/storage/v2018_02_01/models/restriction.py | 4 ++-- .../mgmt/storage/v2018_02_01/models/restriction_py3.py | 4 ++-- .../storage/v2018_02_01/models/service_sas_parameters.py | 7 +++---- .../v2018_02_01/models/service_sas_parameters_py3.py | 9 ++++----- .../storage/v2018_03_01_preview/models/restriction.py | 4 ++-- .../v2018_03_01_preview/models/restriction_py3.py | 4 ++-- .../v2018_03_01_preview/models/service_sas_parameters.py | 7 +++---- .../models/service_sas_parameters_py3.py | 9 ++++----- 12 files changed, 30 insertions(+), 34 deletions(-) diff --git a/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/models/restriction.py b/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/models/restriction.py index fbbca74ff6a1..d747e73cdbcc 100644 --- a/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/models/restriction.py +++ b/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/models/restriction.py @@ -25,9 +25,9 @@ class Restriction(Model): location. This would be different locations where the SKU is restricted. :vartype values: list[str] :param reason_code: The reason for the restriction. As of now this can be - “QuotaId” or “NotAvailableForSubscription”. Quota Id is set when the SKU + "QuotaId" or "NotAvailableForSubscription". Quota Id is set when the SKU has requiredQuotas parameter as the subscription does not belong to that - quota. The “NotAvailableForSubscription” is related to capacity at DC. + quota. The "NotAvailableForSubscription" is related to capacity at DC. Possible values include: 'QuotaId', 'NotAvailableForSubscription' :type reason_code: str or ~azure.mgmt.storage.v2017_06_01.models.ReasonCode diff --git a/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/models/restriction_py3.py b/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/models/restriction_py3.py index 762ae8e58374..591a87f8331e 100644 --- a/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/models/restriction_py3.py +++ b/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/models/restriction_py3.py @@ -25,9 +25,9 @@ class Restriction(Model): location. This would be different locations where the SKU is restricted. :vartype values: list[str] :param reason_code: The reason for the restriction. As of now this can be - “QuotaId” or “NotAvailableForSubscription”. Quota Id is set when the SKU + "QuotaId" or "NotAvailableForSubscription". Quota Id is set when the SKU has requiredQuotas parameter as the subscription does not belong to that - quota. The “NotAvailableForSubscription” is related to capacity at DC. + quota. The "NotAvailableForSubscription" is related to capacity at DC. Possible values include: 'QuotaId', 'NotAvailableForSubscription' :type reason_code: str or ~azure.mgmt.storage.v2017_06_01.models.ReasonCode diff --git a/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/models/restriction.py b/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/models/restriction.py index 8379a99eeab3..049bdfb180dc 100644 --- a/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/models/restriction.py +++ b/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/models/restriction.py @@ -25,9 +25,9 @@ class Restriction(Model): location. This would be different locations where the SKU is restricted. :vartype values: list[str] :param reason_code: The reason for the restriction. As of now this can be - “QuotaId” or “NotAvailableForSubscription”. Quota Id is set when the SKU + "QuotaId" or "NotAvailableForSubscription". Quota Id is set when the SKU has requiredQuotas parameter as the subscription does not belong to that - quota. The “NotAvailableForSubscription” is related to capacity at DC. + quota. The "NotAvailableForSubscription" is related to capacity at DC. Possible values include: 'QuotaId', 'NotAvailableForSubscription' :type reason_code: str or ~azure.mgmt.storage.v2017_10_01.models.ReasonCode diff --git a/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/models/restriction_py3.py b/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/models/restriction_py3.py index 6ce9d0560adc..b16d1f57e121 100644 --- a/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/models/restriction_py3.py +++ b/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/models/restriction_py3.py @@ -25,9 +25,9 @@ class Restriction(Model): location. This would be different locations where the SKU is restricted. :vartype values: list[str] :param reason_code: The reason for the restriction. As of now this can be - “QuotaId” or “NotAvailableForSubscription”. Quota Id is set when the SKU + "QuotaId" or "NotAvailableForSubscription". Quota Id is set when the SKU has requiredQuotas parameter as the subscription does not belong to that - quota. The “NotAvailableForSubscription” is related to capacity at DC. + quota. The "NotAvailableForSubscription" is related to capacity at DC. Possible values include: 'QuotaId', 'NotAvailableForSubscription' :type reason_code: str or ~azure.mgmt.storage.v2017_10_01.models.ReasonCode diff --git a/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/models/restriction.py b/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/models/restriction.py index 9201ec225a1e..cf31a04598b9 100644 --- a/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/models/restriction.py +++ b/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/models/restriction.py @@ -25,9 +25,9 @@ class Restriction(Model): location. This would be different locations where the SKU is restricted. :vartype values: list[str] :param reason_code: The reason for the restriction. As of now this can be - “QuotaId” or “NotAvailableForSubscription”. Quota Id is set when the SKU + "QuotaId" or "NotAvailableForSubscription". Quota Id is set when the SKU has requiredQuotas parameter as the subscription does not belong to that - quota. The “NotAvailableForSubscription” is related to capacity at DC. + quota. The "NotAvailableForSubscription" is related to capacity at DC. Possible values include: 'QuotaId', 'NotAvailableForSubscription' :type reason_code: str or ~azure.mgmt.storage.v2018_02_01.models.ReasonCode diff --git a/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/models/restriction_py3.py b/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/models/restriction_py3.py index e081f446828e..e88e4e13b885 100644 --- a/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/models/restriction_py3.py +++ b/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/models/restriction_py3.py @@ -25,9 +25,9 @@ class Restriction(Model): location. This would be different locations where the SKU is restricted. :vartype values: list[str] :param reason_code: The reason for the restriction. As of now this can be - “QuotaId” or “NotAvailableForSubscription”. Quota Id is set when the SKU + "QuotaId" or "NotAvailableForSubscription". Quota Id is set when the SKU has requiredQuotas parameter as the subscription does not belong to that - quota. The “NotAvailableForSubscription” is related to capacity at DC. + quota. The "NotAvailableForSubscription" is related to capacity at DC. Possible values include: 'QuotaId', 'NotAvailableForSubscription' :type reason_code: str or ~azure.mgmt.storage.v2018_02_01.models.ReasonCode diff --git a/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/models/service_sas_parameters.py b/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/models/service_sas_parameters.py index e53925809343..1ae433c61257 100644 --- a/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/models/service_sas_parameters.py +++ b/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/models/service_sas_parameters.py @@ -20,9 +20,9 @@ class ServiceSasParameters(Model): :param canonicalized_resource: Required. The canonical path to the signed resource. :type canonicalized_resource: str - :param resource: Required. The signed services accessible with the service - SAS. Possible values include: Blob (b), Container (c), File (f), Share - (s). Possible values include: 'b', 'c', 'f', 's' + :param resource: The signed services accessible with the service SAS. + Possible values include: Blob (b), Container (c), File (f), Share (s). + Possible values include: 'b', 'c', 'f', 's' :type resource: str or ~azure.mgmt.storage.v2018_02_01.models.SignedResource :param permissions: The signed permissions for the service SAS. Possible @@ -74,7 +74,6 @@ class ServiceSasParameters(Model): _validation = { 'canonicalized_resource': {'required': True}, - 'resource': {'required': True}, 'identifier': {'max_length': 64}, } diff --git a/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/models/service_sas_parameters_py3.py b/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/models/service_sas_parameters_py3.py index aa7283ec6230..11b3aa19fa1c 100644 --- a/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/models/service_sas_parameters_py3.py +++ b/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/models/service_sas_parameters_py3.py @@ -20,9 +20,9 @@ class ServiceSasParameters(Model): :param canonicalized_resource: Required. The canonical path to the signed resource. :type canonicalized_resource: str - :param resource: Required. The signed services accessible with the service - SAS. Possible values include: Blob (b), Container (c), File (f), Share - (s). Possible values include: 'b', 'c', 'f', 's' + :param resource: The signed services accessible with the service SAS. + Possible values include: Blob (b), Container (c), File (f), Share (s). + Possible values include: 'b', 'c', 'f', 's' :type resource: str or ~azure.mgmt.storage.v2018_02_01.models.SignedResource :param permissions: The signed permissions for the service SAS. Possible @@ -74,7 +74,6 @@ class ServiceSasParameters(Model): _validation = { 'canonicalized_resource': {'required': True}, - 'resource': {'required': True}, 'identifier': {'max_length': 64}, } @@ -99,7 +98,7 @@ class ServiceSasParameters(Model): 'content_type': {'key': 'rsct', 'type': 'str'}, } - def __init__(self, *, canonicalized_resource: str, resource, permissions=None, ip_address_or_range: str=None, protocols=None, shared_access_start_time=None, shared_access_expiry_time=None, identifier: str=None, partition_key_start: str=None, partition_key_end: str=None, row_key_start: str=None, row_key_end: str=None, key_to_sign: str=None, cache_control: str=None, content_disposition: str=None, content_encoding: str=None, content_language: str=None, content_type: str=None, **kwargs) -> None: + def __init__(self, *, canonicalized_resource: str, resource=None, permissions=None, ip_address_or_range: str=None, protocols=None, shared_access_start_time=None, shared_access_expiry_time=None, identifier: str=None, partition_key_start: str=None, partition_key_end: str=None, row_key_start: str=None, row_key_end: str=None, key_to_sign: str=None, cache_control: str=None, content_disposition: str=None, content_encoding: str=None, content_language: str=None, content_type: str=None, **kwargs) -> None: super(ServiceSasParameters, self).__init__(**kwargs) self.canonicalized_resource = canonicalized_resource self.resource = resource diff --git a/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/models/restriction.py b/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/models/restriction.py index 68f70bfe33d8..b2030048d2d5 100644 --- a/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/models/restriction.py +++ b/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/models/restriction.py @@ -25,9 +25,9 @@ class Restriction(Model): location. This would be different locations where the SKU is restricted. :vartype values: list[str] :param reason_code: The reason for the restriction. As of now this can be - “QuotaId” or “NotAvailableForSubscription”. Quota Id is set when the SKU + "QuotaId" or "NotAvailableForSubscription". Quota Id is set when the SKU has requiredQuotas parameter as the subscription does not belong to that - quota. The “NotAvailableForSubscription” is related to capacity at DC. + quota. The "NotAvailableForSubscription" is related to capacity at DC. Possible values include: 'QuotaId', 'NotAvailableForSubscription' :type reason_code: str or ~azure.mgmt.storage.v2018_03_01_preview.models.ReasonCode diff --git a/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/models/restriction_py3.py b/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/models/restriction_py3.py index 02d8fda6fd96..9ae6333a5304 100644 --- a/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/models/restriction_py3.py +++ b/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/models/restriction_py3.py @@ -25,9 +25,9 @@ class Restriction(Model): location. This would be different locations where the SKU is restricted. :vartype values: list[str] :param reason_code: The reason for the restriction. As of now this can be - “QuotaId” or “NotAvailableForSubscription”. Quota Id is set when the SKU + "QuotaId" or "NotAvailableForSubscription". Quota Id is set when the SKU has requiredQuotas parameter as the subscription does not belong to that - quota. The “NotAvailableForSubscription” is related to capacity at DC. + quota. The "NotAvailableForSubscription" is related to capacity at DC. Possible values include: 'QuotaId', 'NotAvailableForSubscription' :type reason_code: str or ~azure.mgmt.storage.v2018_03_01_preview.models.ReasonCode diff --git a/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/models/service_sas_parameters.py b/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/models/service_sas_parameters.py index 736424ddc9c3..947fe63484a8 100644 --- a/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/models/service_sas_parameters.py +++ b/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/models/service_sas_parameters.py @@ -20,9 +20,9 @@ class ServiceSasParameters(Model): :param canonicalized_resource: Required. The canonical path to the signed resource. :type canonicalized_resource: str - :param resource: Required. The signed services accessible with the service - SAS. Possible values include: Blob (b), Container (c), File (f), Share - (s). Possible values include: 'b', 'c', 'f', 's' + :param resource: The signed services accessible with the service SAS. + Possible values include: Blob (b), Container (c), File (f), Share (s). + Possible values include: 'b', 'c', 'f', 's' :type resource: str or ~azure.mgmt.storage.v2018_03_01_preview.models.SignedResource :param permissions: The signed permissions for the service SAS. Possible @@ -74,7 +74,6 @@ class ServiceSasParameters(Model): _validation = { 'canonicalized_resource': {'required': True}, - 'resource': {'required': True}, 'identifier': {'max_length': 64}, } diff --git a/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/models/service_sas_parameters_py3.py b/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/models/service_sas_parameters_py3.py index e1bc7bc90e0e..44f93897d2a7 100644 --- a/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/models/service_sas_parameters_py3.py +++ b/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/models/service_sas_parameters_py3.py @@ -20,9 +20,9 @@ class ServiceSasParameters(Model): :param canonicalized_resource: Required. The canonical path to the signed resource. :type canonicalized_resource: str - :param resource: Required. The signed services accessible with the service - SAS. Possible values include: Blob (b), Container (c), File (f), Share - (s). Possible values include: 'b', 'c', 'f', 's' + :param resource: The signed services accessible with the service SAS. + Possible values include: Blob (b), Container (c), File (f), Share (s). + Possible values include: 'b', 'c', 'f', 's' :type resource: str or ~azure.mgmt.storage.v2018_03_01_preview.models.SignedResource :param permissions: The signed permissions for the service SAS. Possible @@ -74,7 +74,6 @@ class ServiceSasParameters(Model): _validation = { 'canonicalized_resource': {'required': True}, - 'resource': {'required': True}, 'identifier': {'max_length': 64}, } @@ -99,7 +98,7 @@ class ServiceSasParameters(Model): 'content_type': {'key': 'rsct', 'type': 'str'}, } - def __init__(self, *, canonicalized_resource: str, resource, permissions=None, ip_address_or_range: str=None, protocols=None, shared_access_start_time=None, shared_access_expiry_time=None, identifier: str=None, partition_key_start: str=None, partition_key_end: str=None, row_key_start: str=None, row_key_end: str=None, key_to_sign: str=None, cache_control: str=None, content_disposition: str=None, content_encoding: str=None, content_language: str=None, content_type: str=None, **kwargs) -> None: + def __init__(self, *, canonicalized_resource: str, resource=None, permissions=None, ip_address_or_range: str=None, protocols=None, shared_access_start_time=None, shared_access_expiry_time=None, identifier: str=None, partition_key_start: str=None, partition_key_end: str=None, row_key_start: str=None, row_key_end: str=None, key_to_sign: str=None, cache_control: str=None, content_disposition: str=None, content_encoding: str=None, content_language: str=None, content_type: str=None, **kwargs) -> None: super(ServiceSasParameters, self).__init__(**kwargs) self.canonicalized_resource = canonicalized_resource self.resource = resource From a70e2667e7afb49e9755020d0408c39522503b90 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Mon, 23 Jul 2018 06:15:36 +0000 Subject: [PATCH 2/2] Generated from b36d0991a7cc9a7185fc6b7d7ef6919f63435234 [Storage] Fix a format issue. --- .../mgmt/storage/v2018_02_01/models/operation_display.py | 4 ++++ .../storage/v2018_02_01/models/operation_display_py3.py | 6 +++++- .../storage/v2018_03_01_preview/models/operation_display.py | 4 ++++ .../v2018_03_01_preview/models/operation_display_py3.py | 6 +++++- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/models/operation_display.py b/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/models/operation_display.py index 12d72186c4f2..029cfa2a8304 100644 --- a/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/models/operation_display.py +++ b/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/models/operation_display.py @@ -21,12 +21,15 @@ class OperationDisplay(Model): :type resource: str :param operation: Type of operation: get, read, delete, etc. :type operation: str + :param description: Description of the operation. + :type description: str """ _attribute_map = { 'provider': {'key': 'provider', 'type': 'str'}, 'resource': {'key': 'resource', 'type': 'str'}, 'operation': {'key': 'operation', 'type': 'str'}, + 'description': {'key': 'description', 'type': 'str'}, } def __init__(self, **kwargs): @@ -34,3 +37,4 @@ def __init__(self, **kwargs): self.provider = kwargs.get('provider', None) self.resource = kwargs.get('resource', None) self.operation = kwargs.get('operation', None) + self.description = kwargs.get('description', None) diff --git a/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/models/operation_display_py3.py b/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/models/operation_display_py3.py index 632a6393c99f..318ba2236d3e 100644 --- a/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/models/operation_display_py3.py +++ b/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/models/operation_display_py3.py @@ -21,16 +21,20 @@ class OperationDisplay(Model): :type resource: str :param operation: Type of operation: get, read, delete, etc. :type operation: str + :param description: Description of the operation. + :type description: str """ _attribute_map = { 'provider': {'key': 'provider', 'type': 'str'}, 'resource': {'key': 'resource', 'type': 'str'}, 'operation': {'key': 'operation', 'type': 'str'}, + 'description': {'key': 'description', 'type': 'str'}, } - def __init__(self, *, provider: str=None, resource: str=None, operation: str=None, **kwargs) -> None: + def __init__(self, *, provider: str=None, resource: str=None, operation: str=None, description: str=None, **kwargs) -> None: super(OperationDisplay, self).__init__(**kwargs) self.provider = provider self.resource = resource self.operation = operation + self.description = description diff --git a/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/models/operation_display.py b/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/models/operation_display.py index 12d72186c4f2..029cfa2a8304 100644 --- a/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/models/operation_display.py +++ b/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/models/operation_display.py @@ -21,12 +21,15 @@ class OperationDisplay(Model): :type resource: str :param operation: Type of operation: get, read, delete, etc. :type operation: str + :param description: Description of the operation. + :type description: str """ _attribute_map = { 'provider': {'key': 'provider', 'type': 'str'}, 'resource': {'key': 'resource', 'type': 'str'}, 'operation': {'key': 'operation', 'type': 'str'}, + 'description': {'key': 'description', 'type': 'str'}, } def __init__(self, **kwargs): @@ -34,3 +37,4 @@ def __init__(self, **kwargs): self.provider = kwargs.get('provider', None) self.resource = kwargs.get('resource', None) self.operation = kwargs.get('operation', None) + self.description = kwargs.get('description', None) diff --git a/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/models/operation_display_py3.py b/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/models/operation_display_py3.py index 632a6393c99f..318ba2236d3e 100644 --- a/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/models/operation_display_py3.py +++ b/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/models/operation_display_py3.py @@ -21,16 +21,20 @@ class OperationDisplay(Model): :type resource: str :param operation: Type of operation: get, read, delete, etc. :type operation: str + :param description: Description of the operation. + :type description: str """ _attribute_map = { 'provider': {'key': 'provider', 'type': 'str'}, 'resource': {'key': 'resource', 'type': 'str'}, 'operation': {'key': 'operation', 'type': 'str'}, + 'description': {'key': 'description', 'type': 'str'}, } - def __init__(self, *, provider: str=None, resource: str=None, operation: str=None, **kwargs) -> None: + def __init__(self, *, provider: str=None, resource: str=None, operation: str=None, description: str=None, **kwargs) -> None: super(OperationDisplay, self).__init__(**kwargs) self.provider = provider self.resource = resource self.operation = operation + self.description = description