Web app Mgmt new version

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

@@ -15,19 +15,27 @@
 class Address(Model):
     """Address information for domain registration.
 
-    :param address1: Address 1
+    :param address1: Address 1.
     :type address1: str
-    :param address2: Address 2
+    :param address2: Address 2.
     :type address2: str
-    :param city: City
+    :param city: City.
     :type city: str
-    :param country: Country
+    :param country: Country.
     :type country: str
-    :param postal_code: Postal code
+    :param postal_code: Postal code.
     :type postal_code: str
-    :param state: State
+    :param state: State.
     :type state: str
-    """ 
+    """
+
+    _validation = {
+        'address1': {'required': True},
+        'city': {'required': True},
+        'country': {'required': True},
+        'postal_code': {'required': True},
+        'state': {'required': True},
+    }
 
     _attribute_map = {
         'address1': {'key': 'address1', 'type': 'str'},
@@ -38,7 +46,7 @@ class Address(Model):
         'state': {'key': 'state', 'type': 'str'},
     }
 
-    def __init__(self, address1=None, address2=None, city=None, country=None, postal_code=None, state=None):
+    def __init__(self, address1, city, country, postal_code, state, address2=None):
         self.address1 = address1
         self.address2 = address2
         self.city = city

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

@@ -13,21 +13,20 @@
 
 
 class AddressResponse(Model):
-    """Describes main public ip address and any extra vips.
+    """Describes main public IP address and any extra virtual IPs.
 
-    :param service_ip_address: Main public vip
+    :param service_ip_address: Main public virtual IP.
     :type service_ip_address: str
-    :param internal_ip_address: VNET internal ip address of the
-     hostingEnvironment (App Service Environment) if it is in internal
-     load-balancing mode
+    :param internal_ip_address: Virtual Network internal IP address of the App
+     Service Environment if it is in internal load-balancing mode.
     :type internal_ip_address: str
     :param outbound_ip_addresses: IP addresses appearing on outbound
-     connections
+     connections.
     :type outbound_ip_addresses: list of str
-    :param vip_mappings: Additional vips
+    :param vip_mappings: Additional virtual IPs.
     :type vip_mappings: list of :class:`VirtualIPMapping
      <azure.mgmt.web.models.VirtualIPMapping>`
-    """ 
+    """
 
     _attribute_map = {
         'service_ip_address': {'key': 'serviceIpAddress', 'type': 'str'},

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

@@ -13,11 +13,11 @@
 
 
 class ApiDefinitionInfo(Model):
-    """Information about the formal API definition for the web app.
+    """Information about the formal API definition for the app.
 
     :param url: The URL of the API definition.
     :type url: str
-    """ 
+    """
 
     _attribute_map = {
         'url': {'key': 'url', 'type': 'str'},

azure-mgmt-web/azure/mgmt/web/models/certificate_order_certificate.py → azure-mgmt-web/azure/mgmt/web/models/app_service_certificate.py

@@ -12,37 +12,42 @@
 from .resource import Resource
 
 
-class CertificateOrderCertificate(Resource):
-    """Class representing the Key Vault container for certificate purchased
-    through Azure.
+class AppServiceCertificate(Resource):
+    """Key Vault container for a certificate that is purchased through Azure.
 
-    :param id: Resource Id
-    :type id: str
-    :param name: Resource Name
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Resource Id.
+    :vartype id: str
+    :param name: Resource Name.
     :type name: str
-    :param kind: Kind of resource
+    :param kind: Kind of resource.
     :type kind: str
-    :param location: Resource Location
+    :param location: Resource Location.
     :type location: str
-    :param type: Resource type
+    :param type: Resource type.
     :type type: str
-    :param tags: Resource tags
+    :param tags: Resource tags.
     :type tags: dict
-    :param key_vault_id: Key Vault Csm resource Id
+    :param key_vault_id: Key Vault Csm resource Id.
     :type key_vault_id: str
-    :param key_vault_secret_name: Key Vault secret name
+    :param key_vault_secret_name: Key Vault secret name.
     :type key_vault_secret_name: str
-    :param provisioning_state: Status of the Key Vault secret. Possible
-     values include: 'Initialized', 'WaitingOnCertificateOrder', 'Succeeded',
+    :ivar provisioning_state: Status of the Key Vault secret. Possible values
+     include: 'Initialized', 'WaitingOnCertificateOrder', 'Succeeded',
      'CertificateOrderFailed', 'OperationNotPermittedOnKeyVault',
      'AzureServiceUnauthorizedToAccessKeyVault', 'KeyVaultDoesNotExist',
-     'KeyVaultSecretDoesNotExist', 'UnknownError', 'Unknown'
-    :type provisioning_state: str or :class:`KeyVaultSecretStatus
+     'KeyVaultSecretDoesNotExist', 'UnknownError', 'ExternalPrivateKey',
+     'Unknown'
+    :vartype provisioning_state: str or :class:`KeyVaultSecretStatus
      <azure.mgmt.web.models.KeyVaultSecretStatus>`
-    """ 
+    """
 
     _validation = {
+        'id': {'readonly': True},
         'location': {'required': True},
+        'provisioning_state': {'readonly': True},
     }
 
     _attribute_map = {
@@ -57,8 +62,8 @@ class CertificateOrderCertificate(Resource):
         'provisioning_state': {'key': 'properties.provisioningState', 'type': 'KeyVaultSecretStatus'},
     }
 
-    def __init__(self, location, id=None, name=None, kind=None, type=None, tags=None, key_vault_id=None, key_vault_secret_name=None, provisioning_state=None):
-        super(CertificateOrderCertificate, self).__init__(id=id, name=name, kind=kind, location=location, type=type, tags=tags)
+    def __init__(self, location, name=None, kind=None, type=None, tags=None, key_vault_id=None, key_vault_secret_name=None):
+        super(AppServiceCertificate, self).__init__(name=name, kind=kind, location=location, type=type, tags=tags)
         self.key_vault_id = key_vault_id
         self.key_vault_secret_name = key_vault_secret_name
-        self.provisioning_state = provisioning_state
+        self.provisioning_state = None

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

@@ -12,67 +12,87 @@
 from .resource import Resource
 
 
-class CertificateOrder(Resource):
-    """Certificate purchase order.
+class AppServiceCertificateOrder(Resource):
+    """SSL certificate purchase order.
 
-    :param id: Resource Id
-    :type id: str
-    :param name: Resource Name
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Resource Id.
+    :vartype id: str
+    :param name: Resource Name.
     :type name: str
-    :param kind: Kind of resource
+    :param kind: Kind of resource.
     :type kind: str
-    :param location: Resource Location
+    :param location: Resource Location.
     :type location: str
-    :param type: Resource type
+    :param type: Resource type.
     :type type: str
-    :param tags: Resource tags
+    :param tags: Resource tags.
     :type tags: dict
-    :param certificates: State of the Key Vault secret
+    :param certificates: State of the Key Vault secret.
     :type certificates: dict
-    :param distinguished_name: Certificate distinguished name
+    :param distinguished_name: Certificate distinguished name.
     :type distinguished_name: str
-    :param domain_verification_token: Domain Verification Token
-    :type domain_verification_token: str
-    :param validity_in_years: Duration in years (must be between 1 and 3)
+    :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
+    :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 :class:`CertificateProductType
      <azure.mgmt.web.models.CertificateProductType>`
-    :param auto_renew: Auto renew
+    :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
-    :param provisioning_state: Status of certificate order. Possible values
+    :ivar provisioning_state: Status of certificate order. Possible values
      include: 'Succeeded', 'Failed', 'Canceled', 'InProgress', 'Deleting'
-    :type provisioning_state: str or :class:`ProvisioningState
+    :vartype provisioning_state: str or :class:`ProvisioningState
      <azure.mgmt.web.models.ProvisioningState>`
-    :param status: Current order status. Possible values include:
+    :ivar status: Current order status. Possible values include:
      'Pendingissuance', 'Issued', 'Revoked', 'Canceled', 'Denied',
      'Pendingrevocation', 'PendingRekey', 'Unused', 'Expired', 'NotSubmitted'
-    :type status: str or :class:`CertificateOrderStatus
+    :vartype status: str or :class:`CertificateOrderStatus
      <azure.mgmt.web.models.CertificateOrderStatus>`
-    :param signed_certificate: Signed certificate
-    :type signed_certificate: :class:`CertificateDetails
+    :ivar signed_certificate: Signed certificate.
+    :vartype signed_certificate: :class:`CertificateDetails
      <azure.mgmt.web.models.CertificateDetails>`
-    :param csr: Last CSR that was created for this order
+    :param csr: Last CSR that was created for this order.
     :type csr: str
-    :param intermediate: Intermediate certificate
-    :type intermediate: :class:`CertificateDetails
+    :ivar intermediate: Intermediate certificate.
+    :vartype intermediate: :class:`CertificateDetails
      <azure.mgmt.web.models.CertificateDetails>`
-    :param root: Root certificate
-    :type root: :class:`CertificateDetails
+    :ivar root: Root certificate.
+    :vartype root: :class:`CertificateDetails
      <azure.mgmt.web.models.CertificateDetails>`
-    :param serial_number: Current serial number of the certificate
-    :type serial_number: str
-    :param last_certificate_issuance_time: Certificate last issuance time
-    :type last_certificate_issuance_time: datetime
-    :param expiration_time: Certificate expiration time
-    :type expiration_time: datetime
-    """ 
+    :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
+    :param is_private_key_external: <code>true</code> if private key is
+     external; otherwise, <code>false</code>.
+    :type is_private_key_external: bool
+    """
 
     _validation = {
+        'id': {'readonly': True},
         'location': {'required': 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},
     }
 
     _attribute_map = {
@@ -82,7 +102,7 @@ class CertificateOrder(Resource):
         'location': {'key': 'location', 'type': 'str'},
         'type': {'key': 'type', 'type': 'str'},
         'tags': {'key': 'tags', 'type': '{str}'},
-        'certificates': {'key': 'properties.certificates', 'type': '{CertificateOrderCertificate}'},
+        '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'},
@@ -98,23 +118,25 @@ class CertificateOrder(Resource):
         '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'},
     }
 
-    def __init__(self, location, id=None, name=None, kind=None, type=None, tags=None, certificates=None, distinguished_name=None, domain_verification_token=None, validity_in_years=None, key_size=None, product_type=None, auto_renew=None, provisioning_state=None, status=None, signed_certificate=None, csr=None, intermediate=None, root=None, serial_number=None, last_certificate_issuance_time=None, expiration_time=None):
-        super(CertificateOrder, self).__init__(id=id, name=name, kind=kind, location=location, type=type, tags=tags)
+    def __init__(self, location, name=None, kind=None, type=None, tags=None, certificates=None, distinguished_name=None, validity_in_years=1, key_size=2048, product_type=None, auto_renew=True, csr=None, is_private_key_external=None):
+        super(AppServiceCertificateOrder, self).__init__(name=name, kind=kind, location=location, type=type, tags=tags)
         self.certificates = certificates
         self.distinguished_name = distinguished_name
-        self.domain_verification_token = domain_verification_token
+        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 = provisioning_state
-        self.status = status
-        self.signed_certificate = signed_certificate
+        self.provisioning_state = None
+        self.status = None
+        self.signed_certificate = None
         self.csr = csr
-        self.intermediate = intermediate
-        self.root = root
-        self.serial_number = serial_number
-        self.last_certificate_issuance_time = last_certificate_issuance_time
-        self.expiration_time = expiration_time
+        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 = is_private_key_external

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

@@ -0,0 +1,27 @@
+# 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 msrest.paging import Paged
+
+
+class AppServiceCertificateOrderPaged(Paged):
+    """
+    A paging container for iterating over a list of AppServiceCertificateOrder object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[AppServiceCertificateOrder]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(AppServiceCertificateOrderPaged, self).__init__(*args, **kwargs)

azure-mgmt-web/azure/mgmt/web/models/server_farm_with_rich_sku_paged.py → azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_paged.py

@@ -12,16 +12,16 @@
 from msrest.paging import Paged
 
 
-class ServerFarmWithRichSkuPaged(Paged):
+class AppServiceCertificatePaged(Paged):
     """
-    A paging container for iterating over a list of ServerFarmWithRichSku object
+    A paging container for iterating over a list of AppServiceCertificate object
     """
 
     _attribute_map = {
         'next_link': {'key': 'nextLink', 'type': 'str'},
-        'current_page': {'key': 'value', 'type': '[ServerFarmWithRichSku]'}
+        'current_page': {'key': 'value', 'type': '[AppServiceCertificate]'}
     }
 
     def __init__(self, *args, **kwargs):
 
-        super(ServerFarmWithRichSkuPaged, self).__init__(*args, **kwargs)
+        super(AppServiceCertificatePaged, self).__init__(*args, **kwargs)