Merge pull request #1569 from AutorestCI/RestAPI-PR1909

[Web] Update

Author: lmazuel

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

@@ -15,17 +15,17 @@
 class Address(Model):
     """Address information for domain registration.
 
-    :param address1: Address 1.
+    :param address1: First line of an Address.
     :type address1: str
-    :param address2: Address 2.
+    :param address2: The second line of the Address. Optional.
     :type address2: str
-    :param city: City.
+    :param city: The city for the address.
     :type city: str
-    :param country: Country.
+    :param country: The country for the address.
     :type country: str
-    :param postal_code: Postal code.
+    :param postal_code: The postal code for the address.
     :type postal_code: str
-    :param state: State.
+    :param state: The state or province for the address.
     :type state: str
     """
 

azure-mgmt-web/azure/mgmt/web/models/address.py

@@ -30,8 +30,6 @@ class AppServiceCertificateOrder(Resource):
     :vartype type: str
     :param tags: Resource tags.
     :type tags: dict[str, str]
-    :param identity: Identity for the resource.
-    :type identity: ~azure.mgmt.web.models.ResourceIdentity
     :param certificates: State of the Key Vault secret.
     :type certificates: dict[str,
      ~azure.mgmt.web.models.AppServiceCertificate]
@@ -111,7 +109,6 @@ class AppServiceCertificateOrder(Resource):
         'location': {'key': 'location', 'type': 'str'},
         'type': {'key': 'type', 'type': 'str'},
         'tags': {'key': 'tags', 'type': '{str}'},
-        'identity': {'key': 'identity', 'type': 'ResourceIdentity'},
         'certificates': {'key': 'properties.certificates', 'type': '{AppServiceCertificate}'},
         'distinguished_name': {'key': 'properties.distinguishedName', 'type': 'str'},
         'domain_verification_token': {'key': 'properties.domainVerificationToken', 'type': 'str'},
@@ -133,8 +130,8 @@ class AppServiceCertificateOrder(Resource):
         'next_auto_renewal_time_stamp': {'key': 'properties.nextAutoRenewalTimeStamp', 'type': 'iso-8601'},
     }
 
-    def __init__(self, location, kind=None, tags=None, identity=None, certificates=None, distinguished_name=None, validity_in_years=1, key_size=2048, product_type=None, auto_renew=True, csr=None):
-        super(AppServiceCertificateOrder, self).__init__(kind=kind, location=location, tags=tags, identity=identity)
+    def __init__(self, location, kind=None, tags=None, certificates=None, distinguished_name=None, validity_in_years=1, key_size=2048, product_type=None, auto_renew=True, csr=None):
+        super(AppServiceCertificateOrder, self).__init__(kind=kind, location=location, tags=tags)
         self.certificates = certificates
         self.distinguished_name = distinguished_name
         self.domain_verification_token = None

azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_order.py

@@ -0,0 +1,146 @@
+# 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 .proxy_only_resource import ProxyOnlyResource
+
+
+class AppServiceCertificateOrderPatchResource(ProxyOnlyResource):
+    """ARM resource for a certificate order that is purchased through Azure.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Resource Id.
+    :vartype id: str
+    :ivar name: Resource Name.
+    :vartype name: str
+    :param kind: Kind of resource.
+    :type kind: str
+    :ivar type: Resource type.
+    :vartype type: str
+    :param certificates: State of the Key Vault secret.
+    :type certificates: dict[str,
+     ~azure.mgmt.web.models.AppServiceCertificate]
+    :param distinguished_name: Certificate distinguished name.
+    :type distinguished_name: str
+    :ivar domain_verification_token: Domain verification token.
+    :vartype domain_verification_token: str
+    :param validity_in_years: Duration in years (must be between 1 and 3).
+     Default value: 1 .
+    :type validity_in_years: int
+    :param key_size: Certificate key size. Default value: 2048 .
+    :type key_size: int
+    :param product_type: Certificate product type. Possible values include:
+     'StandardDomainValidatedSsl', 'StandardDomainValidatedWildCardSsl'
+    :type product_type: str or ~azure.mgmt.web.models.CertificateProductType
+    :param auto_renew: <code>true</code> if the certificate should be
+     automatically renewed when it expires; otherwise, <code>false</code>.
+     Default value: True .
+    :type auto_renew: bool
+    :ivar provisioning_state: Status of certificate order. Possible values
+     include: 'Succeeded', 'Failed', 'Canceled', 'InProgress', 'Deleting'
+    :vartype provisioning_state: str or
+     ~azure.mgmt.web.models.ProvisioningState
+    :ivar status: Current order status. Possible values include:
+     'Pendingissuance', 'Issued', 'Revoked', 'Canceled', 'Denied',
+     'Pendingrevocation', 'PendingRekey', 'Unused', 'Expired', 'NotSubmitted'
+    :vartype status: str or ~azure.mgmt.web.models.CertificateOrderStatus
+    :ivar signed_certificate: Signed certificate.
+    :vartype signed_certificate: ~azure.mgmt.web.models.CertificateDetails
+    :param csr: Last CSR that was created for this order.
+    :type csr: str
+    :ivar intermediate: Intermediate certificate.
+    :vartype intermediate: ~azure.mgmt.web.models.CertificateDetails
+    :ivar root: Root certificate.
+    :vartype root: ~azure.mgmt.web.models.CertificateDetails
+    :ivar serial_number: Current serial number of the certificate.
+    :vartype serial_number: str
+    :ivar last_certificate_issuance_time: Certificate last issuance time.
+    :vartype last_certificate_issuance_time: datetime
+    :ivar expiration_time: Certificate expiration time.
+    :vartype expiration_time: datetime
+    :ivar is_private_key_external: <code>true</code> if private key is
+     external; otherwise, <code>false</code>.
+    :vartype is_private_key_external: bool
+    :ivar app_service_certificate_not_renewable_reasons: Reasons why App
+     Service Certificate is not renewable at the current moment.
+    :vartype app_service_certificate_not_renewable_reasons: list[str]
+    :ivar next_auto_renewal_time_stamp: Time stamp when the certificate would
+     be auto renewed next
+    :vartype next_auto_renewal_time_stamp: datetime
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'domain_verification_token': {'readonly': True},
+        'validity_in_years': {'maximum': 3, 'minimum': 1},
+        'provisioning_state': {'readonly': True},
+        'status': {'readonly': True},
+        'signed_certificate': {'readonly': True},
+        'intermediate': {'readonly': True},
+        'root': {'readonly': True},
+        'serial_number': {'readonly': True},
+        'last_certificate_issuance_time': {'readonly': True},
+        'expiration_time': {'readonly': True},
+        'is_private_key_external': {'readonly': True},
+        'app_service_certificate_not_renewable_reasons': {'readonly': True},
+        'next_auto_renewal_time_stamp': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'kind': {'key': 'kind', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'certificates': {'key': 'properties.certificates', 'type': '{AppServiceCertificate}'},
+        'distinguished_name': {'key': 'properties.distinguishedName', 'type': 'str'},
+        'domain_verification_token': {'key': 'properties.domainVerificationToken', 'type': 'str'},
+        'validity_in_years': {'key': 'properties.validityInYears', 'type': 'int'},
+        'key_size': {'key': 'properties.keySize', 'type': 'int'},
+        'product_type': {'key': 'properties.productType', 'type': 'CertificateProductType'},
+        'auto_renew': {'key': 'properties.autoRenew', 'type': 'bool'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'ProvisioningState'},
+        'status': {'key': 'properties.status', 'type': 'CertificateOrderStatus'},
+        'signed_certificate': {'key': 'properties.signedCertificate', 'type': 'CertificateDetails'},
+        'csr': {'key': 'properties.csr', 'type': 'str'},
+        'intermediate': {'key': 'properties.intermediate', 'type': 'CertificateDetails'},
+        'root': {'key': 'properties.root', 'type': 'CertificateDetails'},
+        'serial_number': {'key': 'properties.serialNumber', 'type': 'str'},
+        'last_certificate_issuance_time': {'key': 'properties.lastCertificateIssuanceTime', 'type': 'iso-8601'},
+        'expiration_time': {'key': 'properties.expirationTime', 'type': 'iso-8601'},
+        'is_private_key_external': {'key': 'properties.isPrivateKeyExternal', 'type': 'bool'},
+        'app_service_certificate_not_renewable_reasons': {'key': 'properties.appServiceCertificateNotRenewableReasons', 'type': '[str]'},
+        'next_auto_renewal_time_stamp': {'key': 'properties.nextAutoRenewalTimeStamp', 'type': 'iso-8601'},
+    }
+
+    def __init__(self, kind=None, certificates=None, distinguished_name=None, validity_in_years=1, key_size=2048, product_type=None, auto_renew=True, csr=None):
+        super(AppServiceCertificateOrderPatchResource, self).__init__(kind=kind)
+        self.certificates = certificates
+        self.distinguished_name = distinguished_name
+        self.domain_verification_token = None
+        self.validity_in_years = validity_in_years
+        self.key_size = key_size
+        self.product_type = product_type
+        self.auto_renew = auto_renew
+        self.provisioning_state = None
+        self.status = None
+        self.signed_certificate = None
+        self.csr = csr
+        self.intermediate = None
+        self.root = None
+        self.serial_number = None
+        self.last_certificate_issuance_time = None
+        self.expiration_time = None
+        self.is_private_key_external = None
+        self.app_service_certificate_not_renewable_reasons = None
+        self.next_auto_renewal_time_stamp = None

azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_order_patch_resource.py

@@ -0,0 +1,65 @@
+# 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 .proxy_only_resource import ProxyOnlyResource
+
+
+class AppServiceCertificatePatchResource(ProxyOnlyResource):
+    """Key Vault container ARM resource for a certificate that is purchased
+    through Azure.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Resource Id.
+    :vartype id: str
+    :ivar name: Resource Name.
+    :vartype name: str
+    :param kind: Kind of resource.
+    :type kind: str
+    :ivar type: Resource type.
+    :vartype type: str
+    :param key_vault_id: Key Vault resource Id.
+    :type key_vault_id: str
+    :param key_vault_secret_name: Key Vault secret name.
+    :type key_vault_secret_name: str
+    :ivar provisioning_state: Status of the Key Vault secret. Possible values
+     include: 'Initialized', 'WaitingOnCertificateOrder', 'Succeeded',
+     'CertificateOrderFailed', 'OperationNotPermittedOnKeyVault',
+     'AzureServiceUnauthorizedToAccessKeyVault', 'KeyVaultDoesNotExist',
+     'KeyVaultSecretDoesNotExist', 'UnknownError', 'ExternalPrivateKey',
+     'Unknown'
+    :vartype provisioning_state: str or
+     ~azure.mgmt.web.models.KeyVaultSecretStatus
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'provisioning_state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'kind': {'key': 'kind', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'key_vault_id': {'key': 'properties.keyVaultId', 'type': 'str'},
+        'key_vault_secret_name': {'key': 'properties.keyVaultSecretName', 'type': 'str'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'KeyVaultSecretStatus'},
+    }
+
+    def __init__(self, kind=None, key_vault_id=None, key_vault_secret_name=None):
+        super(AppServiceCertificatePatchResource, self).__init__(kind=kind)
+        self.key_vault_id = key_vault_id
+        self.key_vault_secret_name = key_vault_secret_name
+        self.provisioning_state = None

azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_patch_resource.py

@@ -31,8 +31,6 @@ class AppServiceCertificateResource(Resource):
     :vartype type: str
     :param tags: Resource tags.
     :type tags: dict[str, str]
-    :param identity: Identity for the resource.
-    :type identity: ~azure.mgmt.web.models.ResourceIdentity
     :param key_vault_id: Key Vault resource Id.
     :type key_vault_id: str
     :param key_vault_secret_name: Key Vault secret name.
@@ -62,14 +60,13 @@ class AppServiceCertificateResource(Resource):
         'location': {'key': 'location', 'type': 'str'},
         'type': {'key': 'type', 'type': 'str'},
         'tags': {'key': 'tags', 'type': '{str}'},
-        'identity': {'key': 'identity', 'type': 'ResourceIdentity'},
         'key_vault_id': {'key': 'properties.keyVaultId', 'type': 'str'},
         'key_vault_secret_name': {'key': 'properties.keyVaultSecretName', 'type': 'str'},
         'provisioning_state': {'key': 'properties.provisioningState', 'type': 'KeyVaultSecretStatus'},
     }
 
-    def __init__(self, location, kind=None, tags=None, identity=None, key_vault_id=None, key_vault_secret_name=None):
-        super(AppServiceCertificateResource, self).__init__(kind=kind, location=location, tags=tags, identity=identity)
+    def __init__(self, location, kind=None, tags=None, key_vault_id=None, key_vault_secret_name=None):
+        super(AppServiceCertificateResource, self).__init__(kind=kind, location=location, tags=tags)
         self.key_vault_id = key_vault_id
         self.key_vault_secret_name = key_vault_secret_name
         self.provisioning_state = None

azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_resource.py

@@ -120,6 +120,9 @@ class AppServiceEnvironment(Model):
     :param cluster_settings: Custom settings for changing the behavior of the
      App Service Environment.
     :type cluster_settings: list[~azure.mgmt.web.models.NameValuePair]
+    :param user_whitelisted_ip_ranges: User added ip ranges to whitelist on
+     ASE db
+    :type user_whitelisted_ip_ranges: list[str]
     """
 
     _validation = {
@@ -182,9 +185,10 @@ class AppServiceEnvironment(Model):
         'suspended': {'key': 'suspended', 'type': 'bool'},
         'dynamic_cache_enabled': {'key': 'dynamicCacheEnabled', 'type': 'bool'},
         'cluster_settings': {'key': 'clusterSettings', 'type': '[NameValuePair]'},
+        'user_whitelisted_ip_ranges': {'key': 'userWhitelistedIpRanges', 'type': '[str]'},
     }
 
-    def __init__(self, name, location, virtual_network, worker_pools, vnet_name=None, vnet_resource_group_name=None, vnet_subnet_name=None, internal_load_balancing_mode=None, multi_size=None, multi_role_count=None, ipssl_address_count=None, dns_suffix=None, network_access_control_list=None, front_end_scale_factor=None, api_management_account_id=None, suspended=None, dynamic_cache_enabled=None, cluster_settings=None):
+    def __init__(self, name, location, virtual_network, worker_pools, vnet_name=None, vnet_resource_group_name=None, vnet_subnet_name=None, internal_load_balancing_mode=None, multi_size=None, multi_role_count=None, ipssl_address_count=None, dns_suffix=None, network_access_control_list=None, front_end_scale_factor=None, api_management_account_id=None, suspended=None, dynamic_cache_enabled=None, cluster_settings=None, user_whitelisted_ip_ranges=None):
         self.name = name
         self.location = location
         self.provisioning_state = None
@@ -220,3 +224,4 @@ def __init__(self, name, location, virtual_network, worker_pools, vnet_name=None
         self.suspended = suspended
         self.dynamic_cache_enabled = dynamic_cache_enabled
         self.cluster_settings = cluster_settings
+        self.user_whitelisted_ip_ranges = user_whitelisted_ip_ranges