[AutoPR web/resource-manager] Updated the AppService Swagger to include ElasticPremium and ElasticIsolated Skus, and a new MaximumElasticWorkerCount parameter.

azure-mgmt-web/MANIFEST.in

@@ -1,2 +1 @@
 include *.rst
-include azure_bdist_wheel.py

azure-mgmt-web/azure/__init__.py

@@ -1 +1 @@
-__import__('pkg_resources').declare_namespace(__name__)
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)

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

@@ -1 +1 @@
-__import__('pkg_resources').declare_namespace(__name__)
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)

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

@@ -56,6 +56,9 @@ class AppServicePlan(Resource):
      If <code>false</code>, apps assigned to this App Service plan will scale
      to all instances of the plan. Default value: False .
     :type per_site_scaling: bool
+    :param maximum_elastic_worker_count: Maximum number of total workers
+     allowed for this ElasticScaleEnabled App Service Plan
+    :type maximum_elastic_worker_count: int
     :ivar number_of_sites: Number of apps assigned to this App Service plan.
     :vartype number_of_sites: int
     :param is_spot: If <code>true</code>, this App Service Plan owns spot
@@ -120,6 +123,7 @@ class AppServicePlan(Resource):
         'maximum_number_of_workers': {'key': 'properties.maximumNumberOfWorkers', 'type': 'int'},
         'geo_region': {'key': 'properties.geoRegion', 'type': 'str'},
         'per_site_scaling': {'key': 'properties.perSiteScaling', 'type': 'bool'},
+        'maximum_elastic_worker_count': {'key': 'properties.maximumElasticWorkerCount', 'type': 'int'},
         'number_of_sites': {'key': 'properties.numberOfSites', 'type': 'int'},
         'is_spot': {'key': 'properties.isSpot', 'type': 'bool'},
         'spot_expiration_time': {'key': 'properties.spotExpirationTime', 'type': 'iso-8601'},
@@ -144,6 +148,7 @@ def __init__(self, **kwargs):
         self.maximum_number_of_workers = None
         self.geo_region = None
         self.per_site_scaling = kwargs.get('per_site_scaling', False)
+        self.maximum_elastic_worker_count = kwargs.get('maximum_elastic_worker_count', None)
         self.number_of_sites = None
         self.is_spot = kwargs.get('is_spot', None)
         self.spot_expiration_time = kwargs.get('spot_expiration_time', None)

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

@@ -50,6 +50,9 @@ class AppServicePlanPatchResource(ProxyOnlyResource):
      If <code>false</code>, apps assigned to this App Service plan will scale
      to all instances of the plan. Default value: False .
     :type per_site_scaling: bool
+    :param maximum_elastic_worker_count: Maximum number of total workers
+     allowed for this ElasticScaleEnabled App Service Plan
+    :type maximum_elastic_worker_count: int
     :ivar number_of_sites: Number of apps assigned to this App Service plan.
     :vartype number_of_sites: int
     :param is_spot: If <code>true</code>, this App Service Plan owns spot
@@ -109,6 +112,7 @@ class AppServicePlanPatchResource(ProxyOnlyResource):
         'maximum_number_of_workers': {'key': 'properties.maximumNumberOfWorkers', 'type': 'int'},
         'geo_region': {'key': 'properties.geoRegion', 'type': 'str'},
         'per_site_scaling': {'key': 'properties.perSiteScaling', 'type': 'bool'},
+        'maximum_elastic_worker_count': {'key': 'properties.maximumElasticWorkerCount', 'type': 'int'},
         'number_of_sites': {'key': 'properties.numberOfSites', 'type': 'int'},
         'is_spot': {'key': 'properties.isSpot', 'type': 'bool'},
         'spot_expiration_time': {'key': 'properties.spotExpirationTime', 'type': 'iso-8601'},
@@ -132,6 +136,7 @@ def __init__(self, **kwargs):
         self.maximum_number_of_workers = None
         self.geo_region = None
         self.per_site_scaling = kwargs.get('per_site_scaling', False)
+        self.maximum_elastic_worker_count = kwargs.get('maximum_elastic_worker_count', None)
         self.number_of_sites = None
         self.is_spot = kwargs.get('is_spot', None)
         self.spot_expiration_time = kwargs.get('spot_expiration_time', None)

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

@@ -50,6 +50,9 @@ class AppServicePlanPatchResource(ProxyOnlyResource):
      If <code>false</code>, apps assigned to this App Service plan will scale
      to all instances of the plan. Default value: False .
     :type per_site_scaling: bool
+    :param maximum_elastic_worker_count: Maximum number of total workers
+     allowed for this ElasticScaleEnabled App Service Plan
+    :type maximum_elastic_worker_count: int
     :ivar number_of_sites: Number of apps assigned to this App Service plan.
     :vartype number_of_sites: int
     :param is_spot: If <code>true</code>, this App Service Plan owns spot
@@ -109,6 +112,7 @@ class AppServicePlanPatchResource(ProxyOnlyResource):
         'maximum_number_of_workers': {'key': 'properties.maximumNumberOfWorkers', 'type': 'int'},
         'geo_region': {'key': 'properties.geoRegion', 'type': 'str'},
         'per_site_scaling': {'key': 'properties.perSiteScaling', 'type': 'bool'},
+        'maximum_elastic_worker_count': {'key': 'properties.maximumElasticWorkerCount', 'type': 'int'},
         'number_of_sites': {'key': 'properties.numberOfSites', 'type': 'int'},
         'is_spot': {'key': 'properties.isSpot', 'type': 'bool'},
         'spot_expiration_time': {'key': 'properties.spotExpirationTime', 'type': 'iso-8601'},
@@ -122,7 +126,7 @@ class AppServicePlanPatchResource(ProxyOnlyResource):
         'provisioning_state': {'key': 'properties.provisioningState', 'type': 'ProvisioningState'},
     }
 
-    def __init__(self, *, kind: str=None, worker_tier_name: str=None, admin_site_name: str=None, hosting_environment_profile=None, per_site_scaling: bool=False, is_spot: bool=None, spot_expiration_time=None, free_offer_expiration_time=None, reserved: bool=False, is_xenon: bool=False, hyper_v: bool=False, target_worker_count: int=None, target_worker_size_id: int=None, **kwargs) -> None:
+    def __init__(self, *, kind: str=None, worker_tier_name: str=None, admin_site_name: str=None, hosting_environment_profile=None, per_site_scaling: bool=False, maximum_elastic_worker_count: int=None, is_spot: bool=None, spot_expiration_time=None, free_offer_expiration_time=None, reserved: bool=False, is_xenon: bool=False, hyper_v: bool=False, target_worker_count: int=None, target_worker_size_id: int=None, **kwargs) -> None:
         super(AppServicePlanPatchResource, self).__init__(kind=kind, **kwargs)
         self.worker_tier_name = worker_tier_name
         self.status = None
@@ -132,6 +136,7 @@ def __init__(self, *, kind: str=None, worker_tier_name: str=None, admin_site_nam
         self.maximum_number_of_workers = None
         self.geo_region = None
         self.per_site_scaling = per_site_scaling
+        self.maximum_elastic_worker_count = maximum_elastic_worker_count
         self.number_of_sites = None
         self.is_spot = is_spot
         self.spot_expiration_time = spot_expiration_time

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

@@ -56,6 +56,9 @@ class AppServicePlan(Resource):
      If <code>false</code>, apps assigned to this App Service plan will scale
      to all instances of the plan. Default value: False .
     :type per_site_scaling: bool
+    :param maximum_elastic_worker_count: Maximum number of total workers
+     allowed for this ElasticScaleEnabled App Service Plan
+    :type maximum_elastic_worker_count: int
     :ivar number_of_sites: Number of apps assigned to this App Service plan.
     :vartype number_of_sites: int
     :param is_spot: If <code>true</code>, this App Service Plan owns spot
@@ -120,6 +123,7 @@ class AppServicePlan(Resource):
         'maximum_number_of_workers': {'key': 'properties.maximumNumberOfWorkers', 'type': 'int'},
         'geo_region': {'key': 'properties.geoRegion', 'type': 'str'},
         'per_site_scaling': {'key': 'properties.perSiteScaling', 'type': 'bool'},
+        'maximum_elastic_worker_count': {'key': 'properties.maximumElasticWorkerCount', 'type': 'int'},
         'number_of_sites': {'key': 'properties.numberOfSites', 'type': 'int'},
         'is_spot': {'key': 'properties.isSpot', 'type': 'bool'},
         'spot_expiration_time': {'key': 'properties.spotExpirationTime', 'type': 'iso-8601'},
@@ -134,7 +138,7 @@ class AppServicePlan(Resource):
         'sku': {'key': 'sku', 'type': 'SkuDescription'},
     }
 
-    def __init__(self, *, location: str, kind: str=None, tags=None, worker_tier_name: str=None, admin_site_name: str=None, hosting_environment_profile=None, per_site_scaling: bool=False, is_spot: bool=None, spot_expiration_time=None, free_offer_expiration_time=None, reserved: bool=False, is_xenon: bool=False, hyper_v: bool=False, target_worker_count: int=None, target_worker_size_id: int=None, sku=None, **kwargs) -> None:
+    def __init__(self, *, location: str, kind: str=None, tags=None, worker_tier_name: str=None, admin_site_name: str=None, hosting_environment_profile=None, per_site_scaling: bool=False, maximum_elastic_worker_count: int=None, is_spot: bool=None, spot_expiration_time=None, free_offer_expiration_time=None, reserved: bool=False, is_xenon: bool=False, hyper_v: bool=False, target_worker_count: int=None, target_worker_size_id: int=None, sku=None, **kwargs) -> None:
         super(AppServicePlan, self).__init__(kind=kind, location=location, tags=tags, **kwargs)
         self.worker_tier_name = worker_tier_name
         self.status = None
@@ -144,6 +148,7 @@ def __init__(self, *, location: str, kind: str=None, tags=None, worker_tier_name
         self.maximum_number_of_workers = None
         self.geo_region = None
         self.per_site_scaling = per_site_scaling
+        self.maximum_elastic_worker_count = maximum_elastic_worker_count
         self.number_of_sites = None
         self.is_spot = is_spot
         self.spot_expiration_time = spot_expiration_time

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

@@ -544,3 +544,5 @@ class SkuName(str, Enum):
     dynamic = "Dynamic"
     isolated = "Isolated"
     premium_v2 = "PremiumV2"
+    elastic_premium = "ElasticPremium"
+    elastic_isolated = "ElasticIsolated"

azure-mgmt-web/azure/mgmt/web/web_site_management_client.py

@@ -659,7 +659,7 @@ def list_geo_regions(
 
         :param sku: Name of SKU used to filter the regions. Possible values
          include: 'Free', 'Shared', 'Basic', 'Standard', 'Premium', 'Dynamic',
-         'Isolated', 'PremiumV2'
+         'Isolated', 'PremiumV2', 'ElasticPremium', 'ElasticIsolated'
         :type sku: str or ~azure.mgmt.web.models.SkuName
         :param linux_workers_enabled: Specify <code>true</code> if you want to
          filter to only regions that support Linux workers.

azure-mgmt-web/setup.cfg

@@ -1,3 +1,2 @@
 [bdist_wheel]
 universal=1
-azure-namespace-package=azure-mgmt-nspkg

azure-mgmt-web/setup.py

@@ -10,12 +10,6 @@
 import os.path
 from io import open
 from setuptools import find_packages, setup
-try:
-    from azure_bdist_wheel import cmdclass
-except ImportError:
-    from distutils import log as logger
-    logger.warn("Wheel is not available, disabling bdist_wheel hook")
-    cmdclass = {}
 
 # Change the PACKAGE_NAME only to change folder and different name
 PACKAGE_NAME = "azure-mgmt-web"
@@ -76,11 +70,18 @@
         'License :: OSI Approved :: MIT License',
     ],
     zip_safe=False,
-    packages=find_packages(exclude=["tests"]),
+    packages=find_packages(exclude=[
+        'tests',
+        # Exclude packages that will be covered by PEP420 or nspkg
+        'azure',
+        'azure.mgmt',
+    ]),
     install_requires=[
         'msrest>=0.5.0',
         'msrestazure>=0.4.32,<2.0.0',
         'azure-common~=1.1',
     ],
-    cmdclass=cmdclass
+    extras_require={
+        ":python_version<'3.0'": ['azure-mgmt-nspkg'],
+    }
 )