diff --git a/azure-mgmt-web/azure/mgmt/web/models/__init__.py b/azure-mgmt-web/azure/mgmt/web/models/__init__.py
index a50f89c31cf9..e22c77a49bc4 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/__init__.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/__init__.py
@@ -28,7 +28,6 @@
from .snapshot_recovery_target import SnapshotRecoveryTarget
from .snapshot_recovery_request import SnapshotRecoveryRequest
from .resource_metric_availability import ResourceMetricAvailability
-from .resource_metric_name import ResourceMetricName
from .resource_metric_definition import ResourceMetricDefinition
from .push_settings import PushSettings
from .identifier import Identifier
@@ -66,6 +65,9 @@
from .sku_description import SkuDescription
from .app_service_plan import AppServicePlan
from .resource import Resource
+from .default_error_response_error_details_item import DefaultErrorResponseErrorDetailsItem
+from .default_error_response_error import DefaultErrorResponseError
+from .default_error_response import DefaultErrorResponse, DefaultErrorResponseException
from .name_identifier import NameIdentifier
from .metric_availability import MetricAvailability
from .dimension import Dimension
@@ -84,7 +86,6 @@
from .domain_ownership_identifier import DomainOwnershipIdentifier
from .domain_patch_resource import DomainPatchResource
from .domain_recommendation_search_parameters import DomainRecommendationSearchParameters
-from .error_response import ErrorResponse, ErrorResponseException
from .tld_legal_agreement import TldLegalAgreement
from .top_level_domain import TopLevelDomain
from .top_level_domain_agreement_option import TopLevelDomainAgreementOption
@@ -100,6 +101,7 @@
from .csm_usage_quota import CsmUsageQuota
from .error_entity import ErrorEntity
from .operation import Operation
+from .resource_metric_name import ResourceMetricName
from .resource_metric_property import ResourceMetricProperty
from .resource_metric_value import ResourceMetricValue
from .resource_metric import ResourceMetric
@@ -123,6 +125,7 @@
from .application_stack import ApplicationStack
from .recommendation import Recommendation
from .recommendation_rule import RecommendationRule
+from .billing_meter import BillingMeter
from .csm_move_resource_envelope import CsmMoveResourceEnvelope
from .geo_region import GeoRegion
from .hosting_environment_deployment_info import HostingEnvironmentDeploymentInfo
@@ -154,6 +157,7 @@
from .csm_publishing_profile_options import CsmPublishingProfileOptions
from .csm_slot_entity import CsmSlotEntity
from .custom_hostname_analysis_result import CustomHostnameAnalysisResult
+from .deleted_app_restore_request import DeletedAppRestoreRequest
from .deployment import Deployment
from .enabled_config import EnabledConfig
from .file_system_http_logs_config import FileSystemHttpLogsConfig
@@ -173,12 +177,14 @@
from .perf_mon_set import PerfMonSet
from .perf_mon_response import PerfMonResponse
from .premier_add_on import PremierAddOn
+from .private_access_subnet import PrivateAccessSubnet
+from .private_access_virtual_network import PrivateAccessVirtualNetwork
+from .private_access import PrivateAccess
from .process_thread_info import ProcessThreadInfo
from .process_module_info import ProcessModuleInfo
from .process_info import ProcessInfo
from .public_certificate import PublicCertificate
from .restore_request import RestoreRequest
-from .restore_response import RestoreResponse
from .site_auth_settings import SiteAuthSettings
from .site_cloneability_criterion import SiteCloneabilityCriterion
from .site_cloneability import SiteCloneability
@@ -193,6 +199,8 @@
from .slot_config_names_resource import SlotConfigNamesResource
from .slot_difference import SlotDifference
from .snapshot import Snapshot
+from .snapshot_recovery_source import SnapshotRecoverySource
+from .snapshot_restore_request import SnapshotRestoreRequest
from .storage_migration_options import StorageMigrationOptions
from .storage_migration_response import StorageMigrationResponse
from .string_dictionary import StringDictionary
@@ -225,7 +233,9 @@
from .analysis_definition_paged import AnalysisDefinitionPaged
from .detector_definition_paged import DetectorDefinitionPaged
from .application_stack_paged import ApplicationStackPaged
+from .recommendation_paged import RecommendationPaged
from .source_control_paged import SourceControlPaged
+from .billing_meter_paged import BillingMeterPaged
from .geo_region_paged import GeoRegionPaged
from .identifier_paged import IdentifierPaged
from .premier_add_on_offer_paged import PremierAddOnOfferPaged
@@ -267,12 +277,14 @@
CertificateOrderStatus,
CertificateOrderActionType,
RouteType,
+ ManagedServiceIdentityType,
AutoHealActionType,
ConnectionStringType,
ScmType,
ManagedPipelineMode,
SiteLoadBalancing,
SupportedTlsVersions,
+ FtpsState,
SslState,
HostType,
UsageState,
@@ -303,7 +315,6 @@
BackupItemStatus,
DatabaseType,
FrequencyUnit,
- BackupRestoreOperationType,
ContinuousWebJobStatus,
WebJobType,
PublishingProfileFormat,
@@ -312,6 +323,7 @@
MSDeployProvisioningState,
MySqlMigrationType,
PublicCertificateLocation,
+ BackupRestoreOperationType,
UnauthenticatedClientAction,
BuiltInAuthenticationProvider,
CloneAbilityResult,
@@ -340,7 +352,6 @@
'SnapshotRecoveryTarget',
'SnapshotRecoveryRequest',
'ResourceMetricAvailability',
- 'ResourceMetricName',
'ResourceMetricDefinition',
'PushSettings',
'Identifier',
@@ -378,6 +389,9 @@
'SkuDescription',
'AppServicePlan',
'Resource',
+ 'DefaultErrorResponseErrorDetailsItem',
+ 'DefaultErrorResponseError',
+ 'DefaultErrorResponse', 'DefaultErrorResponseException',
'NameIdentifier',
'MetricAvailability',
'Dimension',
@@ -396,7 +410,6 @@
'DomainOwnershipIdentifier',
'DomainPatchResource',
'DomainRecommendationSearchParameters',
- 'ErrorResponse', 'ErrorResponseException',
'TldLegalAgreement',
'TopLevelDomain',
'TopLevelDomainAgreementOption',
@@ -412,6 +425,7 @@
'CsmUsageQuota',
'ErrorEntity',
'Operation',
+ 'ResourceMetricName',
'ResourceMetricProperty',
'ResourceMetricValue',
'ResourceMetric',
@@ -435,6 +449,7 @@
'ApplicationStack',
'Recommendation',
'RecommendationRule',
+ 'BillingMeter',
'CsmMoveResourceEnvelope',
'GeoRegion',
'HostingEnvironmentDeploymentInfo',
@@ -466,6 +481,7 @@
'CsmPublishingProfileOptions',
'CsmSlotEntity',
'CustomHostnameAnalysisResult',
+ 'DeletedAppRestoreRequest',
'Deployment',
'EnabledConfig',
'FileSystemHttpLogsConfig',
@@ -485,12 +501,14 @@
'PerfMonSet',
'PerfMonResponse',
'PremierAddOn',
+ 'PrivateAccessSubnet',
+ 'PrivateAccessVirtualNetwork',
+ 'PrivateAccess',
'ProcessThreadInfo',
'ProcessModuleInfo',
'ProcessInfo',
'PublicCertificate',
'RestoreRequest',
- 'RestoreResponse',
'SiteAuthSettings',
'SiteCloneabilityCriterion',
'SiteCloneability',
@@ -505,6 +523,8 @@
'SlotConfigNamesResource',
'SlotDifference',
'Snapshot',
+ 'SnapshotRecoverySource',
+ 'SnapshotRestoreRequest',
'StorageMigrationOptions',
'StorageMigrationResponse',
'StringDictionary',
@@ -537,7 +557,9 @@
'AnalysisDefinitionPaged',
'DetectorDefinitionPaged',
'ApplicationStackPaged',
+ 'RecommendationPaged',
'SourceControlPaged',
+ 'BillingMeterPaged',
'GeoRegionPaged',
'IdentifierPaged',
'PremierAddOnOfferPaged',
@@ -578,12 +600,14 @@
'CertificateOrderStatus',
'CertificateOrderActionType',
'RouteType',
+ 'ManagedServiceIdentityType',
'AutoHealActionType',
'ConnectionStringType',
'ScmType',
'ManagedPipelineMode',
'SiteLoadBalancing',
'SupportedTlsVersions',
+ 'FtpsState',
'SslState',
'HostType',
'UsageState',
@@ -614,7 +638,6 @@
'BackupItemStatus',
'DatabaseType',
'FrequencyUnit',
- 'BackupRestoreOperationType',
'ContinuousWebJobStatus',
'WebJobType',
'PublishingProfileFormat',
@@ -623,6 +646,7 @@
'MSDeployProvisioningState',
'MySqlMigrationType',
'PublicCertificateLocation',
+ 'BackupRestoreOperationType',
'UnauthenticatedClientAction',
'BuiltInAuthenticationProvider',
'CloneAbilityResult',
diff --git a/azure-mgmt-web/azure/mgmt/web/models/app_service_environment.py b/azure-mgmt-web/azure/mgmt/web/models/app_service_environment.py
index db13b73e5f00..28c702d2eba8 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/app_service_environment.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/app_service_environment.py
@@ -123,6 +123,9 @@ 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
"""
_validation = {
@@ -186,9 +189,10 @@ 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'},
}
- 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):
+ 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, has_linux_workers=None):
super(AppServiceEnvironment, self).__init__()
self.name = name
self.location = location
@@ -226,3 +230,4 @@ def __init__(self, name, location, virtual_network, worker_pools, vnet_name=None
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
diff --git a/azure-mgmt-web/azure/mgmt/web/models/app_service_environment_patch_resource.py b/azure-mgmt-web/azure/mgmt/web/models/app_service_environment_patch_resource.py
index fc92893eb4f4..b7f757b9dd7e 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/app_service_environment_patch_resource.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/app_service_environment_patch_resource.py
@@ -132,6 +132,9 @@ 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
"""
_validation = {
@@ -202,9 +205,10 @@ 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'},
}
- def __init__(self, app_service_environment_patch_resource_name, location, virtual_network, worker_pools, kind=None, 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):
+ def __init__(self, app_service_environment_patch_resource_name, location, virtual_network, worker_pools, kind=None, 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, has_linux_workers=None):
super(AppServiceEnvironmentPatchResource, self).__init__(kind=kind)
self.app_service_environment_patch_resource_name = app_service_environment_patch_resource_name
self.location = location
@@ -242,3 +246,4 @@ def __init__(self, app_service_environment_patch_resource_name, location, virtua
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
diff --git a/azure-mgmt-web/azure/mgmt/web/models/app_service_environment_resource.py b/azure-mgmt-web/azure/mgmt/web/models/app_service_environment_resource.py
index 58ebede0b657..060a4ab89ab3 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/app_service_environment_resource.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/app_service_environment_resource.py
@@ -137,6 +137,9 @@ 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
"""
_validation = {
@@ -210,9 +213,10 @@ 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'},
}
- def __init__(self, location, app_service_environment_resource_name, app_service_environment_resource_location, virtual_network, worker_pools, kind=None, tags=None, 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):
+ def __init__(self, location, app_service_environment_resource_name, app_service_environment_resource_location, virtual_network, worker_pools, kind=None, tags=None, 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, has_linux_workers=None):
super(AppServiceEnvironmentResource, self).__init__(kind=kind, location=location, tags=tags)
self.app_service_environment_resource_name = app_service_environment_resource_name
self.app_service_environment_resource_location = app_service_environment_resource_location
@@ -250,3 +254,4 @@ def __init__(self, location, app_service_environment_resource_name, app_service_
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
diff --git a/azure-mgmt-web/azure/mgmt/web/models/app_service_plan.py b/azure-mgmt-web/azure/mgmt/web/models/app_service_plan.py
index 69647b08d17a..cca5e07111ef 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/app_service_plan.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/app_service_plan.py
@@ -30,8 +30,6 @@ class AppServicePlan(Resource):
:vartype type: str
:param tags: Resource tags.
:type tags: dict[str, str]
- :param app_service_plan_name: 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
@@ -69,6 +67,9 @@ class AppServicePlan(Resource):
:param reserved: If Linux app service plan true
,
false
otherwise. Default value: False .
:type reserved: bool
+ :param is_xenon: If Hyper-V container app service plan true
,
+ false
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.
@@ -87,7 +88,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},
@@ -104,7 +104,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'},
@@ -118,15 +117,15 @@ class AppServicePlan(Resource):
'spot_expiration_time': {'key': 'properties.spotExpirationTime', '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'},
'sku': {'key': 'sku', 'type': 'SkuDescription'},
}
- def __init__(self, location, app_service_plan_name, kind=None, tags=None, worker_tier_name=None, admin_site_name=None, hosting_environment_profile=None, per_site_scaling=False, is_spot=None, spot_expiration_time=None, reserved=False, target_worker_count=None, target_worker_size_id=None, sku=None):
+ def __init__(self, location, kind=None, tags=None, worker_tier_name=None, admin_site_name=None, hosting_environment_profile=None, per_site_scaling=False, is_spot=None, spot_expiration_time=None, reserved=False, is_xenon=False, target_worker_count=None, target_worker_size_id=None, sku=None):
super(AppServicePlan, self).__init__(kind=kind, location=location, tags=tags)
- self.app_service_plan_name = app_service_plan_name
self.worker_tier_name = worker_tier_name
self.status = None
self.subscription = None
@@ -140,6 +139,7 @@ def __init__(self, location, app_service_plan_name, kind=None, tags=None, worker
self.spot_expiration_time = spot_expiration_time
self.resource_group = None
self.reserved = reserved
+ self.is_xenon = is_xenon
self.target_worker_count = target_worker_count
self.target_worker_size_id = target_worker_size_id
self.provisioning_state = None
diff --git a/azure-mgmt-web/azure/mgmt/web/models/app_service_plan_patch_resource.py b/azure-mgmt-web/azure/mgmt/web/models/app_service_plan_patch_resource.py
index a2a773a5469e..ed56b12f52d8 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/app_service_plan_patch_resource.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/app_service_plan_patch_resource.py
@@ -26,9 +26,6 @@ class AppServicePlanPatchResource(ProxyOnlyResource):
:type kind: str
:ivar type: Resource type.
:vartype type: str
- :param app_service_plan_patch_resource_name: Name for the App Service
- plan.
- :type app_service_plan_patch_resource_name: str
:param worker_tier_name: Target worker tier assigned to the App Service
plan.
:type worker_tier_name: str
@@ -66,6 +63,9 @@ class AppServicePlanPatchResource(ProxyOnlyResource):
:param reserved: If Linux app service plan true
,
false
otherwise. Default value: False .
:type reserved: bool
+ :param is_xenon: If Hyper-V container app service plan true
,
+ false
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.
@@ -81,7 +81,6 @@ class AppServicePlanPatchResource(ProxyOnlyResource):
'id': {'readonly': True},
'name': {'readonly': True},
'type': {'readonly': True},
- 'app_service_plan_patch_resource_name': {'required': True},
'status': {'readonly': True},
'subscription': {'readonly': True},
'maximum_number_of_workers': {'readonly': True},
@@ -96,7 +95,6 @@ class AppServicePlanPatchResource(ProxyOnlyResource):
'name': {'key': 'name', 'type': 'str'},
'kind': {'key': 'kind', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
- 'app_service_plan_patch_resource_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'},
@@ -110,14 +108,14 @@ class AppServicePlanPatchResource(ProxyOnlyResource):
'spot_expiration_time': {'key': 'properties.spotExpirationTime', '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'},
}
- def __init__(self, app_service_plan_patch_resource_name, kind=None, worker_tier_name=None, admin_site_name=None, hosting_environment_profile=None, per_site_scaling=False, is_spot=None, spot_expiration_time=None, reserved=False, target_worker_count=None, target_worker_size_id=None):
+ def __init__(self, kind=None, worker_tier_name=None, admin_site_name=None, hosting_environment_profile=None, per_site_scaling=False, is_spot=None, spot_expiration_time=None, reserved=False, is_xenon=False, target_worker_count=None, target_worker_size_id=None):
super(AppServicePlanPatchResource, self).__init__(kind=kind)
- self.app_service_plan_patch_resource_name = app_service_plan_patch_resource_name
self.worker_tier_name = worker_tier_name
self.status = None
self.subscription = None
@@ -131,6 +129,7 @@ def __init__(self, app_service_plan_patch_resource_name, kind=None, worker_tier_
self.spot_expiration_time = spot_expiration_time
self.resource_group = None
self.reserved = reserved
+ self.is_xenon = is_xenon
self.target_worker_count = target_worker_count
self.target_worker_size_id = target_worker_size_id
self.provisioning_state = None
diff --git a/azure-mgmt-web/azure/mgmt/web/models/backup_request.py b/azure-mgmt-web/azure/mgmt/web/models/backup_request.py
index d3e9df59b00d..fc7277bbc9a6 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/backup_request.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/backup_request.py
@@ -26,8 +26,6 @@ class BackupRequest(ProxyOnlyResource):
:type kind: str
:ivar type: Resource type.
:vartype type: str
- :param backup_request_name: Name of the backup.
- :type backup_request_name: str
:param enabled: True if the backup schedule is enabled (must be included
in that case), false if the backup schedule should be disabled.
:type enabled: bool
@@ -38,17 +36,12 @@ class BackupRequest(ProxyOnlyResource):
:type backup_schedule: ~azure.mgmt.web.models.BackupSchedule
:param databases: Databases included in the backup.
:type databases: list[~azure.mgmt.web.models.DatabaseBackupSetting]
- :param backup_request_type: Type of the backup. Possible values include:
- 'Default', 'Clone', 'Relocation', 'Snapshot'
- :type backup_request_type: str or
- ~azure.mgmt.web.models.BackupRestoreOperationType
"""
_validation = {
'id': {'readonly': True},
'name': {'readonly': True},
'type': {'readonly': True},
- 'backup_request_name': {'required': True},
'storage_account_url': {'required': True},
}
@@ -57,19 +50,15 @@ class BackupRequest(ProxyOnlyResource):
'name': {'key': 'name', 'type': 'str'},
'kind': {'key': 'kind', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
- 'backup_request_name': {'key': 'properties.name', 'type': 'str'},
'enabled': {'key': 'properties.enabled', 'type': 'bool'},
'storage_account_url': {'key': 'properties.storageAccountUrl', 'type': 'str'},
'backup_schedule': {'key': 'properties.backupSchedule', 'type': 'BackupSchedule'},
'databases': {'key': 'properties.databases', 'type': '[DatabaseBackupSetting]'},
- 'backup_request_type': {'key': 'properties.type', 'type': 'BackupRestoreOperationType'},
}
- def __init__(self, backup_request_name, storage_account_url, kind=None, enabled=None, backup_schedule=None, databases=None, backup_request_type=None):
+ def __init__(self, storage_account_url, kind=None, enabled=None, backup_schedule=None, databases=None):
super(BackupRequest, self).__init__(kind=kind)
- self.backup_request_name = backup_request_name
self.enabled = enabled
self.storage_account_url = storage_account_url
self.backup_schedule = backup_schedule
self.databases = databases
- self.backup_request_type = backup_request_type
diff --git a/azure-mgmt-web/azure/mgmt/web/models/billing_meter.py b/azure-mgmt-web/azure/mgmt/web/models/billing_meter.py
new file mode 100644
index 000000000000..dd86c4b4f120
--- /dev/null
+++ b/azure-mgmt-web/azure/mgmt/web/models/billing_meter.py
@@ -0,0 +1,66 @@
+# 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 BillingMeter(ProxyOnlyResource):
+ """App Service billing entity that contains information about meter which the
+ Azure billing system utilizes to charge users for services.
+
+ 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 meter_id: Meter GUID onboarded in Commerce
+ :type meter_id: str
+ :param billing_location: Azure Location of billable resource
+ :type billing_location: str
+ :param short_name: Short Name from App Service Azure pricing Page
+ :type short_name: str
+ :param friendly_name: Friendly name of the meter
+ :type friendly_name: str
+ :param resource_type: App Service ResourceType meter used for
+ :type resource_type: str
+ """
+
+ _validation = {
+ 'id': {'readonly': True},
+ 'name': {'readonly': True},
+ 'type': {'readonly': True},
+ }
+
+ _attribute_map = {
+ 'id': {'key': 'id', 'type': 'str'},
+ 'name': {'key': 'name', 'type': 'str'},
+ 'kind': {'key': 'kind', 'type': 'str'},
+ 'type': {'key': 'type', 'type': 'str'},
+ 'meter_id': {'key': 'properties.meterId', 'type': 'str'},
+ 'billing_location': {'key': 'properties.billingLocation', 'type': 'str'},
+ 'short_name': {'key': 'properties.shortName', 'type': 'str'},
+ 'friendly_name': {'key': 'properties.friendlyName', 'type': 'str'},
+ 'resource_type': {'key': 'properties.resourceType', 'type': 'str'},
+ }
+
+ def __init__(self, kind=None, meter_id=None, billing_location=None, short_name=None, friendly_name=None, resource_type=None):
+ super(BillingMeter, self).__init__(kind=kind)
+ self.meter_id = meter_id
+ self.billing_location = billing_location
+ self.short_name = short_name
+ self.friendly_name = friendly_name
+ self.resource_type = resource_type
diff --git a/azure-mgmt-web/azure/mgmt/web/models/billing_meter_paged.py b/azure-mgmt-web/azure/mgmt/web/models/billing_meter_paged.py
new file mode 100644
index 000000000000..cb7b9103b59d
--- /dev/null
+++ b/azure-mgmt-web/azure/mgmt/web/models/billing_meter_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 BillingMeterPaged(Paged):
+ """
+ A paging container for iterating over a list of :class:`BillingMeter ` object
+ """
+
+ _attribute_map = {
+ 'next_link': {'key': 'nextLink', 'type': 'str'},
+ 'current_page': {'key': 'value', 'type': '[BillingMeter]'}
+ }
+
+ def __init__(self, *args, **kwargs):
+
+ super(BillingMeterPaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-web/azure/mgmt/web/models/certificate.py b/azure-mgmt-web/azure/mgmt/web/models/certificate.py
index 5183a1ad5dca..487c446304a9 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/certificate.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/certificate.py
@@ -74,8 +74,6 @@ class Certificate(Resource):
'Unknown'
:vartype key_vault_secret_status: str or
~azure.mgmt.web.models.KeyVaultSecretStatus
- :ivar geo_region: Region of the certificate.
- :vartype geo_region: str
:param server_farm_id: Resource ID of the associated App Service plan,
formatted as:
"/subscriptions/{subscriptionID}/resourceGroups/{groupName}/providers/Microsoft.Web/serverfarms/{appServicePlanName}".
@@ -101,7 +99,6 @@ class Certificate(Resource):
'public_key_hash': {'readonly': True},
'hosting_environment_profile': {'readonly': True},
'key_vault_secret_status': {'readonly': True},
- 'geo_region': {'readonly': True},
}
_attribute_map = {
@@ -129,7 +126,6 @@ class Certificate(Resource):
'key_vault_id': {'key': 'properties.keyVaultId', 'type': 'str'},
'key_vault_secret_name': {'key': 'properties.keyVaultSecretName', 'type': 'str'},
'key_vault_secret_status': {'key': 'properties.keyVaultSecretStatus', 'type': 'KeyVaultSecretStatus'},
- 'geo_region': {'key': 'properties.geoRegion', 'type': 'str'},
'server_farm_id': {'key': 'properties.serverFarmId', 'type': 'str'},
}
@@ -153,5 +149,4 @@ def __init__(self, location, password, kind=None, tags=None, host_names=None, pf
self.key_vault_id = key_vault_id
self.key_vault_secret_name = key_vault_secret_name
self.key_vault_secret_status = None
- self.geo_region = None
self.server_farm_id = server_farm_id
diff --git a/azure-mgmt-web/azure/mgmt/web/models/certificate_order_action.py b/azure-mgmt-web/azure/mgmt/web/models/certificate_order_action.py
index 3144e61ed987..a205ab7f4770 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/certificate_order_action.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/certificate_order_action.py
@@ -26,22 +26,24 @@ class CertificateOrderAction(ProxyOnlyResource):
:type kind: str
:ivar type: Resource type.
:vartype type: str
- :param certificate_order_action_type: Action type. Possible values
- include: 'CertificateIssued', 'CertificateOrderCanceled',
+ :ivar action_type: Action type. Possible values include:
+ 'CertificateIssued', 'CertificateOrderCanceled',
'CertificateOrderCreated', 'CertificateRevoked',
'DomainValidationComplete', 'FraudDetected', 'OrgNameChange',
'OrgValidationComplete', 'SanDrop', 'FraudCleared', 'CertificateExpired',
'CertificateExpirationWarning', 'FraudDocumentationRequired', 'Unknown'
- :type certificate_order_action_type: str or
+ :vartype action_type: str or
~azure.mgmt.web.models.CertificateOrderActionType
- :param created_at: Time at which the certificate action was performed.
- :type created_at: datetime
+ :ivar created_at: Time at which the certificate action was performed.
+ :vartype created_at: datetime
"""
_validation = {
'id': {'readonly': True},
'name': {'readonly': True},
'type': {'readonly': True},
+ 'action_type': {'readonly': True},
+ 'created_at': {'readonly': True},
}
_attribute_map = {
@@ -49,11 +51,11 @@ class CertificateOrderAction(ProxyOnlyResource):
'name': {'key': 'name', 'type': 'str'},
'kind': {'key': 'kind', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
- 'certificate_order_action_type': {'key': 'properties.type', 'type': 'CertificateOrderActionType'},
+ 'action_type': {'key': 'properties.actionType', 'type': 'CertificateOrderActionType'},
'created_at': {'key': 'properties.createdAt', 'type': 'iso-8601'},
}
- def __init__(self, kind=None, certificate_order_action_type=None, created_at=None):
+ def __init__(self, kind=None):
super(CertificateOrderAction, self).__init__(kind=kind)
- self.certificate_order_action_type = certificate_order_action_type
- self.created_at = created_at
+ self.action_type = None
+ self.created_at = None
diff --git a/azure-mgmt-web/azure/mgmt/web/models/certificate_patch_resource.py b/azure-mgmt-web/azure/mgmt/web/models/certificate_patch_resource.py
index 3492c509073c..970f5231ea60 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/certificate_patch_resource.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/certificate_patch_resource.py
@@ -70,8 +70,6 @@ class CertificatePatchResource(ProxyOnlyResource):
'Unknown'
:vartype key_vault_secret_status: str or
~azure.mgmt.web.models.KeyVaultSecretStatus
- :ivar geo_region: Region of the certificate.
- :vartype geo_region: str
:param server_farm_id: Resource ID of the associated App Service plan,
formatted as:
"/subscriptions/{subscriptionID}/resourceGroups/{groupName}/providers/Microsoft.Web/serverfarms/{appServicePlanName}".
@@ -96,7 +94,6 @@ class CertificatePatchResource(ProxyOnlyResource):
'public_key_hash': {'readonly': True},
'hosting_environment_profile': {'readonly': True},
'key_vault_secret_status': {'readonly': True},
- 'geo_region': {'readonly': True},
}
_attribute_map = {
@@ -122,7 +119,6 @@ class CertificatePatchResource(ProxyOnlyResource):
'key_vault_id': {'key': 'properties.keyVaultId', 'type': 'str'},
'key_vault_secret_name': {'key': 'properties.keyVaultSecretName', 'type': 'str'},
'key_vault_secret_status': {'key': 'properties.keyVaultSecretStatus', 'type': 'KeyVaultSecretStatus'},
- 'geo_region': {'key': 'properties.geoRegion', 'type': 'str'},
'server_farm_id': {'key': 'properties.serverFarmId', 'type': 'str'},
}
@@ -146,5 +142,4 @@ def __init__(self, password, kind=None, host_names=None, pfx_blob=None, key_vaul
self.key_vault_id = key_vault_id
self.key_vault_secret_name = key_vault_secret_name
self.key_vault_secret_status = None
- self.geo_region = None
self.server_farm_id = server_farm_id
diff --git a/azure-mgmt-web/azure/mgmt/web/models/cloning_info.py b/azure-mgmt-web/azure/mgmt/web/models/cloning_info.py
index 193c1610ef4d..bf2394b5b3b6 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/cloning_info.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/cloning_info.py
@@ -53,9 +53,6 @@ class CloningInfo(Model):
create. This is only needed if Traffic Manager profile does not already
exist.
:type traffic_manager_profile_name: str
- :param ignore_quotas: true
if quotas should be ignored;
- otherwise, false
.
- :type ignore_quotas: bool
"""
_validation = {
@@ -73,10 +70,9 @@ class CloningInfo(Model):
'configure_load_balancing': {'key': 'configureLoadBalancing', 'type': 'bool'},
'traffic_manager_profile_id': {'key': 'trafficManagerProfileId', 'type': 'str'},
'traffic_manager_profile_name': {'key': 'trafficManagerProfileName', 'type': 'str'},
- 'ignore_quotas': {'key': 'ignoreQuotas', 'type': 'bool'},
}
- def __init__(self, source_web_app_id, correlation_id=None, overwrite=None, clone_custom_host_names=None, clone_source_control=None, hosting_environment=None, app_settings_overrides=None, configure_load_balancing=None, traffic_manager_profile_id=None, traffic_manager_profile_name=None, ignore_quotas=None):
+ def __init__(self, source_web_app_id, correlation_id=None, overwrite=None, clone_custom_host_names=None, clone_source_control=None, hosting_environment=None, app_settings_overrides=None, configure_load_balancing=None, traffic_manager_profile_id=None, traffic_manager_profile_name=None):
super(CloningInfo, self).__init__()
self.correlation_id = correlation_id
self.overwrite = overwrite
@@ -88,4 +84,3 @@ def __init__(self, source_web_app_id, correlation_id=None, overwrite=None, clone
self.configure_load_balancing = configure_load_balancing
self.traffic_manager_profile_id = traffic_manager_profile_id
self.traffic_manager_profile_name = traffic_manager_profile_name
- self.ignore_quotas = ignore_quotas
diff --git a/azure-mgmt-web/azure/mgmt/web/models/continuous_web_job.py b/azure-mgmt-web/azure/mgmt/web/models/continuous_web_job.py
index d8df3ee5ea9a..20db93fb0ce7 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/continuous_web_job.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/continuous_web_job.py
@@ -33,18 +33,15 @@ class ContinuousWebJob(ProxyOnlyResource):
:type detailed_status: str
:param log_url: Log URL.
:type log_url: str
- :ivar continuous_web_job_name: Job name. Used as job identifier in ARM
- resource URI.
- :vartype continuous_web_job_name: str
:param run_command: Run command.
:type run_command: str
:param url: Job URL.
:type url: str
:param extra_info_url: Extra Info URL.
:type extra_info_url: str
- :param job_type: Job type. Possible values include: 'Continuous',
+ :param web_job_type: Job type. Possible values include: 'Continuous',
'Triggered'
- :type job_type: str or ~azure.mgmt.web.models.WebJobType
+ :type web_job_type: str or ~azure.mgmt.web.models.WebJobType
:param error: Error information.
:type error: str
:param using_sdk: Using SDK?
@@ -57,7 +54,6 @@ class ContinuousWebJob(ProxyOnlyResource):
'id': {'readonly': True},
'name': {'readonly': True},
'type': {'readonly': True},
- 'continuous_web_job_name': {'readonly': True},
}
_attribute_map = {
@@ -66,28 +62,26 @@ class ContinuousWebJob(ProxyOnlyResource):
'kind': {'key': 'kind', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
'status': {'key': 'properties.status', 'type': 'ContinuousWebJobStatus'},
- 'detailed_status': {'key': 'properties.detailedStatus', 'type': 'str'},
- 'log_url': {'key': 'properties.logUrl', 'type': 'str'},
- 'continuous_web_job_name': {'key': 'properties.name', 'type': 'str'},
- 'run_command': {'key': 'properties.runCommand', 'type': 'str'},
+ 'detailed_status': {'key': 'properties.detailed_status', 'type': 'str'},
+ 'log_url': {'key': 'properties.log_url', 'type': 'str'},
+ 'run_command': {'key': 'properties.run_command', 'type': 'str'},
'url': {'key': 'properties.url', 'type': 'str'},
- 'extra_info_url': {'key': 'properties.extraInfoUrl', 'type': 'str'},
- 'job_type': {'key': 'properties.jobType', 'type': 'WebJobType'},
+ 'extra_info_url': {'key': 'properties.extra_info_url', 'type': 'str'},
+ 'web_job_type': {'key': 'properties.web_job_type', 'type': 'WebJobType'},
'error': {'key': 'properties.error', 'type': 'str'},
- 'using_sdk': {'key': 'properties.usingSdk', 'type': 'bool'},
+ 'using_sdk': {'key': 'properties.using_sdk', 'type': 'bool'},
'settings': {'key': 'properties.settings', 'type': '{object}'},
}
- def __init__(self, kind=None, status=None, detailed_status=None, log_url=None, run_command=None, url=None, extra_info_url=None, job_type=None, error=None, using_sdk=None, settings=None):
+ def __init__(self, kind=None, status=None, detailed_status=None, log_url=None, run_command=None, url=None, extra_info_url=None, web_job_type=None, error=None, using_sdk=None, settings=None):
super(ContinuousWebJob, self).__init__(kind=kind)
self.status = status
self.detailed_status = detailed_status
self.log_url = log_url
- self.continuous_web_job_name = None
self.run_command = run_command
self.url = url
self.extra_info_url = extra_info_url
- self.job_type = job_type
+ self.web_job_type = web_job_type
self.error = error
self.using_sdk = using_sdk
self.settings = settings
diff --git a/azure-mgmt-web/azure/mgmt/web/models/error_response.py b/azure-mgmt-web/azure/mgmt/web/models/default_error_response.py
similarity index 50%
rename from azure-mgmt-web/azure/mgmt/web/models/error_response.py
rename to azure-mgmt-web/azure/mgmt/web/models/default_error_response.py
index 97176b87f7b3..7a16dd576a12 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/error_response.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/default_error_response.py
@@ -13,28 +13,31 @@
from msrest.exceptions import HttpOperationError
-class ErrorResponse(Model):
- """Error Response.
+class DefaultErrorResponse(Model):
+ """App Service error response.
- :param code: Error code.
- :type code: str
- :param message: Error message indicating why the operation failed.
- :type message: str
+ Variables are only populated by the server, and will be ignored when
+ sending a request.
+
+ :ivar error: Error model.
+ :vartype error: ~azure.mgmt.web.models.DefaultErrorResponseError
"""
+ _validation = {
+ 'error': {'readonly': True},
+ }
+
_attribute_map = {
- 'code': {'key': 'code', 'type': 'str'},
- 'message': {'key': 'message', 'type': 'str'},
+ 'error': {'key': 'error', 'type': 'DefaultErrorResponseError'},
}
- def __init__(self, code=None, message=None):
- super(ErrorResponse, self).__init__()
- self.code = code
- self.message = message
+ def __init__(self):
+ super(DefaultErrorResponse, self).__init__()
+ self.error = None
-class ErrorResponseException(HttpOperationError):
- """Server responsed with exception of type: 'ErrorResponse'.
+class DefaultErrorResponseException(HttpOperationError):
+ """Server responsed with exception of type: 'DefaultErrorResponse'.
:param deserialize: A deserializer
:param response: Server response to be deserialized.
@@ -42,4 +45,4 @@ class ErrorResponseException(HttpOperationError):
def __init__(self, deserialize, response, *args):
- super(ErrorResponseException, self).__init__(deserialize, response, 'ErrorResponse', *args)
+ super(DefaultErrorResponseException, self).__init__(deserialize, response, 'DefaultErrorResponse', *args)
diff --git a/azure-mgmt-web/azure/mgmt/web/models/default_error_response_error.py b/azure-mgmt-web/azure/mgmt/web/models/default_error_response_error.py
new file mode 100644
index 000000000000..a310e52fd21b
--- /dev/null
+++ b/azure-mgmt-web/azure/mgmt/web/models/default_error_response_error.py
@@ -0,0 +1,55 @@
+# 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 DefaultErrorResponseError(Model):
+ """Error model.
+
+ Variables are only populated by the server, and will be ignored when
+ sending a request.
+
+ :ivar code: Standardized string to programmatically identify the error.
+ :vartype code: str
+ :ivar message: Detailed error description and debugging information.
+ :vartype message: str
+ :ivar target: Detailed error description and debugging information.
+ :vartype target: str
+ :param details:
+ :type details:
+ list[~azure.mgmt.web.models.DefaultErrorResponseErrorDetailsItem]
+ :ivar innererror: More information to debug error.
+ :vartype innererror: str
+ """
+
+ _validation = {
+ 'code': {'readonly': True},
+ 'message': {'readonly': True},
+ 'target': {'readonly': True},
+ 'innererror': {'readonly': True},
+ }
+
+ _attribute_map = {
+ 'code': {'key': 'code', 'type': 'str'},
+ 'message': {'key': 'message', 'type': 'str'},
+ 'target': {'key': 'target', 'type': 'str'},
+ 'details': {'key': 'details', 'type': '[DefaultErrorResponseErrorDetailsItem]'},
+ 'innererror': {'key': 'innererror', 'type': 'str'},
+ }
+
+ def __init__(self, details=None):
+ super(DefaultErrorResponseError, self).__init__()
+ self.code = None
+ self.message = None
+ self.target = None
+ self.details = details
+ self.innererror = None
diff --git a/azure-mgmt-web/azure/mgmt/web/models/default_error_response_error_details_item.py b/azure-mgmt-web/azure/mgmt/web/models/default_error_response_error_details_item.py
new file mode 100644
index 000000000000..7434138df870
--- /dev/null
+++ b/azure-mgmt-web/azure/mgmt/web/models/default_error_response_error_details_item.py
@@ -0,0 +1,45 @@
+# 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 DefaultErrorResponseErrorDetailsItem(Model):
+ """Detailed errors.
+
+ Variables are only populated by the server, and will be ignored when
+ sending a request.
+
+ :ivar code: Standardized string to programmatically identify the error.
+ :vartype code: str
+ :ivar message: Detailed error description and debugging information.
+ :vartype message: str
+ :ivar target: Detailed error description and debugging information.
+ :vartype target: str
+ """
+
+ _validation = {
+ 'code': {'readonly': True},
+ 'message': {'readonly': True},
+ 'target': {'readonly': True},
+ }
+
+ _attribute_map = {
+ 'code': {'key': 'code', 'type': 'str'},
+ 'message': {'key': 'message', 'type': 'str'},
+ 'target': {'key': 'target', 'type': 'str'},
+ }
+
+ def __init__(self):
+ super(DefaultErrorResponseErrorDetailsItem, self).__init__()
+ self.code = None
+ self.message = None
+ self.target = None
diff --git a/azure-mgmt-web/azure/mgmt/web/models/deleted_app_restore_request.py b/azure-mgmt-web/azure/mgmt/web/models/deleted_app_restore_request.py
new file mode 100644
index 000000000000..49f7abbcd3b0
--- /dev/null
+++ b/azure-mgmt-web/azure/mgmt/web/models/deleted_app_restore_request.py
@@ -0,0 +1,61 @@
+# 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 DeletedAppRestoreRequest(ProxyOnlyResource):
+ """Details about restoring a deleted app.
+
+ 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 deleted_site_id: ARM resource ID of the deleted app. Example:
+ /subscriptions/{subId}/providers/Microsoft.Web/deletedSites/{deletedSiteId}
+ :type deleted_site_id: str
+ :param recover_configuration: If true, deleted site configuration, in
+ addition to content, will be restored.
+ :type recover_configuration: bool
+ :param snapshot_time: Point in time to restore the deleted app from,
+ formatted as a DateTime string.
+ If unspecified, default value is the time that the app was deleted.
+ :type snapshot_time: str
+ """
+
+ _validation = {
+ 'id': {'readonly': True},
+ 'name': {'readonly': True},
+ 'type': {'readonly': True},
+ }
+
+ _attribute_map = {
+ 'id': {'key': 'id', 'type': 'str'},
+ 'name': {'key': 'name', 'type': 'str'},
+ 'kind': {'key': 'kind', 'type': 'str'},
+ 'type': {'key': 'type', 'type': 'str'},
+ 'deleted_site_id': {'key': 'properties.deletedSiteId', 'type': 'str'},
+ 'recover_configuration': {'key': 'properties.recoverConfiguration', 'type': 'bool'},
+ 'snapshot_time': {'key': 'properties.snapshotTime', 'type': 'str'},
+ }
+
+ def __init__(self, kind=None, deleted_site_id=None, recover_configuration=None, snapshot_time=None):
+ super(DeletedAppRestoreRequest, self).__init__(kind=kind)
+ self.deleted_site_id = deleted_site_id
+ self.recover_configuration = recover_configuration
+ self.snapshot_time = snapshot_time
diff --git a/azure-mgmt-web/azure/mgmt/web/models/deleted_site.py b/azure-mgmt-web/azure/mgmt/web/models/deleted_site.py
index 19a9102156d8..c2907dff3cfb 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/deleted_site.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/deleted_site.py
@@ -18,16 +18,16 @@ class DeletedSite(Model):
Variables are only populated by the server, and will be ignored when
sending a request.
- :param id: Numeric id for the deleted site
- :type id: int
+ :param deleted_site_id: Numeric id for the deleted site
+ :type deleted_site_id: int
:ivar deleted_timestamp: Time in UTC when the app was deleted.
:vartype deleted_timestamp: str
:ivar subscription: Subscription containing the deleted site
:vartype subscription: str
:ivar resource_group: ResourceGroup that contained the deleted site
:vartype resource_group: str
- :ivar name: Name of the deleted site
- :vartype name: str
+ :ivar deleted_site_name: Name of the deleted site
+ :vartype deleted_site_name: str
:ivar slot: Slot of the deleted site
:vartype slot: str
"""
@@ -36,24 +36,24 @@ class DeletedSite(Model):
'deleted_timestamp': {'readonly': True},
'subscription': {'readonly': True},
'resource_group': {'readonly': True},
- 'name': {'readonly': True},
+ 'deleted_site_name': {'readonly': True},
'slot': {'readonly': True},
}
_attribute_map = {
- 'id': {'key': 'id', 'type': 'int'},
+ 'deleted_site_id': {'key': 'deletedSiteId', 'type': 'int'},
'deleted_timestamp': {'key': 'deletedTimestamp', 'type': 'str'},
'subscription': {'key': 'subscription', 'type': 'str'},
'resource_group': {'key': 'resourceGroup', 'type': 'str'},
- 'name': {'key': 'name', 'type': 'str'},
+ 'deleted_site_name': {'key': 'deletedSiteName', 'type': 'str'},
'slot': {'key': 'slot', 'type': 'str'},
}
- def __init__(self, id=None):
+ def __init__(self, deleted_site_id=None):
super(DeletedSite, self).__init__()
- self.id = id
+ self.deleted_site_id = deleted_site_id
self.deleted_timestamp = None
self.subscription = None
self.resource_group = None
- self.name = None
+ self.deleted_site_name = None
self.slot = None
diff --git a/azure-mgmt-web/azure/mgmt/web/models/deployment.py b/azure-mgmt-web/azure/mgmt/web/models/deployment.py
index 27ce8941211f..0e42459b7c37 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/deployment.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/deployment.py
@@ -26,8 +26,6 @@ class Deployment(ProxyOnlyResource):
:type kind: str
:ivar type: Resource type.
:vartype type: str
- :param deployment_id: Identifier for deployment.
- :type deployment_id: str
:param status: Deployment status.
:type status: int
:param message: Details about deployment status.
@@ -60,21 +58,19 @@ class Deployment(ProxyOnlyResource):
'name': {'key': 'name', 'type': 'str'},
'kind': {'key': 'kind', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
- 'deployment_id': {'key': 'properties.id', 'type': 'str'},
'status': {'key': 'properties.status', 'type': 'int'},
'message': {'key': 'properties.message', 'type': 'str'},
'author': {'key': 'properties.author', 'type': 'str'},
'deployer': {'key': 'properties.deployer', 'type': 'str'},
- 'author_email': {'key': 'properties.authorEmail', 'type': 'str'},
- 'start_time': {'key': 'properties.startTime', 'type': 'iso-8601'},
- 'end_time': {'key': 'properties.endTime', 'type': 'iso-8601'},
+ 'author_email': {'key': 'properties.author_email', 'type': 'str'},
+ 'start_time': {'key': 'properties.start_time', 'type': 'iso-8601'},
+ 'end_time': {'key': 'properties.end_time', 'type': 'iso-8601'},
'active': {'key': 'properties.active', 'type': 'bool'},
'details': {'key': 'properties.details', 'type': 'str'},
}
- def __init__(self, kind=None, deployment_id=None, status=None, message=None, author=None, deployer=None, author_email=None, start_time=None, end_time=None, active=None, details=None):
+ def __init__(self, kind=None, status=None, message=None, author=None, deployer=None, author_email=None, start_time=None, end_time=None, active=None, details=None):
super(Deployment, self).__init__(kind=kind)
- self.deployment_id = deployment_id
self.status = status
self.message = message
self.author = author
diff --git a/azure-mgmt-web/azure/mgmt/web/models/function_envelope.py b/azure-mgmt-web/azure/mgmt/web/models/function_envelope.py
index e68f283aefb7..e1d11c9d8602 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/function_envelope.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/function_envelope.py
@@ -26,10 +26,8 @@ class FunctionEnvelope(ProxyOnlyResource):
:type kind: str
:ivar type: Resource type.
:vartype type: str
- :ivar function_envelope_name: Function name.
- :vartype function_envelope_name: str
- :ivar function_app_id: Function App ID.
- :vartype function_app_id: str
+ :param function_app_id: Function App ID.
+ :type function_app_id: str
:param script_root_path_href: Script root path URI.
:type script_root_path_href: str
:param script_href: Script URI.
@@ -52,8 +50,6 @@ class FunctionEnvelope(ProxyOnlyResource):
'id': {'readonly': True},
'name': {'readonly': True},
'type': {'readonly': True},
- 'function_envelope_name': {'readonly': True},
- 'function_app_id': {'readonly': True},
}
_attribute_map = {
@@ -61,22 +57,20 @@ class FunctionEnvelope(ProxyOnlyResource):
'name': {'key': 'name', 'type': 'str'},
'kind': {'key': 'kind', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
- 'function_envelope_name': {'key': 'properties.name', 'type': 'str'},
- 'function_app_id': {'key': 'properties.functionAppId', 'type': 'str'},
- 'script_root_path_href': {'key': 'properties.scriptRootPathHref', 'type': 'str'},
- 'script_href': {'key': 'properties.scriptHref', 'type': 'str'},
- 'config_href': {'key': 'properties.configHref', 'type': 'str'},
- 'secrets_file_href': {'key': 'properties.secretsFileHref', 'type': 'str'},
+ 'function_app_id': {'key': 'properties.function_app_id', 'type': 'str'},
+ 'script_root_path_href': {'key': 'properties.script_root_path_href', 'type': 'str'},
+ 'script_href': {'key': 'properties.script_href', 'type': 'str'},
+ 'config_href': {'key': 'properties.config_href', 'type': 'str'},
+ 'secrets_file_href': {'key': 'properties.secrets_file_href', 'type': 'str'},
'href': {'key': 'properties.href', 'type': 'str'},
'config': {'key': 'properties.config', 'type': 'object'},
'files': {'key': 'properties.files', 'type': '{str}'},
- 'test_data': {'key': 'properties.testData', 'type': 'str'},
+ 'test_data': {'key': 'properties.test_data', 'type': 'str'},
}
- def __init__(self, kind=None, script_root_path_href=None, script_href=None, config_href=None, secrets_file_href=None, href=None, config=None, files=None, test_data=None):
+ def __init__(self, kind=None, function_app_id=None, script_root_path_href=None, script_href=None, config_href=None, secrets_file_href=None, href=None, config=None, files=None, test_data=None):
super(FunctionEnvelope, self).__init__(kind=kind)
- self.function_envelope_name = None
- self.function_app_id = None
+ self.function_app_id = function_app_id
self.script_root_path_href = script_root_path_href
self.script_href = script_href
self.config_href = config_href
diff --git a/azure-mgmt-web/azure/mgmt/web/models/function_secrets.py b/azure-mgmt-web/azure/mgmt/web/models/function_secrets.py
index 86cf03927c63..1b84a4b292e2 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/function_secrets.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/function_secrets.py
@@ -44,7 +44,7 @@ class FunctionSecrets(ProxyOnlyResource):
'kind': {'key': 'kind', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
'key': {'key': 'properties.key', 'type': 'str'},
- 'trigger_url': {'key': 'properties.triggerUrl', 'type': 'str'},
+ 'trigger_url': {'key': 'properties.trigger_url', 'type': 'str'},
}
def __init__(self, kind=None, key=None, trigger_url=None):
diff --git a/azure-mgmt-web/azure/mgmt/web/models/geo_region.py b/azure-mgmt-web/azure/mgmt/web/models/geo_region.py
index 0cd677eef4a6..840be76821bc 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/geo_region.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/geo_region.py
@@ -26,8 +26,6 @@ class GeoRegion(ProxyOnlyResource):
:type kind: str
:ivar type: Resource type.
:vartype type: str
- :ivar geo_region_name: Region name.
- :vartype geo_region_name: str
:ivar description: Region description.
:vartype description: str
:ivar display_name: Display name for region.
@@ -38,7 +36,6 @@ class GeoRegion(ProxyOnlyResource):
'id': {'readonly': True},
'name': {'readonly': True},
'type': {'readonly': True},
- 'geo_region_name': {'readonly': True},
'description': {'readonly': True},
'display_name': {'readonly': True},
}
@@ -48,13 +45,11 @@ class GeoRegion(ProxyOnlyResource):
'name': {'key': 'name', 'type': 'str'},
'kind': {'key': 'kind', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
- 'geo_region_name': {'key': 'properties.name', 'type': 'str'},
'description': {'key': 'properties.description', 'type': 'str'},
'display_name': {'key': 'properties.displayName', 'type': 'str'},
}
def __init__(self, kind=None):
super(GeoRegion, self).__init__(kind=kind)
- self.geo_region_name = None
self.description = None
self.display_name = None
diff --git a/azure-mgmt-web/azure/mgmt/web/models/managed_service_identity.py b/azure-mgmt-web/azure/mgmt/web/models/managed_service_identity.py
index 1b611d7b49f2..2089db9be08a 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/managed_service_identity.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/managed_service_identity.py
@@ -18,12 +18,15 @@ class ManagedServiceIdentity(Model):
Variables are only populated by the server, and will be ignored when
sending a request.
- :param type: Type of managed service identity.
- :type type: object
+ :param type: Type of managed service identity. Possible values include:
+ 'SystemAssigned', 'UserAssigned'
+ :type type: str or ~azure.mgmt.web.models.ManagedServiceIdentityType
:ivar tenant_id: Tenant of managed service identity.
:vartype tenant_id: str
:ivar principal_id: Principal Id of managed service identity.
:vartype principal_id: str
+ :param identity_ids: Array of UserAssigned managed service identities.
+ :type identity_ids: list[str]
"""
_validation = {
@@ -32,13 +35,15 @@ class ManagedServiceIdentity(Model):
}
_attribute_map = {
- 'type': {'key': 'type', 'type': 'object'},
+ 'type': {'key': 'type', 'type': 'str'},
'tenant_id': {'key': 'tenantId', 'type': 'str'},
'principal_id': {'key': 'principalId', 'type': 'str'},
+ 'identity_ids': {'key': 'identityIds', 'type': '[str]'},
}
- def __init__(self, type=None):
+ def __init__(self, type=None, identity_ids=None):
super(ManagedServiceIdentity, self).__init__()
self.type = type
self.tenant_id = None
self.principal_id = None
+ self.identity_ids = identity_ids
diff --git a/azure-mgmt-web/azure/mgmt/web/models/metric_definition.py b/azure-mgmt-web/azure/mgmt/web/models/metric_definition.py
index 2b1ca6a6fcd9..865618b3deb4 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/metric_definition.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/metric_definition.py
@@ -26,8 +26,6 @@ class MetricDefinition(ProxyOnlyResource):
:type kind: str
:ivar type: Resource type.
:vartype type: str
- :ivar metric_definition_name: Name of the metric.
- :vartype metric_definition_name: str
:ivar unit: Unit of the metric.
:vartype unit: str
:ivar primary_aggregation_type: Primary aggregation type.
@@ -44,7 +42,6 @@ class MetricDefinition(ProxyOnlyResource):
'id': {'readonly': True},
'name': {'readonly': True},
'type': {'readonly': True},
- 'metric_definition_name': {'readonly': True},
'unit': {'readonly': True},
'primary_aggregation_type': {'readonly': True},
'metric_availabilities': {'readonly': True},
@@ -56,7 +53,6 @@ class MetricDefinition(ProxyOnlyResource):
'name': {'key': 'name', 'type': 'str'},
'kind': {'key': 'kind', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
- 'metric_definition_name': {'key': 'properties.name', 'type': 'str'},
'unit': {'key': 'properties.unit', 'type': 'str'},
'primary_aggregation_type': {'key': 'properties.primaryAggregationType', 'type': 'str'},
'metric_availabilities': {'key': 'properties.metricAvailabilities', 'type': '[MetricAvailabilily]'},
@@ -65,7 +61,6 @@ class MetricDefinition(ProxyOnlyResource):
def __init__(self, kind=None):
super(MetricDefinition, self).__init__(kind=kind)
- self.metric_definition_name = None
self.unit = None
self.primary_aggregation_type = None
self.metric_availabilities = None
diff --git a/azure-mgmt-web/azure/mgmt/web/models/perf_mon_sample.py b/azure-mgmt-web/azure/mgmt/web/models/perf_mon_sample.py
index bdff69d727cd..2a39d6cb9bf2 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/perf_mon_sample.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/perf_mon_sample.py
@@ -21,20 +21,16 @@ class PerfMonSample(Model):
:type instance_name: str
:param value: Value of counter at a certain time.
:type value: float
- :param core_count: Core Count of worker. Not a data member
- :type core_count: int
"""
_attribute_map = {
'time': {'key': 'time', 'type': 'iso-8601'},
'instance_name': {'key': 'instanceName', 'type': 'str'},
'value': {'key': 'value', 'type': 'float'},
- 'core_count': {'key': 'coreCount', 'type': 'int'},
}
- def __init__(self, time=None, instance_name=None, value=None, core_count=None):
+ def __init__(self, time=None, instance_name=None, value=None):
super(PerfMonSample, self).__init__()
self.time = time
self.instance_name = instance_name
self.value = value
- self.core_count = core_count
diff --git a/azure-mgmt-web/azure/mgmt/web/models/premier_add_on.py b/azure-mgmt-web/azure/mgmt/web/models/premier_add_on.py
index 7efae4b643eb..813deffb4750 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/premier_add_on.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/premier_add_on.py
@@ -36,12 +36,6 @@ class PremierAddOn(Resource):
:type product: str
:param vendor: Premier add on Vendor.
:type vendor: str
- :param premier_add_on_name: Premier add on Name.
- :type premier_add_on_name: str
- :param premier_add_on_location: Premier add on Location.
- :type premier_add_on_location: str
- :param premier_add_on_tags: Premier add on Tags.
- :type premier_add_on_tags: dict[str, str]
:param marketplace_publisher: Premier add on Marketplace publisher.
:type marketplace_publisher: str
:param marketplace_offer: Premier add on Marketplace offer.
@@ -65,20 +59,14 @@ class PremierAddOn(Resource):
'sku': {'key': 'properties.sku', 'type': 'str'},
'product': {'key': 'properties.product', 'type': 'str'},
'vendor': {'key': 'properties.vendor', 'type': 'str'},
- 'premier_add_on_name': {'key': 'properties.name', 'type': 'str'},
- 'premier_add_on_location': {'key': 'properties.location', 'type': 'str'},
- 'premier_add_on_tags': {'key': 'properties.tags', 'type': '{str}'},
'marketplace_publisher': {'key': 'properties.marketplacePublisher', 'type': 'str'},
'marketplace_offer': {'key': 'properties.marketplaceOffer', 'type': 'str'},
}
- def __init__(self, location, kind=None, tags=None, sku=None, product=None, vendor=None, premier_add_on_name=None, premier_add_on_location=None, premier_add_on_tags=None, marketplace_publisher=None, marketplace_offer=None):
+ def __init__(self, location, kind=None, tags=None, sku=None, product=None, vendor=None, marketplace_publisher=None, marketplace_offer=None):
super(PremierAddOn, self).__init__(kind=kind, location=location, tags=tags)
self.sku = sku
self.product = product
self.vendor = vendor
- self.premier_add_on_name = premier_add_on_name
- self.premier_add_on_location = premier_add_on_location
- self.premier_add_on_tags = premier_add_on_tags
self.marketplace_publisher = marketplace_publisher
self.marketplace_offer = marketplace_offer
diff --git a/azure-mgmt-web/azure/mgmt/web/models/premier_add_on_offer.py b/azure-mgmt-web/azure/mgmt/web/models/premier_add_on_offer.py
index 4fb08ec1e518..f88ef1f1e3a5 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/premier_add_on_offer.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/premier_add_on_offer.py
@@ -32,8 +32,6 @@ class PremierAddOnOffer(ProxyOnlyResource):
:type product: str
:param vendor: Premier add on offer Vendor.
:type vendor: str
- :param premier_add_on_offer_name: Premier add on offer Name.
- :type premier_add_on_offer_name: str
:param promo_code_required: true
if promotion code is
required; otherwise, false
.
:type promo_code_required: bool
@@ -68,7 +66,6 @@ class PremierAddOnOffer(ProxyOnlyResource):
'sku': {'key': 'properties.sku', 'type': 'str'},
'product': {'key': 'properties.product', 'type': 'str'},
'vendor': {'key': 'properties.vendor', 'type': 'str'},
- 'premier_add_on_offer_name': {'key': 'properties.name', 'type': 'str'},
'promo_code_required': {'key': 'properties.promoCodeRequired', 'type': 'bool'},
'quota': {'key': 'properties.quota', 'type': 'int'},
'web_hosting_plan_restrictions': {'key': 'properties.webHostingPlanRestrictions', 'type': 'AppServicePlanRestrictions'},
@@ -78,12 +75,11 @@ class PremierAddOnOffer(ProxyOnlyResource):
'marketplace_offer': {'key': 'properties.marketplaceOffer', 'type': 'str'},
}
- def __init__(self, kind=None, sku=None, product=None, vendor=None, premier_add_on_offer_name=None, promo_code_required=None, quota=None, web_hosting_plan_restrictions=None, privacy_policy_url=None, legal_terms_url=None, marketplace_publisher=None, marketplace_offer=None):
+ def __init__(self, kind=None, sku=None, product=None, vendor=None, promo_code_required=None, quota=None, web_hosting_plan_restrictions=None, privacy_policy_url=None, legal_terms_url=None, marketplace_publisher=None, marketplace_offer=None):
super(PremierAddOnOffer, self).__init__(kind=kind)
self.sku = sku
self.product = product
self.vendor = vendor
- self.premier_add_on_offer_name = premier_add_on_offer_name
self.promo_code_required = promo_code_required
self.quota = quota
self.web_hosting_plan_restrictions = web_hosting_plan_restrictions
diff --git a/azure-mgmt-web/azure/mgmt/web/models/restore_response.py b/azure-mgmt-web/azure/mgmt/web/models/private_access.py
similarity index 60%
rename from azure-mgmt-web/azure/mgmt/web/models/restore_response.py
rename to azure-mgmt-web/azure/mgmt/web/models/private_access.py
index 3be8e1f1a0a5..3cf962f54675 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/restore_response.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/private_access.py
@@ -12,8 +12,8 @@
from .proxy_only_resource import ProxyOnlyResource
-class RestoreResponse(ProxyOnlyResource):
- """Response for an app restore request.
+class PrivateAccess(ProxyOnlyResource):
+ """Description of the parameters of Private Access for a Web Site.
Variables are only populated by the server, and will be ignored when
sending a request.
@@ -26,16 +26,18 @@ class RestoreResponse(ProxyOnlyResource):
:type kind: str
:ivar type: Resource type.
:vartype type: str
- :ivar operation_id: When server starts the restore process, it will return
- an operation ID identifying that particular restore operation.
- :vartype operation_id: str
+ :param enabled: Whether private access is enabled or not.
+ :type enabled: bool
+ :param virtual_networks: The Virtual Networks (and subnets) allowed to
+ access the site privately.
+ :type virtual_networks:
+ list[~azure.mgmt.web.models.PrivateAccessVirtualNetwork]
"""
_validation = {
'id': {'readonly': True},
'name': {'readonly': True},
'type': {'readonly': True},
- 'operation_id': {'readonly': True},
}
_attribute_map = {
@@ -43,9 +45,11 @@ class RestoreResponse(ProxyOnlyResource):
'name': {'key': 'name', 'type': 'str'},
'kind': {'key': 'kind', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
- 'operation_id': {'key': 'properties.operationId', 'type': 'str'},
+ 'enabled': {'key': 'properties.enabled', 'type': 'bool'},
+ 'virtual_networks': {'key': 'properties.virtualNetworks', 'type': '[PrivateAccessVirtualNetwork]'},
}
- def __init__(self, kind=None):
- super(RestoreResponse, self).__init__(kind=kind)
- self.operation_id = None
+ def __init__(self, kind=None, enabled=None, virtual_networks=None):
+ super(PrivateAccess, self).__init__(kind=kind)
+ self.enabled = enabled
+ self.virtual_networks = virtual_networks
diff --git a/azure-mgmt-web/azure/mgmt/web/models/private_access_subnet.py b/azure-mgmt-web/azure/mgmt/web/models/private_access_subnet.py
new file mode 100644
index 000000000000..56560729d8be
--- /dev/null
+++ b/azure-mgmt-web/azure/mgmt/web/models/private_access_subnet.py
@@ -0,0 +1,33 @@
+# 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 PrivateAccessSubnet(Model):
+ """Description of a Virtual Network subnet that is useable for private site
+ access.
+
+ :param name: The name of the subnet.
+ :type name: str
+ :param key: The key (ID) of the subnet.
+ :type key: int
+ """
+
+ _attribute_map = {
+ 'name': {'key': 'name', 'type': 'str'},
+ 'key': {'key': 'key', 'type': 'int'},
+ }
+
+ def __init__(self, name=None, key=None):
+ super(PrivateAccessSubnet, self).__init__()
+ self.name = name
+ self.key = key
diff --git a/azure-mgmt-web/azure/mgmt/web/models/private_access_virtual_network.py b/azure-mgmt-web/azure/mgmt/web/models/private_access_virtual_network.py
new file mode 100644
index 000000000000..3a753bad0ee8
--- /dev/null
+++ b/azure-mgmt-web/azure/mgmt/web/models/private_access_virtual_network.py
@@ -0,0 +1,42 @@
+# 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 PrivateAccessVirtualNetwork(Model):
+ """Description of a Virtual Network that is useable for private site access.
+
+ :param name: The name of the Virtual Network.
+ :type name: str
+ :param key: The key (ID) of the Virtual Network.
+ :type key: int
+ :param resource_id: The ARM uri of the Virtual Network
+ :type resource_id: str
+ :param subnets: A List of subnets that access is allowed to on this
+ Virtual Network. An empty array (but not null) is interpreted to mean that
+ all subnets are allowed within this Virtual Network.
+ :type subnets: list[~azure.mgmt.web.models.PrivateAccessSubnet]
+ """
+
+ _attribute_map = {
+ 'name': {'key': 'name', 'type': 'str'},
+ 'key': {'key': 'key', 'type': 'int'},
+ 'resource_id': {'key': 'resourceId', 'type': 'str'},
+ 'subnets': {'key': 'subnets', 'type': '[PrivateAccessSubnet]'},
+ }
+
+ def __init__(self, name=None, key=None, resource_id=None, subnets=None):
+ super(PrivateAccessVirtualNetwork, self).__init__()
+ self.name = name
+ self.key = key
+ self.resource_id = resource_id
+ self.subnets = subnets
diff --git a/azure-mgmt-web/azure/mgmt/web/models/process_info.py b/azure-mgmt-web/azure/mgmt/web/models/process_info.py
index ac9316ca7fb6..cb7818c744a4 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/process_info.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/process_info.py
@@ -26,14 +26,14 @@ class ProcessInfo(ProxyOnlyResource):
:type kind: str
:ivar type: Resource type.
:vartype type: str
- :param process_info_id: ARM Identifier for deployment.
- :type process_info_id: int
- :param process_info_name: Deployment name.
- :type process_info_name: str
+ :ivar identifier: ARM Identifier for deployment.
+ :vartype identifier: int
+ :param deployment_name: Deployment name.
+ :type deployment_name: str
:param href: HRef URI.
:type href: str
- :param mini_dump: Minidump URI.
- :type mini_dump: str
+ :param minidump: Minidump URI.
+ :type minidump: str
:param is_profile_running: Is profile running?
:type is_profile_running: bool
:param is_iis_profile_running: Is the IIS Profile running?
@@ -64,38 +64,38 @@ class ProcessInfo(ProxyOnlyResource):
:type thread_count: int
:param start_time: Start time.
:type start_time: datetime
- :param total_processor_time: Total CPU time.
- :type total_processor_time: str
- :param user_processor_time: User CPU time.
- :type user_processor_time: str
- :param privileged_processor_time: Privileged CPU time.
- :type privileged_processor_time: str
- :param working_set64: Working set.
- :type working_set64: long
- :param peak_working_set64: Peak working set.
- :type peak_working_set64: long
- :param private_memory_size64: Private memory size.
- :type private_memory_size64: long
- :param virtual_memory_size64: Virtual memory size.
- :type virtual_memory_size64: long
- :param peak_virtual_memory_size64: Peak virtual memory usage.
- :type peak_virtual_memory_size64: long
- :param paged_system_memory_size64: Paged system memory.
- :type paged_system_memory_size64: long
- :param nonpaged_system_memory_size64: Non-paged system memory.
- :type nonpaged_system_memory_size64: long
- :param paged_memory_size64: Paged memory.
- :type paged_memory_size64: long
- :param peak_paged_memory_size64: Peak paged memory.
- :type peak_paged_memory_size64: long
+ :param total_cpu_time: Total CPU time.
+ :type total_cpu_time: str
+ :param user_cpu_time: User CPU time.
+ :type user_cpu_time: str
+ :param privileged_cpu_time: Privileged CPU time.
+ :type privileged_cpu_time: str
+ :param working_set: Working set.
+ :type working_set: long
+ :param peak_working_set: Peak working set.
+ :type peak_working_set: long
+ :param private_memory: Private memory size.
+ :type private_memory: long
+ :param virtual_memory: Virtual memory size.
+ :type virtual_memory: long
+ :param peak_virtual_memory: Peak virtual memory usage.
+ :type peak_virtual_memory: long
+ :param paged_system_memory: Paged system memory.
+ :type paged_system_memory: long
+ :param non_paged_system_memory: Non-paged system memory.
+ :type non_paged_system_memory: long
+ :param paged_memory: Paged memory.
+ :type paged_memory: long
+ :param peak_paged_memory: Peak paged memory.
+ :type peak_paged_memory: long
:param time_stamp: Time stamp.
:type time_stamp: datetime
:param environment_variables: List of environment variables.
:type environment_variables: dict[str, str]
:param is_scm_site: Is this the SCM site?
:type is_scm_site: bool
- :param is_web_job: Is this a Web Job?
- :type is_web_job: bool
+ :param is_webjob: Is this a Web Job?
+ :type is_webjob: bool
:param description: Description of process.
:type description: str
"""
@@ -104,6 +104,7 @@ class ProcessInfo(ProxyOnlyResource):
'id': {'readonly': True},
'name': {'readonly': True},
'type': {'readonly': True},
+ 'identifier': {'readonly': True},
}
_attribute_map = {
@@ -111,50 +112,50 @@ class ProcessInfo(ProxyOnlyResource):
'name': {'key': 'name', 'type': 'str'},
'kind': {'key': 'kind', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
- 'process_info_id': {'key': 'properties.id', 'type': 'int'},
- 'process_info_name': {'key': 'properties.name', 'type': 'str'},
+ 'identifier': {'key': 'properties.identifier', 'type': 'int'},
+ 'deployment_name': {'key': 'properties.deployment_name', 'type': 'str'},
'href': {'key': 'properties.href', 'type': 'str'},
- 'mini_dump': {'key': 'properties.miniDump', 'type': 'str'},
- 'is_profile_running': {'key': 'properties.isProfileRunning', 'type': 'bool'},
- 'is_iis_profile_running': {'key': 'properties.isIisProfileRunning', 'type': 'bool'},
- 'iis_profile_timeout_in_seconds': {'key': 'properties.iisProfileTimeoutInSeconds', 'type': 'float'},
+ 'minidump': {'key': 'properties.minidump', 'type': 'str'},
+ 'is_profile_running': {'key': 'properties.is_profile_running', 'type': 'bool'},
+ 'is_iis_profile_running': {'key': 'properties.is_iis_profile_running', 'type': 'bool'},
+ 'iis_profile_timeout_in_seconds': {'key': 'properties.iis_profile_timeout_in_seconds', 'type': 'float'},
'parent': {'key': 'properties.parent', 'type': 'str'},
'children': {'key': 'properties.children', 'type': '[str]'},
'threads': {'key': 'properties.threads', 'type': '[ProcessThreadInfo]'},
- 'open_file_handles': {'key': 'properties.openFileHandles', 'type': '[str]'},
+ 'open_file_handles': {'key': 'properties.open_file_handles', 'type': '[str]'},
'modules': {'key': 'properties.modules', 'type': '[ProcessModuleInfo]'},
- 'file_name': {'key': 'properties.fileName', 'type': 'str'},
- 'command_line': {'key': 'properties.commandLine', 'type': 'str'},
- 'user_name': {'key': 'properties.userName', 'type': 'str'},
- 'handle_count': {'key': 'properties.handleCount', 'type': 'int'},
- 'module_count': {'key': 'properties.moduleCount', 'type': 'int'},
- 'thread_count': {'key': 'properties.threadCount', 'type': 'int'},
- 'start_time': {'key': 'properties.startTime', 'type': 'iso-8601'},
- 'total_processor_time': {'key': 'properties.totalProcessorTime', 'type': 'str'},
- 'user_processor_time': {'key': 'properties.userProcessorTime', 'type': 'str'},
- 'privileged_processor_time': {'key': 'properties.privilegedProcessorTime', 'type': 'str'},
- 'working_set64': {'key': 'properties.workingSet64', 'type': 'long'},
- 'peak_working_set64': {'key': 'properties.peakWorkingSet64', 'type': 'long'},
- 'private_memory_size64': {'key': 'properties.privateMemorySize64', 'type': 'long'},
- 'virtual_memory_size64': {'key': 'properties.virtualMemorySize64', 'type': 'long'},
- 'peak_virtual_memory_size64': {'key': 'properties.peakVirtualMemorySize64', 'type': 'long'},
- 'paged_system_memory_size64': {'key': 'properties.pagedSystemMemorySize64', 'type': 'long'},
- 'nonpaged_system_memory_size64': {'key': 'properties.nonpagedSystemMemorySize64', 'type': 'long'},
- 'paged_memory_size64': {'key': 'properties.pagedMemorySize64', 'type': 'long'},
- 'peak_paged_memory_size64': {'key': 'properties.peakPagedMemorySize64', 'type': 'long'},
- 'time_stamp': {'key': 'properties.timeStamp', 'type': 'iso-8601'},
- 'environment_variables': {'key': 'properties.environmentVariables', 'type': '{str}'},
- 'is_scm_site': {'key': 'properties.isScmSite', 'type': 'bool'},
- 'is_web_job': {'key': 'properties.isWebJob', 'type': 'bool'},
+ 'file_name': {'key': 'properties.file_name', 'type': 'str'},
+ 'command_line': {'key': 'properties.command_line', 'type': 'str'},
+ 'user_name': {'key': 'properties.user_name', 'type': 'str'},
+ 'handle_count': {'key': 'properties.handle_count', 'type': 'int'},
+ 'module_count': {'key': 'properties.module_count', 'type': 'int'},
+ 'thread_count': {'key': 'properties.thread_count', 'type': 'int'},
+ 'start_time': {'key': 'properties.start_time', 'type': 'iso-8601'},
+ 'total_cpu_time': {'key': 'properties.total_cpu_time', 'type': 'str'},
+ 'user_cpu_time': {'key': 'properties.user_cpu_time', 'type': 'str'},
+ 'privileged_cpu_time': {'key': 'properties.privileged_cpu_time', 'type': 'str'},
+ 'working_set': {'key': 'properties.working_set', 'type': 'long'},
+ 'peak_working_set': {'key': 'properties.peak_working_set', 'type': 'long'},
+ 'private_memory': {'key': 'properties.private_memory', 'type': 'long'},
+ 'virtual_memory': {'key': 'properties.virtual_memory', 'type': 'long'},
+ 'peak_virtual_memory': {'key': 'properties.peak_virtual_memory', 'type': 'long'},
+ 'paged_system_memory': {'key': 'properties.paged_system_memory', 'type': 'long'},
+ 'non_paged_system_memory': {'key': 'properties.non_paged_system_memory', 'type': 'long'},
+ 'paged_memory': {'key': 'properties.paged_memory', 'type': 'long'},
+ 'peak_paged_memory': {'key': 'properties.peak_paged_memory', 'type': 'long'},
+ 'time_stamp': {'key': 'properties.time_stamp', 'type': 'iso-8601'},
+ 'environment_variables': {'key': 'properties.environment_variables', 'type': '{str}'},
+ 'is_scm_site': {'key': 'properties.is_scm_site', 'type': 'bool'},
+ 'is_webjob': {'key': 'properties.is_webjob', 'type': 'bool'},
'description': {'key': 'properties.description', 'type': 'str'},
}
- def __init__(self, kind=None, process_info_id=None, process_info_name=None, href=None, mini_dump=None, is_profile_running=None, is_iis_profile_running=None, iis_profile_timeout_in_seconds=None, parent=None, children=None, threads=None, open_file_handles=None, modules=None, file_name=None, command_line=None, user_name=None, handle_count=None, module_count=None, thread_count=None, start_time=None, total_processor_time=None, user_processor_time=None, privileged_processor_time=None, working_set64=None, peak_working_set64=None, private_memory_size64=None, virtual_memory_size64=None, peak_virtual_memory_size64=None, paged_system_memory_size64=None, nonpaged_system_memory_size64=None, paged_memory_size64=None, peak_paged_memory_size64=None, time_stamp=None, environment_variables=None, is_scm_site=None, is_web_job=None, description=None):
+ def __init__(self, kind=None, deployment_name=None, href=None, minidump=None, is_profile_running=None, is_iis_profile_running=None, iis_profile_timeout_in_seconds=None, parent=None, children=None, threads=None, open_file_handles=None, modules=None, file_name=None, command_line=None, user_name=None, handle_count=None, module_count=None, thread_count=None, start_time=None, total_cpu_time=None, user_cpu_time=None, privileged_cpu_time=None, working_set=None, peak_working_set=None, private_memory=None, virtual_memory=None, peak_virtual_memory=None, paged_system_memory=None, non_paged_system_memory=None, paged_memory=None, peak_paged_memory=None, time_stamp=None, environment_variables=None, is_scm_site=None, is_webjob=None, description=None):
super(ProcessInfo, self).__init__(kind=kind)
- self.process_info_id = process_info_id
- self.process_info_name = process_info_name
+ self.identifier = None
+ self.deployment_name = deployment_name
self.href = href
- self.mini_dump = mini_dump
+ self.minidump = minidump
self.is_profile_running = is_profile_running
self.is_iis_profile_running = is_iis_profile_running
self.iis_profile_timeout_in_seconds = iis_profile_timeout_in_seconds
@@ -170,20 +171,20 @@ def __init__(self, kind=None, process_info_id=None, process_info_name=None, href
self.module_count = module_count
self.thread_count = thread_count
self.start_time = start_time
- self.total_processor_time = total_processor_time
- self.user_processor_time = user_processor_time
- self.privileged_processor_time = privileged_processor_time
- self.working_set64 = working_set64
- self.peak_working_set64 = peak_working_set64
- self.private_memory_size64 = private_memory_size64
- self.virtual_memory_size64 = virtual_memory_size64
- self.peak_virtual_memory_size64 = peak_virtual_memory_size64
- self.paged_system_memory_size64 = paged_system_memory_size64
- self.nonpaged_system_memory_size64 = nonpaged_system_memory_size64
- self.paged_memory_size64 = paged_memory_size64
- self.peak_paged_memory_size64 = peak_paged_memory_size64
+ self.total_cpu_time = total_cpu_time
+ self.user_cpu_time = user_cpu_time
+ self.privileged_cpu_time = privileged_cpu_time
+ self.working_set = working_set
+ self.peak_working_set = peak_working_set
+ self.private_memory = private_memory
+ self.virtual_memory = virtual_memory
+ self.peak_virtual_memory = peak_virtual_memory
+ self.paged_system_memory = paged_system_memory
+ self.non_paged_system_memory = non_paged_system_memory
+ self.paged_memory = paged_memory
+ self.peak_paged_memory = peak_paged_memory
self.time_stamp = time_stamp
self.environment_variables = environment_variables
self.is_scm_site = is_scm_site
- self.is_web_job = is_web_job
+ self.is_webjob = is_webjob
self.description = description
diff --git a/azure-mgmt-web/azure/mgmt/web/models/process_module_info.py b/azure-mgmt-web/azure/mgmt/web/models/process_module_info.py
index 5607da524700..a6321f4e5c66 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/process_module_info.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/process_module_info.py
@@ -62,16 +62,16 @@ class ProcessModuleInfo(ProxyOnlyResource):
'name': {'key': 'name', 'type': 'str'},
'kind': {'key': 'kind', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
- 'base_address': {'key': 'properties.baseAddress', 'type': 'str'},
- 'file_name': {'key': 'properties.fileName', 'type': 'str'},
+ 'base_address': {'key': 'properties.base_address', 'type': 'str'},
+ 'file_name': {'key': 'properties.file_name', 'type': 'str'},
'href': {'key': 'properties.href', 'type': 'str'},
- 'file_path': {'key': 'properties.filePath', 'type': 'str'},
- 'module_memory_size': {'key': 'properties.moduleMemorySize', 'type': 'int'},
- 'file_version': {'key': 'properties.fileVersion', 'type': 'str'},
- 'file_description': {'key': 'properties.fileDescription', 'type': 'str'},
+ 'file_path': {'key': 'properties.file_path', 'type': 'str'},
+ 'module_memory_size': {'key': 'properties.module_memory_size', 'type': 'int'},
+ 'file_version': {'key': 'properties.file_version', 'type': 'str'},
+ 'file_description': {'key': 'properties.file_description', 'type': 'str'},
'product': {'key': 'properties.product', 'type': 'str'},
- 'product_version': {'key': 'properties.productVersion', 'type': 'str'},
- 'is_debug': {'key': 'properties.isDebug', 'type': 'bool'},
+ 'product_version': {'key': 'properties.product_version', 'type': 'str'},
+ 'is_debug': {'key': 'properties.is_debug', 'type': 'bool'},
'language': {'key': 'properties.language', 'type': 'str'},
}
diff --git a/azure-mgmt-web/azure/mgmt/web/models/process_thread_info.py b/azure-mgmt-web/azure/mgmt/web/models/process_thread_info.py
index e7ba64aafca8..124433ca5c3d 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/process_thread_info.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/process_thread_info.py
@@ -26,8 +26,8 @@ class ProcessThreadInfo(ProxyOnlyResource):
:type kind: str
:ivar type: Resource type.
:vartype type: str
- :param process_thread_info_id: ARM Identifier for deployment.
- :type process_thread_info_id: int
+ :ivar identifier: Site extension ID.
+ :vartype identifier: int
:param href: HRef URI.
:type href: str
:param process: Process URI.
@@ -58,6 +58,7 @@ class ProcessThreadInfo(ProxyOnlyResource):
'id': {'readonly': True},
'name': {'readonly': True},
'type': {'readonly': True},
+ 'identifier': {'readonly': True},
}
_attribute_map = {
@@ -65,24 +66,24 @@ class ProcessThreadInfo(ProxyOnlyResource):
'name': {'key': 'name', 'type': 'str'},
'kind': {'key': 'kind', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
- 'process_thread_info_id': {'key': 'properties.id', 'type': 'int'},
+ 'identifier': {'key': 'properties.identifier', 'type': 'int'},
'href': {'key': 'properties.href', 'type': 'str'},
'process': {'key': 'properties.process', 'type': 'str'},
- 'start_address': {'key': 'properties.startAddress', 'type': 'str'},
- 'current_priority': {'key': 'properties.currentPriority', 'type': 'int'},
- 'priority_level': {'key': 'properties.priorityLevel', 'type': 'str'},
- 'base_priority': {'key': 'properties.basePriority', 'type': 'int'},
- 'start_time': {'key': 'properties.startTime', 'type': 'iso-8601'},
- 'total_processor_time': {'key': 'properties.totalProcessorTime', 'type': 'str'},
- 'user_processor_time': {'key': 'properties.userProcessorTime', 'type': 'str'},
- 'priviledged_processor_time': {'key': 'properties.priviledgedProcessorTime', 'type': 'str'},
+ 'start_address': {'key': 'properties.start_address', 'type': 'str'},
+ 'current_priority': {'key': 'properties.current_priority', 'type': 'int'},
+ 'priority_level': {'key': 'properties.priority_level', 'type': 'str'},
+ 'base_priority': {'key': 'properties.base_priority', 'type': 'int'},
+ 'start_time': {'key': 'properties.start_time', 'type': 'iso-8601'},
+ 'total_processor_time': {'key': 'properties.total_processor_time', 'type': 'str'},
+ 'user_processor_time': {'key': 'properties.user_processor_time', 'type': 'str'},
+ 'priviledged_processor_time': {'key': 'properties.priviledged_processor_time', 'type': 'str'},
'state': {'key': 'properties.state', 'type': 'str'},
- 'wait_reason': {'key': 'properties.waitReason', 'type': 'str'},
+ 'wait_reason': {'key': 'properties.wait_reason', 'type': 'str'},
}
- def __init__(self, kind=None, process_thread_info_id=None, href=None, process=None, start_address=None, current_priority=None, priority_level=None, base_priority=None, start_time=None, total_processor_time=None, user_processor_time=None, priviledged_processor_time=None, state=None, wait_reason=None):
+ def __init__(self, kind=None, href=None, process=None, start_address=None, current_priority=None, priority_level=None, base_priority=None, start_time=None, total_processor_time=None, user_processor_time=None, priviledged_processor_time=None, state=None, wait_reason=None):
super(ProcessThreadInfo, self).__init__(kind=kind)
- self.process_thread_info_id = process_thread_info_id
+ self.identifier = None
self.href = href
self.process = process
self.start_address = start_address
diff --git a/azure-mgmt-web/azure/mgmt/web/models/recommendation.py b/azure-mgmt-web/azure/mgmt/web/models/recommendation.py
index f53222b7f41d..451480935045 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/recommendation.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/recommendation.py
@@ -9,12 +9,23 @@
# regenerated.
# --------------------------------------------------------------------------
-from msrest.serialization import Model
+from .proxy_only_resource import ProxyOnlyResource
-class Recommendation(Model):
+class Recommendation(ProxyOnlyResource):
"""Represents a recommendation result generated by the recommendation engine.
+ 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 creation_time: Timestamp when this instance was created.
:type creation_time: datetime
:param recommendation_id: A GUID value that each recommendation object is
@@ -40,11 +51,17 @@ class Recommendation(Model):
:param channels: List of channels that this recommendation can apply.
Possible values include: 'Notification', 'Api', 'Email', 'Webhook', 'All'
:type channels: str or ~azure.mgmt.web.models.Channels
- :param tags: The list of category tags that this recommendation belongs
- to.
- :type tags: list[str]
+ :ivar category_tags: The list of category tags that this recommendation
+ belongs to.
+ :vartype category_tags: list[str]
:param action_name: Name of action recommended by this object.
:type action_name: str
+ :param enabled: True if this recommendation is still valid (i.e.
+ "actionable"). False if it is invalid.
+ :type enabled: int
+ :param states: The list of states of this recommendation. If it's null
+ then it shoud be considered "Active".
+ :type states: list[str]
:param start_time: The beginning time in UTC of a range that the
recommendation refers to.
:type start_time: datetime
@@ -74,32 +91,45 @@ class Recommendation(Model):
:type forward_link: str
"""
+ _validation = {
+ 'id': {'readonly': True},
+ 'name': {'readonly': True},
+ 'type': {'readonly': True},
+ 'category_tags': {'readonly': True},
+ }
+
_attribute_map = {
- 'creation_time': {'key': 'creationTime', 'type': 'iso-8601'},
- 'recommendation_id': {'key': 'recommendationId', 'type': 'str'},
- 'resource_id': {'key': 'resourceId', 'type': 'str'},
- 'resource_scope': {'key': 'resourceScope', 'type': 'str'},
- 'rule_name': {'key': 'ruleName', 'type': 'str'},
- 'display_name': {'key': 'displayName', 'type': 'str'},
- 'message': {'key': 'message', 'type': 'str'},
- 'level': {'key': 'level', 'type': 'NotificationLevel'},
- 'channels': {'key': 'channels', 'type': 'Channels'},
- 'tags': {'key': 'tags', 'type': '[str]'},
- 'action_name': {'key': 'actionName', 'type': 'str'},
- 'start_time': {'key': 'startTime', 'type': 'iso-8601'},
- 'end_time': {'key': 'endTime', 'type': 'iso-8601'},
- 'next_notification_time': {'key': 'nextNotificationTime', 'type': 'iso-8601'},
- 'notification_expiration_time': {'key': 'notificationExpirationTime', 'type': 'iso-8601'},
- 'notified_time': {'key': 'notifiedTime', 'type': 'iso-8601'},
- 'score': {'key': 'score', 'type': 'float'},
- 'is_dynamic': {'key': 'isDynamic', 'type': 'bool'},
- 'extension_name': {'key': 'extensionName', 'type': 'str'},
- 'blade_name': {'key': 'bladeName', 'type': 'str'},
- 'forward_link': {'key': 'forwardLink', 'type': 'str'},
+ 'id': {'key': 'id', 'type': 'str'},
+ 'name': {'key': 'name', 'type': 'str'},
+ 'kind': {'key': 'kind', 'type': 'str'},
+ 'type': {'key': 'type', 'type': 'str'},
+ 'creation_time': {'key': 'properties.creationTime', 'type': 'iso-8601'},
+ 'recommendation_id': {'key': 'properties.recommendationId', 'type': 'str'},
+ 'resource_id': {'key': 'properties.resourceId', 'type': 'str'},
+ 'resource_scope': {'key': 'properties.resourceScope', 'type': 'str'},
+ 'rule_name': {'key': 'properties.ruleName', 'type': 'str'},
+ 'display_name': {'key': 'properties.displayName', 'type': 'str'},
+ 'message': {'key': 'properties.message', 'type': 'str'},
+ 'level': {'key': 'properties.level', 'type': 'NotificationLevel'},
+ 'channels': {'key': 'properties.channels', 'type': 'Channels'},
+ 'category_tags': {'key': 'properties.categoryTags', 'type': '[str]'},
+ 'action_name': {'key': 'properties.actionName', 'type': 'str'},
+ 'enabled': {'key': 'properties.enabled', 'type': 'int'},
+ 'states': {'key': 'properties.states', 'type': '[str]'},
+ 'start_time': {'key': 'properties.startTime', 'type': 'iso-8601'},
+ 'end_time': {'key': 'properties.endTime', 'type': 'iso-8601'},
+ 'next_notification_time': {'key': 'properties.nextNotificationTime', 'type': 'iso-8601'},
+ 'notification_expiration_time': {'key': 'properties.notificationExpirationTime', 'type': 'iso-8601'},
+ 'notified_time': {'key': 'properties.notifiedTime', 'type': 'iso-8601'},
+ 'score': {'key': 'properties.score', 'type': 'float'},
+ 'is_dynamic': {'key': 'properties.isDynamic', 'type': 'bool'},
+ 'extension_name': {'key': 'properties.extensionName', 'type': 'str'},
+ 'blade_name': {'key': 'properties.bladeName', 'type': 'str'},
+ 'forward_link': {'key': 'properties.forwardLink', 'type': 'str'},
}
- def __init__(self, creation_time=None, recommendation_id=None, resource_id=None, resource_scope=None, rule_name=None, display_name=None, message=None, level=None, channels=None, tags=None, action_name=None, start_time=None, end_time=None, next_notification_time=None, notification_expiration_time=None, notified_time=None, score=None, is_dynamic=None, extension_name=None, blade_name=None, forward_link=None):
- super(Recommendation, self).__init__()
+ def __init__(self, kind=None, creation_time=None, recommendation_id=None, resource_id=None, resource_scope=None, rule_name=None, display_name=None, message=None, level=None, channels=None, action_name=None, enabled=None, states=None, start_time=None, end_time=None, next_notification_time=None, notification_expiration_time=None, notified_time=None, score=None, is_dynamic=None, extension_name=None, blade_name=None, forward_link=None):
+ super(Recommendation, self).__init__(kind=kind)
self.creation_time = creation_time
self.recommendation_id = recommendation_id
self.resource_id = resource_id
@@ -109,8 +139,10 @@ def __init__(self, creation_time=None, recommendation_id=None, resource_id=None,
self.message = message
self.level = level
self.channels = channels
- self.tags = tags
+ self.category_tags = None
self.action_name = action_name
+ self.enabled = enabled
+ self.states = states
self.start_time = start_time
self.end_time = end_time
self.next_notification_time = next_notification_time
diff --git a/azure-mgmt-web/azure/mgmt/web/models/recommendation_paged.py b/azure-mgmt-web/azure/mgmt/web/models/recommendation_paged.py
new file mode 100644
index 000000000000..2eaf7b6d2ebd
--- /dev/null
+++ b/azure-mgmt-web/azure/mgmt/web/models/recommendation_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 RecommendationPaged(Paged):
+ """
+ A paging container for iterating over a list of :class:`Recommendation ` object
+ """
+
+ _attribute_map = {
+ 'next_link': {'key': 'nextLink', 'type': 'str'},
+ 'current_page': {'key': 'value', 'type': '[Recommendation]'}
+ }
+
+ def __init__(self, *args, **kwargs):
+
+ super(RecommendationPaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-web/azure/mgmt/web/models/recommendation_rule.py b/azure-mgmt-web/azure/mgmt/web/models/recommendation_rule.py
index d8e666053a44..85c9c24d60ff 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/recommendation_rule.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/recommendation_rule.py
@@ -9,15 +9,26 @@
# regenerated.
# --------------------------------------------------------------------------
-from msrest.serialization import Model
+from .proxy_only_resource import ProxyOnlyResource
-class RecommendationRule(Model):
+class RecommendationRule(ProxyOnlyResource):
"""Represents a recommendation rule that the recommendation engine can
perform.
- :param name: Unique name of the rule.
- :type name: str
+ 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 recommendation_name: Unique name of the rule.
+ :type recommendation_name: str
:param display_name: UI friendly name of the rule.
:type display_name: str
:param message: Localized name of the rule (Good for UI).
@@ -38,8 +49,9 @@ class RecommendationRule(Model):
:param channels: List of available channels that this rule applies.
Possible values include: 'Notification', 'Api', 'Email', 'Webhook', 'All'
:type channels: str or ~azure.mgmt.web.models.Channels
- :param tags: An array of category tags that the rule contains.
- :type tags: list[str]
+ :ivar category_tags: The list of category tags that this recommendation
+ rule belongs to.
+ :vartype category_tags: list[str]
:param is_dynamic: True if this is associated with a dynamically added
rule
:type is_dynamic: bool
@@ -54,25 +66,36 @@ class RecommendationRule(Model):
:type forward_link: str
"""
+ _validation = {
+ 'id': {'readonly': True},
+ 'name': {'readonly': True},
+ 'type': {'readonly': True},
+ 'category_tags': {'readonly': True},
+ }
+
_attribute_map = {
+ 'id': {'key': 'id', 'type': 'str'},
'name': {'key': 'name', 'type': 'str'},
- 'display_name': {'key': 'displayName', 'type': 'str'},
- 'message': {'key': 'message', 'type': 'str'},
- 'recommendation_id': {'key': 'recommendationId', 'type': 'str'},
- 'description': {'key': 'description', 'type': 'str'},
- 'action_name': {'key': 'actionName', 'type': 'str'},
- 'level': {'key': 'level', 'type': 'NotificationLevel'},
- 'channels': {'key': 'channels', 'type': 'Channels'},
- 'tags': {'key': 'tags', 'type': '[str]'},
- 'is_dynamic': {'key': 'isDynamic', 'type': 'bool'},
- 'extension_name': {'key': 'extensionName', 'type': 'str'},
- 'blade_name': {'key': 'bladeName', 'type': 'str'},
- 'forward_link': {'key': 'forwardLink', 'type': 'str'},
+ 'kind': {'key': 'kind', 'type': 'str'},
+ 'type': {'key': 'type', 'type': 'str'},
+ 'recommendation_name': {'key': 'properties.recommendationName', 'type': 'str'},
+ 'display_name': {'key': 'properties.displayName', 'type': 'str'},
+ 'message': {'key': 'properties.message', 'type': 'str'},
+ 'recommendation_id': {'key': 'properties.recommendationId', 'type': 'str'},
+ 'description': {'key': 'properties.description', 'type': 'str'},
+ 'action_name': {'key': 'properties.actionName', 'type': 'str'},
+ 'level': {'key': 'properties.level', 'type': 'NotificationLevel'},
+ 'channels': {'key': 'properties.channels', 'type': 'Channels'},
+ 'category_tags': {'key': 'properties.categoryTags', 'type': '[str]'},
+ 'is_dynamic': {'key': 'properties.isDynamic', 'type': 'bool'},
+ 'extension_name': {'key': 'properties.extensionName', 'type': 'str'},
+ 'blade_name': {'key': 'properties.bladeName', 'type': 'str'},
+ 'forward_link': {'key': 'properties.forwardLink', 'type': 'str'},
}
- def __init__(self, name=None, display_name=None, message=None, recommendation_id=None, description=None, action_name=None, level=None, channels=None, tags=None, is_dynamic=None, extension_name=None, blade_name=None, forward_link=None):
- super(RecommendationRule, self).__init__()
- self.name = name
+ def __init__(self, kind=None, recommendation_name=None, display_name=None, message=None, recommendation_id=None, description=None, action_name=None, level=None, channels=None, is_dynamic=None, extension_name=None, blade_name=None, forward_link=None):
+ super(RecommendationRule, self).__init__(kind=kind)
+ self.recommendation_name = recommendation_name
self.display_name = display_name
self.message = message
self.recommendation_id = recommendation_id
@@ -80,7 +103,7 @@ def __init__(self, name=None, display_name=None, message=None, recommendation_id
self.action_name = action_name
self.level = level
self.channels = channels
- self.tags = tags
+ self.category_tags = None
self.is_dynamic = is_dynamic
self.extension_name = extension_name
self.blade_name = blade_name
diff --git a/azure-mgmt-web/azure/mgmt/web/models/resource_metric_definition.py b/azure-mgmt-web/azure/mgmt/web/models/resource_metric_definition.py
index bcfd2baf221b..90a4ab5ae5af 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/resource_metric_definition.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/resource_metric_definition.py
@@ -26,9 +26,6 @@ class ResourceMetricDefinition(ProxyOnlyResource):
:type kind: str
:ivar type: Resource type.
:vartype type: str
- :ivar resource_metric_definition_name: Name of the metric.
- :vartype resource_metric_definition_name:
- ~azure.mgmt.web.models.ResourceMetricName
:ivar unit: Unit of the metric.
:vartype unit: str
:ivar primary_aggregation_type: Primary aggregation type.
@@ -39,8 +36,6 @@ class ResourceMetricDefinition(ProxyOnlyResource):
list[~azure.mgmt.web.models.ResourceMetricAvailability]
:ivar resource_uri: Resource URI.
:vartype resource_uri: str
- :ivar resource_metric_definition_id: Resource ID.
- :vartype resource_metric_definition_id: str
:ivar properties: Resource metric definition properties.
:vartype properties: dict[str, str]
"""
@@ -49,12 +44,10 @@ class ResourceMetricDefinition(ProxyOnlyResource):
'id': {'readonly': True},
'name': {'readonly': True},
'type': {'readonly': True},
- 'resource_metric_definition_name': {'readonly': True},
'unit': {'readonly': True},
'primary_aggregation_type': {'readonly': True},
'metric_availabilities': {'readonly': True},
'resource_uri': {'readonly': True},
- 'resource_metric_definition_id': {'readonly': True},
'properties': {'readonly': True},
}
@@ -63,21 +56,17 @@ class ResourceMetricDefinition(ProxyOnlyResource):
'name': {'key': 'name', 'type': 'str'},
'kind': {'key': 'kind', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
- 'resource_metric_definition_name': {'key': 'properties.name', 'type': 'ResourceMetricName'},
'unit': {'key': 'properties.unit', 'type': 'str'},
'primary_aggregation_type': {'key': 'properties.primaryAggregationType', 'type': 'str'},
'metric_availabilities': {'key': 'properties.metricAvailabilities', 'type': '[ResourceMetricAvailability]'},
'resource_uri': {'key': 'properties.resourceUri', 'type': 'str'},
- 'resource_metric_definition_id': {'key': 'properties.id', 'type': 'str'},
'properties': {'key': 'properties.properties', 'type': '{str}'},
}
def __init__(self, kind=None):
super(ResourceMetricDefinition, self).__init__(kind=kind)
- self.resource_metric_definition_name = None
self.unit = None
self.primary_aggregation_type = None
self.metric_availabilities = None
self.resource_uri = None
- self.resource_metric_definition_id = None
self.properties = None
diff --git a/azure-mgmt-web/azure/mgmt/web/models/restore_request.py b/azure-mgmt-web/azure/mgmt/web/models/restore_request.py
index 72c3ccec6db0..4bd489a1c2a4 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/restore_request.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/restore_request.py
@@ -52,7 +52,7 @@ class RestoreRequest(ProxyOnlyResource):
site.
:type app_service_plan: str
:param operation_type: Operation type. Possible values include: 'Default',
- 'Clone', 'Relocation', 'Snapshot'. Default value: "Default" .
+ 'Clone', 'Relocation', 'Snapshot', 'CloudFS'. Default value: "Default" .
:type operation_type: str or
~azure.mgmt.web.models.BackupRestoreOperationType
:param adjust_connection_strings: true
if
diff --git a/azure-mgmt-web/azure/mgmt/web/models/site.py b/azure-mgmt-web/azure/mgmt/web/models/site.py
index 44ddd0d3ff08..d4ca0b64d591 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/site.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/site.py
@@ -62,6 +62,8 @@ class Site(Resource):
:param reserved: true
if reserved; otherwise,
false
. Default value: False .
:type reserved: bool
+ :param is_xenon: Hyper-V sandbox. Default value: False .
+ :type is_xenon: bool
:ivar last_modified_time_utc: Last time the app was modified, in UTC.
Read-only.
:vartype last_modified_time_utc: datetime
@@ -179,6 +181,7 @@ class Site(Resource):
'host_name_ssl_states': {'key': 'properties.hostNameSslStates', 'type': '[HostNameSslState]'},
'server_farm_id': {'key': 'properties.serverFarmId', 'type': 'str'},
'reserved': {'key': 'properties.reserved', 'type': 'bool'},
+ 'is_xenon': {'key': 'properties.isXenon', 'type': 'bool'},
'last_modified_time_utc': {'key': 'properties.lastModifiedTimeUtc', 'type': 'iso-8601'},
'site_config': {'key': 'properties.siteConfig', 'type': 'SiteConfig'},
'traffic_manager_host_names': {'key': 'properties.trafficManagerHostNames', 'type': '[str]'},
@@ -204,7 +207,7 @@ class Site(Resource):
'identity': {'key': 'identity', 'type': 'ManagedServiceIdentity'},
}
- def __init__(self, location, kind=None, tags=None, enabled=None, host_name_ssl_states=None, server_farm_id=None, reserved=False, site_config=None, scm_site_also_stopped=False, hosting_environment_profile=None, client_affinity_enabled=None, client_cert_enabled=None, host_names_disabled=None, container_size=None, daily_memory_time_quota=None, cloning_info=None, snapshot_info=None, https_only=None, identity=None):
+ def __init__(self, location, kind=None, tags=None, enabled=None, host_name_ssl_states=None, server_farm_id=None, reserved=False, is_xenon=False, site_config=None, scm_site_also_stopped=False, hosting_environment_profile=None, client_affinity_enabled=None, client_cert_enabled=None, host_names_disabled=None, container_size=None, daily_memory_time_quota=None, cloning_info=None, snapshot_info=None, https_only=None, identity=None):
super(Site, self).__init__(kind=kind, location=location, tags=tags)
self.state = None
self.host_names = None
@@ -216,6 +219,7 @@ def __init__(self, location, kind=None, tags=None, enabled=None, host_name_ssl_s
self.host_name_ssl_states = host_name_ssl_states
self.server_farm_id = server_farm_id
self.reserved = reserved
+ self.is_xenon = is_xenon
self.last_modified_time_utc = None
self.site_config = site_config
self.traffic_manager_host_names = None
diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_auth_settings.py b/azure-mgmt-web/azure/mgmt/web/models/site_auth_settings.py
index ad9faca40f10..292e8cb17855 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/site_auth_settings.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/site_auth_settings.py
@@ -90,6 +90,9 @@ class SiteAuthSettings(ProxyOnlyResource):
More information on OpenID Connect Discovery:
http://openid.net/specs/openid-connect-discovery-1_0.html
:type issuer: str
+ :param validate_issuer: Gets a value indicating whether the issuer should
+ be a valid HTTPS url and be validated as such.
+ :type validate_issuer: bool
:param allowed_audiences: Allowed audience values to consider when
validating JWTs issued by
Azure Active Directory. Note that the ClientID
value is
@@ -188,6 +191,7 @@ class SiteAuthSettings(ProxyOnlyResource):
'client_id': {'key': 'properties.clientId', 'type': 'str'},
'client_secret': {'key': 'properties.clientSecret', 'type': 'str'},
'issuer': {'key': 'properties.issuer', 'type': 'str'},
+ 'validate_issuer': {'key': 'properties.validateIssuer', 'type': 'bool'},
'allowed_audiences': {'key': 'properties.allowedAudiences', 'type': '[str]'},
'additional_login_params': {'key': 'properties.additionalLoginParams', 'type': '[str]'},
'google_client_id': {'key': 'properties.googleClientId', 'type': 'str'},
@@ -203,7 +207,7 @@ class SiteAuthSettings(ProxyOnlyResource):
'microsoft_account_oauth_scopes': {'key': 'properties.microsoftAccountOAuthScopes', 'type': '[str]'},
}
- def __init__(self, kind=None, enabled=None, runtime_version=None, unauthenticated_client_action=None, token_store_enabled=None, allowed_external_redirect_urls=None, default_provider=None, token_refresh_extension_hours=None, client_id=None, client_secret=None, issuer=None, allowed_audiences=None, additional_login_params=None, google_client_id=None, google_client_secret=None, google_oauth_scopes=None, facebook_app_id=None, facebook_app_secret=None, facebook_oauth_scopes=None, twitter_consumer_key=None, twitter_consumer_secret=None, microsoft_account_client_id=None, microsoft_account_client_secret=None, microsoft_account_oauth_scopes=None):
+ def __init__(self, kind=None, enabled=None, runtime_version=None, unauthenticated_client_action=None, token_store_enabled=None, allowed_external_redirect_urls=None, default_provider=None, token_refresh_extension_hours=None, client_id=None, client_secret=None, issuer=None, validate_issuer=None, allowed_audiences=None, additional_login_params=None, google_client_id=None, google_client_secret=None, google_oauth_scopes=None, facebook_app_id=None, facebook_app_secret=None, facebook_oauth_scopes=None, twitter_consumer_key=None, twitter_consumer_secret=None, microsoft_account_client_id=None, microsoft_account_client_secret=None, microsoft_account_oauth_scopes=None):
super(SiteAuthSettings, self).__init__(kind=kind)
self.enabled = enabled
self.runtime_version = runtime_version
@@ -215,6 +219,7 @@ def __init__(self, kind=None, enabled=None, runtime_version=None, unauthenticate
self.client_id = client_id
self.client_secret = client_secret
self.issuer = issuer
+ self.validate_issuer = validate_issuer
self.allowed_audiences = allowed_audiences
self.additional_login_params = additional_login_params
self.google_client_id = google_client_id
diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_config.py b/azure-mgmt-web/azure/mgmt/web/models/site_config.py
index 48b3fdb973a1..55d6b949dbcd 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/site_config.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/site_config.py
@@ -33,6 +33,8 @@ class SiteConfig(Model):
:type node_version: str
:param linux_fx_version: Linux App Framework and version
:type linux_fx_version: str
+ :param xenon_fx_version: Xenon App Framework and version
+ :type xenon_fx_version: str
:param request_tracing_enabled: true
if request tracing is
enabled; otherwise, false
.
:type request_tracing_enabled: bool
@@ -120,6 +122,10 @@ class SiteConfig(Model):
:param local_my_sql_enabled: true
to enable local MySQL;
otherwise, false
. Default value: False .
:type local_my_sql_enabled: bool
+ :param managed_service_identity_id: Managed Service Identity Id
+ :type managed_service_identity_id: int
+ :param x_managed_service_identity_id: Explicit Managed Service Identity Id
+ :type x_managed_service_identity_id: int
:param ip_security_restrictions: IP security restrictions.
:type ip_security_restrictions:
list[~azure.mgmt.web.models.IpSecurityRestriction]
@@ -130,6 +136,9 @@ class SiteConfig(Model):
TLS required for SSL requests. Possible values include: '1.0', '1.1',
'1.2'
:type min_tls_version: str or ~azure.mgmt.web.models.SupportedTlsVersions
+ :param ftps_state: State of FTP / FTPS service. Possible values include:
+ 'AllAllowed', 'FtpsOnly', 'Disabled'
+ :type ftps_state: str or ~azure.mgmt.web.models.FtpsState
"""
_validation = {
@@ -144,6 +153,7 @@ class SiteConfig(Model):
'python_version': {'key': 'pythonVersion', 'type': 'str'},
'node_version': {'key': 'nodeVersion', 'type': 'str'},
'linux_fx_version': {'key': 'linuxFxVersion', 'type': 'str'},
+ 'xenon_fx_version': {'key': 'xenonFxVersion', 'type': 'str'},
'request_tracing_enabled': {'key': 'requestTracingEnabled', 'type': 'bool'},
'request_tracing_expiration_time': {'key': 'requestTracingExpirationTime', 'type': 'iso-8601'},
'remote_debugging_enabled': {'key': 'remoteDebuggingEnabled', 'type': 'bool'},
@@ -179,12 +189,15 @@ class SiteConfig(Model):
'api_definition': {'key': 'apiDefinition', 'type': 'ApiDefinitionInfo'},
'auto_swap_slot_name': {'key': 'autoSwapSlotName', 'type': 'str'},
'local_my_sql_enabled': {'key': 'localMySqlEnabled', 'type': 'bool'},
+ 'managed_service_identity_id': {'key': 'managedServiceIdentityId', 'type': 'int'},
+ 'x_managed_service_identity_id': {'key': 'xManagedServiceIdentityId', 'type': 'int'},
'ip_security_restrictions': {'key': 'ipSecurityRestrictions', 'type': '[IpSecurityRestriction]'},
'http20_enabled': {'key': 'http20Enabled', 'type': 'bool'},
'min_tls_version': {'key': 'minTlsVersion', 'type': 'str'},
+ 'ftps_state': {'key': 'ftpsState', 'type': 'str'},
}
- def __init__(self, number_of_workers=None, default_documents=None, net_framework_version="v4.6", php_version=None, python_version=None, node_version=None, linux_fx_version=None, request_tracing_enabled=None, request_tracing_expiration_time=None, remote_debugging_enabled=None, remote_debugging_version=None, http_logging_enabled=None, logs_directory_size_limit=None, detailed_error_logging_enabled=None, publishing_username=None, app_settings=None, connection_strings=None, handler_mappings=None, document_root=None, scm_type=None, use32_bit_worker_process=None, web_sockets_enabled=None, always_on=None, java_version=None, java_container=None, java_container_version=None, app_command_line=None, managed_pipeline_mode=None, virtual_applications=None, load_balancing=None, experiments=None, limits=None, auto_heal_enabled=None, auto_heal_rules=None, tracing_options=None, vnet_name=None, cors=None, push=None, api_definition=None, auto_swap_slot_name=None, local_my_sql_enabled=False, ip_security_restrictions=None, http20_enabled=True, min_tls_version=None):
+ def __init__(self, number_of_workers=None, default_documents=None, net_framework_version="v4.6", php_version=None, python_version=None, node_version=None, linux_fx_version=None, xenon_fx_version=None, request_tracing_enabled=None, request_tracing_expiration_time=None, remote_debugging_enabled=None, remote_debugging_version=None, http_logging_enabled=None, logs_directory_size_limit=None, detailed_error_logging_enabled=None, publishing_username=None, app_settings=None, connection_strings=None, handler_mappings=None, document_root=None, scm_type=None, use32_bit_worker_process=None, web_sockets_enabled=None, always_on=None, java_version=None, java_container=None, java_container_version=None, app_command_line=None, managed_pipeline_mode=None, virtual_applications=None, load_balancing=None, experiments=None, limits=None, auto_heal_enabled=None, auto_heal_rules=None, tracing_options=None, vnet_name=None, cors=None, push=None, api_definition=None, auto_swap_slot_name=None, local_my_sql_enabled=False, managed_service_identity_id=None, x_managed_service_identity_id=None, ip_security_restrictions=None, http20_enabled=True, min_tls_version=None, ftps_state=None):
super(SiteConfig, self).__init__()
self.number_of_workers = number_of_workers
self.default_documents = default_documents
@@ -193,6 +206,7 @@ def __init__(self, number_of_workers=None, default_documents=None, net_framework
self.python_version = python_version
self.node_version = node_version
self.linux_fx_version = linux_fx_version
+ self.xenon_fx_version = xenon_fx_version
self.request_tracing_enabled = request_tracing_enabled
self.request_tracing_expiration_time = request_tracing_expiration_time
self.remote_debugging_enabled = remote_debugging_enabled
@@ -228,6 +242,9 @@ def __init__(self, number_of_workers=None, default_documents=None, net_framework
self.api_definition = api_definition
self.auto_swap_slot_name = auto_swap_slot_name
self.local_my_sql_enabled = local_my_sql_enabled
+ self.managed_service_identity_id = managed_service_identity_id
+ self.x_managed_service_identity_id = x_managed_service_identity_id
self.ip_security_restrictions = ip_security_restrictions
self.http20_enabled = http20_enabled
self.min_tls_version = min_tls_version
+ self.ftps_state = ftps_state
diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_config_resource.py b/azure-mgmt-web/azure/mgmt/web/models/site_config_resource.py
index 23a88e94d737..712fed3c8db6 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/site_config_resource.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/site_config_resource.py
@@ -41,6 +41,8 @@ class SiteConfigResource(ProxyOnlyResource):
:type node_version: str
:param linux_fx_version: Linux App Framework and version
:type linux_fx_version: str
+ :param xenon_fx_version: Xenon App Framework and version
+ :type xenon_fx_version: str
:param request_tracing_enabled: true
if request tracing is
enabled; otherwise, false
.
:type request_tracing_enabled: bool
@@ -128,6 +130,10 @@ class SiteConfigResource(ProxyOnlyResource):
:param local_my_sql_enabled: true
to enable local MySQL;
otherwise, false
. Default value: False .
:type local_my_sql_enabled: bool
+ :param managed_service_identity_id: Managed Service Identity Id
+ :type managed_service_identity_id: int
+ :param x_managed_service_identity_id: Explicit Managed Service Identity Id
+ :type x_managed_service_identity_id: int
:param ip_security_restrictions: IP security restrictions.
:type ip_security_restrictions:
list[~azure.mgmt.web.models.IpSecurityRestriction]
@@ -138,6 +144,9 @@ class SiteConfigResource(ProxyOnlyResource):
TLS required for SSL requests. Possible values include: '1.0', '1.1',
'1.2'
:type min_tls_version: str or ~azure.mgmt.web.models.SupportedTlsVersions
+ :param ftps_state: State of FTP / FTPS service. Possible values include:
+ 'AllAllowed', 'FtpsOnly', 'Disabled'
+ :type ftps_state: str or ~azure.mgmt.web.models.FtpsState
"""
_validation = {
@@ -159,6 +168,7 @@ class SiteConfigResource(ProxyOnlyResource):
'python_version': {'key': 'properties.pythonVersion', 'type': 'str'},
'node_version': {'key': 'properties.nodeVersion', 'type': 'str'},
'linux_fx_version': {'key': 'properties.linuxFxVersion', 'type': 'str'},
+ 'xenon_fx_version': {'key': 'properties.xenonFxVersion', 'type': 'str'},
'request_tracing_enabled': {'key': 'properties.requestTracingEnabled', 'type': 'bool'},
'request_tracing_expiration_time': {'key': 'properties.requestTracingExpirationTime', 'type': 'iso-8601'},
'remote_debugging_enabled': {'key': 'properties.remoteDebuggingEnabled', 'type': 'bool'},
@@ -194,12 +204,15 @@ class SiteConfigResource(ProxyOnlyResource):
'api_definition': {'key': 'properties.apiDefinition', 'type': 'ApiDefinitionInfo'},
'auto_swap_slot_name': {'key': 'properties.autoSwapSlotName', 'type': 'str'},
'local_my_sql_enabled': {'key': 'properties.localMySqlEnabled', 'type': 'bool'},
+ 'managed_service_identity_id': {'key': 'properties.managedServiceIdentityId', 'type': 'int'},
+ 'x_managed_service_identity_id': {'key': 'properties.xManagedServiceIdentityId', 'type': 'int'},
'ip_security_restrictions': {'key': 'properties.ipSecurityRestrictions', 'type': '[IpSecurityRestriction]'},
'http20_enabled': {'key': 'properties.http20Enabled', 'type': 'bool'},
'min_tls_version': {'key': 'properties.minTlsVersion', 'type': 'str'},
+ 'ftps_state': {'key': 'properties.ftpsState', 'type': 'str'},
}
- def __init__(self, kind=None, number_of_workers=None, default_documents=None, net_framework_version="v4.6", php_version=None, python_version=None, node_version=None, linux_fx_version=None, request_tracing_enabled=None, request_tracing_expiration_time=None, remote_debugging_enabled=None, remote_debugging_version=None, http_logging_enabled=None, logs_directory_size_limit=None, detailed_error_logging_enabled=None, publishing_username=None, app_settings=None, connection_strings=None, handler_mappings=None, document_root=None, scm_type=None, use32_bit_worker_process=None, web_sockets_enabled=None, always_on=None, java_version=None, java_container=None, java_container_version=None, app_command_line=None, managed_pipeline_mode=None, virtual_applications=None, load_balancing=None, experiments=None, limits=None, auto_heal_enabled=None, auto_heal_rules=None, tracing_options=None, vnet_name=None, cors=None, push=None, api_definition=None, auto_swap_slot_name=None, local_my_sql_enabled=False, ip_security_restrictions=None, http20_enabled=True, min_tls_version=None):
+ def __init__(self, kind=None, number_of_workers=None, default_documents=None, net_framework_version="v4.6", php_version=None, python_version=None, node_version=None, linux_fx_version=None, xenon_fx_version=None, request_tracing_enabled=None, request_tracing_expiration_time=None, remote_debugging_enabled=None, remote_debugging_version=None, http_logging_enabled=None, logs_directory_size_limit=None, detailed_error_logging_enabled=None, publishing_username=None, app_settings=None, connection_strings=None, handler_mappings=None, document_root=None, scm_type=None, use32_bit_worker_process=None, web_sockets_enabled=None, always_on=None, java_version=None, java_container=None, java_container_version=None, app_command_line=None, managed_pipeline_mode=None, virtual_applications=None, load_balancing=None, experiments=None, limits=None, auto_heal_enabled=None, auto_heal_rules=None, tracing_options=None, vnet_name=None, cors=None, push=None, api_definition=None, auto_swap_slot_name=None, local_my_sql_enabled=False, managed_service_identity_id=None, x_managed_service_identity_id=None, ip_security_restrictions=None, http20_enabled=True, min_tls_version=None, ftps_state=None):
super(SiteConfigResource, self).__init__(kind=kind)
self.number_of_workers = number_of_workers
self.default_documents = default_documents
@@ -208,6 +221,7 @@ def __init__(self, kind=None, number_of_workers=None, default_documents=None, ne
self.python_version = python_version
self.node_version = node_version
self.linux_fx_version = linux_fx_version
+ self.xenon_fx_version = xenon_fx_version
self.request_tracing_enabled = request_tracing_enabled
self.request_tracing_expiration_time = request_tracing_expiration_time
self.remote_debugging_enabled = remote_debugging_enabled
@@ -243,6 +257,9 @@ def __init__(self, kind=None, number_of_workers=None, default_documents=None, ne
self.api_definition = api_definition
self.auto_swap_slot_name = auto_swap_slot_name
self.local_my_sql_enabled = local_my_sql_enabled
+ self.managed_service_identity_id = managed_service_identity_id
+ self.x_managed_service_identity_id = x_managed_service_identity_id
self.ip_security_restrictions = ip_security_restrictions
self.http20_enabled = http20_enabled
self.min_tls_version = min_tls_version
+ self.ftps_state = ftps_state
diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_configuration_snapshot_info.py b/azure-mgmt-web/azure/mgmt/web/models/site_configuration_snapshot_info.py
index 6cb6fb32764f..64a19f7158d6 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/site_configuration_snapshot_info.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/site_configuration_snapshot_info.py
@@ -28,8 +28,8 @@ class SiteConfigurationSnapshotInfo(ProxyOnlyResource):
:vartype type: str
:ivar time: The time the snapshot was taken.
:vartype time: datetime
- :ivar site_configuration_snapshot_info_id: The id of the snapshot
- :vartype site_configuration_snapshot_info_id: int
+ :ivar snapshot_id: The id of the snapshot
+ :vartype snapshot_id: int
"""
_validation = {
@@ -37,7 +37,7 @@ class SiteConfigurationSnapshotInfo(ProxyOnlyResource):
'name': {'readonly': True},
'type': {'readonly': True},
'time': {'readonly': True},
- 'site_configuration_snapshot_info_id': {'readonly': True},
+ 'snapshot_id': {'readonly': True},
}
_attribute_map = {
@@ -46,10 +46,10 @@ class SiteConfigurationSnapshotInfo(ProxyOnlyResource):
'kind': {'key': 'kind', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
'time': {'key': 'properties.time', 'type': 'iso-8601'},
- 'site_configuration_snapshot_info_id': {'key': 'properties.id', 'type': 'int'},
+ 'snapshot_id': {'key': 'properties.snapshotId', 'type': 'int'},
}
def __init__(self, kind=None):
super(SiteConfigurationSnapshotInfo, self).__init__(kind=kind)
self.time = None
- self.site_configuration_snapshot_info_id = None
+ self.snapshot_id = None
diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_extension_info.py b/azure-mgmt-web/azure/mgmt/web/models/site_extension_info.py
index f09fd23f9e9e..f4558c98ae5e 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/site_extension_info.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/site_extension_info.py
@@ -26,14 +26,13 @@ class SiteExtensionInfo(ProxyOnlyResource):
:type kind: str
:ivar type: Resource type.
:vartype type: str
- :param site_extension_info_id: Site extension ID.
- :type site_extension_info_id: str
- :param title: Site extension title.
+ :param extension_id: Site extension ID.
+ :type extension_id: str
+ :param title:
:type title: str
- :param site_extension_info_type: Site extension type. Possible values
- include: 'Gallery', 'WebRoot'
- :type site_extension_info_type: str or
- ~azure.mgmt.web.models.SiteExtensionType
+ :param extension_type: Site extension type. Possible values include:
+ 'Gallery', 'WebRoot'
+ :type extension_type: str or ~azure.mgmt.web.models.SiteExtensionType
:param summary: Summary description.
:type summary: str
:param description: Detailed description.
@@ -52,8 +51,8 @@ class SiteExtensionInfo(ProxyOnlyResource):
:type feed_url: str
:param authors: List of authors.
:type authors: list[str]
- :param installation_args: Installer command line parameters.
- :type installation_args: str
+ :param installer_command_line_params: Installer command line parameters.
+ :type installer_command_line_params: str
:param published_date_time: Published timestamp.
:type published_date_time: datetime
:param download_count: Count of downloads.
@@ -82,33 +81,33 @@ class SiteExtensionInfo(ProxyOnlyResource):
'name': {'key': 'name', 'type': 'str'},
'kind': {'key': 'kind', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
- 'site_extension_info_id': {'key': 'properties.id', 'type': 'str'},
+ 'extension_id': {'key': 'properties.extension_id', 'type': 'str'},
'title': {'key': 'properties.title', 'type': 'str'},
- 'site_extension_info_type': {'key': 'properties.type', 'type': 'SiteExtensionType'},
+ 'extension_type': {'key': 'properties.extension_type', 'type': 'SiteExtensionType'},
'summary': {'key': 'properties.summary', 'type': 'str'},
'description': {'key': 'properties.description', 'type': 'str'},
'version': {'key': 'properties.version', 'type': 'str'},
- 'extension_url': {'key': 'properties.extensionUrl', 'type': 'str'},
- 'project_url': {'key': 'properties.projectUrl', 'type': 'str'},
- 'icon_url': {'key': 'properties.iconUrl', 'type': 'str'},
- 'license_url': {'key': 'properties.licenseUrl', 'type': 'str'},
- 'feed_url': {'key': 'properties.feedUrl', 'type': 'str'},
+ 'extension_url': {'key': 'properties.extension_url', 'type': 'str'},
+ 'project_url': {'key': 'properties.project_url', 'type': 'str'},
+ 'icon_url': {'key': 'properties.icon_url', 'type': 'str'},
+ 'license_url': {'key': 'properties.license_url', 'type': 'str'},
+ 'feed_url': {'key': 'properties.feed_url', 'type': 'str'},
'authors': {'key': 'properties.authors', 'type': '[str]'},
- 'installation_args': {'key': 'properties.installationArgs', 'type': 'str'},
- 'published_date_time': {'key': 'properties.publishedDateTime', 'type': 'iso-8601'},
- 'download_count': {'key': 'properties.downloadCount', 'type': 'int'},
- 'local_is_latest_version': {'key': 'properties.localIsLatestVersion', 'type': 'bool'},
- 'local_path': {'key': 'properties.localPath', 'type': 'str'},
- 'installed_date_time': {'key': 'properties.installedDateTime', 'type': 'iso-8601'},
+ 'installer_command_line_params': {'key': 'properties.installer_command_line_params', 'type': 'str'},
+ 'published_date_time': {'key': 'properties.published_date_time', 'type': 'iso-8601'},
+ 'download_count': {'key': 'properties.download_count', 'type': 'int'},
+ 'local_is_latest_version': {'key': 'properties.local_is_latest_version', 'type': 'bool'},
+ 'local_path': {'key': 'properties.local_path', 'type': 'str'},
+ 'installed_date_time': {'key': 'properties.installed_date_time', 'type': 'iso-8601'},
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
'comment': {'key': 'properties.comment', 'type': 'str'},
}
- def __init__(self, kind=None, site_extension_info_id=None, title=None, site_extension_info_type=None, summary=None, description=None, version=None, extension_url=None, project_url=None, icon_url=None, license_url=None, feed_url=None, authors=None, installation_args=None, published_date_time=None, download_count=None, local_is_latest_version=None, local_path=None, installed_date_time=None, provisioning_state=None, comment=None):
+ def __init__(self, kind=None, extension_id=None, title=None, extension_type=None, summary=None, description=None, version=None, extension_url=None, project_url=None, icon_url=None, license_url=None, feed_url=None, authors=None, installer_command_line_params=None, published_date_time=None, download_count=None, local_is_latest_version=None, local_path=None, installed_date_time=None, provisioning_state=None, comment=None):
super(SiteExtensionInfo, self).__init__(kind=kind)
- self.site_extension_info_id = site_extension_info_id
+ self.extension_id = extension_id
self.title = title
- self.site_extension_info_type = site_extension_info_type
+ self.extension_type = extension_type
self.summary = summary
self.description = description
self.version = version
@@ -118,7 +117,7 @@ def __init__(self, kind=None, site_extension_info_id=None, title=None, site_exte
self.license_url = license_url
self.feed_url = feed_url
self.authors = authors
- self.installation_args = installation_args
+ self.installer_command_line_params = installer_command_line_params
self.published_date_time = published_date_time
self.download_count = download_count
self.local_is_latest_version = local_is_latest_version
diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_instance.py b/azure-mgmt-web/azure/mgmt/web/models/site_instance.py
index dfd3fc7c4fd3..8d729123db18 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/site_instance.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/site_instance.py
@@ -42,7 +42,7 @@ class SiteInstance(ProxyOnlyResource):
'name': {'key': 'name', 'type': 'str'},
'kind': {'key': 'kind', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
- 'site_instance_name': {'key': 'properties.name', 'type': 'str'},
+ 'site_instance_name': {'key': 'properties.siteInstanceName', 'type': 'str'},
}
def __init__(self, kind=None):
diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_patch_resource.py b/azure-mgmt-web/azure/mgmt/web/models/site_patch_resource.py
index 02d64d06af90..8b09daafeb40 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/site_patch_resource.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/site_patch_resource.py
@@ -58,6 +58,8 @@ class SitePatchResource(ProxyOnlyResource):
:param reserved: true
if reserved; otherwise,
false
. Default value: False .
:type reserved: bool
+ :param is_xenon: Hyper-V sandbox. Default value: False .
+ :type is_xenon: bool
:ivar last_modified_time_utc: Last time the app was modified, in UTC.
Read-only.
:vartype last_modified_time_utc: datetime
@@ -170,6 +172,7 @@ class SitePatchResource(ProxyOnlyResource):
'host_name_ssl_states': {'key': 'properties.hostNameSslStates', 'type': '[HostNameSslState]'},
'server_farm_id': {'key': 'properties.serverFarmId', 'type': 'str'},
'reserved': {'key': 'properties.reserved', 'type': 'bool'},
+ 'is_xenon': {'key': 'properties.isXenon', 'type': 'bool'},
'last_modified_time_utc': {'key': 'properties.lastModifiedTimeUtc', 'type': 'iso-8601'},
'site_config': {'key': 'properties.siteConfig', 'type': 'SiteConfig'},
'traffic_manager_host_names': {'key': 'properties.trafficManagerHostNames', 'type': '[str]'},
@@ -194,7 +197,7 @@ class SitePatchResource(ProxyOnlyResource):
'https_only': {'key': 'properties.httpsOnly', 'type': 'bool'},
}
- def __init__(self, kind=None, enabled=None, host_name_ssl_states=None, server_farm_id=None, reserved=False, site_config=None, scm_site_also_stopped=False, hosting_environment_profile=None, client_affinity_enabled=None, client_cert_enabled=None, host_names_disabled=None, container_size=None, daily_memory_time_quota=None, cloning_info=None, snapshot_info=None, https_only=None):
+ def __init__(self, kind=None, enabled=None, host_name_ssl_states=None, server_farm_id=None, reserved=False, is_xenon=False, site_config=None, scm_site_also_stopped=False, hosting_environment_profile=None, client_affinity_enabled=None, client_cert_enabled=None, host_names_disabled=None, container_size=None, daily_memory_time_quota=None, cloning_info=None, snapshot_info=None, https_only=None):
super(SitePatchResource, self).__init__(kind=kind)
self.state = None
self.host_names = None
@@ -206,6 +209,7 @@ def __init__(self, kind=None, enabled=None, host_name_ssl_states=None, server_fa
self.host_name_ssl_states = host_name_ssl_states
self.server_farm_id = server_farm_id
self.reserved = reserved
+ self.is_xenon = is_xenon
self.last_modified_time_utc = None
self.site_config = site_config
self.traffic_manager_host_names = None
diff --git a/azure-mgmt-web/azure/mgmt/web/models/slot_difference.py b/azure-mgmt-web/azure/mgmt/web/models/slot_difference.py
index 58b2c975a0a3..a18762d1c812 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/slot_difference.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/slot_difference.py
@@ -26,9 +26,8 @@ class SlotDifference(ProxyOnlyResource):
:type kind: str
:ivar type: Resource type.
:vartype type: str
- :ivar slot_difference_type: Type of the difference: Information, Warning
- or Error.
- :vartype slot_difference_type: str
+ :ivar level: Level of the difference: Information, Warning or Error.
+ :vartype level: str
:ivar setting_type: The type of the setting: General, AppSetting or
ConnectionString.
:vartype setting_type: str
@@ -49,7 +48,7 @@ class SlotDifference(ProxyOnlyResource):
'id': {'readonly': True},
'name': {'readonly': True},
'type': {'readonly': True},
- 'slot_difference_type': {'readonly': True},
+ 'level': {'readonly': True},
'setting_type': {'readonly': True},
'diff_rule': {'readonly': True},
'setting_name': {'readonly': True},
@@ -63,7 +62,7 @@ class SlotDifference(ProxyOnlyResource):
'name': {'key': 'name', 'type': 'str'},
'kind': {'key': 'kind', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
- 'slot_difference_type': {'key': 'properties.type', 'type': 'str'},
+ 'level': {'key': 'properties.level', 'type': 'str'},
'setting_type': {'key': 'properties.settingType', 'type': 'str'},
'diff_rule': {'key': 'properties.diffRule', 'type': 'str'},
'setting_name': {'key': 'properties.settingName', 'type': 'str'},
@@ -74,7 +73,7 @@ class SlotDifference(ProxyOnlyResource):
def __init__(self, kind=None):
super(SlotDifference, self).__init__(kind=kind)
- self.slot_difference_type = None
+ self.level = None
self.setting_type = None
self.diff_rule = None
self.setting_name = None
diff --git a/azure-mgmt-web/azure/mgmt/web/models/snapshot_recovery_source.py b/azure-mgmt-web/azure/mgmt/web/models/snapshot_recovery_source.py
new file mode 100644
index 000000000000..2b2edaabca7e
--- /dev/null
+++ b/azure-mgmt-web/azure/mgmt/web/models/snapshot_recovery_source.py
@@ -0,0 +1,37 @@
+# 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 SnapshotRecoverySource(Model):
+ """Specifies the web app that snapshot contents will be retrieved from.
+
+ :param location: Geographical location of the source web app, e.g.
+ SouthEastAsia, SouthCentralUS
+ :type location: str
+ :param id: ARM resource ID of the source app.
+ /subscriptions/{subId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{siteName}
+ for production slots and
+ /subscriptions/{subId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{siteName}/slots/{slotName}
+ for other slots.
+ :type id: str
+ """
+
+ _attribute_map = {
+ 'location': {'key': 'location', 'type': 'str'},
+ 'id': {'key': 'id', 'type': 'str'},
+ }
+
+ def __init__(self, location=None, id=None):
+ super(SnapshotRecoverySource, self).__init__()
+ self.location = location
+ self.id = id
diff --git a/azure-mgmt-web/azure/mgmt/web/models/snapshot_restore_request.py b/azure-mgmt-web/azure/mgmt/web/models/snapshot_restore_request.py
new file mode 100644
index 000000000000..8874498958e7
--- /dev/null
+++ b/azure-mgmt-web/azure/mgmt/web/models/snapshot_restore_request.py
@@ -0,0 +1,73 @@
+# 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 SnapshotRestoreRequest(ProxyOnlyResource):
+ """Details about app recovery operation.
+
+ 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 snapshot_time: Point in time in which the app restore should be
+ done, formatted as a DateTime string.
+ :type snapshot_time: str
+ :param recovery_source: Optional. Specifies the web app that snapshot
+ contents will be retrieved from.
+ If empty, the targeted web app will be used as the source.
+ :type recovery_source: ~azure.mgmt.web.models.SnapshotRecoverySource
+ :param overwrite: If true
the restore operation can overwrite
+ source app; otherwise, false
.
+ :type overwrite: bool
+ :param recover_configuration: If true, site configuration, in addition to
+ content, will be reverted.
+ :type recover_configuration: bool
+ :param ignore_conflicting_host_names: If true, custom hostname conflicts
+ will be ignored when recovering to a target web app.
+ This setting is only necessary when RecoverConfiguration is enabled.
+ :type ignore_conflicting_host_names: bool
+ """
+
+ _validation = {
+ 'id': {'readonly': True},
+ 'name': {'readonly': True},
+ 'type': {'readonly': True},
+ 'overwrite': {'required': True},
+ }
+
+ _attribute_map = {
+ 'id': {'key': 'id', 'type': 'str'},
+ 'name': {'key': 'name', 'type': 'str'},
+ 'kind': {'key': 'kind', 'type': 'str'},
+ 'type': {'key': 'type', 'type': 'str'},
+ 'snapshot_time': {'key': 'properties.snapshotTime', 'type': 'str'},
+ 'recovery_source': {'key': 'properties.recoverySource', 'type': 'SnapshotRecoverySource'},
+ 'overwrite': {'key': 'properties.overwrite', 'type': 'bool'},
+ 'recover_configuration': {'key': 'properties.recoverConfiguration', 'type': 'bool'},
+ 'ignore_conflicting_host_names': {'key': 'properties.ignoreConflictingHostNames', 'type': 'bool'},
+ }
+
+ def __init__(self, overwrite, kind=None, snapshot_time=None, recovery_source=None, recover_configuration=None, ignore_conflicting_host_names=None):
+ super(SnapshotRestoreRequest, self).__init__(kind=kind)
+ self.snapshot_time = snapshot_time
+ self.recovery_source = recovery_source
+ self.overwrite = overwrite
+ self.recover_configuration = recover_configuration
+ self.ignore_conflicting_host_names = ignore_conflicting_host_names
diff --git a/azure-mgmt-web/azure/mgmt/web/models/source_control.py b/azure-mgmt-web/azure/mgmt/web/models/source_control.py
index 154659566101..d7cdcea446dc 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/source_control.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/source_control.py
@@ -26,8 +26,6 @@ class SourceControl(ProxyOnlyResource):
:type kind: str
:ivar type: Resource type.
:vartype type: str
- :param source_control_name: Name or source control type.
- :type source_control_name: str
:param token: OAuth access token.
:type token: str
:param token_secret: OAuth access token secret.
@@ -49,16 +47,14 @@ class SourceControl(ProxyOnlyResource):
'name': {'key': 'name', 'type': 'str'},
'kind': {'key': 'kind', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
- 'source_control_name': {'key': 'properties.name', 'type': 'str'},
'token': {'key': 'properties.token', 'type': 'str'},
'token_secret': {'key': 'properties.tokenSecret', 'type': 'str'},
'refresh_token': {'key': 'properties.refreshToken', 'type': 'str'},
'expiration_time': {'key': 'properties.expirationTime', 'type': 'iso-8601'},
}
- def __init__(self, kind=None, source_control_name=None, token=None, token_secret=None, refresh_token=None, expiration_time=None):
+ def __init__(self, kind=None, token=None, token_secret=None, refresh_token=None, expiration_time=None):
super(SourceControl, self).__init__(kind=kind)
- self.source_control_name = source_control_name
self.token = token
self.token_secret = token_secret
self.refresh_token = refresh_token
diff --git a/azure-mgmt-web/azure/mgmt/web/models/stamp_capacity.py b/azure-mgmt-web/azure/mgmt/web/models/stamp_capacity.py
index 8ee3fa14d24b..9dc5b2f77b44 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/stamp_capacity.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/stamp_capacity.py
@@ -29,7 +29,7 @@ class StampCapacity(Model):
'Shared', 'Dedicated', 'Dynamic'
:type compute_mode: str or ~azure.mgmt.web.models.ComputeModeOptions
:param worker_size: Size of the machines. Possible values include:
- 'Default', 'Small', 'Medium', 'Large', 'D1', 'D2', 'D3'
+ 'Small', 'Medium', 'Large', 'D1', 'D2', 'D3', 'Default'
:type worker_size: str or ~azure.mgmt.web.models.WorkerSizeOptions
:param worker_size_id: Size ID of machines:
0 - Small
@@ -45,6 +45,8 @@ class StampCapacity(Model):
:type is_applicable_for_all_compute_modes: bool
:param site_mode: Shared or Dedicated.
:type site_mode: str
+ :param is_linux: Is this a linux stamp capacity
+ :type is_linux: bool
"""
_attribute_map = {
@@ -58,9 +60,10 @@ class StampCapacity(Model):
'exclude_from_capacity_allocation': {'key': 'excludeFromCapacityAllocation', 'type': 'bool'},
'is_applicable_for_all_compute_modes': {'key': 'isApplicableForAllComputeModes', 'type': 'bool'},
'site_mode': {'key': 'siteMode', 'type': 'str'},
+ 'is_linux': {'key': 'isLinux', 'type': 'bool'},
}
- def __init__(self, name=None, available_capacity=None, total_capacity=None, unit=None, compute_mode=None, worker_size=None, worker_size_id=None, exclude_from_capacity_allocation=None, is_applicable_for_all_compute_modes=None, site_mode=None):
+ def __init__(self, name=None, available_capacity=None, total_capacity=None, unit=None, compute_mode=None, worker_size=None, worker_size_id=None, exclude_from_capacity_allocation=None, is_applicable_for_all_compute_modes=None, site_mode=None, is_linux=None):
super(StampCapacity, self).__init__()
self.name = name
self.available_capacity = available_capacity
@@ -72,3 +75,4 @@ def __init__(self, name=None, available_capacity=None, total_capacity=None, unit
self.exclude_from_capacity_allocation = exclude_from_capacity_allocation
self.is_applicable_for_all_compute_modes = is_applicable_for_all_compute_modes
self.site_mode = site_mode
+ self.is_linux = is_linux
diff --git a/azure-mgmt-web/azure/mgmt/web/models/top_level_domain.py b/azure-mgmt-web/azure/mgmt/web/models/top_level_domain.py
index c5b5397e3d90..c54f5fe88e9a 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/top_level_domain.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/top_level_domain.py
@@ -26,8 +26,6 @@ class TopLevelDomain(ProxyOnlyResource):
:type kind: str
:ivar type: Resource type.
:vartype type: str
- :ivar domain_name: Name of the top level domain.
- :vartype domain_name: str
:param privacy: If true
, then the top level domain supports
domain privacy; otherwise, false
.
:type privacy: bool
@@ -37,7 +35,6 @@ class TopLevelDomain(ProxyOnlyResource):
'id': {'readonly': True},
'name': {'readonly': True},
'type': {'readonly': True},
- 'domain_name': {'readonly': True},
}
_attribute_map = {
@@ -45,11 +42,9 @@ class TopLevelDomain(ProxyOnlyResource):
'name': {'key': 'name', 'type': 'str'},
'kind': {'key': 'kind', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
- 'domain_name': {'key': 'properties.name', 'type': 'str'},
'privacy': {'key': 'properties.privacy', 'type': 'bool'},
}
def __init__(self, kind=None, privacy=None):
super(TopLevelDomain, self).__init__(kind=kind)
- self.domain_name = None
self.privacy = privacy
diff --git a/azure-mgmt-web/azure/mgmt/web/models/triggered_job_history.py b/azure-mgmt-web/azure/mgmt/web/models/triggered_job_history.py
index 52afa075ca28..2428bf966407 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/triggered_job_history.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/triggered_job_history.py
@@ -27,8 +27,8 @@ class TriggeredJobHistory(ProxyOnlyResource):
:type kind: str
:ivar type: Resource type.
:vartype type: str
- :param triggered_job_runs: List of triggered web job runs.
- :type triggered_job_runs: list[~azure.mgmt.web.models.TriggeredJobRun]
+ :param runs: List of triggered web job runs.
+ :type runs: list[~azure.mgmt.web.models.TriggeredJobRun]
"""
_validation = {
@@ -42,9 +42,9 @@ class TriggeredJobHistory(ProxyOnlyResource):
'name': {'key': 'name', 'type': 'str'},
'kind': {'key': 'kind', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
- 'triggered_job_runs': {'key': 'properties.triggeredJobRuns', 'type': '[TriggeredJobRun]'},
+ 'runs': {'key': 'properties.runs', 'type': '[TriggeredJobRun]'},
}
- def __init__(self, kind=None, triggered_job_runs=None):
+ def __init__(self, kind=None, runs=None):
super(TriggeredJobHistory, self).__init__(kind=kind)
- self.triggered_job_runs = triggered_job_runs
+ self.runs = runs
diff --git a/azure-mgmt-web/azure/mgmt/web/models/triggered_job_run.py b/azure-mgmt-web/azure/mgmt/web/models/triggered_job_run.py
index 3b9bef7b7671..e64f17fd2d20 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/triggered_job_run.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/triggered_job_run.py
@@ -26,10 +26,10 @@ class TriggeredJobRun(ProxyOnlyResource):
:type kind: str
:ivar type: Resource type.
:vartype type: str
- :param triggered_job_run_id: Job ID.
- :type triggered_job_run_id: str
- :ivar triggered_job_run_name: Job name.
- :vartype triggered_job_run_name: str
+ :param web_job_id: Job ID.
+ :type web_job_id: str
+ :param web_job_name: Job name.
+ :type web_job_name: str
:param status: Job status. Possible values include: 'Success', 'Failed',
'Error'
:type status: str or ~azure.mgmt.web.models.TriggeredWebJobStatus
@@ -55,7 +55,6 @@ class TriggeredJobRun(ProxyOnlyResource):
'id': {'readonly': True},
'name': {'readonly': True},
'type': {'readonly': True},
- 'triggered_job_run_name': {'readonly': True},
}
_attribute_map = {
@@ -63,23 +62,23 @@ class TriggeredJobRun(ProxyOnlyResource):
'name': {'key': 'name', 'type': 'str'},
'kind': {'key': 'kind', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
- 'triggered_job_run_id': {'key': 'properties.id', 'type': 'str'},
- 'triggered_job_run_name': {'key': 'properties.name', 'type': 'str'},
+ 'web_job_id': {'key': 'properties.web_job_id', 'type': 'str'},
+ 'web_job_name': {'key': 'properties.web_job_name', 'type': 'str'},
'status': {'key': 'properties.status', 'type': 'TriggeredWebJobStatus'},
- 'start_time': {'key': 'properties.startTime', 'type': 'iso-8601'},
- 'end_time': {'key': 'properties.endTime', 'type': 'iso-8601'},
+ 'start_time': {'key': 'properties.start_time', 'type': 'iso-8601'},
+ 'end_time': {'key': 'properties.end_time', 'type': 'iso-8601'},
'duration': {'key': 'properties.duration', 'type': 'str'},
- 'output_url': {'key': 'properties.outputUrl', 'type': 'str'},
- 'error_url': {'key': 'properties.errorUrl', 'type': 'str'},
+ 'output_url': {'key': 'properties.output_url', 'type': 'str'},
+ 'error_url': {'key': 'properties.error_url', 'type': 'str'},
'url': {'key': 'properties.url', 'type': 'str'},
- 'job_name': {'key': 'properties.jobName', 'type': 'str'},
+ 'job_name': {'key': 'properties.job_name', 'type': 'str'},
'trigger': {'key': 'properties.trigger', 'type': 'str'},
}
- def __init__(self, kind=None, triggered_job_run_id=None, status=None, start_time=None, end_time=None, duration=None, output_url=None, error_url=None, url=None, job_name=None, trigger=None):
+ def __init__(self, kind=None, web_job_id=None, web_job_name=None, status=None, start_time=None, end_time=None, duration=None, output_url=None, error_url=None, url=None, job_name=None, trigger=None):
super(TriggeredJobRun, self).__init__(kind=kind)
- self.triggered_job_run_id = triggered_job_run_id
- self.triggered_job_run_name = None
+ self.web_job_id = web_job_id
+ self.web_job_name = web_job_name
self.status = status
self.start_time = start_time
self.end_time = end_time
diff --git a/azure-mgmt-web/azure/mgmt/web/models/triggered_web_job.py b/azure-mgmt-web/azure/mgmt/web/models/triggered_web_job.py
index a64ffb9c9bb9..cc25e5cd9f4d 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/triggered_web_job.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/triggered_web_job.py
@@ -32,18 +32,15 @@ class TriggeredWebJob(ProxyOnlyResource):
:type history_url: str
:param scheduler_logs_url: Scheduler Logs URL.
:type scheduler_logs_url: str
- :ivar triggered_web_job_name: Job name. Used as job identifier in ARM
- resource URI.
- :vartype triggered_web_job_name: str
:param run_command: Run command.
:type run_command: str
:param url: Job URL.
:type url: str
:param extra_info_url: Extra Info URL.
:type extra_info_url: str
- :param job_type: Job type. Possible values include: 'Continuous',
+ :param web_job_type: Job type. Possible values include: 'Continuous',
'Triggered'
- :type job_type: str or ~azure.mgmt.web.models.WebJobType
+ :type web_job_type: str or ~azure.mgmt.web.models.WebJobType
:param error: Error information.
:type error: str
:param using_sdk: Using SDK?
@@ -56,7 +53,6 @@ class TriggeredWebJob(ProxyOnlyResource):
'id': {'readonly': True},
'name': {'readonly': True},
'type': {'readonly': True},
- 'triggered_web_job_name': {'readonly': True},
}
_attribute_map = {
@@ -64,29 +60,27 @@ class TriggeredWebJob(ProxyOnlyResource):
'name': {'key': 'name', 'type': 'str'},
'kind': {'key': 'kind', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
- 'latest_run': {'key': 'properties.latestRun', 'type': 'TriggeredJobRun'},
- 'history_url': {'key': 'properties.historyUrl', 'type': 'str'},
- 'scheduler_logs_url': {'key': 'properties.schedulerLogsUrl', 'type': 'str'},
- 'triggered_web_job_name': {'key': 'properties.name', 'type': 'str'},
- 'run_command': {'key': 'properties.runCommand', 'type': 'str'},
+ 'latest_run': {'key': 'properties.latest_run', 'type': 'TriggeredJobRun'},
+ 'history_url': {'key': 'properties.history_url', 'type': 'str'},
+ 'scheduler_logs_url': {'key': 'properties.scheduler_logs_url', 'type': 'str'},
+ 'run_command': {'key': 'properties.run_command', 'type': 'str'},
'url': {'key': 'properties.url', 'type': 'str'},
- 'extra_info_url': {'key': 'properties.extraInfoUrl', 'type': 'str'},
- 'job_type': {'key': 'properties.jobType', 'type': 'WebJobType'},
+ 'extra_info_url': {'key': 'properties.extra_info_url', 'type': 'str'},
+ 'web_job_type': {'key': 'properties.web_job_type', 'type': 'WebJobType'},
'error': {'key': 'properties.error', 'type': 'str'},
- 'using_sdk': {'key': 'properties.usingSdk', 'type': 'bool'},
+ 'using_sdk': {'key': 'properties.using_sdk', 'type': 'bool'},
'settings': {'key': 'properties.settings', 'type': '{object}'},
}
- def __init__(self, kind=None, latest_run=None, history_url=None, scheduler_logs_url=None, run_command=None, url=None, extra_info_url=None, job_type=None, error=None, using_sdk=None, settings=None):
+ def __init__(self, kind=None, latest_run=None, history_url=None, scheduler_logs_url=None, run_command=None, url=None, extra_info_url=None, web_job_type=None, error=None, using_sdk=None, settings=None):
super(TriggeredWebJob, self).__init__(kind=kind)
self.latest_run = latest_run
self.history_url = history_url
self.scheduler_logs_url = scheduler_logs_url
- self.triggered_web_job_name = None
self.run_command = run_command
self.url = url
self.extra_info_url = extra_info_url
- self.job_type = job_type
+ self.web_job_type = web_job_type
self.error = error
self.using_sdk = using_sdk
self.settings = settings
diff --git a/azure-mgmt-web/azure/mgmt/web/models/usage.py b/azure-mgmt-web/azure/mgmt/web/models/usage.py
index 7ae5ab1dba10..23d493fbc471 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/usage.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/usage.py
@@ -28,8 +28,6 @@ class Usage(ProxyOnlyResource):
:vartype type: str
:ivar display_name: Friendly name shown in the UI.
:vartype display_name: str
- :ivar usage_name: Name of the quota.
- :vartype usage_name: str
:ivar resource_name: Name of the quota resource.
:vartype resource_name: str
:ivar unit: Units of measurement for the quota resource.
@@ -52,7 +50,6 @@ class Usage(ProxyOnlyResource):
'name': {'readonly': True},
'type': {'readonly': True},
'display_name': {'readonly': True},
- 'usage_name': {'readonly': True},
'resource_name': {'readonly': True},
'unit': {'readonly': True},
'current_value': {'readonly': True},
@@ -68,7 +65,6 @@ class Usage(ProxyOnlyResource):
'kind': {'key': 'kind', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
'display_name': {'key': 'properties.displayName', 'type': 'str'},
- 'usage_name': {'key': 'properties.name', 'type': 'str'},
'resource_name': {'key': 'properties.resourceName', 'type': 'str'},
'unit': {'key': 'properties.unit', 'type': 'str'},
'current_value': {'key': 'properties.currentValue', 'type': 'long'},
@@ -81,7 +77,6 @@ class Usage(ProxyOnlyResource):
def __init__(self, kind=None):
super(Usage, self).__init__(kind=kind)
self.display_name = None
- self.usage_name = None
self.resource_name = None
self.unit = None
self.current_value = None
diff --git a/azure-mgmt-web/azure/mgmt/web/models/user.py b/azure-mgmt-web/azure/mgmt/web/models/user.py
index bb48fef75395..fe08001b2a6b 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/user.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/user.py
@@ -26,8 +26,6 @@ class User(ProxyOnlyResource):
:type kind: str
:ivar type: Resource type.
:vartype type: str
- :param user_name: Username
- :type user_name: str
:param publishing_user_name: Username used for publishing.
:type publishing_user_name: str
:param publishing_password: Password used for publishing.
@@ -37,6 +35,8 @@ class User(ProxyOnlyResource):
:param publishing_password_hash_salt: Password hash salt used for
publishing.
:type publishing_password_hash_salt: str
+ :param scm_uri: Url of SCM site.
+ :type scm_uri: str
"""
_validation = {
@@ -51,17 +51,17 @@ class User(ProxyOnlyResource):
'name': {'key': 'name', 'type': 'str'},
'kind': {'key': 'kind', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
- 'user_name': {'key': 'properties.name', 'type': 'str'},
'publishing_user_name': {'key': 'properties.publishingUserName', 'type': 'str'},
'publishing_password': {'key': 'properties.publishingPassword', 'type': 'str'},
'publishing_password_hash': {'key': 'properties.publishingPasswordHash', 'type': 'str'},
'publishing_password_hash_salt': {'key': 'properties.publishingPasswordHashSalt', 'type': 'str'},
+ 'scm_uri': {'key': 'properties.scmUri', 'type': 'str'},
}
- def __init__(self, publishing_user_name, kind=None, user_name=None, publishing_password=None, publishing_password_hash=None, publishing_password_hash_salt=None):
+ def __init__(self, publishing_user_name, kind=None, publishing_password=None, publishing_password_hash=None, publishing_password_hash_salt=None, scm_uri=None):
super(User, self).__init__(kind=kind)
- self.user_name = user_name
self.publishing_user_name = publishing_user_name
self.publishing_password = publishing_password
self.publishing_password_hash = publishing_password_hash
self.publishing_password_hash_salt = publishing_password_hash_salt
+ self.scm_uri = scm_uri
diff --git a/azure-mgmt-web/azure/mgmt/web/models/vnet_route.py b/azure-mgmt-web/azure/mgmt/web/models/vnet_route.py
index ef511e8fb23b..7055daf5db01 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/vnet_route.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/vnet_route.py
@@ -27,9 +27,6 @@ class VnetRoute(ProxyOnlyResource):
:type kind: str
:ivar type: Resource type.
:vartype type: str
- :param vnet_route_name: The name of this route. This is only returned by
- the server and does not need to be set by the client.
- :type vnet_route_name: str
:param start_address: The starting address for this route. This may also
include a CIDR notation, in which case the end address must not be
specified.
@@ -58,15 +55,13 @@ class VnetRoute(ProxyOnlyResource):
'name': {'key': 'name', 'type': 'str'},
'kind': {'key': 'kind', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
- 'vnet_route_name': {'key': 'properties.name', 'type': 'str'},
'start_address': {'key': 'properties.startAddress', 'type': 'str'},
'end_address': {'key': 'properties.endAddress', 'type': 'str'},
'route_type': {'key': 'properties.routeType', 'type': 'str'},
}
- def __init__(self, kind=None, vnet_route_name=None, start_address=None, end_address=None, route_type=None):
+ def __init__(self, kind=None, start_address=None, end_address=None, route_type=None):
super(VnetRoute, self).__init__(kind=kind)
- self.vnet_route_name = vnet_route_name
self.start_address = start_address
self.end_address = end_address
self.route_type = route_type
diff --git a/azure-mgmt-web/azure/mgmt/web/models/web_job.py b/azure-mgmt-web/azure/mgmt/web/models/web_job.py
index 5a3caa921631..9119ad7b93da 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/web_job.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/web_job.py
@@ -26,17 +26,15 @@ class WebJob(ProxyOnlyResource):
:type kind: str
:ivar type: Resource type.
:vartype type: str
- :ivar web_job_name: Job name. Used as job identifier in ARM resource URI.
- :vartype web_job_name: str
:param run_command: Run command.
:type run_command: str
:param url: Job URL.
:type url: str
:param extra_info_url: Extra Info URL.
:type extra_info_url: str
- :param job_type: Job type. Possible values include: 'Continuous',
+ :param web_job_type: Job type. Possible values include: 'Continuous',
'Triggered'
- :type job_type: str or ~azure.mgmt.web.models.WebJobType
+ :type web_job_type: str or ~azure.mgmt.web.models.WebJobType
:param error: Error information.
:type error: str
:param using_sdk: Using SDK?
@@ -49,7 +47,6 @@ class WebJob(ProxyOnlyResource):
'id': {'readonly': True},
'name': {'readonly': True},
'type': {'readonly': True},
- 'web_job_name': {'readonly': True},
}
_attribute_map = {
@@ -57,23 +54,21 @@ class WebJob(ProxyOnlyResource):
'name': {'key': 'name', 'type': 'str'},
'kind': {'key': 'kind', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
- 'web_job_name': {'key': 'properties.name', 'type': 'str'},
- 'run_command': {'key': 'properties.runCommand', 'type': 'str'},
+ 'run_command': {'key': 'properties.run_command', 'type': 'str'},
'url': {'key': 'properties.url', 'type': 'str'},
- 'extra_info_url': {'key': 'properties.extraInfoUrl', 'type': 'str'},
- 'job_type': {'key': 'properties.jobType', 'type': 'WebJobType'},
+ 'extra_info_url': {'key': 'properties.extra_info_url', 'type': 'str'},
+ 'web_job_type': {'key': 'properties.web_job_type', 'type': 'WebJobType'},
'error': {'key': 'properties.error', 'type': 'str'},
- 'using_sdk': {'key': 'properties.usingSdk', 'type': 'bool'},
+ 'using_sdk': {'key': 'properties.using_sdk', 'type': 'bool'},
'settings': {'key': 'properties.settings', 'type': '{object}'},
}
- def __init__(self, kind=None, run_command=None, url=None, extra_info_url=None, job_type=None, error=None, using_sdk=None, settings=None):
+ def __init__(self, kind=None, run_command=None, url=None, extra_info_url=None, web_job_type=None, error=None, using_sdk=None, settings=None):
super(WebJob, self).__init__(kind=kind)
- self.web_job_name = None
self.run_command = run_command
self.url = url
self.extra_info_url = extra_info_url
- self.job_type = job_type
+ self.web_job_type = web_job_type
self.error = error
self.using_sdk = using_sdk
self.settings = settings
diff --git a/azure-mgmt-web/azure/mgmt/web/models/web_site_management_client_enums.py b/azure-mgmt-web/azure/mgmt/web/models/web_site_management_client_enums.py
index 732822bd5a3f..18048e05bd4e 100644
--- a/azure-mgmt-web/azure/mgmt/web/models/web_site_management_client_enums.py
+++ b/azure-mgmt-web/azure/mgmt/web/models/web_site_management_client_enums.py
@@ -81,6 +81,12 @@ class RouteType(Enum):
static = "STATIC"
+class ManagedServiceIdentityType(Enum):
+
+ system_assigned = "SystemAssigned"
+ user_assigned = "UserAssigned"
+
+
class AutoHealActionType(Enum):
recycle = "Recycle"
@@ -142,6 +148,13 @@ class SupportedTlsVersions(Enum):
one_full_stop_two = "1.2"
+class FtpsState(Enum):
+
+ all_allowed = "AllAllowed"
+ ftps_only = "FtpsOnly"
+ disabled = "Disabled"
+
+
class SslState(Enum):
disabled = "Disabled"
@@ -254,13 +267,13 @@ class ComputeModeOptions(Enum):
class WorkerSizeOptions(Enum):
- default = "Default"
small = "Small"
medium = "Medium"
large = "Large"
d1 = "D1"
d2 = "D2"
d3 = "D3"
+ default = "Default"
class AccessControlEntryAction(Enum):
@@ -392,14 +405,6 @@ class FrequencyUnit(Enum):
hour = "Hour"
-class BackupRestoreOperationType(Enum):
-
- default = "Default"
- clone = "Clone"
- relocation = "Relocation"
- snapshot = "Snapshot"
-
-
class ContinuousWebJobStatus(Enum):
initializing = "Initializing"
@@ -458,6 +463,15 @@ class PublicCertificateLocation(Enum):
unknown = "Unknown"
+class BackupRestoreOperationType(Enum):
+
+ default = "Default"
+ clone = "Clone"
+ relocation = "Relocation"
+ snapshot = "Snapshot"
+ cloud_fs = "CloudFS"
+
+
class UnauthenticatedClientAction(Enum):
redirect_to_login_page = "RedirectToLoginPage"
@@ -500,6 +514,6 @@ class SkuName(Enum):
basic = "Basic"
standard = "Standard"
premium = "Premium"
- premium_v2 = "PremiumV2"
dynamic = "Dynamic"
isolated = "Isolated"
+ premium_v2 = "PremiumV2"
diff --git a/azure-mgmt-web/azure/mgmt/web/operations/app_service_certificate_orders_operations.py b/azure-mgmt-web/azure/mgmt/web/operations/app_service_certificate_orders_operations.py
index e1cc7214d1cb..9437e7248aea 100644
--- a/azure-mgmt-web/azure/mgmt/web/operations/app_service_certificate_orders_operations.py
+++ b/azure-mgmt-web/azure/mgmt/web/operations/app_service_certificate_orders_operations.py
@@ -25,7 +25,7 @@ class AppServiceCertificateOrdersOperations(object):
:param config: Configuration of service client.
:param serializer: An object model serializer.
:param deserializer: An object model deserializer.
- :ivar api_version: API Version. Constant value: "2015-08-01".
+ :ivar api_version: API Version. Constant value: "2018-02-01".
"""
models = models
@@ -35,7 +35,7 @@ def __init__(self, client, config, serializer, deserializer):
self._client = client
self._serialize = serializer
self._deserialize = deserializer
- self.api_version = "2015-08-01"
+ self.api_version = "2018-02-01"
self.config = config
@@ -53,7 +53,8 @@ def list(
:return: An iterator like instance of AppServiceCertificateOrder
:rtype:
~azure.mgmt.web.models.AppServiceCertificateOrderPaged[~azure.mgmt.web.models.AppServiceCertificateOrder]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -89,9 +90,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -181,7 +180,8 @@ def list_by_resource_group(
:return: An iterator like instance of AppServiceCertificateOrder
:rtype:
~azure.mgmt.web.models.AppServiceCertificateOrderPaged[~azure.mgmt.web.models.AppServiceCertificateOrder]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -218,9 +218,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -254,7 +252,8 @@ def get(
:return: AppServiceCertificateOrder or ClientRawResponse if raw=true
:rtype: ~azure.mgmt.web.models.AppServiceCertificateOrder or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.get.metadata['url']
@@ -284,9 +283,7 @@ def get(
response = self._client.send(request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -335,9 +332,7 @@ def _create_or_update_initial(
request, header_parameters, body_content, stream=False, **operation_config)
if response.status_code not in [200, 201]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -375,7 +370,8 @@ def create_or_update(
:rtype:
~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.AppServiceCertificateOrder]
or ~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
raw_result = self._create_or_update_initial(
resource_group_name=resource_group_name,
@@ -405,9 +401,7 @@ def get_long_running_status(status_link, headers=None):
def get_long_running_output(response):
if response.status_code not in [200, 201]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = self._deserialize('AppServiceCertificateOrder', response)
@@ -505,7 +499,8 @@ def update(
:return: AppServiceCertificateOrder or ClientRawResponse if raw=true
:rtype: ~azure.mgmt.web.models.AppServiceCertificateOrder or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.update.metadata['url']
@@ -539,9 +534,7 @@ def update(
request, header_parameters, body_content, stream=False, **operation_config)
if response.status_code not in [200, 201]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -576,7 +569,8 @@ def list_certificates(
:return: An iterator like instance of AppServiceCertificateResource
:rtype:
~azure.mgmt.web.models.AppServiceCertificateResourcePaged[~azure.mgmt.web.models.AppServiceCertificateResource]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -614,9 +608,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -653,7 +645,8 @@ def get_certificate(
raw=true
:rtype: ~azure.mgmt.web.models.AppServiceCertificateResource or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.get_certificate.metadata['url']
@@ -684,9 +677,7 @@ def get_certificate(
response = self._client.send(request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -736,9 +727,7 @@ def _create_or_update_certificate_initial(
request, header_parameters, body_content, stream=False, **operation_config)
if response.status_code not in [200, 201]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -777,7 +766,8 @@ def create_or_update_certificate(
:rtype:
~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.AppServiceCertificateResource]
or ~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
raw_result = self._create_or_update_certificate_initial(
resource_group_name=resource_group_name,
@@ -808,9 +798,7 @@ def get_long_running_status(status_link, headers=None):
def get_long_running_output(response):
if response.status_code not in [200, 201]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = self._deserialize('AppServiceCertificateResource', response)
@@ -913,7 +901,8 @@ def update_certificate(
raw=true
:rtype: ~azure.mgmt.web.models.AppServiceCertificateResource or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.update_certificate.metadata['url']
@@ -948,9 +937,7 @@ def update_certificate(
request, header_parameters, body_content, stream=False, **operation_config)
if response.status_code not in [200, 201]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -1240,7 +1227,8 @@ def retrieve_site_seal(
:return: SiteSeal or ClientRawResponse if raw=true
:rtype: ~azure.mgmt.web.models.SiteSeal or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
site_seal_request = models.SiteSealRequest(light_theme=light_theme, locale=locale)
@@ -1276,9 +1264,7 @@ def retrieve_site_seal(
request, header_parameters, body_content, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -1368,7 +1354,8 @@ def retrieve_certificate_actions(
:return: list or ClientRawResponse if raw=true
:rtype: list[~azure.mgmt.web.models.CertificateOrderAction] or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.retrieve_certificate_actions.metadata['url']
@@ -1398,9 +1385,7 @@ def retrieve_certificate_actions(
response = self._client.send(request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -1433,7 +1418,8 @@ def retrieve_certificate_email_history(
:return: list or ClientRawResponse if raw=true
:rtype: list[~azure.mgmt.web.models.CertificateEmail] or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.retrieve_certificate_email_history.metadata['url']
@@ -1463,9 +1449,7 @@ def retrieve_certificate_email_history(
response = self._client.send(request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
diff --git a/azure-mgmt-web/azure/mgmt/web/operations/app_service_environments_operations.py b/azure-mgmt-web/azure/mgmt/web/operations/app_service_environments_operations.py
index f4c683d13e7b..bdbe5fc7e11a 100644
--- a/azure-mgmt-web/azure/mgmt/web/operations/app_service_environments_operations.py
+++ b/azure-mgmt-web/azure/mgmt/web/operations/app_service_environments_operations.py
@@ -25,7 +25,7 @@ class AppServiceEnvironmentsOperations(object):
:param config: Configuration of service client.
:param serializer: An object model serializer.
:param deserializer: An object model deserializer.
- :ivar api_version: API Version. Constant value: "2016-09-01".
+ :ivar api_version: API Version. Constant value: "2018-02-01".
"""
models = models
@@ -35,7 +35,7 @@ def __init__(self, client, config, serializer, deserializer):
self._client = client
self._serialize = serializer
self._deserialize = deserializer
- self.api_version = "2016-09-01"
+ self.api_version = "2018-02-01"
self.config = config
@@ -53,7 +53,8 @@ def list(
:return: An iterator like instance of AppServiceEnvironmentResource
:rtype:
~azure.mgmt.web.models.AppServiceEnvironmentResourcePaged[~azure.mgmt.web.models.AppServiceEnvironmentResource]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -89,9 +90,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -123,7 +122,8 @@ def list_by_resource_group(
:return: An iterator like instance of AppServiceEnvironmentResource
:rtype:
~azure.mgmt.web.models.AppServiceEnvironmentResourcePaged[~azure.mgmt.web.models.AppServiceEnvironmentResource]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -160,9 +160,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -197,7 +195,8 @@ def get(
raw=true
:rtype: ~azure.mgmt.web.models.AppServiceEnvironmentResource or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.get.metadata['url']
@@ -227,9 +226,7 @@ def get(
response = self._client.send(request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -574,7 +571,8 @@ def list_capacities(
:return: An iterator like instance of StampCapacity
:rtype:
~azure.mgmt.web.models.StampCapacityPaged[~azure.mgmt.web.models.StampCapacity]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -612,9 +610,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -648,7 +644,8 @@ def list_vips(
:return: AddressResponse or ClientRawResponse if raw=true
:rtype: ~azure.mgmt.web.models.AddressResponse or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.list_vips.metadata['url']
@@ -678,9 +675,7 @@ def list_vips(
response = self._client.send(request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -694,6 +689,131 @@ def list_vips(
return deserialized
list_vips.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/capacities/virtualip'}
+
+ def _change_vnet_initial(
+ self, resource_group_name, name, id=None, subnet=None, custom_headers=None, raw=False, **operation_config):
+ vnet_info = models.VirtualNetworkProfile(id=id, subnet=subnet)
+
+ # Construct URL
+ url = self.change_vnet.metadata['url']
+ path_format_arguments = {
+ 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+[^\.]$'),
+ 'name': self._serialize.url("name", name, 'str'),
+ 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
+ }
+ url = self._client.format_url(url, **path_format_arguments)
+
+ # Construct parameters
+ query_parameters = {}
+ query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+ # Construct headers
+ header_parameters = {}
+ header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+ if self.config.generate_client_request_id:
+ header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
+ if custom_headers:
+ header_parameters.update(custom_headers)
+ if self.config.accept_language is not None:
+ header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
+
+ # Construct body
+ body_content = self._serialize.body(vnet_info, 'VirtualNetworkProfile')
+
+ # Construct and send request
+ request = self._client.post(url, query_parameters)
+ response = self._client.send(
+ request, header_parameters, body_content, stream=False, **operation_config)
+
+ if response.status_code not in [200, 202]:
+ raise models.DefaultErrorResponseException(self._deserialize, response)
+
+ deserialized = None
+
+ if response.status_code == 200:
+ deserialized = self._deserialize('WebAppCollection', response)
+ if response.status_code == 202:
+ deserialized = self._deserialize('WebAppCollection', response)
+
+ if raw:
+ client_raw_response = ClientRawResponse(deserialized, response)
+ return client_raw_response
+
+ return deserialized
+
+ def change_vnet(
+ self, resource_group_name, name, id=None, subnet=None, custom_headers=None, raw=False, **operation_config):
+ """Move an App Service Environment to a different VNET.
+
+ Move an App Service Environment to a different VNET.
+
+ :param resource_group_name: Name of the resource group to which the
+ resource belongs.
+ :type resource_group_name: str
+ :param name: Name of the App Service Environment.
+ :type name: str
+ :param id: Resource id of the Virtual Network.
+ :type id: str
+ :param subnet: Subnet within the Virtual Network.
+ :type subnet: str
+ :param dict custom_headers: headers that will be added to the request
+ :param bool raw: returns the direct response alongside the
+ deserialized response
+ :return: An instance of AzureOperationPoller that returns
+ WebAppCollection or ClientRawResponse if raw=true
+ :rtype:
+ ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.WebAppCollection]
+ or ~msrest.pipeline.ClientRawResponse
+ :raises:
+ :class:`DefaultErrorResponseException`
+ """
+ raw_result = self._change_vnet_initial(
+ resource_group_name=resource_group_name,
+ name=name,
+ id=id,
+ subnet=subnet,
+ custom_headers=custom_headers,
+ raw=True,
+ **operation_config
+ )
+ if raw:
+ return raw_result
+
+ # Construct and send request
+ def long_running_send():
+ return raw_result.response
+
+ def get_long_running_status(status_link, headers=None):
+
+ request = self._client.get(status_link)
+ if headers:
+ request.headers.update(headers)
+ header_parameters = {}
+ header_parameters['x-ms-client-request-id'] = raw_result.response.request.headers['x-ms-client-request-id']
+ return self._client.send(
+ request, header_parameters, stream=False, **operation_config)
+
+ def get_long_running_output(response):
+
+ if response.status_code not in [200, 202]:
+ raise models.DefaultErrorResponseException(self._deserialize, response)
+
+ deserialized = self._deserialize('WebAppCollection', response)
+
+ if raw:
+ client_raw_response = ClientRawResponse(deserialized, response)
+ return client_raw_response
+
+ return deserialized
+
+ long_running_operation_timeout = operation_config.get(
+ 'long_running_operation_timeout',
+ self.config.long_running_operation_timeout)
+ return AzureOperationPoller(
+ long_running_send, get_long_running_output,
+ get_long_running_status, long_running_operation_timeout)
+ change_vnet.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/changeVirtualNetwork'}
+
def list_diagnostics(
self, resource_group_name, name, custom_headers=None, raw=False, **operation_config):
"""Get diagnostic information for an App Service Environment.
@@ -713,7 +833,8 @@ def list_diagnostics(
:return: list or ClientRawResponse if raw=true
:rtype: list[~azure.mgmt.web.models.HostingEnvironmentDiagnostics] or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.list_diagnostics.metadata['url']
@@ -743,9 +864,7 @@ def list_diagnostics(
response = self._client.send(request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -781,7 +900,8 @@ def get_diagnostics_item(
raw=true
:rtype: ~azure.mgmt.web.models.HostingEnvironmentDiagnostics or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.get_diagnostics_item.metadata['url']
@@ -812,9 +932,7 @@ def get_diagnostics_item(
response = self._client.send(request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -847,7 +965,8 @@ def list_metric_definitions(
:return: MetricDefinition or ClientRawResponse if raw=true
:rtype: ~azure.mgmt.web.models.MetricDefinition or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.list_metric_definitions.metadata['url']
@@ -877,9 +996,7 @@ def list_metric_definitions(
response = self._client.send(request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -921,7 +1038,8 @@ def list_metrics(
:return: An iterator like instance of ResourceMetric
:rtype:
~azure.mgmt.web.models.ResourceMetricPaged[~azure.mgmt.web.models.ResourceMetric]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -963,9 +1081,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -999,7 +1115,8 @@ def list_multi_role_pools(
:return: An iterator like instance of WorkerPoolResource
:rtype:
~azure.mgmt.web.models.WorkerPoolResourcePaged[~azure.mgmt.web.models.WorkerPoolResource]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -1037,9 +1154,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -1073,7 +1188,8 @@ def get_multi_role_pool(
:return: WorkerPoolResource or ClientRawResponse if raw=true
:rtype: ~azure.mgmt.web.models.WorkerPoolResource or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.get_multi_role_pool.metadata['url']
@@ -1103,9 +1219,7 @@ def get_multi_role_pool(
response = self._client.send(request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -1340,7 +1454,8 @@ def list_multi_role_pool_instance_metric_definitions(
:return: An iterator like instance of ResourceMetricDefinition
:rtype:
~azure.mgmt.web.models.ResourceMetricDefinitionPaged[~azure.mgmt.web.models.ResourceMetricDefinition]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -1379,9 +1494,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -1422,7 +1535,8 @@ def list_multi_role_pool_instance_metrics(
:return: An iterator like instance of ResourceMetric
:rtype:
~azure.mgmt.web.models.ResourceMetricPaged[~azure.mgmt.web.models.ResourceMetric]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -1463,9 +1577,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -1501,7 +1613,8 @@ def list_multi_role_metric_definitions(
:return: An iterator like instance of ResourceMetricDefinition
:rtype:
~azure.mgmt.web.models.ResourceMetricDefinitionPaged[~azure.mgmt.web.models.ResourceMetricDefinition]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -1539,9 +1652,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -1590,7 +1701,8 @@ def list_multi_role_metrics(
:return: An iterator like instance of ResourceMetric
:rtype:
~azure.mgmt.web.models.ResourceMetricPaged[~azure.mgmt.web.models.ResourceMetric]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -1638,9 +1750,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -1674,7 +1784,8 @@ def list_multi_role_pool_skus(
:return: An iterator like instance of SkuInfo
:rtype:
~azure.mgmt.web.models.SkuInfoPaged[~azure.mgmt.web.models.SkuInfo]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -1712,9 +1823,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -1748,7 +1857,8 @@ def list_multi_role_usages(
:return: An iterator like instance of Usage
:rtype:
~azure.mgmt.web.models.UsagePaged[~azure.mgmt.web.models.Usage]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -1786,9 +1896,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -1822,7 +1930,8 @@ def list_operations(
:return: list or ClientRawResponse if raw=true
:rtype: list[~azure.mgmt.web.models.Operation] or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.list_operations.metadata['url']
@@ -1852,9 +1961,7 @@ def list_operations(
response = self._client.send(request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -1956,9 +2063,7 @@ def _resume_initial(
response = self._client.send(request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200, 202]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -1992,7 +2097,8 @@ def resume(
:rtype:
~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.WebAppCollection]
or ~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
raw_result = self._resume_initial(
resource_group_name=resource_group_name,
@@ -2021,9 +2127,7 @@ def get_long_running_status(status_link, headers=None):
def get_long_running_output(response):
if response.status_code not in [200, 202]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = self._deserialize('WebAppCollection', response)
@@ -2060,7 +2164,8 @@ def list_app_service_plans(
:return: An iterator like instance of AppServicePlan
:rtype:
~azure.mgmt.web.models.AppServicePlanPaged[~azure.mgmt.web.models.AppServicePlan]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -2098,9 +2203,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -2136,7 +2239,8 @@ def list_web_apps(
overrides`.
:return: An iterator like instance of Site
:rtype: ~azure.mgmt.web.models.SitePaged[~azure.mgmt.web.models.Site]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -2176,9 +2280,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -2224,9 +2326,7 @@ def _suspend_initial(
response = self._client.send(request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200, 202]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -2260,7 +2360,8 @@ def suspend(
:rtype:
~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.WebAppCollection]
or ~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
raw_result = self._suspend_initial(
resource_group_name=resource_group_name,
@@ -2289,9 +2390,7 @@ def get_long_running_status(status_link, headers=None):
def get_long_running_output(response):
if response.status_code not in [200, 202]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = self._deserialize('WebAppCollection', response)
@@ -2309,6 +2408,63 @@ def get_long_running_output(response):
get_long_running_status, long_running_operation_timeout)
suspend.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/suspend'}
+ def sync_virtual_network_info(
+ self, resource_group_name, name, custom_headers=None, raw=False, **operation_config):
+ """Resume an App Service Environment.
+
+ Resume an App Service Environment.
+
+ :param resource_group_name: Name of the resource group to which the
+ resource belongs.
+ :type resource_group_name: str
+ :param name: Name of the App Service Environment.
+ :type name: str
+ :param dict custom_headers: headers that will be added to the request
+ :param bool raw: returns the direct response alongside the
+ deserialized response
+ :param operation_config: :ref:`Operation configuration
+ overrides`.
+ :return: None or ClientRawResponse if raw=true
+ :rtype: None or ~msrest.pipeline.ClientRawResponse
+ :raises: :class:`CloudError`
+ """
+ # Construct URL
+ url = self.sync_virtual_network_info.metadata['url']
+ path_format_arguments = {
+ 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+[^\.]$'),
+ 'name': self._serialize.url("name", name, 'str'),
+ 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
+ }
+ url = self._client.format_url(url, **path_format_arguments)
+
+ # Construct parameters
+ query_parameters = {}
+ query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+ # Construct headers
+ header_parameters = {}
+ header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+ if self.config.generate_client_request_id:
+ header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
+ if custom_headers:
+ header_parameters.update(custom_headers)
+ if self.config.accept_language is not None:
+ header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
+
+ # Construct and send request
+ request = self._client.post(url, query_parameters)
+ response = self._client.send(request, header_parameters, stream=False, **operation_config)
+
+ if response.status_code not in [200, 202]:
+ exp = CloudError(response)
+ exp.request_id = response.headers.get('x-ms-request-id')
+ raise exp
+
+ if raw:
+ client_raw_response = ClientRawResponse(None, response)
+ return client_raw_response
+ sync_virtual_network_info.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/syncVirtualNetwork'}
+
def list_usages(
self, resource_group_name, name, filter=None, custom_headers=None, raw=False, **operation_config):
"""Get global usage metrics of an App Service Environment.
@@ -2334,7 +2490,8 @@ def list_usages(
:return: An iterator like instance of CsmUsageQuota
:rtype:
~azure.mgmt.web.models.CsmUsageQuotaPaged[~azure.mgmt.web.models.CsmUsageQuota]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -2374,9 +2531,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -2410,7 +2565,8 @@ def list_worker_pools(
:return: An iterator like instance of WorkerPoolResource
:rtype:
~azure.mgmt.web.models.WorkerPoolResourcePaged[~azure.mgmt.web.models.WorkerPoolResource]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -2448,9 +2604,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -2486,7 +2640,8 @@ def get_worker_pool(
:return: WorkerPoolResource or ClientRawResponse if raw=true
:rtype: ~azure.mgmt.web.models.WorkerPoolResource or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.get_worker_pool.metadata['url']
@@ -2517,9 +2672,7 @@ def get_worker_pool(
response = self._client.send(request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -2761,7 +2914,8 @@ def list_worker_pool_instance_metric_definitions(
:return: An iterator like instance of ResourceMetricDefinition
:rtype:
~azure.mgmt.web.models.ResourceMetricDefinitionPaged[~azure.mgmt.web.models.ResourceMetricDefinition]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -2801,9 +2955,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -2852,7 +3004,8 @@ def list_worker_pool_instance_metrics(
:return: An iterator like instance of ResourceMetric
:rtype:
~azure.mgmt.web.models.ResourceMetricPaged[~azure.mgmt.web.models.ResourceMetric]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -2896,9 +3049,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -2934,7 +3085,8 @@ def list_web_worker_metric_definitions(
:return: An iterator like instance of ResourceMetricDefinition
:rtype:
~azure.mgmt.web.models.ResourceMetricDefinitionPaged[~azure.mgmt.web.models.ResourceMetricDefinition]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -2973,9 +3125,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -3022,7 +3172,8 @@ def list_web_worker_metrics(
:return: An iterator like instance of ResourceMetric
:rtype:
~azure.mgmt.web.models.ResourceMetricPaged[~azure.mgmt.web.models.ResourceMetric]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -3065,9 +3216,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -3103,7 +3252,8 @@ def list_worker_pool_skus(
:return: An iterator like instance of SkuInfo
:rtype:
~azure.mgmt.web.models.SkuInfoPaged[~azure.mgmt.web.models.SkuInfo]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -3142,9 +3292,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -3180,7 +3328,8 @@ def list_web_worker_usages(
:return: An iterator like instance of Usage
:rtype:
~azure.mgmt.web.models.UsagePaged[~azure.mgmt.web.models.Usage]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -3219,9 +3368,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
diff --git a/azure-mgmt-web/azure/mgmt/web/operations/app_service_plans_operations.py b/azure-mgmt-web/azure/mgmt/web/operations/app_service_plans_operations.py
index 49c88aa0afd4..3c7cff2ee396 100644
--- a/azure-mgmt-web/azure/mgmt/web/operations/app_service_plans_operations.py
+++ b/azure-mgmt-web/azure/mgmt/web/operations/app_service_plans_operations.py
@@ -25,7 +25,7 @@ class AppServicePlansOperations(object):
:param config: Configuration of service client.
:param serializer: An object model serializer.
:param deserializer: An object model deserializer.
- :ivar api_version: API Version. Constant value: "2016-09-01".
+ :ivar api_version: API Version. Constant value: "2018-02-01".
"""
models = models
@@ -35,7 +35,7 @@ def __init__(self, client, config, serializer, deserializer):
self._client = client
self._serialize = serializer
self._deserialize = deserializer
- self.api_version = "2016-09-01"
+ self.api_version = "2018-02-01"
self.config = config
@@ -58,7 +58,8 @@ def list(
:return: An iterator like instance of AppServicePlan
:rtype:
~azure.mgmt.web.models.AppServicePlanPaged[~azure.mgmt.web.models.AppServicePlan]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -96,9 +97,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -130,7 +129,8 @@ def list_by_resource_group(
:return: An iterator like instance of AppServicePlan
:rtype:
~azure.mgmt.web.models.AppServicePlanPaged[~azure.mgmt.web.models.AppServicePlan]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -167,9 +167,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -284,9 +282,7 @@ def _create_or_update_initial(
request, header_parameters, body_content, stream=False, **operation_config)
if response.status_code not in [200, 202]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -322,7 +318,8 @@ def create_or_update(
:rtype:
~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.AppServicePlan]
or ~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
raw_result = self._create_or_update_initial(
resource_group_name=resource_group_name,
@@ -352,9 +349,7 @@ def get_long_running_status(status_link, headers=None):
def get_long_running_output(response):
if response.status_code not in [200, 202]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = self._deserialize('AppServicePlan', response)
@@ -451,7 +446,8 @@ def update(
:return: AppServicePlan or ClientRawResponse if raw=true
:rtype: ~azure.mgmt.web.models.AppServicePlan or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.update.metadata['url']
@@ -485,9 +481,7 @@ def update(
request, header_parameters, body_content, stream=False, **operation_config)
if response.status_code not in [200, 202]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -522,7 +516,8 @@ def list_capabilities(
:return: list or ClientRawResponse if raw=true
:rtype: list[~azure.mgmt.web.models.Capability] or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.list_capabilities.metadata['url']
@@ -552,9 +547,7 @@ def list_capabilities(
response = self._client.send(request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -591,7 +584,8 @@ def get_hybrid_connection(
:return: HybridConnection or ClientRawResponse if raw=true
:rtype: ~azure.mgmt.web.models.HybridConnection or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.get_hybrid_connection.metadata['url']
@@ -623,9 +617,7 @@ def get_hybrid_connection(
response = self._client.send(request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -725,7 +717,8 @@ def list_hybrid_connection_keys(
:return: HybridConnectionKey or ClientRawResponse if raw=true
:rtype: ~azure.mgmt.web.models.HybridConnectionKey or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.list_hybrid_connection_keys.metadata['url']
@@ -757,9 +750,7 @@ def list_hybrid_connection_keys(
response = self._client.send(request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -795,7 +786,8 @@ def list_web_apps_by_hybrid_connection(
overrides`.
:return: An iterator like instance of str
:rtype: ~azure.mgmt.web.models.StrPaged[str]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -835,9 +827,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -873,7 +863,8 @@ def get_hybrid_connection_plan_limit(
:return: HybridConnectionLimits or ClientRawResponse if raw=true
:rtype: ~azure.mgmt.web.models.HybridConnectionLimits or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.get_hybrid_connection_plan_limit.metadata['url']
@@ -903,9 +894,7 @@ def get_hybrid_connection_plan_limit(
response = self._client.send(request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -938,7 +927,8 @@ def list_hybrid_connections(
:return: An iterator like instance of HybridConnection
:rtype:
~azure.mgmt.web.models.HybridConnectionPaged[~azure.mgmt.web.models.HybridConnection]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -976,9 +966,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -1014,7 +1002,8 @@ def list_metric_defintions(
:return: An iterator like instance of ResourceMetricDefinition
:rtype:
~azure.mgmt.web.models.ResourceMetricDefinitionPaged[~azure.mgmt.web.models.ResourceMetricDefinition]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -1052,9 +1041,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -1097,7 +1084,8 @@ def list_metrics(
:return: An iterator like instance of ResourceMetric
:rtype:
~azure.mgmt.web.models.ResourceMetricPaged[~azure.mgmt.web.models.ResourceMetric]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -1139,9 +1127,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -1248,7 +1234,8 @@ def list_web_apps(
overrides`.
:return: An iterator like instance of Site
:rtype: ~azure.mgmt.web.models.SitePaged[~azure.mgmt.web.models.Site]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -1292,9 +1279,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -1327,7 +1312,8 @@ def get_server_farm_skus(
overrides`.
:return: object or ClientRawResponse if raw=true
:rtype: object or ~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.get_server_farm_skus.metadata['url']
@@ -1357,9 +1343,7 @@ def get_server_farm_skus(
response = self._client.send(request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -1396,7 +1380,8 @@ def list_usages(
:return: An iterator like instance of CsmUsageQuota
:rtype:
~azure.mgmt.web.models.CsmUsageQuotaPaged[~azure.mgmt.web.models.CsmUsageQuota]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -1436,9 +1421,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -1472,7 +1455,8 @@ def list_vnets(
:return: list or ClientRawResponse if raw=true
:rtype: list[~azure.mgmt.web.models.VnetInfo] or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.list_vnets.metadata['url']
@@ -1502,9 +1486,7 @@ def list_vnets(
response = self._client.send(request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -1610,7 +1592,8 @@ def get_vnet_gateway(
:return: VnetGateway or ClientRawResponse if raw=true
:rtype: ~azure.mgmt.web.models.VnetGateway or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.get_vnet_gateway.metadata['url']
@@ -1642,9 +1625,7 @@ def get_vnet_gateway(
response = self._client.send(request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -1684,7 +1665,8 @@ def update_vnet_gateway(
:return: VnetGateway or ClientRawResponse if raw=true
:rtype: ~azure.mgmt.web.models.VnetGateway or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.update_vnet_gateway.metadata['url']
@@ -1720,9 +1702,7 @@ def update_vnet_gateway(
request, header_parameters, body_content, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -1759,7 +1739,8 @@ def list_routes_for_vnet(
:return: list or ClientRawResponse if raw=true
:rtype: list[~azure.mgmt.web.models.VnetRoute] or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.list_routes_for_vnet.metadata['url']
@@ -1790,9 +1771,7 @@ def list_routes_for_vnet(
response = self._client.send(request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
diff --git a/azure-mgmt-web/azure/mgmt/web/operations/certificate_registration_provider_operations.py b/azure-mgmt-web/azure/mgmt/web/operations/certificate_registration_provider_operations.py
index efea44179bf3..6fe72e405f80 100644
--- a/azure-mgmt-web/azure/mgmt/web/operations/certificate_registration_provider_operations.py
+++ b/azure-mgmt-web/azure/mgmt/web/operations/certificate_registration_provider_operations.py
@@ -11,7 +11,6 @@
import uuid
from msrest.pipeline import ClientRawResponse
-from msrestazure.azure_exceptions import CloudError
from .. import models
@@ -23,7 +22,7 @@ class CertificateRegistrationProviderOperations(object):
:param config: Configuration of service client.
:param serializer: An object model serializer.
:param deserializer: An object model deserializer.
- :ivar api_version: API Version. Constant value: "2015-08-01".
+ :ivar api_version: API Version. Constant value: "2018-02-01".
"""
models = models
@@ -33,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
self._client = client
self._serialize = serializer
self._deserialize = deserializer
- self.api_version = "2015-08-01"
+ self.api_version = "2018-02-01"
self.config = config
@@ -53,7 +52,8 @@ def list_operations(
:return: An iterator like instance of CsmOperationDescription
:rtype:
~azure.mgmt.web.models.CsmOperationDescriptionPaged[~azure.mgmt.web.models.CsmOperationDescription]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -85,9 +85,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
diff --git a/azure-mgmt-web/azure/mgmt/web/operations/certificates_operations.py b/azure-mgmt-web/azure/mgmt/web/operations/certificates_operations.py
index c1dc2463d2dd..d228ffb21026 100644
--- a/azure-mgmt-web/azure/mgmt/web/operations/certificates_operations.py
+++ b/azure-mgmt-web/azure/mgmt/web/operations/certificates_operations.py
@@ -23,7 +23,7 @@ class CertificatesOperations(object):
:param config: Configuration of service client.
:param serializer: An object model serializer.
:param deserializer: An object model deserializer.
- :ivar api_version: API Version. Constant value: "2016-03-01".
+ :ivar api_version: API Version. Constant value: "2018-02-01".
"""
models = models
@@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer):
self._client = client
self._serialize = serializer
self._deserialize = deserializer
- self.api_version = "2016-03-01"
+ self.api_version = "2018-02-01"
self.config = config
@@ -51,7 +51,8 @@ def list(
:return: An iterator like instance of Certificate
:rtype:
~azure.mgmt.web.models.CertificatePaged[~azure.mgmt.web.models.Certificate]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -87,9 +88,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -121,7 +120,8 @@ def list_by_resource_group(
:return: An iterator like instance of Certificate
:rtype:
~azure.mgmt.web.models.CertificatePaged[~azure.mgmt.web.models.Certificate]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -158,9 +158,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -194,7 +192,8 @@ def get(
:return: Certificate or ClientRawResponse if raw=true
:rtype: ~azure.mgmt.web.models.Certificate or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.get.metadata['url']
@@ -224,9 +223,7 @@ def get(
response = self._client.send(request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -262,7 +259,8 @@ def create_or_update(
:return: Certificate or ClientRawResponse if raw=true
:rtype: ~azure.mgmt.web.models.Certificate or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.create_or_update.metadata['url']
@@ -296,9 +294,7 @@ def create_or_update(
request, header_parameters, body_content, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -392,7 +388,8 @@ def update(
:return: Certificate or ClientRawResponse if raw=true
:rtype: ~azure.mgmt.web.models.Certificate or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.update.metadata['url']
@@ -426,9 +423,7 @@ def update(
request, header_parameters, body_content, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
diff --git a/azure-mgmt-web/azure/mgmt/web/operations/deleted_web_apps_operations.py b/azure-mgmt-web/azure/mgmt/web/operations/deleted_web_apps_operations.py
index dadbb2822b87..267973006f96 100644
--- a/azure-mgmt-web/azure/mgmt/web/operations/deleted_web_apps_operations.py
+++ b/azure-mgmt-web/azure/mgmt/web/operations/deleted_web_apps_operations.py
@@ -11,7 +11,6 @@
import uuid
from msrest.pipeline import ClientRawResponse
-from msrestazure.azure_exceptions import CloudError
from .. import models
@@ -23,7 +22,7 @@ class DeletedWebAppsOperations(object):
:param config: Configuration of service client.
:param serializer: An object model serializer.
:param deserializer: An object model deserializer.
- :ivar api_version: API Version. Constant value: "2016-03-01".
+ :ivar api_version: API Version. Constant value: "2018-02-01".
"""
models = models
@@ -33,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
self._client = client
self._serialize = serializer
self._deserialize = deserializer
- self.api_version = "2016-03-01"
+ self.api_version = "2018-02-01"
self.config = config
@@ -51,7 +50,8 @@ def list(
:return: An iterator like instance of DeletedSite
:rtype:
~azure.mgmt.web.models.DeletedSitePaged[~azure.mgmt.web.models.DeletedSite]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -87,9 +87,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
diff --git a/azure-mgmt-web/azure/mgmt/web/operations/diagnostics_operations.py b/azure-mgmt-web/azure/mgmt/web/operations/diagnostics_operations.py
index 1e912118452c..00a05d137da7 100644
--- a/azure-mgmt-web/azure/mgmt/web/operations/diagnostics_operations.py
+++ b/azure-mgmt-web/azure/mgmt/web/operations/diagnostics_operations.py
@@ -11,7 +11,6 @@
import uuid
from msrest.pipeline import ClientRawResponse
-from msrestazure.azure_exceptions import CloudError
from .. import models
@@ -23,7 +22,7 @@ class DiagnosticsOperations(object):
:param config: Configuration of service client.
:param serializer: An object model serializer.
:param deserializer: An object model deserializer.
- :ivar api_version: API Version. Constant value: "2016-03-01".
+ :ivar api_version: API Version. Constant value: "2018-02-01".
"""
models = models
@@ -33,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
self._client = client
self._serialize = serializer
self._deserialize = deserializer
- self.api_version = "2016-03-01"
+ self.api_version = "2018-02-01"
self.config = config
@@ -56,7 +55,8 @@ def list_site_diagnostic_categories(
:return: An iterator like instance of DiagnosticCategory
:rtype:
~azure.mgmt.web.models.DiagnosticCategoryPaged[~azure.mgmt.web.models.DiagnosticCategory]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -94,9 +94,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -132,7 +130,8 @@ def get_site_diagnostic_category(
:return: DiagnosticCategory or ClientRawResponse if raw=true
:rtype: ~azure.mgmt.web.models.DiagnosticCategory or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.get_site_diagnostic_category.metadata['url']
@@ -163,9 +162,7 @@ def get_site_diagnostic_category(
response = self._client.send(request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -200,7 +197,8 @@ def list_site_analyses(
:return: An iterator like instance of AnalysisDefinition
:rtype:
~azure.mgmt.web.models.AnalysisDefinitionPaged[~azure.mgmt.web.models.AnalysisDefinition]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -239,9 +237,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -279,7 +275,8 @@ def get_site_analysis(
:return: DiagnosticAnalysis or ClientRawResponse if raw=true
:rtype: ~azure.mgmt.web.models.DiagnosticAnalysis or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.get_site_analysis.metadata['url']
@@ -311,9 +308,7 @@ def get_site_analysis(
response = self._client.send(request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -356,7 +351,8 @@ def execute_site_analysis(
:return: DiagnosticAnalysis or ClientRawResponse if raw=true
:rtype: ~azure.mgmt.web.models.DiagnosticAnalysis or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.execute_site_analysis.metadata['url']
@@ -394,9 +390,7 @@ def execute_site_analysis(
response = self._client.send(request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -431,7 +425,8 @@ def list_site_detectors(
:return: An iterator like instance of DetectorDefinition
:rtype:
~azure.mgmt.web.models.DetectorDefinitionPaged[~azure.mgmt.web.models.DetectorDefinition]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -470,9 +465,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -510,7 +503,8 @@ def get_site_detector(
:return: An iterator like instance of DetectorDefinition
:rtype:
~azure.mgmt.web.models.DetectorDefinitionPaged[~azure.mgmt.web.models.DetectorDefinition]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -550,9 +544,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -596,7 +588,8 @@ def execute_site_detector(
:return: DiagnosticDetectorResponse or ClientRawResponse if raw=true
:rtype: ~azure.mgmt.web.models.DiagnosticDetectorResponse or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.execute_site_detector.metadata['url']
@@ -634,9 +627,7 @@ def execute_site_detector(
response = self._client.send(request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -671,7 +662,8 @@ def list_site_diagnostic_categories_slot(
:return: An iterator like instance of DiagnosticCategory
:rtype:
~azure.mgmt.web.models.DiagnosticCategoryPaged[~azure.mgmt.web.models.DiagnosticCategory]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -710,9 +702,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -750,7 +740,8 @@ def get_site_diagnostic_category_slot(
:return: DiagnosticCategory or ClientRawResponse if raw=true
:rtype: ~azure.mgmt.web.models.DiagnosticCategory or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.get_site_diagnostic_category_slot.metadata['url']
@@ -782,9 +773,7 @@ def get_site_diagnostic_category_slot(
response = self._client.send(request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -821,7 +810,8 @@ def list_site_analyses_slot(
:return: An iterator like instance of AnalysisDefinition
:rtype:
~azure.mgmt.web.models.AnalysisDefinitionPaged[~azure.mgmt.web.models.AnalysisDefinition]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -861,9 +851,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -903,7 +891,8 @@ def get_site_analysis_slot(
:return: DiagnosticAnalysis or ClientRawResponse if raw=true
:rtype: ~azure.mgmt.web.models.DiagnosticAnalysis or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.get_site_analysis_slot.metadata['url']
@@ -936,9 +925,7 @@ def get_site_analysis_slot(
response = self._client.send(request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -983,7 +970,8 @@ def execute_site_analysis_slot(
:return: DiagnosticAnalysis or ClientRawResponse if raw=true
:rtype: ~azure.mgmt.web.models.DiagnosticAnalysis or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.execute_site_analysis_slot.metadata['url']
@@ -1022,9 +1010,7 @@ def execute_site_analysis_slot(
response = self._client.send(request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -1061,7 +1047,8 @@ def list_site_detectors_slot(
:return: An iterator like instance of DetectorDefinition
:rtype:
~azure.mgmt.web.models.DetectorDefinitionPaged[~azure.mgmt.web.models.DetectorDefinition]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -1101,9 +1088,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -1143,7 +1128,8 @@ def get_site_detector_slot(
:return: An iterator like instance of DetectorDefinition
:rtype:
~azure.mgmt.web.models.DetectorDefinitionPaged[~azure.mgmt.web.models.DetectorDefinition]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -1184,9 +1170,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -1232,7 +1216,8 @@ def execute_site_detector_slot(
:return: DiagnosticDetectorResponse or ClientRawResponse if raw=true
:rtype: ~azure.mgmt.web.models.DiagnosticDetectorResponse or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.execute_site_detector_slot.metadata['url']
@@ -1271,9 +1256,7 @@ def execute_site_detector_slot(
response = self._client.send(request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
diff --git a/azure-mgmt-web/azure/mgmt/web/operations/domain_registration_provider_operations.py b/azure-mgmt-web/azure/mgmt/web/operations/domain_registration_provider_operations.py
index 03e425c85bb8..70c15a6bb903 100644
--- a/azure-mgmt-web/azure/mgmt/web/operations/domain_registration_provider_operations.py
+++ b/azure-mgmt-web/azure/mgmt/web/operations/domain_registration_provider_operations.py
@@ -11,7 +11,6 @@
import uuid
from msrest.pipeline import ClientRawResponse
-from msrestazure.azure_exceptions import CloudError
from .. import models
@@ -23,7 +22,7 @@ class DomainRegistrationProviderOperations(object):
:param config: Configuration of service client.
:param serializer: An object model serializer.
:param deserializer: An object model deserializer.
- :ivar api_version: API Version. Constant value: "2015-04-01".
+ :ivar api_version: API Version. Constant value: "2018-02-01".
"""
models = models
@@ -33,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
self._client = client
self._serialize = serializer
self._deserialize = deserializer
- self.api_version = "2015-04-01"
+ self.api_version = "2018-02-01"
self.config = config
@@ -53,7 +52,8 @@ def list_operations(
:return: An iterator like instance of CsmOperationDescription
:rtype:
~azure.mgmt.web.models.CsmOperationDescriptionPaged[~azure.mgmt.web.models.CsmOperationDescription]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -85,9 +85,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
diff --git a/azure-mgmt-web/azure/mgmt/web/operations/domains_operations.py b/azure-mgmt-web/azure/mgmt/web/operations/domains_operations.py
index 2f3b2b1c3ae3..c1ffb2bb45e2 100644
--- a/azure-mgmt-web/azure/mgmt/web/operations/domains_operations.py
+++ b/azure-mgmt-web/azure/mgmt/web/operations/domains_operations.py
@@ -25,7 +25,7 @@ class DomainsOperations(object):
:param config: Configuration of service client.
:param serializer: An object model serializer.
:param deserializer: An object model deserializer.
- :ivar api_version: API Version. Constant value: "2015-04-01".
+ :ivar api_version: API Version. Constant value: "2018-02-01".
"""
models = models
@@ -35,7 +35,7 @@ def __init__(self, client, config, serializer, deserializer):
self._client = client
self._serialize = serializer
self._deserialize = deserializer
- self.api_version = "2015-04-01"
+ self.api_version = "2018-02-01"
self.config = config
@@ -56,7 +56,8 @@ def check_availability(
raw=true
:rtype: ~azure.mgmt.web.models.DomainAvailablilityCheckResult or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
identifier = models.NameIdentifier(name=name)
@@ -90,9 +91,7 @@ def check_availability(
request, header_parameters, body_content, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -120,7 +119,8 @@ def list(
:return: An iterator like instance of Domain
:rtype:
~azure.mgmt.web.models.DomainPaged[~azure.mgmt.web.models.Domain]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -156,9 +156,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -188,7 +186,8 @@ def get_control_center_sso_request(
raw=true
:rtype: ~azure.mgmt.web.models.DomainControlCenterSsoRequest or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.get_control_center_sso_request.metadata['url']
@@ -216,9 +215,7 @@ def get_control_center_sso_request(
response = self._client.send(request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -251,7 +248,8 @@ def list_recommendations(
:return: An iterator like instance of NameIdentifier
:rtype:
~azure.mgmt.web.models.NameIdentifierPaged[~azure.mgmt.web.models.NameIdentifier]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
parameters = models.DomainRecommendationSearchParameters(keywords=keywords, max_domain_recommendations=max_domain_recommendations)
@@ -292,9 +290,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, body_content, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -326,7 +322,8 @@ def list_by_resource_group(
:return: An iterator like instance of Domain
:rtype:
~azure.mgmt.web.models.DomainPaged[~azure.mgmt.web.models.Domain]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -363,9 +360,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -399,7 +394,8 @@ def get(
:return: Domain or ClientRawResponse if raw=true
:rtype: ~azure.mgmt.web.models.Domain or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.get.metadata['url']
@@ -429,9 +425,7 @@ def get(
response = self._client.send(request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -480,9 +474,7 @@ def _create_or_update_initial(
request, header_parameters, body_content, stream=False, **operation_config)
if response.status_code not in [200, 202]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -518,7 +510,8 @@ def create_or_update(
:rtype:
~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.Domain]
or ~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
raw_result = self._create_or_update_initial(
resource_group_name=resource_group_name,
@@ -548,9 +541,7 @@ def get_long_running_status(status_link, headers=None):
def get_long_running_output(response):
if response.status_code not in [200, 202]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = self._deserialize('Domain', response)
@@ -652,7 +643,8 @@ def update(
:return: Domain or ClientRawResponse if raw=true
:rtype: ~azure.mgmt.web.models.Domain or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.update.metadata['url']
@@ -686,9 +678,7 @@ def update(
request, header_parameters, body_content, stream=False, **operation_config)
if response.status_code not in [200, 202]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -723,7 +713,8 @@ def list_ownership_identifiers(
:return: An iterator like instance of DomainOwnershipIdentifier
:rtype:
~azure.mgmt.web.models.DomainOwnershipIdentifierPaged[~azure.mgmt.web.models.DomainOwnershipIdentifier]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -761,9 +752,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -799,7 +788,8 @@ def get_ownership_identifier(
:return: DomainOwnershipIdentifier or ClientRawResponse if raw=true
:rtype: ~azure.mgmt.web.models.DomainOwnershipIdentifier or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.get_ownership_identifier.metadata['url']
@@ -830,9 +820,7 @@ def get_ownership_identifier(
response = self._client.send(request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -873,7 +861,8 @@ def create_or_update_ownership_identifier(
:return: DomainOwnershipIdentifier or ClientRawResponse if raw=true
:rtype: ~azure.mgmt.web.models.DomainOwnershipIdentifier or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
domain_ownership_identifier = models.DomainOwnershipIdentifier(kind=kind, ownership_id=ownership_id)
@@ -910,9 +899,7 @@ def create_or_update_ownership_identifier(
request, header_parameters, body_content, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -1013,7 +1000,8 @@ def update_ownership_identifier(
:return: DomainOwnershipIdentifier or ClientRawResponse if raw=true
:rtype: ~azure.mgmt.web.models.DomainOwnershipIdentifier or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
domain_ownership_identifier = models.DomainOwnershipIdentifier(kind=kind, ownership_id=ownership_id)
@@ -1050,9 +1038,7 @@ def update_ownership_identifier(
request, header_parameters, body_content, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -1084,8 +1070,7 @@ def renew(
overrides`.
:return: None or ClientRawResponse if raw=true
:rtype: None or ~msrest.pipeline.ClientRawResponse
- :raises:
- :class:`ErrorResponseException`
+ :raises: :class:`CloudError`
"""
# Construct URL
url = self.renew.metadata['url']
@@ -1114,8 +1099,10 @@ def renew(
request = self._client.post(url, query_parameters)
response = self._client.send(request, header_parameters, stream=False, **operation_config)
- if response.status_code not in [200, 202, 204]:
- raise models.ErrorResponseException(self._deserialize, response)
+ if response.status_code not in [200, 202, 204, 400, 500]:
+ exp = CloudError(response)
+ exp.request_id = response.headers.get('x-ms-request-id')
+ raise exp
if raw:
client_raw_response = ClientRawResponse(None, response)
diff --git a/azure-mgmt-web/azure/mgmt/web/operations/provider_operations.py b/azure-mgmt-web/azure/mgmt/web/operations/provider_operations.py
index 3e88a13473a6..d30181ee2b50 100644
--- a/azure-mgmt-web/azure/mgmt/web/operations/provider_operations.py
+++ b/azure-mgmt-web/azure/mgmt/web/operations/provider_operations.py
@@ -11,7 +11,6 @@
import uuid
from msrest.pipeline import ClientRawResponse
-from msrestazure.azure_exceptions import CloudError
from .. import models
@@ -23,7 +22,7 @@ class ProviderOperations(object):
:param config: Configuration of service client.
:param serializer: An object model serializer.
:param deserializer: An object model deserializer.
- :ivar api_version: API Version. Constant value: "2016-03-01".
+ :ivar api_version: API Version. Constant value: "2018-02-01".
"""
models = models
@@ -33,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
self._client = client
self._serialize = serializer
self._deserialize = deserializer
- self.api_version = "2016-03-01"
+ self.api_version = "2018-02-01"
self.config = config
@@ -53,7 +52,8 @@ def get_available_stacks(
:return: An iterator like instance of ApplicationStack
:rtype:
~azure.mgmt.web.models.ApplicationStackPaged[~azure.mgmt.web.models.ApplicationStack]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -87,9 +87,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -120,7 +118,8 @@ def list_operations(
:return: An iterator like instance of CsmOperationDescription
:rtype:
~azure.mgmt.web.models.CsmOperationDescriptionPaged[~azure.mgmt.web.models.CsmOperationDescription]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -152,9 +151,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -185,7 +182,8 @@ def get_available_stacks_on_prem(
:return: An iterator like instance of ApplicationStack
:rtype:
~azure.mgmt.web.models.ApplicationStackPaged[~azure.mgmt.web.models.ApplicationStack]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -223,9 +221,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
diff --git a/azure-mgmt-web/azure/mgmt/web/operations/recommendations_operations.py b/azure-mgmt-web/azure/mgmt/web/operations/recommendations_operations.py
index 737ad36f893a..45d9d9a5b4c6 100644
--- a/azure-mgmt-web/azure/mgmt/web/operations/recommendations_operations.py
+++ b/azure-mgmt-web/azure/mgmt/web/operations/recommendations_operations.py
@@ -23,7 +23,7 @@ class RecommendationsOperations(object):
:param config: Configuration of service client.
:param serializer: An object model serializer.
:param deserializer: An object model deserializer.
- :ivar api_version: API Version. Constant value: "2016-03-01".
+ :ivar api_version: API Version. Constant value: "2018-02-01".
"""
models = models
@@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer):
self._client = client
self._serialize = serializer
self._deserialize = deserializer
- self.api_version = "2016-03-01"
+ self.api_version = "2018-02-01"
self.config = config
@@ -57,13 +57,82 @@ def list(
deserialized response
:param operation_config: :ref:`Operation configuration
overrides`.
- :return: list or ClientRawResponse if raw=true
- :rtype: list[~azure.mgmt.web.models.Recommendation] or
- ~msrest.pipeline.ClientRawResponse
+ :return: An iterator like instance of Recommendation
+ :rtype:
+ ~azure.mgmt.web.models.RecommendationPaged[~azure.mgmt.web.models.Recommendation]
+ :raises:
+ :class:`DefaultErrorResponseException`
+ """
+ def internal_paging(next_link=None, raw=False):
+
+ if not next_link:
+ # Construct URL
+ url = self.list.metadata['url']
+ path_format_arguments = {
+ 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
+ }
+ url = self._client.format_url(url, **path_format_arguments)
+
+ # Construct parameters
+ query_parameters = {}
+ if featured is not None:
+ query_parameters['featured'] = self._serialize.query("featured", featured, 'bool')
+ if filter is not None:
+ query_parameters['$filter'] = self._serialize.query("filter", filter, 'str', skip_quote=True)
+ query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+ else:
+ url = next_link
+ query_parameters = {}
+
+ # Construct headers
+ header_parameters = {}
+ header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+ if self.config.generate_client_request_id:
+ header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
+ if custom_headers:
+ header_parameters.update(custom_headers)
+ if self.config.accept_language is not None:
+ header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
+
+ # Construct and send request
+ request = self._client.get(url, query_parameters)
+ response = self._client.send(
+ request, header_parameters, stream=False, **operation_config)
+
+ if response.status_code not in [200]:
+ raise models.DefaultErrorResponseException(self._deserialize, response)
+
+ return response
+
+ # Deserialize response
+ deserialized = models.RecommendationPaged(internal_paging, self._deserialize.dependencies)
+
+ if raw:
+ header_dict = {}
+ client_raw_response = models.RecommendationPaged(internal_paging, self._deserialize.dependencies, header_dict)
+ return client_raw_response
+
+ return deserialized
+ list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Web/recommendations'}
+
+ def reset_all_filters(
+ self, custom_headers=None, raw=False, **operation_config):
+ """Reset all recommendation opt-out settings for a subscription.
+
+ Reset all recommendation opt-out settings for a subscription.
+
+ :param dict custom_headers: headers that will be added to the request
+ :param bool raw: returns the direct response alongside the
+ deserialized response
+ :param operation_config: :ref:`Operation configuration
+ overrides`.
+ :return: None or ClientRawResponse if raw=true
+ :rtype: None or ~msrest.pipeline.ClientRawResponse
:raises: :class:`CloudError`
"""
# Construct URL
- url = self.list.metadata['url']
+ url = self.reset_all_filters.metadata['url']
path_format_arguments = {
'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
}
@@ -71,10 +140,6 @@ def list(
# Construct parameters
query_parameters = {}
- if featured is not None:
- query_parameters['featured'] = self._serialize.query("featured", featured, 'bool')
- if filter is not None:
- query_parameters['$filter'] = self._serialize.query("filter", filter, 'str', skip_quote=True)
query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
# Construct headers
@@ -88,32 +153,29 @@ def list(
header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
# Construct and send request
- request = self._client.get(url, query_parameters)
+ request = self._client.post(url, query_parameters)
response = self._client.send(request, header_parameters, stream=False, **operation_config)
- if response.status_code not in [200]:
+ if response.status_code not in [204]:
exp = CloudError(response)
exp.request_id = response.headers.get('x-ms-request-id')
raise exp
- deserialized = None
-
- if response.status_code == 200:
- deserialized = self._deserialize('[Recommendation]', response)
-
if raw:
- client_raw_response = ClientRawResponse(deserialized, response)
+ client_raw_response = ClientRawResponse(None, response)
return client_raw_response
+ reset_all_filters.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Web/recommendations/reset'}
- return deserialized
- list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Web/recommendations'}
-
- def reset_all_filters(
- self, custom_headers=None, raw=False, **operation_config):
- """Reset all recommendation opt-out settings for a subscription.
+ def disable_recommendation_for_subscription(
+ self, name, custom_headers=None, raw=False, **operation_config):
+ """Disables the specified rule so it will not apply to a subscription in
+ the future.
- Reset all recommendation opt-out settings for a subscription.
+ Disables the specified rule so it will not apply to a subscription in
+ the future.
+ :param name: Rule name
+ :type name: str
:param dict custom_headers: headers that will be added to the request
:param bool raw: returns the direct response alongside the
deserialized response
@@ -124,8 +186,9 @@ def reset_all_filters(
:raises: :class:`CloudError`
"""
# Construct URL
- url = self.reset_all_filters.metadata['url']
+ url = self.disable_recommendation_for_subscription.metadata['url']
path_format_arguments = {
+ 'name': self._serialize.url("name", name, 'str'),
'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
}
url = self._client.format_url(url, **path_format_arguments)
@@ -148,7 +211,7 @@ def reset_all_filters(
request = self._client.post(url, query_parameters)
response = self._client.send(request, header_parameters, stream=False, **operation_config)
- if response.status_code not in [204]:
+ if response.status_code not in [200]:
exp = CloudError(response)
exp.request_id = response.headers.get('x-ms-request-id')
raise exp
@@ -156,10 +219,10 @@ def reset_all_filters(
if raw:
client_raw_response = ClientRawResponse(None, response)
return client_raw_response
- reset_all_filters.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Web/recommendations/reset'}
+ disable_recommendation_for_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Web/recommendations/{name}/disable'}
def list_history_for_web_app(
- self, resource_group_name, site_name, filter=None, custom_headers=None, raw=False, **operation_config):
+ self, resource_group_name, site_name, expired_only=None, filter=None, custom_headers=None, raw=False, **operation_config):
"""Get past recommendations for an app, optionally specified by the time
range.
@@ -171,6 +234,10 @@ def list_history_for_web_app(
:type resource_group_name: str
:param site_name: Name of the app.
:type site_name: str
+ :param expired_only: Specify false
to return all
+ recommendations. The default is true
, which returns only
+ expired recommendations.
+ :type expired_only: bool
:param filter: Filter is specified by using OData syntax. Example:
$filter=channels eq 'Api' or channel eq 'Notification' and startTime
eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and
@@ -181,52 +248,62 @@ def list_history_for_web_app(
deserialized response
:param operation_config: :ref:`Operation configuration
overrides`.
- :return: list or ClientRawResponse if raw=true
- :rtype: list[~azure.mgmt.web.models.Recommendation] or
- ~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :return: An iterator like instance of Recommendation
+ :rtype:
+ ~azure.mgmt.web.models.RecommendationPaged[~azure.mgmt.web.models.Recommendation]
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
- # Construct URL
- url = self.list_history_for_web_app.metadata['url']
- path_format_arguments = {
- 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+[^\.]$'),
- 'siteName': self._serialize.url("site_name", site_name, 'str'),
- 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
- }
- url = self._client.format_url(url, **path_format_arguments)
-
- # Construct parameters
- query_parameters = {}
- if filter is not None:
- query_parameters['$filter'] = self._serialize.query("filter", filter, 'str', skip_quote=True)
- query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
-
- # Construct headers
- header_parameters = {}
- header_parameters['Content-Type'] = 'application/json; charset=utf-8'
- if self.config.generate_client_request_id:
- header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
- if custom_headers:
- header_parameters.update(custom_headers)
- if self.config.accept_language is not None:
- header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
-
- # Construct and send request
- request = self._client.get(url, query_parameters)
- response = self._client.send(request, header_parameters, stream=False, **operation_config)
-
- if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
-
- deserialized = None
-
- if response.status_code == 200:
- deserialized = self._deserialize('[Recommendation]', response)
+ def internal_paging(next_link=None, raw=False):
+
+ if not next_link:
+ # Construct URL
+ url = self.list_history_for_web_app.metadata['url']
+ path_format_arguments = {
+ 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+[^\.]$'),
+ 'siteName': self._serialize.url("site_name", site_name, 'str'),
+ 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
+ }
+ url = self._client.format_url(url, **path_format_arguments)
+
+ # Construct parameters
+ query_parameters = {}
+ if expired_only is not None:
+ query_parameters['expiredOnly'] = self._serialize.query("expired_only", expired_only, 'bool')
+ if filter is not None:
+ query_parameters['$filter'] = self._serialize.query("filter", filter, 'str', skip_quote=True)
+ query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+ else:
+ url = next_link
+ query_parameters = {}
+
+ # Construct headers
+ header_parameters = {}
+ header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+ if self.config.generate_client_request_id:
+ header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
+ if custom_headers:
+ header_parameters.update(custom_headers)
+ if self.config.accept_language is not None:
+ header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
+
+ # Construct and send request
+ request = self._client.get(url, query_parameters)
+ response = self._client.send(
+ request, header_parameters, stream=False, **operation_config)
+
+ if response.status_code not in [200]:
+ raise models.DefaultErrorResponseException(self._deserialize, response)
+
+ return response
+
+ # Deserialize response
+ deserialized = models.RecommendationPaged(internal_paging, self._deserialize.dependencies)
if raw:
- client_raw_response = ClientRawResponse(deserialized, response)
+ header_dict = {}
+ client_raw_response = models.RecommendationPaged(internal_paging, self._deserialize.dependencies, header_dict)
return client_raw_response
return deserialized
@@ -256,54 +333,62 @@ def list_recommended_rules_for_web_app(
deserialized response
:param operation_config: :ref:`Operation configuration
overrides`.
- :return: list or ClientRawResponse if raw=true
- :rtype: list[~azure.mgmt.web.models.Recommendation] or
- ~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :return: An iterator like instance of Recommendation
+ :rtype:
+ ~azure.mgmt.web.models.RecommendationPaged[~azure.mgmt.web.models.Recommendation]
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
- # Construct URL
- url = self.list_recommended_rules_for_web_app.metadata['url']
- path_format_arguments = {
- 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+[^\.]$'),
- 'siteName': self._serialize.url("site_name", site_name, 'str'),
- 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
- }
- url = self._client.format_url(url, **path_format_arguments)
-
- # Construct parameters
- query_parameters = {}
- if featured is not None:
- query_parameters['featured'] = self._serialize.query("featured", featured, 'bool')
- if filter is not None:
- query_parameters['$filter'] = self._serialize.query("filter", filter, 'str', skip_quote=True)
- query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
-
- # Construct headers
- header_parameters = {}
- header_parameters['Content-Type'] = 'application/json; charset=utf-8'
- if self.config.generate_client_request_id:
- header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
- if custom_headers:
- header_parameters.update(custom_headers)
- if self.config.accept_language is not None:
- header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
-
- # Construct and send request
- request = self._client.get(url, query_parameters)
- response = self._client.send(request, header_parameters, stream=False, **operation_config)
-
- if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
-
- deserialized = None
-
- if response.status_code == 200:
- deserialized = self._deserialize('[Recommendation]', response)
+ def internal_paging(next_link=None, raw=False):
+
+ if not next_link:
+ # Construct URL
+ url = self.list_recommended_rules_for_web_app.metadata['url']
+ path_format_arguments = {
+ 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+[^\.]$'),
+ 'siteName': self._serialize.url("site_name", site_name, 'str'),
+ 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
+ }
+ url = self._client.format_url(url, **path_format_arguments)
+
+ # Construct parameters
+ query_parameters = {}
+ if featured is not None:
+ query_parameters['featured'] = self._serialize.query("featured", featured, 'bool')
+ if filter is not None:
+ query_parameters['$filter'] = self._serialize.query("filter", filter, 'str', skip_quote=True)
+ query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+ else:
+ url = next_link
+ query_parameters = {}
+
+ # Construct headers
+ header_parameters = {}
+ header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+ if self.config.generate_client_request_id:
+ header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
+ if custom_headers:
+ header_parameters.update(custom_headers)
+ if self.config.accept_language is not None:
+ header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
+
+ # Construct and send request
+ request = self._client.get(url, query_parameters)
+ response = self._client.send(
+ request, header_parameters, stream=False, **operation_config)
+
+ if response.status_code not in [200]:
+ raise models.DefaultErrorResponseException(self._deserialize, response)
+
+ return response
+
+ # Deserialize response
+ deserialized = models.RecommendationPaged(internal_paging, self._deserialize.dependencies)
if raw:
- client_raw_response = ClientRawResponse(deserialized, response)
+ header_dict = {}
+ client_raw_response = models.RecommendationPaged(internal_paging, self._deserialize.dependencies, header_dict)
return client_raw_response
return deserialized
@@ -424,7 +509,7 @@ def reset_all_filters_for_web_app(
reset_all_filters_for_web_app.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{siteName}/recommendations/reset'}
def get_rule_details_by_web_app(
- self, resource_group_name, site_name, name, update_seen=None, custom_headers=None, raw=False, **operation_config):
+ self, resource_group_name, site_name, name, update_seen=None, recommendation_id=None, custom_headers=None, raw=False, **operation_config):
"""Get a recommendation rule for an app.
Get a recommendation rule for an app.
@@ -439,6 +524,10 @@ def get_rule_details_by_web_app(
:param update_seen: Specify true
to update the last-seen
timestamp of the recommendation object.
:type update_seen: bool
+ :param recommendation_id: The GUID of the recommedation object if you
+ query an expired one. You don't need to specify it to query an active
+ entry.
+ :type recommendation_id: str
:param dict custom_headers: headers that will be added to the request
:param bool raw: returns the direct response alongside the
deserialized response
@@ -447,7 +536,8 @@ def get_rule_details_by_web_app(
:return: RecommendationRule or ClientRawResponse if raw=true
:rtype: ~azure.mgmt.web.models.RecommendationRule or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.get_rule_details_by_web_app.metadata['url']
@@ -463,6 +553,8 @@ def get_rule_details_by_web_app(
query_parameters = {}
if update_seen is not None:
query_parameters['updateSeen'] = self._serialize.query("update_seen", update_seen, 'bool')
+ if recommendation_id is not None:
+ query_parameters['recommendationId'] = self._serialize.query("recommendation_id", recommendation_id, 'str')
query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
# Construct headers
@@ -480,9 +572,7 @@ def get_rule_details_by_web_app(
response = self._client.send(request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -495,3 +585,63 @@ def get_rule_details_by_web_app(
return deserialized
get_rule_details_by_web_app.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{siteName}/recommendations/{name}'}
+
+ def disable_recommendation_for_site(
+ self, resource_group_name, site_name, name, custom_headers=None, raw=False, **operation_config):
+ """Disables the specific rule for a web site permanently.
+
+ Disables the specific rule for a web site permanently.
+
+ :param resource_group_name: Name of the resource group to which the
+ resource belongs.
+ :type resource_group_name: str
+ :param site_name: Site name
+ :type site_name: str
+ :param name: Rule name
+ :type name: str
+ :param dict custom_headers: headers that will be added to the request
+ :param bool raw: returns the direct response alongside the
+ deserialized response
+ :param operation_config: :ref:`Operation configuration
+ overrides`.
+ :return: None or ClientRawResponse if raw=true
+ :rtype: None or ~msrest.pipeline.ClientRawResponse
+ :raises: :class:`CloudError`
+ """
+ # Construct URL
+ url = self.disable_recommendation_for_site.metadata['url']
+ path_format_arguments = {
+ 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+[^\.]$'),
+ 'siteName': self._serialize.url("site_name", site_name, 'str'),
+ 'name': self._serialize.url("name", name, 'str'),
+ 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
+ }
+ url = self._client.format_url(url, **path_format_arguments)
+
+ # Construct parameters
+ query_parameters = {}
+ query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+ # Construct headers
+ header_parameters = {}
+ header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+ if self.config.generate_client_request_id:
+ header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
+ if custom_headers:
+ header_parameters.update(custom_headers)
+ if self.config.accept_language is not None:
+ header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
+
+ # Construct and send request
+ request = self._client.post(url, query_parameters)
+ response = self._client.send(request, header_parameters, stream=False, **operation_config)
+
+ if response.status_code not in [200]:
+ exp = CloudError(response)
+ exp.request_id = response.headers.get('x-ms-request-id')
+ raise exp
+
+ if raw:
+ client_raw_response = ClientRawResponse(None, response)
+ return client_raw_response
+ disable_recommendation_for_site.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{siteName}/recommendations/{name}/disable'}
diff --git a/azure-mgmt-web/azure/mgmt/web/operations/top_level_domains_operations.py b/azure-mgmt-web/azure/mgmt/web/operations/top_level_domains_operations.py
index ff0497fd60be..83cf978b7f06 100644
--- a/azure-mgmt-web/azure/mgmt/web/operations/top_level_domains_operations.py
+++ b/azure-mgmt-web/azure/mgmt/web/operations/top_level_domains_operations.py
@@ -11,7 +11,6 @@
import uuid
from msrest.pipeline import ClientRawResponse
-from msrestazure.azure_exceptions import CloudError
from .. import models
@@ -23,7 +22,7 @@ class TopLevelDomainsOperations(object):
:param config: Configuration of service client.
:param serializer: An object model serializer.
:param deserializer: An object model deserializer.
- :ivar api_version: API Version. Constant value: "2015-04-01".
+ :ivar api_version: API Version. Constant value: "2018-02-01".
"""
models = models
@@ -33,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
self._client = client
self._serialize = serializer
self._deserialize = deserializer
- self.api_version = "2015-04-01"
+ self.api_version = "2018-02-01"
self.config = config
@@ -51,7 +50,8 @@ def list(
:return: An iterator like instance of TopLevelDomain
:rtype:
~azure.mgmt.web.models.TopLevelDomainPaged[~azure.mgmt.web.models.TopLevelDomain]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -87,9 +87,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -120,7 +118,8 @@ def get(
:return: TopLevelDomain or ClientRawResponse if raw=true
:rtype: ~azure.mgmt.web.models.TopLevelDomain or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.get.metadata['url']
@@ -149,9 +148,7 @@ def get(
response = self._client.send(request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -191,7 +188,8 @@ def list_agreements(
:return: An iterator like instance of TldLegalAgreement
:rtype:
~azure.mgmt.web.models.TldLegalAgreementPaged[~azure.mgmt.web.models.TldLegalAgreement]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
agreement_option = models.TopLevelDomainAgreementOption(include_privacy=include_privacy, for_transfer=for_transfer)
@@ -233,9 +231,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, body_content, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
diff --git a/azure-mgmt-web/azure/mgmt/web/operations/web_apps_operations.py b/azure-mgmt-web/azure/mgmt/web/operations/web_apps_operations.py
index 3bf64d3266ad..dd637408d207 100644
--- a/azure-mgmt-web/azure/mgmt/web/operations/web_apps_operations.py
+++ b/azure-mgmt-web/azure/mgmt/web/operations/web_apps_operations.py
@@ -25,7 +25,7 @@ class WebAppsOperations(object):
:param config: Configuration of service client.
:param serializer: An object model serializer.
:param deserializer: An object model deserializer.
- :ivar api_version: API Version. Constant value: "2016-08-01".
+ :ivar api_version: API Version. Constant value: "2018-02-01".
"""
models = models
@@ -35,7 +35,7 @@ def __init__(self, client, config, serializer, deserializer):
self._client = client
self._serialize = serializer
self._deserialize = deserializer
- self.api_version = "2016-08-01"
+ self.api_version = "2018-02-01"
self.config = config
@@ -52,7 +52,8 @@ def list(
overrides`.
:return: An iterator like instance of Site
:rtype: ~azure.mgmt.web.models.SitePaged[~azure.mgmt.web.models.Site]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -88,9 +89,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -125,7 +124,8 @@ def list_by_resource_group(
overrides`.
:return: An iterator like instance of Site
:rtype: ~azure.mgmt.web.models.SitePaged[~azure.mgmt.web.models.Site]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -164,9 +164,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -248,7 +246,7 @@ def get(
def _create_or_update_initial(
- self, resource_group_name, name, site_envelope, skip_dns_registration=None, skip_custom_domain_verification=None, force_dns_registration=None, ttl_in_seconds=None, custom_headers=None, raw=False, **operation_config):
+ self, resource_group_name, name, site_envelope, custom_headers=None, raw=False, **operation_config):
# Construct URL
url = self.create_or_update.metadata['url']
path_format_arguments = {
@@ -260,14 +258,6 @@ def _create_or_update_initial(
# Construct parameters
query_parameters = {}
- if skip_dns_registration is not None:
- query_parameters['skipDnsRegistration'] = self._serialize.query("skip_dns_registration", skip_dns_registration, 'bool')
- if skip_custom_domain_verification is not None:
- query_parameters['skipCustomDomainVerification'] = self._serialize.query("skip_custom_domain_verification", skip_custom_domain_verification, 'bool')
- if force_dns_registration is not None:
- query_parameters['forceDnsRegistration'] = self._serialize.query("force_dns_registration", force_dns_registration, 'bool')
- if ttl_in_seconds is not None:
- query_parameters['ttlInSeconds'] = self._serialize.query("ttl_in_seconds", ttl_in_seconds, 'str')
query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
# Construct headers
@@ -289,9 +279,7 @@ def _create_or_update_initial(
request, header_parameters, body_content, stream=False, **operation_config)
if response.status_code not in [200, 202]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -307,7 +295,7 @@ def _create_or_update_initial(
return deserialized
def create_or_update(
- self, resource_group_name, name, site_envelope, skip_dns_registration=None, skip_custom_domain_verification=None, force_dns_registration=None, ttl_in_seconds=None, custom_headers=None, raw=False, **operation_config):
+ self, resource_group_name, name, site_envelope, custom_headers=None, raw=False, **operation_config):
"""Creates a new web, mobile, or API app in an existing resource group, or
updates an existing app.
@@ -323,19 +311,6 @@ def create_or_update(
:param site_envelope: A JSON representation of the app properties. See
example.
:type site_envelope: ~azure.mgmt.web.models.Site
- :param skip_dns_registration: If true web app hostname is not
- registered with DNS on creation. This parameter is
- only used for app creation.
- :type skip_dns_registration: bool
- :param skip_custom_domain_verification: If true, custom (non
- *.azurewebsites.net) domains associated with web app are not verified.
- :type skip_custom_domain_verification: bool
- :param force_dns_registration: If true, web app hostname is force
- registered with DNS.
- :type force_dns_registration: bool
- :param ttl_in_seconds: Time to live in seconds for web app's default
- domain name.
- :type ttl_in_seconds: str
:param dict custom_headers: headers that will be added to the request
:param bool raw: returns the direct response alongside the
deserialized response
@@ -344,16 +319,13 @@ def create_or_update(
:rtype:
~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.Site]
or ~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
raw_result = self._create_or_update_initial(
resource_group_name=resource_group_name,
name=name,
site_envelope=site_envelope,
- skip_dns_registration=skip_dns_registration,
- skip_custom_domain_verification=skip_custom_domain_verification,
- force_dns_registration=force_dns_registration,
- ttl_in_seconds=ttl_in_seconds,
custom_headers=custom_headers,
raw=True,
**operation_config
@@ -378,9 +350,7 @@ def get_long_running_status(status_link, headers=None):
def get_long_running_output(response):
if response.status_code not in [200, 202]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = self._deserialize('Site', response)
@@ -399,7 +369,7 @@ def get_long_running_output(response):
create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}'}
def delete(
- self, resource_group_name, name, delete_metrics=None, delete_empty_server_farm=None, skip_dns_registration=None, custom_headers=None, raw=False, **operation_config):
+ self, resource_group_name, name, delete_metrics=None, delete_empty_server_farm=None, custom_headers=None, raw=False, **operation_config):
"""Deletes a web, mobile, or API app, or one of the deployment slots.
Deletes a web, mobile, or API app, or one of the deployment slots.
@@ -415,8 +385,6 @@ def delete(
will be empty after app deletion and you want to delete the empty App
Service plan. By default, the empty App Service plan is not deleted.
:type delete_empty_server_farm: bool
- :param skip_dns_registration: If true, DNS registration is skipped.
- :type skip_dns_registration: bool
:param dict custom_headers: headers that will be added to the request
:param bool raw: returns the direct response alongside the
deserialized response
@@ -441,8 +409,6 @@ def delete(
query_parameters['deleteMetrics'] = self._serialize.query("delete_metrics", delete_metrics, 'bool')
if delete_empty_server_farm is not None:
query_parameters['deleteEmptyServerFarm'] = self._serialize.query("delete_empty_server_farm", delete_empty_server_farm, 'bool')
- if skip_dns_registration is not None:
- query_parameters['skipDnsRegistration'] = self._serialize.query("skip_dns_registration", skip_dns_registration, 'bool')
query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
# Construct headers
@@ -470,7 +436,7 @@ def delete(
delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}'}
def update(
- self, resource_group_name, name, site_envelope, skip_dns_registration=None, skip_custom_domain_verification=None, force_dns_registration=None, ttl_in_seconds=None, custom_headers=None, raw=False, **operation_config):
+ self, resource_group_name, name, site_envelope, custom_headers=None, raw=False, **operation_config):
"""Creates a new web, mobile, or API app in an existing resource group, or
updates an existing app.
@@ -486,19 +452,6 @@ def update(
:param site_envelope: A JSON representation of the app properties. See
example.
:type site_envelope: ~azure.mgmt.web.models.SitePatchResource
- :param skip_dns_registration: If true web app hostname is not
- registered with DNS on creation. This parameter is
- only used for app creation.
- :type skip_dns_registration: bool
- :param skip_custom_domain_verification: If true, custom (non
- *.azurewebsites.net) domains associated with web app are not verified.
- :type skip_custom_domain_verification: bool
- :param force_dns_registration: If true, web app hostname is force
- registered with DNS.
- :type force_dns_registration: bool
- :param ttl_in_seconds: Time to live in seconds for web app's default
- domain name.
- :type ttl_in_seconds: str
:param dict custom_headers: headers that will be added to the request
:param bool raw: returns the direct response alongside the
deserialized response
@@ -507,7 +460,8 @@ def update(
:return: Site or ClientRawResponse if raw=true
:rtype: ~azure.mgmt.web.models.Site or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.update.metadata['url']
@@ -520,14 +474,6 @@ def update(
# Construct parameters
query_parameters = {}
- if skip_dns_registration is not None:
- query_parameters['skipDnsRegistration'] = self._serialize.query("skip_dns_registration", skip_dns_registration, 'bool')
- if skip_custom_domain_verification is not None:
- query_parameters['skipCustomDomainVerification'] = self._serialize.query("skip_custom_domain_verification", skip_custom_domain_verification, 'bool')
- if force_dns_registration is not None:
- query_parameters['forceDnsRegistration'] = self._serialize.query("force_dns_registration", force_dns_registration, 'bool')
- if ttl_in_seconds is not None:
- query_parameters['ttlInSeconds'] = self._serialize.query("ttl_in_seconds", ttl_in_seconds, 'str')
query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
# Construct headers
@@ -549,9 +495,7 @@ def update(
request, header_parameters, body_content, stream=False, **operation_config)
if response.status_code not in [200, 202]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -588,7 +532,8 @@ def analyze_custom_hostname(
:return: CustomHostnameAnalysisResult or ClientRawResponse if raw=true
:rtype: ~azure.mgmt.web.models.CustomHostnameAnalysisResult or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.analyze_custom_hostname.metadata['url']
@@ -620,9 +565,7 @@ def analyze_custom_hostname(
response = self._client.send(request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -728,7 +671,8 @@ def backup(
:return: BackupItem or ClientRawResponse if raw=true
:rtype: ~azure.mgmt.web.models.BackupItem or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.backup.metadata['url']
@@ -762,9 +706,7 @@ def backup(
request, header_parameters, body_content, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -797,7 +739,8 @@ def list_backups(
:return: An iterator like instance of BackupItem
:rtype:
~azure.mgmt.web.models.BackupItemPaged[~azure.mgmt.web.models.BackupItem]
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
def internal_paging(next_link=None, raw=False):
@@ -835,9 +778,7 @@ def internal_paging(next_link=None, raw=False):
request, header_parameters, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
return response
@@ -876,7 +817,8 @@ def discover_restore(
:return: RestoreRequest or ClientRawResponse if raw=true
:rtype: ~azure.mgmt.web.models.RestoreRequest or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException`
"""
# Construct URL
url = self.discover_restore.metadata['url']
@@ -910,9 +852,7 @@ def discover_restore(
request, header_parameters, body_content, stream=False, **operation_config)
if response.status_code not in [200]:
- exp = CloudError(response)
- exp.request_id = response.headers.get('x-ms-request-id')
- raise exp
+ raise models.DefaultErrorResponseException(self._deserialize, response)
deserialized = None
@@ -947,7 +887,8 @@ def get_backup_status(
:return: BackupItem or ClientRawResponse if raw=true
:rtype: ~azure.mgmt.web.models.BackupItem or
~msrest.pipeline.ClientRawResponse
- :raises: :class:`CloudError`
+ :raises:
+ :class:`DefaultErrorResponseException