Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AutoPR web/resource-manager] Add initial set for changes for ANT79 #3764

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions azure-mgmt-web/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
include *.rst
include azure/__init__.py
include azure/mgmt/__init__.py

3 changes: 3 additions & 0 deletions azure-mgmt-web/azure/mgmt/web/models/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@
from .migrate_my_sql_status_py3 import MigrateMySqlStatus
from .relay_service_connection_entity_py3 import RelayServiceConnectionEntity
from .network_features_py3 import NetworkFeatures
from .network_trace_py3 import NetworkTrace
from .perf_mon_sample_py3 import PerfMonSample
from .perf_mon_set_py3 import PerfMonSet
from .perf_mon_response_py3 import PerfMonResponse
Expand Down Expand Up @@ -403,6 +404,7 @@
from .migrate_my_sql_status import MigrateMySqlStatus
from .relay_service_connection_entity import RelayServiceConnectionEntity
from .network_features import NetworkFeatures
from .network_trace import NetworkTrace
from .perf_mon_sample import PerfMonSample
from .perf_mon_set import PerfMonSet
from .perf_mon_response import PerfMonResponse
Expand Down Expand Up @@ -743,6 +745,7 @@
'MigrateMySqlStatus',
'RelayServiceConnectionEntity',
'NetworkFeatures',
'NetworkTrace',
'PerfMonSample',
'PerfMonSet',
'PerfMonResponse',
Expand Down
5 changes: 5 additions & 0 deletions azure-mgmt-web/azure/mgmt/web/models/app_service_plan.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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'},
Expand All @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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'},
Expand All @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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'},
Expand All @@ -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
Expand All @@ -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
Expand Down
7 changes: 6 additions & 1 deletion azure-mgmt-web/azure/mgmt/web/models/app_service_plan_py3.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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'},
Expand All @@ -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
Expand All @@ -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
Expand Down
7 changes: 7 additions & 0 deletions azure-mgmt-web/azure/mgmt/web/models/cors_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,19 @@ class CorsSettings(Model):
allowed to make cross-origin
calls (for example: http://example.com:12345). Use "*" to allow all.
:type allowed_origins: list[str]
:param support_credentials: Gets or sets whether CORS requests with
credentials are allowed. See
https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS#Requests_with_credentials
for more details.
:type support_credentials: bool
"""

_attribute_map = {
'allowed_origins': {'key': 'allowedOrigins', 'type': '[str]'},
'support_credentials': {'key': 'supportCredentials', 'type': 'bool'},
}

def __init__(self, **kwargs):
super(CorsSettings, self).__init__(**kwargs)
self.allowed_origins = kwargs.get('allowed_origins', None)
self.support_credentials = kwargs.get('support_credentials', None)
9 changes: 8 additions & 1 deletion azure-mgmt-web/azure/mgmt/web/models/cors_settings_py3.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,19 @@ class CorsSettings(Model):
allowed to make cross-origin
calls (for example: http://example.com:12345). Use "*" to allow all.
:type allowed_origins: list[str]
:param support_credentials: Gets or sets whether CORS requests with
credentials are allowed. See
https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS#Requests_with_credentials
for more details.
:type support_credentials: bool
"""

_attribute_map = {
'allowed_origins': {'key': 'allowedOrigins', 'type': '[str]'},
'support_credentials': {'key': 'supportCredentials', 'type': 'bool'},
}

def __init__(self, *, allowed_origins=None, **kwargs) -> None:
def __init__(self, *, allowed_origins=None, support_credentials: bool=None, **kwargs) -> None:
super(CorsSettings, self).__init__(**kwargs)
self.allowed_origins = allowed_origins
self.support_credentials = support_credentials
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ class DeletedAppRestoreRequest(ProxyOnlyResource):
formatted as a DateTime string.
If unspecified, default value is the time that the app was deleted.
:type snapshot_time: str
:param use_dr_secondary: If true, the snapshot is retrieved from
DRSecondary endpoint.
:type use_dr_secondary: bool
"""

_validation = {
Expand All @@ -52,10 +55,12 @@ class DeletedAppRestoreRequest(ProxyOnlyResource):
'deleted_site_id': {'key': 'properties.deletedSiteId', 'type': 'str'},
'recover_configuration': {'key': 'properties.recoverConfiguration', 'type': 'bool'},
'snapshot_time': {'key': 'properties.snapshotTime', 'type': 'str'},
'use_dr_secondary': {'key': 'properties.useDRSecondary', 'type': 'bool'},
}

def __init__(self, **kwargs):
super(DeletedAppRestoreRequest, self).__init__(**kwargs)
self.deleted_site_id = kwargs.get('deleted_site_id', None)
self.recover_configuration = kwargs.get('recover_configuration', None)
self.snapshot_time = kwargs.get('snapshot_time', None)
self.use_dr_secondary = kwargs.get('use_dr_secondary', None)
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ class DeletedAppRestoreRequest(ProxyOnlyResource):
formatted as a DateTime string.
If unspecified, default value is the time that the app was deleted.
:type snapshot_time: str
:param use_dr_secondary: If true, the snapshot is retrieved from
DRSecondary endpoint.
:type use_dr_secondary: bool
"""

_validation = {
Expand All @@ -52,10 +55,12 @@ class DeletedAppRestoreRequest(ProxyOnlyResource):
'deleted_site_id': {'key': 'properties.deletedSiteId', 'type': 'str'},
'recover_configuration': {'key': 'properties.recoverConfiguration', 'type': 'bool'},
'snapshot_time': {'key': 'properties.snapshotTime', 'type': 'str'},
'use_dr_secondary': {'key': 'properties.useDRSecondary', 'type': 'bool'},
}

def __init__(self, *, kind: str=None, deleted_site_id: str=None, recover_configuration: bool=None, snapshot_time: str=None, **kwargs) -> None:
def __init__(self, *, kind: str=None, deleted_site_id: str=None, recover_configuration: bool=None, snapshot_time: str=None, use_dr_secondary: bool=None, **kwargs) -> None:
super(DeletedAppRestoreRequest, self).__init__(kind=kind, **kwargs)
self.deleted_site_id = deleted_site_id
self.recover_configuration = recover_configuration
self.snapshot_time = snapshot_time
self.use_dr_secondary = use_dr_secondary
38 changes: 38 additions & 0 deletions azure-mgmt-web/azure/mgmt/web/models/network_trace.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# 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.serialization import Model


class NetworkTrace(Model):
"""Network trace.

:param path: Local file path for the captured network trace file.
:type path: str
:param status: Current status of the network trace operation, same as
Operation.Status (InProgress/Succeeded/Failed).
:type status: str
:param message: Detailed message of a network trace operation, e.g. error
message in case of failure.
:type message: str
"""

_attribute_map = {
'path': {'key': 'path', 'type': 'str'},
'status': {'key': 'status', 'type': 'str'},
'message': {'key': 'message', 'type': 'str'},
}

def __init__(self, **kwargs):
super(NetworkTrace, self).__init__(**kwargs)
self.path = kwargs.get('path', None)
self.status = kwargs.get('status', None)
self.message = kwargs.get('message', None)
38 changes: 38 additions & 0 deletions azure-mgmt-web/azure/mgmt/web/models/network_trace_py3.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# 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.serialization import Model


class NetworkTrace(Model):
"""Network trace.

:param path: Local file path for the captured network trace file.
:type path: str
:param status: Current status of the network trace operation, same as
Operation.Status (InProgress/Succeeded/Failed).
:type status: str
:param message: Detailed message of a network trace operation, e.g. error
message in case of failure.
:type message: str
"""

_attribute_map = {
'path': {'key': 'path', 'type': 'str'},
'status': {'key': 'status', 'type': 'str'},
'message': {'key': 'message', 'type': 'str'},
}

def __init__(self, *, path: str=None, status: str=None, message: str=None, **kwargs) -> None:
super(NetworkTrace, self).__init__(**kwargs)
self.path = path
self.status = status
self.message = message
7 changes: 7 additions & 0 deletions azure-mgmt-web/azure/mgmt/web/models/site_auth_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,11 @@ class SiteAuthSettings(ProxyOnlyResource):
More information on OpenID Connect:
http://openid.net/specs/openid-connect-core-1_0.html
:type client_secret: str
:param client_secret_certificate_thumbprint: An alternative to the client
secret, that is the thumbprint of a certifite used for signing purposes.
This property acts as
a replacement for the Client Secret. It is also optional.
:type client_secret_certificate_thumbprint: str
:param issuer: The OpenID Connect Issuer URI that represents the entity
which issues access tokens for this application.
When using Azure Active Directory, this value is the URI of the directory
Expand Down Expand Up @@ -190,6 +195,7 @@ class SiteAuthSettings(ProxyOnlyResource):
'token_refresh_extension_hours': {'key': 'properties.tokenRefreshExtensionHours', 'type': 'float'},
'client_id': {'key': 'properties.clientId', 'type': 'str'},
'client_secret': {'key': 'properties.clientSecret', 'type': 'str'},
'client_secret_certificate_thumbprint': {'key': 'properties.clientSecretCertificateThumbprint', 'type': 'str'},
'issuer': {'key': 'properties.issuer', 'type': 'str'},
'validate_issuer': {'key': 'properties.validateIssuer', 'type': 'bool'},
'allowed_audiences': {'key': 'properties.allowedAudiences', 'type': '[str]'},
Expand Down Expand Up @@ -218,6 +224,7 @@ def __init__(self, **kwargs):
self.token_refresh_extension_hours = kwargs.get('token_refresh_extension_hours', None)
self.client_id = kwargs.get('client_id', None)
self.client_secret = kwargs.get('client_secret', None)
self.client_secret_certificate_thumbprint = kwargs.get('client_secret_certificate_thumbprint', None)
self.issuer = kwargs.get('issuer', None)
self.validate_issuer = kwargs.get('validate_issuer', None)
self.allowed_audiences = kwargs.get('allowed_audiences', None)
Expand Down
Loading