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] Update default package version for WebSiteManagementClient #2925

Merged
merged 1 commit into from
Jul 18, 2018
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
92 changes: 53 additions & 39 deletions azure-mgmt-web/azure/mgmt/web/models/__init__.py

Large diffs are not rendered by default.

15 changes: 15 additions & 0 deletions azure-mgmt-web/azure/mgmt/web/models/app_service_environment.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,15 @@ class AppServiceEnvironment(Model):
:param user_whitelisted_ip_ranges: User added ip ranges to whitelist on
ASE db
:type user_whitelisted_ip_ranges: list[str]
:param has_linux_workers: Flag that displays whether an ASE has linux
workers or not
:type has_linux_workers: bool
:param ssl_cert_key_vault_id: Key Vault ID for ILB App Service Environment
default SSL certificate
:type ssl_cert_key_vault_id: str
:param ssl_cert_key_vault_secret_name: Key Vault Secret Name for ILB App
Service Environment default SSL certificate
:type ssl_cert_key_vault_secret_name: str
"""

_validation = {
Expand Down Expand Up @@ -189,6 +198,9 @@ class AppServiceEnvironment(Model):
'dynamic_cache_enabled': {'key': 'dynamicCacheEnabled', 'type': 'bool'},
'cluster_settings': {'key': 'clusterSettings', 'type': '[NameValuePair]'},
'user_whitelisted_ip_ranges': {'key': 'userWhitelistedIpRanges', 'type': '[str]'},
'has_linux_workers': {'key': 'hasLinuxWorkers', 'type': 'bool'},
'ssl_cert_key_vault_id': {'key': 'sslCertKeyVaultId', 'type': 'str'},
'ssl_cert_key_vault_secret_name': {'key': 'sslCertKeyVaultSecretName', 'type': 'str'},
}

def __init__(self, **kwargs):
Expand Down Expand Up @@ -229,3 +241,6 @@ def __init__(self, **kwargs):
self.dynamic_cache_enabled = kwargs.get('dynamic_cache_enabled', None)
self.cluster_settings = kwargs.get('cluster_settings', None)
self.user_whitelisted_ip_ranges = kwargs.get('user_whitelisted_ip_ranges', None)
self.has_linux_workers = kwargs.get('has_linux_workers', None)
self.ssl_cert_key_vault_id = kwargs.get('ssl_cert_key_vault_id', None)
self.ssl_cert_key_vault_secret_name = kwargs.get('ssl_cert_key_vault_secret_name', None)
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,15 @@ class AppServiceEnvironmentPatchResource(ProxyOnlyResource):
:param user_whitelisted_ip_ranges: User added ip ranges to whitelist on
ASE db
:type user_whitelisted_ip_ranges: list[str]
:param has_linux_workers: Flag that displays whether an ASE has linux
workers or not
:type has_linux_workers: bool
:param ssl_cert_key_vault_id: Key Vault ID for ILB App Service Environment
default SSL certificate
:type ssl_cert_key_vault_id: str
:param ssl_cert_key_vault_secret_name: Key Vault Secret Name for ILB App
Service Environment default SSL certificate
:type ssl_cert_key_vault_secret_name: str
"""

_validation = {
Expand Down Expand Up @@ -205,6 +214,9 @@ class AppServiceEnvironmentPatchResource(ProxyOnlyResource):
'dynamic_cache_enabled': {'key': 'properties.dynamicCacheEnabled', 'type': 'bool'},
'cluster_settings': {'key': 'properties.clusterSettings', 'type': '[NameValuePair]'},
'user_whitelisted_ip_ranges': {'key': 'properties.userWhitelistedIpRanges', 'type': '[str]'},
'has_linux_workers': {'key': 'properties.hasLinuxWorkers', 'type': 'bool'},
'ssl_cert_key_vault_id': {'key': 'properties.sslCertKeyVaultId', 'type': 'str'},
'ssl_cert_key_vault_secret_name': {'key': 'properties.sslCertKeyVaultSecretName', 'type': 'str'},
}

def __init__(self, **kwargs):
Expand Down Expand Up @@ -245,3 +257,6 @@ def __init__(self, **kwargs):
self.dynamic_cache_enabled = kwargs.get('dynamic_cache_enabled', None)
self.cluster_settings = kwargs.get('cluster_settings', None)
self.user_whitelisted_ip_ranges = kwargs.get('user_whitelisted_ip_ranges', None)
self.has_linux_workers = kwargs.get('has_linux_workers', None)
self.ssl_cert_key_vault_id = kwargs.get('ssl_cert_key_vault_id', None)
self.ssl_cert_key_vault_secret_name = kwargs.get('ssl_cert_key_vault_secret_name', None)
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,15 @@ class AppServiceEnvironmentPatchResource(ProxyOnlyResource):
:param user_whitelisted_ip_ranges: User added ip ranges to whitelist on
ASE db
:type user_whitelisted_ip_ranges: list[str]
:param has_linux_workers: Flag that displays whether an ASE has linux
workers or not
:type has_linux_workers: bool
:param ssl_cert_key_vault_id: Key Vault ID for ILB App Service Environment
default SSL certificate
:type ssl_cert_key_vault_id: str
:param ssl_cert_key_vault_secret_name: Key Vault Secret Name for ILB App
Service Environment default SSL certificate
:type ssl_cert_key_vault_secret_name: str
"""

_validation = {
Expand Down Expand Up @@ -205,9 +214,12 @@ class AppServiceEnvironmentPatchResource(ProxyOnlyResource):
'dynamic_cache_enabled': {'key': 'properties.dynamicCacheEnabled', 'type': 'bool'},
'cluster_settings': {'key': 'properties.clusterSettings', 'type': '[NameValuePair]'},
'user_whitelisted_ip_ranges': {'key': 'properties.userWhitelistedIpRanges', 'type': '[str]'},
'has_linux_workers': {'key': 'properties.hasLinuxWorkers', 'type': 'bool'},
'ssl_cert_key_vault_id': {'key': 'properties.sslCertKeyVaultId', 'type': 'str'},
'ssl_cert_key_vault_secret_name': {'key': 'properties.sslCertKeyVaultSecretName', 'type': 'str'},
}

def __init__(self, *, app_service_environment_patch_resource_name: str, location: str, virtual_network, worker_pools, kind: str=None, vnet_name: str=None, vnet_resource_group_name: str=None, vnet_subnet_name: str=None, internal_load_balancing_mode=None, multi_size: str=None, multi_role_count: int=None, ipssl_address_count: int=None, dns_suffix: str=None, network_access_control_list=None, front_end_scale_factor: int=None, api_management_account_id: str=None, suspended: bool=None, dynamic_cache_enabled: bool=None, cluster_settings=None, user_whitelisted_ip_ranges=None, **kwargs) -> None:
def __init__(self, *, app_service_environment_patch_resource_name: str, location: str, virtual_network, worker_pools, kind: str=None, vnet_name: str=None, vnet_resource_group_name: str=None, vnet_subnet_name: str=None, internal_load_balancing_mode=None, multi_size: str=None, multi_role_count: int=None, ipssl_address_count: int=None, dns_suffix: str=None, network_access_control_list=None, front_end_scale_factor: int=None, api_management_account_id: str=None, suspended: bool=None, dynamic_cache_enabled: bool=None, cluster_settings=None, user_whitelisted_ip_ranges=None, has_linux_workers: bool=None, ssl_cert_key_vault_id: str=None, ssl_cert_key_vault_secret_name: str=None, **kwargs) -> None:
super(AppServiceEnvironmentPatchResource, self).__init__(kind=kind, **kwargs)
self.app_service_environment_patch_resource_name = app_service_environment_patch_resource_name
self.location = location
Expand Down Expand Up @@ -245,3 +257,6 @@ def __init__(self, *, app_service_environment_patch_resource_name: str, location
self.dynamic_cache_enabled = dynamic_cache_enabled
self.cluster_settings = cluster_settings
self.user_whitelisted_ip_ranges = user_whitelisted_ip_ranges
self.has_linux_workers = has_linux_workers
self.ssl_cert_key_vault_id = ssl_cert_key_vault_id
self.ssl_cert_key_vault_secret_name = ssl_cert_key_vault_secret_name
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,15 @@ class AppServiceEnvironment(Model):
:param user_whitelisted_ip_ranges: User added ip ranges to whitelist on
ASE db
:type user_whitelisted_ip_ranges: list[str]
:param has_linux_workers: Flag that displays whether an ASE has linux
workers or not
:type has_linux_workers: bool
:param ssl_cert_key_vault_id: Key Vault ID for ILB App Service Environment
default SSL certificate
:type ssl_cert_key_vault_id: str
:param ssl_cert_key_vault_secret_name: Key Vault Secret Name for ILB App
Service Environment default SSL certificate
:type ssl_cert_key_vault_secret_name: str
"""

_validation = {
Expand Down Expand Up @@ -189,9 +198,12 @@ class AppServiceEnvironment(Model):
'dynamic_cache_enabled': {'key': 'dynamicCacheEnabled', 'type': 'bool'},
'cluster_settings': {'key': 'clusterSettings', 'type': '[NameValuePair]'},
'user_whitelisted_ip_ranges': {'key': 'userWhitelistedIpRanges', 'type': '[str]'},
'has_linux_workers': {'key': 'hasLinuxWorkers', 'type': 'bool'},
'ssl_cert_key_vault_id': {'key': 'sslCertKeyVaultId', 'type': 'str'},
'ssl_cert_key_vault_secret_name': {'key': 'sslCertKeyVaultSecretName', 'type': 'str'},
}

def __init__(self, *, name: str, location: str, virtual_network, worker_pools, vnet_name: str=None, vnet_resource_group_name: str=None, vnet_subnet_name: str=None, internal_load_balancing_mode=None, multi_size: str=None, multi_role_count: int=None, ipssl_address_count: int=None, dns_suffix: str=None, network_access_control_list=None, front_end_scale_factor: int=None, api_management_account_id: str=None, suspended: bool=None, dynamic_cache_enabled: bool=None, cluster_settings=None, user_whitelisted_ip_ranges=None, **kwargs) -> None:
def __init__(self, *, name: str, location: str, virtual_network, worker_pools, vnet_name: str=None, vnet_resource_group_name: str=None, vnet_subnet_name: str=None, internal_load_balancing_mode=None, multi_size: str=None, multi_role_count: int=None, ipssl_address_count: int=None, dns_suffix: str=None, network_access_control_list=None, front_end_scale_factor: int=None, api_management_account_id: str=None, suspended: bool=None, dynamic_cache_enabled: bool=None, cluster_settings=None, user_whitelisted_ip_ranges=None, has_linux_workers: bool=None, ssl_cert_key_vault_id: str=None, ssl_cert_key_vault_secret_name: str=None, **kwargs) -> None:
super(AppServiceEnvironment, self).__init__(**kwargs)
self.name = name
self.location = location
Expand Down Expand Up @@ -229,3 +241,6 @@ def __init__(self, *, name: str, location: str, virtual_network, worker_pools, v
self.dynamic_cache_enabled = dynamic_cache_enabled
self.cluster_settings = cluster_settings
self.user_whitelisted_ip_ranges = user_whitelisted_ip_ranges
self.has_linux_workers = has_linux_workers
self.ssl_cert_key_vault_id = ssl_cert_key_vault_id
self.ssl_cert_key_vault_secret_name = ssl_cert_key_vault_secret_name
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,15 @@ class AppServiceEnvironmentResource(Resource):
:param user_whitelisted_ip_ranges: User added ip ranges to whitelist on
ASE db
:type user_whitelisted_ip_ranges: list[str]
:param has_linux_workers: Flag that displays whether an ASE has linux
workers or not
:type has_linux_workers: bool
:param ssl_cert_key_vault_id: Key Vault ID for ILB App Service Environment
default SSL certificate
:type ssl_cert_key_vault_id: str
:param ssl_cert_key_vault_secret_name: Key Vault Secret Name for ILB App
Service Environment default SSL certificate
:type ssl_cert_key_vault_secret_name: str
"""

_validation = {
Expand Down Expand Up @@ -212,6 +221,9 @@ class AppServiceEnvironmentResource(Resource):
'dynamic_cache_enabled': {'key': 'properties.dynamicCacheEnabled', 'type': 'bool'},
'cluster_settings': {'key': 'properties.clusterSettings', 'type': '[NameValuePair]'},
'user_whitelisted_ip_ranges': {'key': 'properties.userWhitelistedIpRanges', 'type': '[str]'},
'has_linux_workers': {'key': 'properties.hasLinuxWorkers', 'type': 'bool'},
'ssl_cert_key_vault_id': {'key': 'properties.sslCertKeyVaultId', 'type': 'str'},
'ssl_cert_key_vault_secret_name': {'key': 'properties.sslCertKeyVaultSecretName', 'type': 'str'},
}

def __init__(self, **kwargs):
Expand Down Expand Up @@ -252,3 +264,6 @@ def __init__(self, **kwargs):
self.dynamic_cache_enabled = kwargs.get('dynamic_cache_enabled', None)
self.cluster_settings = kwargs.get('cluster_settings', None)
self.user_whitelisted_ip_ranges = kwargs.get('user_whitelisted_ip_ranges', None)
self.has_linux_workers = kwargs.get('has_linux_workers', None)
self.ssl_cert_key_vault_id = kwargs.get('ssl_cert_key_vault_id', None)
self.ssl_cert_key_vault_secret_name = kwargs.get('ssl_cert_key_vault_secret_name', None)
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,15 @@ class AppServiceEnvironmentResource(Resource):
:param user_whitelisted_ip_ranges: User added ip ranges to whitelist on
ASE db
:type user_whitelisted_ip_ranges: list[str]
:param has_linux_workers: Flag that displays whether an ASE has linux
workers or not
:type has_linux_workers: bool
:param ssl_cert_key_vault_id: Key Vault ID for ILB App Service Environment
default SSL certificate
:type ssl_cert_key_vault_id: str
:param ssl_cert_key_vault_secret_name: Key Vault Secret Name for ILB App
Service Environment default SSL certificate
:type ssl_cert_key_vault_secret_name: str
"""

_validation = {
Expand Down Expand Up @@ -212,9 +221,12 @@ class AppServiceEnvironmentResource(Resource):
'dynamic_cache_enabled': {'key': 'properties.dynamicCacheEnabled', 'type': 'bool'},
'cluster_settings': {'key': 'properties.clusterSettings', 'type': '[NameValuePair]'},
'user_whitelisted_ip_ranges': {'key': 'properties.userWhitelistedIpRanges', 'type': '[str]'},
'has_linux_workers': {'key': 'properties.hasLinuxWorkers', 'type': 'bool'},
'ssl_cert_key_vault_id': {'key': 'properties.sslCertKeyVaultId', 'type': 'str'},
'ssl_cert_key_vault_secret_name': {'key': 'properties.sslCertKeyVaultSecretName', 'type': 'str'},
}

def __init__(self, *, location: str, app_service_environment_resource_name: str, app_service_environment_resource_location: str, virtual_network, worker_pools, kind: str=None, tags=None, vnet_name: str=None, vnet_resource_group_name: str=None, vnet_subnet_name: str=None, internal_load_balancing_mode=None, multi_size: str=None, multi_role_count: int=None, ipssl_address_count: int=None, dns_suffix: str=None, network_access_control_list=None, front_end_scale_factor: int=None, api_management_account_id: str=None, suspended: bool=None, dynamic_cache_enabled: bool=None, cluster_settings=None, user_whitelisted_ip_ranges=None, **kwargs) -> None:
def __init__(self, *, location: str, app_service_environment_resource_name: str, app_service_environment_resource_location: str, virtual_network, worker_pools, kind: str=None, tags=None, vnet_name: str=None, vnet_resource_group_name: str=None, vnet_subnet_name: str=None, internal_load_balancing_mode=None, multi_size: str=None, multi_role_count: int=None, ipssl_address_count: int=None, dns_suffix: str=None, network_access_control_list=None, front_end_scale_factor: int=None, api_management_account_id: str=None, suspended: bool=None, dynamic_cache_enabled: bool=None, cluster_settings=None, user_whitelisted_ip_ranges=None, has_linux_workers: bool=None, ssl_cert_key_vault_id: str=None, ssl_cert_key_vault_secret_name: str=None, **kwargs) -> None:
super(AppServiceEnvironmentResource, self).__init__(kind=kind, location=location, tags=tags, **kwargs)
self.app_service_environment_resource_name = app_service_environment_resource_name
self.app_service_environment_resource_location = app_service_environment_resource_location
Expand Down Expand Up @@ -252,3 +264,6 @@ def __init__(self, *, location: str, app_service_environment_resource_name: str,
self.dynamic_cache_enabled = dynamic_cache_enabled
self.cluster_settings = cluster_settings
self.user_whitelisted_ip_ranges = user_whitelisted_ip_ranges
self.has_linux_workers = has_linux_workers
self.ssl_cert_key_vault_id = ssl_cert_key_vault_id
self.ssl_cert_key_vault_secret_name = ssl_cert_key_vault_secret_name
15 changes: 10 additions & 5 deletions azure-mgmt-web/azure/mgmt/web/models/app_service_plan.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ class AppServicePlan(Resource):
:vartype type: str
:param tags: Resource tags.
:type tags: dict[str, str]
:param app_service_plan_name: Required. Name for the App Service plan.
:type app_service_plan_name: str
:param worker_tier_name: Target worker tier assigned to the App Service
plan.
:type worker_tier_name: str
Expand Down Expand Up @@ -66,11 +64,17 @@ class AppServicePlan(Resource):
:param spot_expiration_time: The time when the server farm expires. Valid
only if it is a spot server farm.
:type spot_expiration_time: datetime
:param free_offer_expiration_time: The time when the server farm free
offer expires.
:type free_offer_expiration_time: datetime
:ivar resource_group: Resource group of the App Service plan.
:vartype resource_group: str
:param reserved: If Linux app service plan <code>true</code>,
<code>false</code> otherwise. Default value: False .
:type reserved: bool
:param is_xenon: If Hyper-V container app service plan <code>true</code>,
<code>false</code> otherwise. Default value: False .
:type is_xenon: bool
:param target_worker_count: Scaling worker count.
:type target_worker_count: int
:param target_worker_size_id: Scaling worker size ID.
Expand All @@ -89,7 +93,6 @@ class AppServicePlan(Resource):
'name': {'readonly': True},
'location': {'required': True},
'type': {'readonly': True},
'app_service_plan_name': {'required': True},
'status': {'readonly': True},
'subscription': {'readonly': True},
'maximum_number_of_workers': {'readonly': True},
Expand All @@ -106,7 +109,6 @@ class AppServicePlan(Resource):
'location': {'key': 'location', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
'tags': {'key': 'tags', 'type': '{str}'},
'app_service_plan_name': {'key': 'properties.name', 'type': 'str'},
'worker_tier_name': {'key': 'properties.workerTierName', 'type': 'str'},
'status': {'key': 'properties.status', 'type': 'StatusOptions'},
'subscription': {'key': 'properties.subscription', 'type': 'str'},
Expand All @@ -118,8 +120,10 @@ class AppServicePlan(Resource):
'number_of_sites': {'key': 'properties.numberOfSites', 'type': 'int'},
'is_spot': {'key': 'properties.isSpot', 'type': 'bool'},
'spot_expiration_time': {'key': 'properties.spotExpirationTime', 'type': 'iso-8601'},
'free_offer_expiration_time': {'key': 'properties.freeOfferExpirationTime', 'type': 'iso-8601'},
'resource_group': {'key': 'properties.resourceGroup', 'type': 'str'},
'reserved': {'key': 'properties.reserved', 'type': 'bool'},
'is_xenon': {'key': 'properties.isXenon', 'type': 'bool'},
'target_worker_count': {'key': 'properties.targetWorkerCount', 'type': 'int'},
'target_worker_size_id': {'key': 'properties.targetWorkerSizeId', 'type': 'int'},
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'ProvisioningState'},
Expand All @@ -128,7 +132,6 @@ class AppServicePlan(Resource):

def __init__(self, **kwargs):
super(AppServicePlan, self).__init__(**kwargs)
self.app_service_plan_name = kwargs.get('app_service_plan_name', None)
self.worker_tier_name = kwargs.get('worker_tier_name', None)
self.status = None
self.subscription = None
Expand All @@ -140,8 +143,10 @@ def __init__(self, **kwargs):
self.number_of_sites = None
self.is_spot = kwargs.get('is_spot', None)
self.spot_expiration_time = kwargs.get('spot_expiration_time', None)
self.free_offer_expiration_time = kwargs.get('free_offer_expiration_time', None)
self.resource_group = None
self.reserved = kwargs.get('reserved', False)
self.is_xenon = kwargs.get('is_xenon', False)
self.target_worker_count = kwargs.get('target_worker_count', None)
self.target_worker_size_id = kwargs.get('target_worker_size_id', None)
self.provisioning_state = None
Expand Down
Loading