From 9da18976cd6775393db057d7727547f160c46f14 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Tue, 27 Feb 2018 11:39:32 -0800 Subject: [PATCH 01/19] Generated from 38e4303e047f81ab46e00d32d6356c4db74ddce1 (#2064) Web Python conf --- azure-mgmt-web/azure/mgmt/web/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-mgmt-web/azure/mgmt/web/version.py b/azure-mgmt-web/azure/mgmt/web/version.py index a39f64422a75..8ae395630e43 100644 --- a/azure-mgmt-web/azure/mgmt/web/version.py +++ b/azure-mgmt-web/azure/mgmt/web/version.py @@ -9,5 +9,5 @@ # regenerated. # -------------------------------------------------------------------------- -VERSION = "0.35.0" +VERSION = "0.36.0" From 4d58ae7a2c945a77939847b3fdd42dc139e5ea5d Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Wed, 28 Feb 2018 08:38:24 -0800 Subject: [PATCH 02/19] [AutoPR web/resource-manager] Fix recommendation resource properties, add disable recommendation APIs (#2063) * Generated from 00ffb2040dfb1d813a1780159b322c53cd2efb30 Add disable recommendation APIs * Generated from 00ffb2040dfb1d813a1780159b322c53cd2efb30 Add disable recommendation APIs --- .../azure/mgmt/web/models/__init__.py | 2 + .../azure/mgmt/web/models/recommendation.py | 71 ++-- .../mgmt/web/models/recommendation_paged.py | 27 ++ .../mgmt/web/models/recommendation_rule.py | 59 ++- .../operations/recommendations_operations.py | 374 ++++++++++++------ azure-mgmt-web/azure/mgmt/web/version.py | 2 +- 6 files changed, 377 insertions(+), 158 deletions(-) create mode 100644 azure-mgmt-web/azure/mgmt/web/models/recommendation_paged.py diff --git a/azure-mgmt-web/azure/mgmt/web/models/__init__.py b/azure-mgmt-web/azure/mgmt/web/models/__init__.py index a50f89c31cf9..0b1a573e7329 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/__init__.py +++ b/azure-mgmt-web/azure/mgmt/web/models/__init__.py @@ -225,6 +225,7 @@ 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 .geo_region_paged import GeoRegionPaged from .identifier_paged import IdentifierPaged @@ -537,6 +538,7 @@ 'AnalysisDefinitionPaged', 'DetectorDefinitionPaged', 'ApplicationStackPaged', + 'RecommendationPaged', 'SourceControlPaged', 'GeoRegionPaged', 'IdentifierPaged', diff --git a/azure-mgmt-web/azure/mgmt/web/models/recommendation.py b/azure-mgmt-web/azure/mgmt/web/models/recommendation.py index f53222b7f41d..bc2ff02a1140 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 @@ -74,32 +85,42 @@ class Recommendation(Model): :type forward_link: str """ + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'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'}, + 'tags': {'key': 'properties.tags', 'type': '[str]'}, + 'action_name': {'key': 'properties.actionName', '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, 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__(kind=kind) self.creation_time = creation_time self.recommendation_id = recommendation_id self.resource_id = resource_id 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..cbc61204c922 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_rule_name: Unique name of the rule. + :type recommendation_rule_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). @@ -54,25 +65,35 @@ class RecommendationRule(Model): :type forward_link: str """ + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'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_rule_name': {'key': 'properties.name', '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'}, + 'tags': {'key': 'properties.tags', '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_rule_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__(kind=kind) + self.recommendation_rule_name = recommendation_rule_name self.display_name = display_name self.message = message self.recommendation_id = recommendation_id 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..79c8c4c870fd 100644 --- a/azure-mgmt-web/azure/mgmt/web/operations/recommendations_operations.py +++ b/azure-mgmt-web/azure/mgmt/web/operations/recommendations_operations.py @@ -57,13 +57,83 @@ 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:`CloudError` + """ + 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]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp + + 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 +141,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 +154,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 +187,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 +212,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,7 +220,7 @@ 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): @@ -181,52 +245,61 @@ 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 + :return: An iterator like instance of Recommendation + :rtype: + ~azure.mgmt.web.models.RecommendationPaged[~azure.mgmt.web.models.Recommendation] :raises: :class:`CloudError` """ - # 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 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]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp + + 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 +329,63 @@ 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 + :return: An iterator like instance of Recommendation + :rtype: + ~azure.mgmt.web.models.RecommendationPaged[~azure.mgmt.web.models.Recommendation] :raises: :class:`CloudError` """ - # 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]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp + + 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 +506,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 +521,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 @@ -463,6 +549,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 @@ -495,3 +583,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/version.py b/azure-mgmt-web/azure/mgmt/web/version.py index 8ae395630e43..53a203f32aaf 100644 --- a/azure-mgmt-web/azure/mgmt/web/version.py +++ b/azure-mgmt-web/azure/mgmt/web/version.py @@ -9,5 +9,5 @@ # regenerated. # -------------------------------------------------------------------------- -VERSION = "0.36.0" +VERSION = "" From bc382daa4b2c35f1dd4e5a09f8818d8ed6da1787 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Fri, 2 Mar 2018 13:30:59 -0800 Subject: [PATCH 03/19] Generated from 6b4f8a041355f71703ff968f9a7209ab27d93605 (#2090) Add missing type specifier to enum definition. --- azure-mgmt-web/azure/mgmt/web/models/__init__.py | 2 ++ .../azure/mgmt/web/models/managed_service_identity.py | 7 ++++--- .../mgmt/web/models/web_site_management_client_enums.py | 5 +++++ azure-mgmt-web/azure/mgmt/web/version.py | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/azure-mgmt-web/azure/mgmt/web/models/__init__.py b/azure-mgmt-web/azure/mgmt/web/models/__init__.py index 0b1a573e7329..f60ea1a3a7da 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/__init__.py +++ b/azure-mgmt-web/azure/mgmt/web/models/__init__.py @@ -268,6 +268,7 @@ CertificateOrderStatus, CertificateOrderActionType, RouteType, + ManagedServiceIdentityType, AutoHealActionType, ConnectionStringType, ScmType, @@ -580,6 +581,7 @@ 'CertificateOrderStatus', 'CertificateOrderActionType', 'RouteType', + 'ManagedServiceIdentityType', 'AutoHealActionType', 'ConnectionStringType', 'ScmType', 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..4e33e830ae33 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,8 +18,9 @@ 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' + :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. @@ -32,7 +33,7 @@ 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'}, } 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..0b311784c359 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,11 @@ class RouteType(Enum): static = "STATIC" +class ManagedServiceIdentityType(Enum): + + system_assigned = "SystemAssigned" + + class AutoHealActionType(Enum): recycle = "Recycle" diff --git a/azure-mgmt-web/azure/mgmt/web/version.py b/azure-mgmt-web/azure/mgmt/web/version.py index 53a203f32aaf..8ae395630e43 100644 --- a/azure-mgmt-web/azure/mgmt/web/version.py +++ b/azure-mgmt-web/azure/mgmt/web/version.py @@ -9,5 +9,5 @@ # regenerated. # -------------------------------------------------------------------------- -VERSION = "" +VERSION = "0.36.0" From fcfe2182a1dfc047557649fa70e1d03c92291605 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Fri, 23 Mar 2018 15:12:17 -0700 Subject: [PATCH 04/19] Generated from 2cfd4201a8ac6728ed176142e879fa13c9aff776 (#2177) Fix for https://github.com/Azure/azure-rest-api-specs/issues/1697#issuecomment-367167726 --- .../web/operations/web_apps_operations.py | 58 ++----------------- 1 file changed, 4 insertions(+), 54 deletions(-) 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..1d1bb5d4bb57 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 @@ -248,7 +248,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 +260,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 @@ -307,7 +299,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 +315,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 @@ -350,10 +329,6 @@ def create_or_update( 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 @@ -399,7 +374,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 +390,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 +414,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 +441,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 +457,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 @@ -520,14 +478,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 From 0a8ffbe44cb4e211dae86a92f758b5957fcd1948 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Thu, 29 Mar 2018 14:17:40 -0700 Subject: [PATCH 05/19] [AutoPR web/resource-manager] Update logicAppsManagementClient.json to current offerings (#2289) * Generated from a708b01ae8047043514cb507bebd12838177c896 PR Updates * Generated from d8ef07295ba7ceb1c9a3d1bbd15f5507dbd59a45 PR Updates --- .../azure/mgmt/web/models/__init__.py | 10 + .../mgmt/web/models/default_error_response.py | 48 ++ .../models/default_error_response_error.py | 55 +++ ...fault_error_response_error_details_item.py | 45 ++ .../web/models/resource_health_metadata.py | 54 ++ .../models/resource_health_metadata_paged.py | 27 + .../azure/mgmt/web/operations/__init__.py | 2 + .../resource_health_metadata_operations.py | 461 ++++++++++++++++++ .../web/operations/web_apps_operations.py | 58 ++- .../mgmt/web/web_site_management_client.py | 5 + 10 files changed, 761 insertions(+), 4 deletions(-) create mode 100644 azure-mgmt-web/azure/mgmt/web/models/default_error_response.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/default_error_response_error.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/default_error_response_error_details_item.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/resource_health_metadata.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/resource_health_metadata_paged.py create mode 100644 azure-mgmt-web/azure/mgmt/web/operations/resource_health_metadata_operations.py diff --git a/azure-mgmt-web/azure/mgmt/web/models/__init__.py b/azure-mgmt-web/azure/mgmt/web/models/__init__.py index f60ea1a3a7da..aad8d9bfc2fe 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/__init__.py +++ b/azure-mgmt-web/azure/mgmt/web/models/__init__.py @@ -99,6 +99,9 @@ from .localizable_string import LocalizableString from .csm_usage_quota import CsmUsageQuota from .error_entity import ErrorEntity +from .default_error_response_error_details_item import DefaultErrorResponseErrorDetailsItem +from .default_error_response_error import DefaultErrorResponseError +from .default_error_response import DefaultErrorResponse, DefaultErrorResponseException from .operation import Operation from .resource_metric_property import ResourceMetricProperty from .resource_metric_value import ResourceMetricValue @@ -123,6 +126,7 @@ from .application_stack import ApplicationStack from .recommendation import Recommendation from .recommendation_rule import RecommendationRule +from .resource_health_metadata import ResourceHealthMetadata from .csm_move_resource_envelope import CsmMoveResourceEnvelope from .geo_region import GeoRegion from .hosting_environment_deployment_info import HostingEnvironmentDeploymentInfo @@ -226,6 +230,7 @@ from .detector_definition_paged import DetectorDefinitionPaged from .application_stack_paged import ApplicationStackPaged from .recommendation_paged import RecommendationPaged +from .resource_health_metadata_paged import ResourceHealthMetadataPaged from .source_control_paged import SourceControlPaged from .geo_region_paged import GeoRegionPaged from .identifier_paged import IdentifierPaged @@ -413,6 +418,9 @@ 'LocalizableString', 'CsmUsageQuota', 'ErrorEntity', + 'DefaultErrorResponseErrorDetailsItem', + 'DefaultErrorResponseError', + 'DefaultErrorResponse', 'DefaultErrorResponseException', 'Operation', 'ResourceMetricProperty', 'ResourceMetricValue', @@ -437,6 +445,7 @@ 'ApplicationStack', 'Recommendation', 'RecommendationRule', + 'ResourceHealthMetadata', 'CsmMoveResourceEnvelope', 'GeoRegion', 'HostingEnvironmentDeploymentInfo', @@ -540,6 +549,7 @@ 'DetectorDefinitionPaged', 'ApplicationStackPaged', 'RecommendationPaged', + 'ResourceHealthMetadataPaged', 'SourceControlPaged', 'GeoRegionPaged', 'IdentifierPaged', diff --git a/azure-mgmt-web/azure/mgmt/web/models/default_error_response.py b/azure-mgmt-web/azure/mgmt/web/models/default_error_response.py new file mode 100644 index 000000000000..7a16dd576a12 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/default_error_response.py @@ -0,0 +1,48 @@ +# 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 +from msrest.exceptions import HttpOperationError + + +class DefaultErrorResponse(Model): + """App Service error response. + + 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 = { + 'error': {'key': 'error', 'type': 'DefaultErrorResponseError'}, + } + + def __init__(self): + super(DefaultErrorResponse, self).__init__() + self.error = None + + +class DefaultErrorResponseException(HttpOperationError): + """Server responsed with exception of type: 'DefaultErrorResponse'. + + :param deserialize: A deserializer + :param response: Server response to be deserialized. + """ + + def __init__(self, deserialize, response, *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..c12f968877e1 --- /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': {'required': True, 'readonly': True}, + 'message': {'required': True, '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..bb0a260d8c93 --- /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': {'required': True, 'readonly': True}, + 'message': {'required': True, '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/resource_health_metadata.py b/azure-mgmt-web/azure/mgmt/web/models/resource_health_metadata.py new file mode 100644 index 000000000000..25f2a86c4607 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/resource_health_metadata.py @@ -0,0 +1,54 @@ +# 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 ResourceHealthMetadata(ProxyOnlyResource): + """Used for getting ResourceHealthCheck settings. + + 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 category: The category that the resource matches in the RHC Policy + File + :type category: str + :param signal_availability: Is there a health signal for the resource + :type signal_availability: bool + """ + + _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'}, + 'category': {'key': 'properties.category', 'type': 'str'}, + 'signal_availability': {'key': 'properties.signalAvailability', 'type': 'bool'}, + } + + def __init__(self, kind=None, category=None, signal_availability=None): + super(ResourceHealthMetadata, self).__init__(kind=kind) + self.category = category + self.signal_availability = signal_availability diff --git a/azure-mgmt-web/azure/mgmt/web/models/resource_health_metadata_paged.py b/azure-mgmt-web/azure/mgmt/web/models/resource_health_metadata_paged.py new file mode 100644 index 000000000000..45c9b8c4945b --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/resource_health_metadata_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 ResourceHealthMetadataPaged(Paged): + """ + A paging container for iterating over a list of :class:`ResourceHealthMetadata ` object + """ + + _attribute_map = { + 'next_link': {'key': 'nextLink', 'type': 'str'}, + 'current_page': {'key': 'value', 'type': '[ResourceHealthMetadata]'} + } + + def __init__(self, *args, **kwargs): + + super(ResourceHealthMetadataPaged, self).__init__(*args, **kwargs) diff --git a/azure-mgmt-web/azure/mgmt/web/operations/__init__.py b/azure-mgmt-web/azure/mgmt/web/operations/__init__.py index 93d9712f46bd..55c58c4be3bb 100644 --- a/azure-mgmt-web/azure/mgmt/web/operations/__init__.py +++ b/azure-mgmt-web/azure/mgmt/web/operations/__init__.py @@ -19,6 +19,7 @@ from .diagnostics_operations import DiagnosticsOperations from .provider_operations import ProviderOperations from .recommendations_operations import RecommendationsOperations +from .resource_health_metadata_operations import ResourceHealthMetadataOperations from .web_apps_operations import WebAppsOperations from .app_service_environments_operations import AppServiceEnvironmentsOperations from .app_service_plans_operations import AppServicePlansOperations @@ -34,6 +35,7 @@ 'DiagnosticsOperations', 'ProviderOperations', 'RecommendationsOperations', + 'ResourceHealthMetadataOperations', 'WebAppsOperations', 'AppServiceEnvironmentsOperations', 'AppServicePlansOperations', diff --git a/azure-mgmt-web/azure/mgmt/web/operations/resource_health_metadata_operations.py b/azure-mgmt-web/azure/mgmt/web/operations/resource_health_metadata_operations.py new file mode 100644 index 000000000000..2b8b44f45e60 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/operations/resource_health_metadata_operations.py @@ -0,0 +1,461 @@ +# 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. +# -------------------------------------------------------------------------- + +import uuid +from msrest.pipeline import ClientRawResponse + +from .. import models + + +class ResourceHealthMetadataOperations(object): + """ResourceHealthMetadataOperations operations. + + :param client: Client for service requests. + :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". + """ + + models = models + + def __init__(self, client, config, serializer, deserializer): + + self._client = client + self._serialize = serializer + self._deserialize = deserializer + self.api_version = "2016-03-01" + + self.config = config + + def list( + self, custom_headers=None, raw=False, **operation_config): + """List all ResourceHealthMetadata for all sites in the subscription. + + List all ResourceHealthMetadata for all sites in the 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: An iterator like instance of ResourceHealthMetadata + :rtype: + ~azure.mgmt.web.models.ResourceHealthMetadataPaged[~azure.mgmt.web.models.ResourceHealthMetadata] + :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 = {} + 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.ResourceHealthMetadataPaged(internal_paging, self._deserialize.dependencies) + + if raw: + header_dict = {} + client_raw_response = models.ResourceHealthMetadataPaged(internal_paging, self._deserialize.dependencies, header_dict) + return client_raw_response + + return deserialized + list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Web/resourceHealthMetadata'} + + def list_by_resource_group( + self, resource_group_name, custom_headers=None, raw=False, **operation_config): + """List all ResourceHealthMetadata for all sites in the resource group in + the subscription. + + List all ResourceHealthMetadata for all sites in the resource group in + the subscription. + + :param resource_group_name: Name of the resource group to which the + resource belongs. + :type resource_group_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: An iterator like instance of ResourceHealthMetadata + :rtype: + ~azure.mgmt.web.models.ResourceHealthMetadataPaged[~azure.mgmt.web.models.ResourceHealthMetadata] + :raises: + :class:`DefaultErrorResponseException` + """ + def internal_paging(next_link=None, raw=False): + + if not next_link: + # Construct URL + url = self.list_by_resource_group.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\._\(\)]+[^\.]$'), + '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') + + 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.ResourceHealthMetadataPaged(internal_paging, self._deserialize.dependencies) + + if raw: + header_dict = {} + client_raw_response = models.ResourceHealthMetadataPaged(internal_paging, self._deserialize.dependencies, header_dict) + return client_raw_response + + return deserialized + list_by_resource_group.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/resourceHealthMetadata'} + + def list_by_site( + self, resource_group_name, name, custom_headers=None, raw=False, **operation_config): + """Gets the category of ResourceHealthMetadata to use for the given site + as a collection. + + Gets the category of ResourceHealthMetadata to use for the given site + as a collection. + + :param resource_group_name: Name of the resource group to which the + resource belongs. + :type resource_group_name: str + :param name: Name of web app. + :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: An iterator like instance of ResourceHealthMetadata + :rtype: + ~azure.mgmt.web.models.ResourceHealthMetadataPaged[~azure.mgmt.web.models.ResourceHealthMetadata] + :raises: + :class:`DefaultErrorResponseException` + """ + def internal_paging(next_link=None, raw=False): + + if not next_link: + # Construct URL + url = self.list_by_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\._\(\)]+[^\.]$'), + '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') + + 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.ResourceHealthMetadataPaged(internal_paging, self._deserialize.dependencies) + + if raw: + header_dict = {} + client_raw_response = models.ResourceHealthMetadataPaged(internal_paging, self._deserialize.dependencies, header_dict) + return client_raw_response + + return deserialized + list_by_site.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/resourceHealthMetadata'} + + def get_by_site( + self, resource_group_name, name, custom_headers=None, raw=False, **operation_config): + """Gets the category of ResourceHealthMetadata to use for the given site. + + Gets the category of ResourceHealthMetadata to use for the given site. + + :param resource_group_name: Name of the resource group to which the + resource belongs. + :type resource_group_name: str + :param name: Name of web app + :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: ResourceHealthMetadata or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.ResourceHealthMetadata or + ~msrest.pipeline.ClientRawResponse + :raises: + :class:`DefaultErrorResponseException` + """ + # Construct URL + url = self.get_by_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\._\(\)]+[^\.]$'), + '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.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) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('ResourceHealthMetadata', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + get_by_site.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/resourceHealthMetadata/default'} + + def list_by_site_slot( + self, resource_group_name, name, slot, custom_headers=None, raw=False, **operation_config): + """Gets the category of ResourceHealthMetadata to use for the given site + as a collection. + + Gets the category of ResourceHealthMetadata to use for the given site + as a collection. + + :param resource_group_name: Name of the resource group to which the + resource belongs. + :type resource_group_name: str + :param name: Name of web app. + :type name: str + :param slot: Name of web app slot. If not specified then will default + to production slot. + :type slot: 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: An iterator like instance of ResourceHealthMetadata + :rtype: + ~azure.mgmt.web.models.ResourceHealthMetadataPaged[~azure.mgmt.web.models.ResourceHealthMetadata] + :raises: + :class:`DefaultErrorResponseException` + """ + def internal_paging(next_link=None, raw=False): + + if not next_link: + # Construct URL + url = self.list_by_site_slot.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'), + 'slot': self._serialize.url("slot", slot, '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') + + 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.ResourceHealthMetadataPaged(internal_paging, self._deserialize.dependencies) + + if raw: + header_dict = {} + client_raw_response = models.ResourceHealthMetadataPaged(internal_paging, self._deserialize.dependencies, header_dict) + return client_raw_response + + return deserialized + list_by_site_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/resourceHealthMetadata'} + + def get_by_site_slot( + self, resource_group_name, name, slot, custom_headers=None, raw=False, **operation_config): + """Gets the category of ResourceHealthMetadata to use for the given site. + + Gets the category of ResourceHealthMetadata to use for the given site. + + :param resource_group_name: Name of the resource group to which the + resource belongs. + :type resource_group_name: str + :param name: Name of web app + :type name: str + :param slot: Name of web app slot. If not specified then will default + to production slot. + :type slot: 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: ResourceHealthMetadata or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.ResourceHealthMetadata or + ~msrest.pipeline.ClientRawResponse + :raises: + :class:`DefaultErrorResponseException` + """ + # Construct URL + url = self.get_by_site_slot.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'), + 'slot': self._serialize.url("slot", slot, '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.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) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('ResourceHealthMetadata', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + get_by_site_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/resourceHealthMetadata/default'} 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 1d1bb5d4bb57..3bf64d3266ad 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 @@ -248,7 +248,7 @@ def get( def _create_or_update_initial( - self, resource_group_name, name, site_envelope, custom_headers=None, raw=False, **operation_config): + 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): # Construct URL url = self.create_or_update.metadata['url'] path_format_arguments = { @@ -260,6 +260,14 @@ 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 @@ -299,7 +307,7 @@ def _create_or_update_initial( return deserialized def create_or_update( - self, resource_group_name, name, site_envelope, custom_headers=None, raw=False, **operation_config): + 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): """Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. @@ -315,6 +323,19 @@ 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 @@ -329,6 +350,10 @@ def create_or_update( 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 @@ -374,7 +399,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, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, delete_metrics=None, delete_empty_server_farm=None, skip_dns_registration=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. @@ -390,6 +415,8 @@ 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 @@ -414,6 +441,8 @@ 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 @@ -441,7 +470,7 @@ def delete( delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}'} def update( - self, resource_group_name, name, site_envelope, custom_headers=None, raw=False, **operation_config): + 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): """Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. @@ -457,6 +486,19 @@ 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 @@ -478,6 +520,14 @@ 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 diff --git a/azure-mgmt-web/azure/mgmt/web/web_site_management_client.py b/azure-mgmt-web/azure/mgmt/web/web_site_management_client.py index a7da435b33ab..48e5cff90861 100644 --- a/azure-mgmt-web/azure/mgmt/web/web_site_management_client.py +++ b/azure-mgmt-web/azure/mgmt/web/web_site_management_client.py @@ -27,6 +27,7 @@ from .operations.diagnostics_operations import DiagnosticsOperations from .operations.provider_operations import ProviderOperations from .operations.recommendations_operations import RecommendationsOperations +from .operations.resource_health_metadata_operations import ResourceHealthMetadataOperations from .operations.web_apps_operations import WebAppsOperations from .operations.app_service_environments_operations import AppServiceEnvironmentsOperations from .operations.app_service_plans_operations import AppServicePlansOperations @@ -92,6 +93,8 @@ class WebSiteManagementClient(object): :vartype provider: azure.mgmt.web.operations.ProviderOperations :ivar recommendations: Recommendations operations :vartype recommendations: azure.mgmt.web.operations.RecommendationsOperations + :ivar resource_health_metadata: ResourceHealthMetadata operations + :vartype resource_health_metadata: azure.mgmt.web.operations.ResourceHealthMetadataOperations :ivar web_apps: WebApps operations :vartype web_apps: azure.mgmt.web.operations.WebAppsOperations :ivar app_service_environments: AppServiceEnvironments operations @@ -138,6 +141,8 @@ def __init__( self._client, self.config, self._serialize, self._deserialize) self.recommendations = RecommendationsOperations( self._client, self.config, self._serialize, self._deserialize) + self.resource_health_metadata = ResourceHealthMetadataOperations( + self._client, self.config, self._serialize, self._deserialize) self.web_apps = WebAppsOperations( self._client, self.config, self._serialize, self._deserialize) self.app_service_environments = AppServiceEnvironmentsOperations( From 749691a2bd85f88ea57dbd70e9846414f1cb204a Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Mon, 2 Apr 2018 16:25:57 -0700 Subject: [PATCH 06/19] [AutoPR web/resource-manager] Adding BillingMeters API (#2271) * Generated from 346651741dcafd1a91d0741d726aef7cdac29c4d Adding BillingMeters API * Generated from 2c9ced71b2b53f7039ec9ddbcbe4f23f05897e89 Adding reference to readme.md * Generated from 1723dbe3e971a273cd0d143700e69c20912f9bce Merge branch 'master' of https://github.com/andreyse/azure-rest-api-specs * Generated from 1723dbe3e971a273cd0d143700e69c20912f9bce Merge branch 'master' of https://github.com/andreyse/azure-rest-api-specs --- .../azure/mgmt/web/models/__init__.py | 4 + .../azure/mgmt/web/models/billing_meter.py | 66 +++++++++++ .../mgmt/web/models/billing_meter_paged.py | 27 +++++ .../azure/mgmt/web/operations/__init__.py | 2 + .../operations/billing_meters_operations.py | 109 ++++++++++++++++++ .../mgmt/web/web_site_management_client.py | 5 + 6 files changed, 213 insertions(+) create mode 100644 azure-mgmt-web/azure/mgmt/web/models/billing_meter.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/billing_meter_paged.py create mode 100644 azure-mgmt-web/azure/mgmt/web/operations/billing_meters_operations.py diff --git a/azure-mgmt-web/azure/mgmt/web/models/__init__.py b/azure-mgmt-web/azure/mgmt/web/models/__init__.py index aad8d9bfc2fe..5807858a38b6 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/__init__.py +++ b/azure-mgmt-web/azure/mgmt/web/models/__init__.py @@ -127,6 +127,7 @@ from .recommendation import Recommendation from .recommendation_rule import RecommendationRule from .resource_health_metadata import ResourceHealthMetadata +from .billing_meter import BillingMeter from .csm_move_resource_envelope import CsmMoveResourceEnvelope from .geo_region import GeoRegion from .hosting_environment_deployment_info import HostingEnvironmentDeploymentInfo @@ -235,6 +236,7 @@ from .geo_region_paged import GeoRegionPaged from .identifier_paged import IdentifierPaged from .premier_add_on_offer_paged import PremierAddOnOfferPaged +from .billing_meter_paged import BillingMeterPaged from .site_paged import SitePaged from .backup_item_paged import BackupItemPaged from .site_config_resource_paged import SiteConfigResourcePaged @@ -446,6 +448,7 @@ 'Recommendation', 'RecommendationRule', 'ResourceHealthMetadata', + 'BillingMeter', 'CsmMoveResourceEnvelope', 'GeoRegion', 'HostingEnvironmentDeploymentInfo', @@ -554,6 +557,7 @@ 'GeoRegionPaged', 'IdentifierPaged', 'PremierAddOnOfferPaged', + 'BillingMeterPaged', 'SitePaged', 'BackupItemPaged', 'SiteConfigResourcePaged', 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..cad0a62ae07d --- /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 resource type 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/operations/__init__.py b/azure-mgmt-web/azure/mgmt/web/operations/__init__.py index 55c58c4be3bb..5ceaac0d94eb 100644 --- a/azure-mgmt-web/azure/mgmt/web/operations/__init__.py +++ b/azure-mgmt-web/azure/mgmt/web/operations/__init__.py @@ -20,6 +20,7 @@ from .provider_operations import ProviderOperations from .recommendations_operations import RecommendationsOperations from .resource_health_metadata_operations import ResourceHealthMetadataOperations +from .billing_meters_operations import BillingMetersOperations from .web_apps_operations import WebAppsOperations from .app_service_environments_operations import AppServiceEnvironmentsOperations from .app_service_plans_operations import AppServicePlansOperations @@ -36,6 +37,7 @@ 'ProviderOperations', 'RecommendationsOperations', 'ResourceHealthMetadataOperations', + 'BillingMetersOperations', 'WebAppsOperations', 'AppServiceEnvironmentsOperations', 'AppServicePlansOperations', diff --git a/azure-mgmt-web/azure/mgmt/web/operations/billing_meters_operations.py b/azure-mgmt-web/azure/mgmt/web/operations/billing_meters_operations.py new file mode 100644 index 000000000000..1fd793c46673 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/operations/billing_meters_operations.py @@ -0,0 +1,109 @@ +# 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. +# -------------------------------------------------------------------------- + +import uuid +from msrest.pipeline import ClientRawResponse +from msrestazure.azure_exceptions import CloudError + +from .. import models + + +class BillingMetersOperations(object): + """BillingMetersOperations operations. + + :param client: Client for service requests. + :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". + """ + + models = models + + def __init__(self, client, config, serializer, deserializer): + + self._client = client + self._serialize = serializer + self._deserialize = deserializer + self.api_version = "2016-03-01" + + self.config = config + + def list( + self, billing_location=None, custom_headers=None, raw=False, **operation_config): + """Gets a list of meters for a given location. + + Gets a list of meters for a given location. + + :param billing_location: Azure Location of billable resource + :type billing_location: 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: An iterator like instance of BillingMeter + :rtype: + ~azure.mgmt.web.models.BillingMeterPaged[~azure.mgmt.web.models.BillingMeter] + :raises: :class:`CloudError` + """ + 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 billing_location is not None: + query_parameters['billingLocation'] = self._serialize.query("billing_location", billing_location, 'str') + 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]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp + + return response + + # Deserialize response + deserialized = models.BillingMeterPaged(internal_paging, self._deserialize.dependencies) + + if raw: + header_dict = {} + client_raw_response = models.BillingMeterPaged(internal_paging, self._deserialize.dependencies, header_dict) + return client_raw_response + + return deserialized + list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Web/billingMeters'} diff --git a/azure-mgmt-web/azure/mgmt/web/web_site_management_client.py b/azure-mgmt-web/azure/mgmt/web/web_site_management_client.py index 48e5cff90861..a3891b93bd46 100644 --- a/azure-mgmt-web/azure/mgmt/web/web_site_management_client.py +++ b/azure-mgmt-web/azure/mgmt/web/web_site_management_client.py @@ -28,6 +28,7 @@ from .operations.provider_operations import ProviderOperations from .operations.recommendations_operations import RecommendationsOperations from .operations.resource_health_metadata_operations import ResourceHealthMetadataOperations +from .operations.billing_meters_operations import BillingMetersOperations from .operations.web_apps_operations import WebAppsOperations from .operations.app_service_environments_operations import AppServiceEnvironmentsOperations from .operations.app_service_plans_operations import AppServicePlansOperations @@ -95,6 +96,8 @@ class WebSiteManagementClient(object): :vartype recommendations: azure.mgmt.web.operations.RecommendationsOperations :ivar resource_health_metadata: ResourceHealthMetadata operations :vartype resource_health_metadata: azure.mgmt.web.operations.ResourceHealthMetadataOperations + :ivar billing_meters: BillingMeters operations + :vartype billing_meters: azure.mgmt.web.operations.BillingMetersOperations :ivar web_apps: WebApps operations :vartype web_apps: azure.mgmt.web.operations.WebAppsOperations :ivar app_service_environments: AppServiceEnvironments operations @@ -143,6 +146,8 @@ def __init__( self._client, self.config, self._serialize, self._deserialize) self.resource_health_metadata = ResourceHealthMetadataOperations( self._client, self.config, self._serialize, self._deserialize) + self.billing_meters = BillingMetersOperations( + self._client, self.config, self._serialize, self._deserialize) self.web_apps = WebAppsOperations( self._client, self.config, self._serialize, self._deserialize) self.app_service_environments = AppServiceEnvironmentsOperations( From 3c8eb4abba2c508b736d98d712d4f89a39c1edd2 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Thu, 12 Apr 2018 14:09:07 -0700 Subject: [PATCH 07/19] [AutoPR web/resource-manager] Adding new API version for Microsoft.Web RP which fixes swagger errors (#2340) * Generated from 574e458be59a062c8af950ba83768ea41095a1d2 Fixing API version in the examples * Generated from 8957477812a8f2abbc895a363756062be9f2ca45 Removed location element for top level domain examples --- .../models/default_error_response_error.py | 4 +- ...fault_error_response_error_details_item.py | 4 +- .../web/operations/web_apps_operations.py | 58 ++----------------- 3 files changed, 8 insertions(+), 58 deletions(-) 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 index c12f968877e1..a310e52fd21b 100644 --- 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 @@ -32,8 +32,8 @@ class DefaultErrorResponseError(Model): """ _validation = { - 'code': {'required': True, 'readonly': True}, - 'message': {'required': True, 'readonly': True}, + 'code': {'readonly': True}, + 'message': {'readonly': True}, 'target': {'readonly': True}, 'innererror': {'readonly': True}, } 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 index bb0a260d8c93..7434138df870 100644 --- 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 @@ -27,8 +27,8 @@ class DefaultErrorResponseErrorDetailsItem(Model): """ _validation = { - 'code': {'required': True, 'readonly': True}, - 'message': {'required': True, 'readonly': True}, + 'code': {'readonly': True}, + 'message': {'readonly': True}, 'target': {'readonly': True}, } 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..1d1bb5d4bb57 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 @@ -248,7 +248,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 +260,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 @@ -307,7 +299,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 +315,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 @@ -350,10 +329,6 @@ def create_or_update( 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 @@ -399,7 +374,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 +390,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 +414,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 +441,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 +457,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 @@ -520,14 +478,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 From 36175610c4a3287341c9a3b41c9459364fe22b37 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Tue, 1 May 2018 15:49:35 -0700 Subject: [PATCH 08/19] Generated from 78c1d019bfd4816ca21ad4f3cbebe6b9aed3175d (#2436) Fix for https://github.com/Azure/azure-rest-api-specs/issues/2907 --- .../azure/mgmt/web/models/__init__.py | 16 + .../web/models/data_table_response_column.py | 36 ++ .../web/models/data_table_response_object.py | 36 ++ .../azure/mgmt/web/models/detector_info.py | 50 ++ .../mgmt/web/models/detector_response.py | 53 ++ .../web/models/detector_response_paged.py | 27 + .../azure/mgmt/web/models/diagnostic_data.py | 33 ++ .../azure/mgmt/web/models/rendering.py | 38 ++ .../web_site_management_client_enums.py | 8 + .../web/operations/diagnostics_operations.py | 468 ++++++++++++++++++ .../web/operations/web_apps_operations.py | 12 +- 11 files changed, 774 insertions(+), 3 deletions(-) create mode 100644 azure-mgmt-web/azure/mgmt/web/models/data_table_response_column.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/data_table_response_object.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/detector_info.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/detector_response.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/detector_response_paged.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/diagnostic_data.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/rendering.py diff --git a/azure-mgmt-web/azure/mgmt/web/models/__init__.py b/azure-mgmt-web/azure/mgmt/web/models/__init__.py index 5807858a38b6..1e376153b5a4 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/__init__.py +++ b/azure-mgmt-web/azure/mgmt/web/models/__init__.py @@ -118,6 +118,12 @@ from .response_meta_data import ResponseMetaData from .analysis_data import AnalysisData from .analysis_definition import AnalysisDefinition +from .data_table_response_column import DataTableResponseColumn +from .data_table_response_object import DataTableResponseObject +from .detector_info import DetectorInfo +from .rendering import Rendering +from .diagnostic_data import DiagnosticData +from .detector_response import DetectorResponse from .diagnostic_analysis import DiagnosticAnalysis from .diagnostic_category import DiagnosticCategory from .diagnostic_detector_response import DiagnosticDetectorResponse @@ -226,6 +232,7 @@ from .tld_legal_agreement_paged import TldLegalAgreementPaged from .certificate_paged import CertificatePaged from .deleted_site_paged import DeletedSitePaged +from .detector_response_paged import DetectorResponsePaged from .diagnostic_category_paged import DiagnosticCategoryPaged from .analysis_definition_paged import AnalysisDefinitionPaged from .detector_definition_paged import DetectorDefinitionPaged @@ -301,6 +308,7 @@ OperationStatus, IssueType, SolutionType, + RenderingType, ResourceScopeType, NotificationLevel, Channels, @@ -439,6 +447,12 @@ 'ResponseMetaData', 'AnalysisData', 'AnalysisDefinition', + 'DataTableResponseColumn', + 'DataTableResponseObject', + 'DetectorInfo', + 'Rendering', + 'DiagnosticData', + 'DetectorResponse', 'DiagnosticAnalysis', 'DiagnosticCategory', 'DiagnosticDetectorResponse', @@ -547,6 +561,7 @@ 'TldLegalAgreementPaged', 'CertificatePaged', 'DeletedSitePaged', + 'DetectorResponsePaged', 'DiagnosticCategoryPaged', 'AnalysisDefinitionPaged', 'DetectorDefinitionPaged', @@ -621,6 +636,7 @@ 'OperationStatus', 'IssueType', 'SolutionType', + 'RenderingType', 'ResourceScopeType', 'NotificationLevel', 'Channels', diff --git a/azure-mgmt-web/azure/mgmt/web/models/data_table_response_column.py b/azure-mgmt-web/azure/mgmt/web/models/data_table_response_column.py new file mode 100644 index 000000000000..388f033f30b3 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/data_table_response_column.py @@ -0,0 +1,36 @@ +# 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 DataTableResponseColumn(Model): + """Column definition. + + :param column_name: Name of the column + :type column_name: str + :param data_type: Data type which looks like 'String' or 'Int32'. + :type data_type: str + :param column_type: Column Type + :type column_type: str + """ + + _attribute_map = { + 'column_name': {'key': 'columnName', 'type': 'str'}, + 'data_type': {'key': 'dataType', 'type': 'str'}, + 'column_type': {'key': 'columnType', 'type': 'str'}, + } + + def __init__(self, column_name=None, data_type=None, column_type=None): + super(DataTableResponseColumn, self).__init__() + self.column_name = column_name + self.data_type = data_type + self.column_type = column_type diff --git a/azure-mgmt-web/azure/mgmt/web/models/data_table_response_object.py b/azure-mgmt-web/azure/mgmt/web/models/data_table_response_object.py new file mode 100644 index 000000000000..3d3ba7bb8e93 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/data_table_response_object.py @@ -0,0 +1,36 @@ +# 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 DataTableResponseObject(Model): + """Data Table which defines columns and raw row values. + + :param table_name: Name of the table + :type table_name: str + :param columns: List of columns with data types + :type columns: list[~azure.mgmt.web.models.DataTableResponseColumn] + :param rows: Raw row values + :type rows: list[list[str]] + """ + + _attribute_map = { + 'table_name': {'key': 'tableName', 'type': 'str'}, + 'columns': {'key': 'columns', 'type': '[DataTableResponseColumn]'}, + 'rows': {'key': 'rows', 'type': '[[str]]'}, + } + + def __init__(self, table_name=None, columns=None, rows=None): + super(DataTableResponseObject, self).__init__() + self.table_name = table_name + self.columns = columns + self.rows = rows diff --git a/azure-mgmt-web/azure/mgmt/web/models/detector_info.py b/azure-mgmt-web/azure/mgmt/web/models/detector_info.py new file mode 100644 index 000000000000..4c01fe87ecea --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/detector_info.py @@ -0,0 +1,50 @@ +# 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 DetectorInfo(Model): + """Definition of Detector. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar description: Short description of the detector and its purpose + :vartype description: str + :ivar category: Support Category + :vartype category: str + :ivar sub_category: Support Sub Category + :vartype sub_category: str + :ivar support_topic_id: Support Topic Id + :vartype support_topic_id: str + """ + + _validation = { + 'description': {'readonly': True}, + 'category': {'readonly': True}, + 'sub_category': {'readonly': True}, + 'support_topic_id': {'readonly': True}, + } + + _attribute_map = { + 'description': {'key': 'description', 'type': 'str'}, + 'category': {'key': 'category', 'type': 'str'}, + 'sub_category': {'key': 'subCategory', 'type': 'str'}, + 'support_topic_id': {'key': 'supportTopicId', 'type': 'str'}, + } + + def __init__(self): + super(DetectorInfo, self).__init__() + self.description = None + self.category = None + self.sub_category = None + self.support_topic_id = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/detector_response.py b/azure-mgmt-web/azure/mgmt/web/models/detector_response.py new file mode 100644 index 000000000000..bfaf8d33cb36 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/detector_response.py @@ -0,0 +1,53 @@ +# 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 DetectorResponse(ProxyOnlyResource): + """Class representing Response from Detector. + + 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 metadata: metadata for the detector + :type metadata: ~azure.mgmt.web.models.DetectorInfo + :param dataset: Data Set + :type dataset: list[~azure.mgmt.web.models.DiagnosticData] + """ + + _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'}, + 'metadata': {'key': 'properties.metadata', 'type': 'DetectorInfo'}, + 'dataset': {'key': 'properties.dataset', 'type': '[DiagnosticData]'}, + } + + def __init__(self, kind=None, metadata=None, dataset=None): + super(DetectorResponse, self).__init__(kind=kind) + self.metadata = metadata + self.dataset = dataset diff --git a/azure-mgmt-web/azure/mgmt/web/models/detector_response_paged.py b/azure-mgmt-web/azure/mgmt/web/models/detector_response_paged.py new file mode 100644 index 000000000000..57ed8d9b2788 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/detector_response_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 DetectorResponsePaged(Paged): + """ + A paging container for iterating over a list of :class:`DetectorResponse ` object + """ + + _attribute_map = { + 'next_link': {'key': 'nextLink', 'type': 'str'}, + 'current_page': {'key': 'value', 'type': '[DetectorResponse]'} + } + + def __init__(self, *args, **kwargs): + + super(DetectorResponsePaged, self).__init__(*args, **kwargs) diff --git a/azure-mgmt-web/azure/mgmt/web/models/diagnostic_data.py b/azure-mgmt-web/azure/mgmt/web/models/diagnostic_data.py new file mode 100644 index 000000000000..7208684bfb30 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/diagnostic_data.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 DiagnosticData(Model): + """Set of data with rendering instructions. + + :param table: Data in table form + :type table: ~azure.mgmt.web.models.DataTableResponseObject + :param rendering_properties: Properties that describe how the table should + be rendered + :type rendering_properties: ~azure.mgmt.web.models.Rendering + """ + + _attribute_map = { + 'table': {'key': 'table', 'type': 'DataTableResponseObject'}, + 'rendering_properties': {'key': 'renderingProperties', 'type': 'Rendering'}, + } + + def __init__(self, table=None, rendering_properties=None): + super(DiagnosticData, self).__init__() + self.table = table + self.rendering_properties = rendering_properties diff --git a/azure-mgmt-web/azure/mgmt/web/models/rendering.py b/azure-mgmt-web/azure/mgmt/web/models/rendering.py new file mode 100644 index 000000000000..c8b709727043 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/rendering.py @@ -0,0 +1,38 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class Rendering(Model): + """Instructions for rendering the data. + + :param rendering_type: Rendering Type. Possible values include: 'NoGraph', + 'Table', 'TimeSeries', 'TimeSeriesPerInstance' + :type rendering_type: str or ~azure.mgmt.web.models.RenderingType + :param title: Title of data + :type title: str + :param description: Description of the data that will help it be + interpreted + :type description: str + """ + + _attribute_map = { + 'rendering_type': {'key': 'renderingType', 'type': 'RenderingType'}, + 'title': {'key': 'title', 'type': 'str'}, + 'description': {'key': 'description', 'type': 'str'}, + } + + def __init__(self, rendering_type=None, title=None, description=None): + super(Rendering, self).__init__() + self.rendering_type = rendering_type + self.title = title + self.description = description 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 0b311784c359..4636a2b0e7d6 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 @@ -302,6 +302,14 @@ class SolutionType(Enum): best_practices = "BestPractices" +class RenderingType(Enum): + + no_graph = "NoGraph" + table = "Table" + time_series = "TimeSeries" + time_series_per_instance = "TimeSeriesPerInstance" + + class ResourceScopeType(Enum): server_farm = "ServerFarm" 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..90609947d199 100644 --- a/azure-mgmt-web/azure/mgmt/web/operations/diagnostics_operations.py +++ b/azure-mgmt-web/azure/mgmt/web/operations/diagnostics_operations.py @@ -37,6 +37,314 @@ def __init__(self, client, config, serializer, deserializer): self.config = config + def list_hosting_environment_detector_responses( + self, resource_group_name, name, custom_headers=None, raw=False, **operation_config): + """List Hosting Environment Detector Responses. + + List Hosting Environment Detector Responses. + + :param resource_group_name: Name of the resource group to which the + resource belongs. + :type resource_group_name: str + :param name: Site 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: An iterator like instance of DetectorResponse + :rtype: + ~azure.mgmt.web.models.DetectorResponsePaged[~azure.mgmt.web.models.DetectorResponse] + :raises: :class:`CloudError` + """ + def internal_paging(next_link=None, raw=False): + + if not next_link: + # Construct URL + url = self.list_hosting_environment_detector_responses.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') + + 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]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp + + return response + + # Deserialize response + deserialized = models.DetectorResponsePaged(internal_paging, self._deserialize.dependencies) + + if raw: + header_dict = {} + client_raw_response = models.DetectorResponsePaged(internal_paging, self._deserialize.dependencies, header_dict) + return client_raw_response + + return deserialized + list_hosting_environment_detector_responses.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/detectors'} + + def get_hosting_environment_detector_response( + self, resource_group_name, name, detector_name, start_time=None, end_time=None, time_grain=None, custom_headers=None, raw=False, **operation_config): + """Get Hosting Environment Detector Response. + + Get Hosting Environment Detector Response. + + :param resource_group_name: Name of the resource group to which the + resource belongs. + :type resource_group_name: str + :param name: App Service Environment Name + :type name: str + :param detector_name: Detector Resource Name + :type detector_name: str + :param start_time: Start Time + :type start_time: datetime + :param end_time: End Time + :type end_time: datetime + :param time_grain: Time Grain + :type time_grain: 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: DetectorResponse or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.DetectorResponse or + ~msrest.pipeline.ClientRawResponse + :raises: :class:`CloudError` + """ + # Construct URL + url = self.get_hosting_environment_detector_response.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'), + 'detectorName': self._serialize.url("detector_name", detector_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 start_time is not None: + query_parameters['startTime'] = self._serialize.query("start_time", start_time, 'iso-8601') + if end_time is not None: + query_parameters['endTime'] = self._serialize.query("end_time", end_time, 'iso-8601') + if time_grain is not None: + query_parameters['timeGrain'] = self._serialize.query("time_grain", time_grain, 'str', pattern=r'PT[1-9][0-9]+[SMH]') + 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('DetectorResponse', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + get_hosting_environment_detector_response.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/detectors/{detectorName}'} + + def list_site_detector_responses( + self, resource_group_name, site_name, custom_headers=None, raw=False, **operation_config): + """List Site Detector Responses. + + List Site Detector Responses. + + :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 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: An iterator like instance of DetectorResponse + :rtype: + ~azure.mgmt.web.models.DetectorResponsePaged[~azure.mgmt.web.models.DetectorResponse] + :raises: :class:`CloudError` + """ + def internal_paging(next_link=None, raw=False): + + if not next_link: + # Construct URL + url = self.list_site_detector_responses.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 = {} + 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]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp + + return response + + # Deserialize response + deserialized = models.DetectorResponsePaged(internal_paging, self._deserialize.dependencies) + + if raw: + header_dict = {} + client_raw_response = models.DetectorResponsePaged(internal_paging, self._deserialize.dependencies, header_dict) + return client_raw_response + + return deserialized + list_site_detector_responses.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{siteName}/detectors'} + + def get_site_detector_response( + self, resource_group_name, site_name, detector_name, start_time=None, end_time=None, time_grain=None, custom_headers=None, raw=False, **operation_config): + """Get site detector response. + + Get site detector response. + + :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 detector_name: Detector Resource Name + :type detector_name: str + :param start_time: Start Time + :type start_time: datetime + :param end_time: End Time + :type end_time: datetime + :param time_grain: Time Grain + :type time_grain: 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: DetectorResponse or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.DetectorResponse or + ~msrest.pipeline.ClientRawResponse + :raises: :class:`CloudError` + """ + # Construct URL + url = self.get_site_detector_response.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'), + 'detectorName': self._serialize.url("detector_name", detector_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 start_time is not None: + query_parameters['startTime'] = self._serialize.query("start_time", start_time, 'iso-8601') + if end_time is not None: + query_parameters['endTime'] = self._serialize.query("end_time", end_time, 'iso-8601') + if time_grain is not None: + query_parameters['timeGrain'] = self._serialize.query("time_grain", time_grain, 'str', pattern=r'PT[1-9][0-9]+[SMH]') + 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('DetectorResponse', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + get_site_detector_response.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{siteName}/detectors/{detectorName}'} + def list_site_diagnostic_categories( self, resource_group_name, site_name, custom_headers=None, raw=False, **operation_config): """Get Diagnostics Categories. @@ -650,6 +958,166 @@ def execute_site_detector( return deserialized execute_site_detector.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{siteName}/diagnostics/{diagnosticCategory}/detectors/{detectorName}/execute'} + def list_site_detector_responses_slot( + self, resource_group_name, site_name, slot, custom_headers=None, raw=False, **operation_config): + """List Site Detector Responses. + + List Site Detector Responses. + + :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 slot: Slot Name + :type slot: 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: An iterator like instance of DetectorResponse + :rtype: + ~azure.mgmt.web.models.DetectorResponsePaged[~azure.mgmt.web.models.DetectorResponse] + :raises: :class:`CloudError` + """ + def internal_paging(next_link=None, raw=False): + + if not next_link: + # Construct URL + url = self.list_site_detector_responses_slot.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'), + 'slot': self._serialize.url("slot", slot, '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') + + 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]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp + + return response + + # Deserialize response + deserialized = models.DetectorResponsePaged(internal_paging, self._deserialize.dependencies) + + if raw: + header_dict = {} + client_raw_response = models.DetectorResponsePaged(internal_paging, self._deserialize.dependencies, header_dict) + return client_raw_response + + return deserialized + list_site_detector_responses_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{siteName}/slots/{slot}/detectors'} + + def get_site_detector_response_slot( + self, resource_group_name, site_name, detector_name, slot, start_time=None, end_time=None, time_grain=None, custom_headers=None, raw=False, **operation_config): + """Get site detector response. + + Get site detector response. + + :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 detector_name: Detector Resource Name + :type detector_name: str + :param slot: Slot Name + :type slot: str + :param start_time: Start Time + :type start_time: datetime + :param end_time: End Time + :type end_time: datetime + :param time_grain: Time Grain + :type time_grain: 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: DetectorResponse or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.DetectorResponse or + ~msrest.pipeline.ClientRawResponse + :raises: :class:`CloudError` + """ + # Construct URL + url = self.get_site_detector_response_slot.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'), + 'detectorName': self._serialize.url("detector_name", detector_name, 'str'), + 'slot': self._serialize.url("slot", slot, '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 start_time is not None: + query_parameters['startTime'] = self._serialize.query("start_time", start_time, 'iso-8601') + if end_time is not None: + query_parameters['endTime'] = self._serialize.query("end_time", end_time, 'iso-8601') + if time_grain is not None: + query_parameters['timeGrain'] = self._serialize.query("time_grain", time_grain, 'str', pattern=r'PT[1-9][0-9]+[SMH]') + 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('DetectorResponse', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + get_site_detector_response_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{siteName}/slots/{slot}/detectors/{detectorName}'} + def list_site_diagnostic_categories_slot( self, resource_group_name, site_name, slot, custom_headers=None, raw=False, **operation_config): """Get Diagnostics Categories. 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 1d1bb5d4bb57..89bcbe7254e9 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 @@ -19767,7 +19767,7 @@ def get_source_control_slot( 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]: + if response.status_code not in [200, 201, 202]: exp = CloudError(response) exp.request_id = response.headers.get('x-ms-request-id') raise exp @@ -19776,6 +19776,10 @@ def get_source_control_slot( if response.status_code == 200: deserialized = self._deserialize('SiteSourceControl', response) + if response.status_code == 201: + deserialized = self._deserialize('SiteSourceControl', response) + if response.status_code == 202: + deserialized = self._deserialize('SiteSourceControl', response) if raw: client_raw_response = ClientRawResponse(deserialized, response) @@ -19819,7 +19823,7 @@ def _create_or_update_source_control_slot_initial( response = self._client.send( request, header_parameters, body_content, stream=False, **operation_config) - if response.status_code not in [200, 201]: + if response.status_code not in [200, 201, 202]: exp = CloudError(response) exp.request_id = response.headers.get('x-ms-request-id') raise exp @@ -19830,6 +19834,8 @@ def _create_or_update_source_control_slot_initial( deserialized = self._deserialize('SiteSourceControl', response) if response.status_code == 201: deserialized = self._deserialize('SiteSourceControl', response) + if response.status_code == 202: + deserialized = self._deserialize('SiteSourceControl', response) if raw: client_raw_response = ClientRawResponse(deserialized, response) @@ -19893,7 +19899,7 @@ def get_long_running_status(status_link, headers=None): def get_long_running_output(response): - if response.status_code not in [200, 201]: + if response.status_code not in [200, 201, 202]: exp = CloudError(response) exp.request_id = response.headers.get('x-ms-request-id') raise exp From 2feef0c8347e834a11d53e2af14ce364d9d377c6 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Fri, 4 May 2018 10:36:58 -0700 Subject: [PATCH 09/19] Generated from 803aa2f0154403f9b82544013d0f108a5f0781d2 (#2533) https://github.com/Azure/azure-rest-api-specs/issues/2907 --- .../app_service_environments_operations.py | 4 ++-- .../azure/mgmt/web/operations/web_apps_operations.py | 12 +++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) 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..b7d3c51d4d22 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 @@ -1478,7 +1478,7 @@ def internal_paging(next_link=None, raw=False): return client_raw_response return deserialized - list_multi_role_pool_instance_metrics.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools/default/instances/{instance}metrics'} + list_multi_role_pool_instance_metrics.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools/default/instances/{instance}/metrics'} def list_multi_role_metric_definitions( self, resource_group_name, name, custom_headers=None, raw=False, **operation_config): @@ -2911,7 +2911,7 @@ def internal_paging(next_link=None, raw=False): return client_raw_response return deserialized - list_worker_pool_instance_metrics.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools/{workerPoolName}/instances/{instance}metrics'} + list_worker_pool_instance_metrics.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools/{workerPoolName}/instances/{instance}/metrics'} def list_web_worker_metric_definitions( self, resource_group_name, name, worker_pool_name, custom_headers=None, raw=False, **operation_config): 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 89bcbe7254e9..6f868fd1fc3d 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 @@ -21919,7 +21919,7 @@ def get_source_control( 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]: + if response.status_code not in [200, 201, 202]: exp = CloudError(response) exp.request_id = response.headers.get('x-ms-request-id') raise exp @@ -21928,6 +21928,10 @@ def get_source_control( if response.status_code == 200: deserialized = self._deserialize('SiteSourceControl', response) + if response.status_code == 201: + deserialized = self._deserialize('SiteSourceControl', response) + if response.status_code == 202: + deserialized = self._deserialize('SiteSourceControl', response) if raw: client_raw_response = ClientRawResponse(deserialized, response) @@ -21970,7 +21974,7 @@ def _create_or_update_source_control_initial( response = self._client.send( request, header_parameters, body_content, stream=False, **operation_config) - if response.status_code not in [200, 201]: + if response.status_code not in [200, 201, 202]: exp = CloudError(response) exp.request_id = response.headers.get('x-ms-request-id') raise exp @@ -21981,6 +21985,8 @@ def _create_or_update_source_control_initial( deserialized = self._deserialize('SiteSourceControl', response) if response.status_code == 201: deserialized = self._deserialize('SiteSourceControl', response) + if response.status_code == 202: + deserialized = self._deserialize('SiteSourceControl', response) if raw: client_raw_response = ClientRawResponse(deserialized, response) @@ -22039,7 +22045,7 @@ def get_long_running_status(status_link, headers=None): def get_long_running_output(response): - if response.status_code not in [200, 201]: + if response.status_code not in [200, 201, 202]: exp = CloudError(response) exp.request_id = response.headers.get('x-ms-request-id') raise exp From 4eb5eea43149f883facb1e1f5acce911ccaa80ba Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Tue, 29 May 2018 21:20:34 +0000 Subject: [PATCH 10/19] Rebuild by https://github.com/Azure/azure-sdk-for-python/pull/2065 --- .../azure/mgmt/web/models/__init__.py | 641 +++++++---- .../mgmt/web/models/abnormal_time_period.py | 12 +- .../web/models/abnormal_time_period_py3.py | 40 + .../azure/mgmt/web/models/address.py | 28 +- .../azure/mgmt/web/models/address_py3.py | 58 + .../azure/mgmt/web/models/address_response.py | 12 +- .../mgmt/web/models/address_response_py3.py | 42 + .../azure/mgmt/web/models/analysis_data.py | 14 +- .../mgmt/web/models/analysis_data_py3.py | 44 + .../mgmt/web/models/analysis_definition.py | 4 +- .../web/models/analysis_definition_py3.py | 50 + .../mgmt/web/models/api_definition_info.py | 6 +- .../web/models/api_definition_info_py3.py | 28 + .../web/models/app_service_certificate.py | 8 +- .../models/app_service_certificate_order.py | 27 +- ...ervice_certificate_order_patch_resource.py | 25 +- ...ce_certificate_order_patch_resource_py3.py | 150 +++ .../app_service_certificate_order_py3.py | 157 +++ .../app_service_certificate_patch_resource.py | 8 +- ..._service_certificate_patch_resource_py3.py | 65 ++ .../web/models/app_service_certificate_py3.py | 49 + .../app_service_certificate_resource.py | 12 +- .../app_service_certificate_resource_py3.py | 74 ++ .../web/models/app_service_environment.py | 55 +- .../app_service_environment_patch_resource.py | 57 +- ..._service_environment_patch_resource_py3.py | 247 ++++ .../web/models/app_service_environment_py3.py | 231 ++++ .../app_service_environment_resource.py | 60 +- .../app_service_environment_resource_py3.py | 254 +++++ .../azure/mgmt/web/models/app_service_plan.py | 32 +- .../models/app_service_plan_patch_resource.py | 30 +- .../app_service_plan_patch_resource_py3.py | 138 +++ .../mgmt/web/models/app_service_plan_py3.py | 148 +++ .../web/models/application_logs_config.py | 10 +- .../web/models/application_logs_config_py3.py | 39 + .../mgmt/web/models/application_stack.py | 14 +- .../mgmt/web/models/application_stack_py3.py | 44 + .../mgmt/web/models/auto_heal_actions.py | 10 +- .../mgmt/web/models/auto_heal_actions_py3.py | 38 + .../web/models/auto_heal_custom_action.py | 8 +- .../web/models/auto_heal_custom_action_py3.py | 33 + .../azure/mgmt/web/models/auto_heal_rules.py | 8 +- .../mgmt/web/models/auto_heal_rules_py3.py | 33 + .../mgmt/web/models/auto_heal_triggers.py | 12 +- .../mgmt/web/models/auto_heal_triggers_py3.py | 40 + ...re_blob_storage_application_logs_config.py | 10 +- ...lob_storage_application_logs_config_py3.py | 40 + .../azure_blob_storage_http_logs_config.py | 10 +- ...azure_blob_storage_http_logs_config_py3.py | 40 + ...e_table_storage_application_logs_config.py | 12 +- ...ble_storage_application_logs_config_py3.py | 40 + .../azure/mgmt/web/models/backup_item.py | 4 +- .../azure/mgmt/web/models/backup_item_py3.py | 122 ++ .../azure/mgmt/web/models/backup_request.py | 22 +- .../mgmt/web/models/backup_request_py3.py | 77 ++ .../azure/mgmt/web/models/backup_schedule.py | 36 +- .../mgmt/web/models/backup_schedule_py3.py | 70 ++ .../azure/mgmt/web/models/billing_meter.py | 14 +- .../mgmt/web/models/billing_meter_py3.py | 66 ++ .../azure/mgmt/web/models/capability.py | 10 +- .../azure/mgmt/web/models/capability_py3.py | 36 + .../azure/mgmt/web/models/certificate.py | 22 +- .../mgmt/web/models/certificate_details.py | 4 +- .../web/models/certificate_details_py3.py | 75 ++ .../mgmt/web/models/certificate_email.py | 8 +- .../mgmt/web/models/certificate_email_py3.py | 53 + .../web/models/certificate_order_action.py | 8 +- .../models/certificate_order_action_py3.py | 59 + .../web/models/certificate_patch_resource.py | 20 +- .../models/certificate_patch_resource_py3.py | 152 +++ .../azure/mgmt/web/models/certificate_py3.py | 159 +++ .../azure/mgmt/web/models/cloning_info.py | 32 +- .../azure/mgmt/web/models/cloning_info_py3.py | 93 ++ .../azure/mgmt/web/models/conn_string_info.py | 10 +- .../mgmt/web/models/conn_string_info_py3.py | 38 + .../web/models/conn_string_value_type_pair.py | 14 +- .../models/conn_string_value_type_pair_py3.py | 41 + .../models/connection_string_dictionary.py | 6 +- .../connection_string_dictionary_py3.py | 50 + .../azure/mgmt/web/models/contact.py | 32 +- .../azure/mgmt/web/models/contact_py3.py | 72 ++ .../mgmt/web/models/continuous_web_job.py | 24 +- .../mgmt/web/models/continuous_web_job_py3.py | 93 ++ .../azure/mgmt/web/models/cors_settings.py | 6 +- .../mgmt/web/models/cors_settings_py3.py | 30 + .../web/models/csm_move_resource_envelope.py | 8 +- .../models/csm_move_resource_envelope_py3.py | 37 + .../web/models/csm_operation_description.py | 12 +- .../csm_operation_description_properties.py | 6 +- ...sm_operation_description_properties_py3.py | 28 + .../models/csm_operation_description_py3.py | 40 + .../mgmt/web/models/csm_operation_display.py | 12 +- .../web/models/csm_operation_display_py3.py | 40 + .../models/csm_publishing_profile_options.py | 6 +- .../csm_publishing_profile_options_py3.py | 31 + .../azure/mgmt/web/models/csm_slot_entity.py | 17 +- .../mgmt/web/models/csm_slot_entity_py3.py | 41 + .../azure/mgmt/web/models/csm_usage_quota.py | 14 +- .../mgmt/web/models/csm_usage_quota_py3.py | 44 + .../models/custom_hostname_analysis_result.py | 14 +- .../custom_hostname_analysis_result_py3.py | 105 ++ .../azure/mgmt/web/models/data_source.py | 8 +- .../azure/mgmt/web/models/data_source_py3.py | 32 + .../web/models/data_table_response_column.py | 10 +- .../models/data_table_response_column_py3.py | 36 + .../web/models/data_table_response_object.py | 10 +- .../models/data_table_response_object_py3.py | 36 + .../web/models/database_backup_setting.py | 18 +- .../web/models/database_backup_setting_py3.py | 51 + .../mgmt/web/models/default_error_response.py | 4 +- .../models/default_error_response_error.py | 6 +- ...fault_error_response_error_details_item.py | 4 +- ...t_error_response_error_details_item_py3.py | 45 + .../default_error_response_error_py3.py | 55 + .../web/models/default_error_response_py3.py | 48 + .../azure/mgmt/web/models/deleted_site.py | 6 +- .../azure/mgmt/web/models/deleted_site_py3.py | 59 + .../azure/mgmt/web/models/deployment.py | 24 +- .../mgmt/web/models/deployment_locations.py | 10 +- .../web/models/deployment_locations_py3.py | 41 + .../azure/mgmt/web/models/deployment_py3.py | 86 ++ .../models/detector_abnormal_time_period.py | 20 +- .../detector_abnormal_time_period_py3.py | 58 + .../mgmt/web/models/detector_definition.py | 4 +- .../web/models/detector_definition_py3.py | 65 ++ .../azure/mgmt/web/models/detector_info.py | 4 +- .../mgmt/web/models/detector_info_py3.py | 50 + .../mgmt/web/models/detector_response.py | 8 +- .../mgmt/web/models/detector_response_py3.py | 53 + .../mgmt/web/models/diagnostic_analysis.py | 14 +- .../web/models/diagnostic_analysis_py3.py | 68 ++ .../mgmt/web/models/diagnostic_category.py | 4 +- .../web/models/diagnostic_category_py3.py | 50 + .../azure/mgmt/web/models/diagnostic_data.py | 8 +- .../mgmt/web/models/diagnostic_data_py3.py | 33 + .../models/diagnostic_detector_response.py | 20 +- .../diagnostic_detector_response_py3.py | 79 ++ .../web/models/diagnostic_metric_sample.py | 16 +- .../models/diagnostic_metric_sample_py3.py | 56 + .../mgmt/web/models/diagnostic_metric_set.py | 16 +- .../web/models/diagnostic_metric_set_py3.py | 51 + .../azure/mgmt/web/models/dimension.py | 12 +- .../azure/mgmt/web/models/dimension_py3.py | 42 + .../azure/mgmt/web/models/domain.py | 40 +- .../domain_availablility_check_result.py | 10 +- .../domain_availablility_check_result_py3.py | 40 + .../domain_control_center_sso_request.py | 4 +- .../domain_control_center_sso_request_py3.py | 46 + .../web/models/domain_ownership_identifier.py | 6 +- .../models/domain_ownership_identifier_py3.py | 49 + .../mgmt/web/models/domain_patch_resource.py | 38 +- .../web/models/domain_patch_resource_py3.py | 156 +++ .../web/models/domain_purchase_consent.py | 10 +- .../web/models/domain_purchase_consent_py3.py | 39 + .../azure/mgmt/web/models/domain_py3.py | 163 +++ ...domain_recommendation_search_parameters.py | 8 +- ...in_recommendation_search_parameters_py3.py | 33 + .../azure/mgmt/web/models/enabled_config.py | 6 +- .../mgmt/web/models/enabled_config_py3.py | 29 + .../azure/mgmt/web/models/error_entity.py | 16 +- .../azure/mgmt/web/models/error_entity_py3.py | 48 + .../azure/mgmt/web/models/error_response.py | 8 +- .../mgmt/web/models/error_response_py3.py | 45 + .../azure/mgmt/web/models/experiments.py | 6 +- .../azure/mgmt/web/models/experiments_py3.py | 28 + .../file_system_application_logs_config.py | 6 +- ...file_system_application_logs_config_py3.py | 29 + .../models/file_system_http_logs_config.py | 10 +- .../file_system_http_logs_config_py3.py | 46 + .../mgmt/web/models/function_envelope.py | 20 +- .../mgmt/web/models/function_envelope_py3.py | 87 ++ .../azure/mgmt/web/models/function_secrets.py | 8 +- .../mgmt/web/models/function_secrets_py3.py | 53 + .../azure/mgmt/web/models/geo_region.py | 4 +- .../azure/mgmt/web/models/geo_region_py3.py | 60 + .../web/models/global_csm_sku_description.py | 18 +- .../models/global_csm_sku_description_py3.py | 53 + .../azure/mgmt/web/models/handler_mapping.py | 10 +- .../mgmt/web/models/handler_mapping_py3.py | 41 + .../azure/mgmt/web/models/host_name.py | 16 +- .../mgmt/web/models/host_name_binding.py | 20 +- .../mgmt/web/models/host_name_binding_py3.py | 88 ++ .../azure/mgmt/web/models/host_name_py3.py | 56 + .../mgmt/web/models/host_name_ssl_state.py | 16 +- .../web/models/host_name_ssl_state_py3.py | 51 + .../hosting_environment_deployment_info.py | 8 +- ...hosting_environment_deployment_info_py3.py | 32 + .../models/hosting_environment_diagnostics.py | 8 +- .../hosting_environment_diagnostics_py3.py | 32 + .../web/models/hosting_environment_profile.py | 6 +- .../models/hosting_environment_profile_py3.py | 44 + .../azure/mgmt/web/models/http_logs_config.py | 8 +- .../mgmt/web/models/http_logs_config_py3.py | 33 + .../mgmt/web/models/hybrid_connection.py | 20 +- .../mgmt/web/models/hybrid_connection_key.py | 4 +- .../web/models/hybrid_connection_key_py3.py | 56 + .../web/models/hybrid_connection_limits.py | 4 +- .../models/hybrid_connection_limits_py3.py | 56 + .../mgmt/web/models/hybrid_connection_py3.py | 81 ++ .../azure/mgmt/web/models/identifier.py | 6 +- .../azure/mgmt/web/models/identifier_py3.py | 49 + .../web/models/ip_security_restriction.py | 13 +- .../web/models/ip_security_restriction_py3.py | 40 + .../mgmt/web/models/localizable_string.py | 8 +- .../mgmt/web/models/localizable_string_py3.py | 32 + .../web/models/managed_service_identity.py | 6 +- .../models/managed_service_identity_py3.py | 45 + .../mgmt/web/models/metric_availabilily.py | 8 +- .../web/models/metric_availabilily_py3.py | 32 + .../mgmt/web/models/metric_availability.py | 8 +- .../web/models/metric_availability_py3.py | 32 + .../mgmt/web/models/metric_definition.py | 4 +- .../mgmt/web/models/metric_definition_py3.py | 72 ++ .../mgmt/web/models/metric_specification.py | 34 +- .../web/models/metric_specification_py3.py | 84 ++ .../mgmt/web/models/migrate_my_sql_request.py | 17 +- .../web/models/migrate_my_sql_request_py3.py | 59 + .../mgmt/web/models/migrate_my_sql_status.py | 4 +- .../web/models/migrate_my_sql_status_py3.py | 62 + .../azure/mgmt/web/models/ms_deploy.py | 18 +- .../azure/mgmt/web/models/ms_deploy_log.py | 4 +- .../mgmt/web/models/ms_deploy_log_entry.py | 4 +- .../web/models/ms_deploy_log_entry_py3.py | 46 + .../mgmt/web/models/ms_deploy_log_py3.py | 50 + .../azure/mgmt/web/models/ms_deploy_py3.py | 83 ++ .../azure/mgmt/web/models/ms_deploy_status.py | 4 +- .../mgmt/web/models/ms_deploy_status_py3.py | 72 ++ .../azure/mgmt/web/models/name_identifier.py | 6 +- .../mgmt/web/models/name_identifier_py3.py | 28 + .../azure/mgmt/web/models/name_value_pair.py | 8 +- .../mgmt/web/models/name_value_pair_py3.py | 32 + .../models/network_access_control_entry.py | 12 +- .../network_access_control_entry_py3.py | 40 + .../azure/mgmt/web/models/network_features.py | 4 +- .../mgmt/web/models/network_features_py3.py | 68 ++ .../azure/mgmt/web/models/operation.py | 20 +- .../azure/mgmt/web/models/operation_py3.py | 57 + .../mgmt/web/models/perf_mon_response.py | 10 +- .../mgmt/web/models/perf_mon_response_py3.py | 36 + .../azure/mgmt/web/models/perf_mon_sample.py | 12 +- .../mgmt/web/models/perf_mon_sample_py3.py | 40 + .../azure/mgmt/web/models/perf_mon_set.py | 14 +- .../azure/mgmt/web/models/perf_mon_set_py3.py | 44 + .../azure/mgmt/web/models/premier_add_on.py | 24 +- .../mgmt/web/models/premier_add_on_offer.py | 26 +- .../web/models/premier_add_on_offer_py3.py | 93 ++ .../mgmt/web/models/premier_add_on_py3.py | 86 ++ .../azure/mgmt/web/models/process_info.py | 76 +- .../azure/mgmt/web/models/process_info_py3.py | 189 +++ .../mgmt/web/models/process_module_info.py | 26 +- .../web/models/process_module_info_py3.py | 90 ++ .../mgmt/web/models/process_thread_info.py | 30 +- .../web/models/process_thread_info_py3.py | 97 ++ .../mgmt/web/models/proxy_only_resource.py | 6 +- .../web/models/proxy_only_resource_py3.py | 50 + .../mgmt/web/models/public_certificate.py | 8 +- .../mgmt/web/models/public_certificate_py3.py | 60 + .../azure/mgmt/web/models/push_settings.py | 18 +- .../mgmt/web/models/push_settings_py3.py | 73 ++ .../azure/mgmt/web/models/ramp_up_rule.py | 20 +- .../azure/mgmt/web/models/ramp_up_rule_py3.py | 72 ++ .../azure/mgmt/web/models/recommendation.py | 46 +- .../mgmt/web/models/recommendation_py3.py | 144 +++ .../mgmt/web/models/recommendation_rule.py | 30 +- .../web/models/recommendation_rule_py3.py | 108 ++ .../reissue_certificate_order_request.py | 12 +- .../reissue_certificate_order_request_py3.py | 63 + .../models/relay_service_connection_entity.py | 18 +- .../relay_service_connection_entity_py3.py | 73 ++ .../azure/mgmt/web/models/rendering.py | 10 +- .../azure/mgmt/web/models/rendering_py3.py | 38 + .../models/renew_certificate_order_request.py | 10 +- .../renew_certificate_order_request_py3.py | 58 + .../mgmt/web/models/requests_based_trigger.py | 8 +- .../web/models/requests_based_trigger_py3.py | 32 + .../azure/mgmt/web/models/resource.py | 14 +- .../web/models/resource_health_metadata.py | 8 +- .../models/resource_health_metadata_py3.py | 54 + .../azure/mgmt/web/models/resource_metric.py | 4 +- .../models/resource_metric_availability.py | 4 +- .../resource_metric_availability_py3.py | 40 + .../web/models/resource_metric_definition.py | 4 +- .../models/resource_metric_definition_py3.py | 83 ++ .../mgmt/web/models/resource_metric_name.py | 4 +- .../web/models/resource_metric_name_py3.py | 40 + .../web/models/resource_metric_property.py | 8 +- .../models/resource_metric_property_py3.py | 32 + .../mgmt/web/models/resource_metric_py3.py | 75 ++ .../mgmt/web/models/resource_metric_value.py | 4 +- .../web/models/resource_metric_value_py3.py | 65 ++ .../web/models/resource_name_availability.py | 10 +- .../models/resource_name_availability_py3.py | 45 + .../resource_name_availability_request.py | 18 +- .../resource_name_availability_request_py3.py | 46 + .../azure/mgmt/web/models/resource_py3.py | 60 + .../mgmt/web/models/response_meta_data.py | 6 +- .../mgmt/web/models/response_meta_data_py3.py | 28 + .../azure/mgmt/web/models/restore_request.py | 36 +- .../mgmt/web/models/restore_request_py3.py | 107 ++ .../azure/mgmt/web/models/restore_response.py | 4 +- .../mgmt/web/models/restore_response_py3.py | 51 + .../mgmt/web/models/service_specification.py | 6 +- .../web/models/service_specification_py3.py | 29 + azure-mgmt-web/azure/mgmt/web/models/site.py | 40 +- .../mgmt/web/models/site_auth_settings.py | 50 +- .../mgmt/web/models/site_auth_settings_py3.py | 230 ++++ .../mgmt/web/models/site_cloneability.py | 12 +- .../web/models/site_cloneability_criterion.py | 8 +- .../models/site_cloneability_criterion_py3.py | 32 + .../mgmt/web/models/site_cloneability_py3.py | 48 + .../azure/mgmt/web/models/site_config.py | 92 +- .../azure/mgmt/web/models/site_config_py3.py | 233 ++++ .../mgmt/web/models/site_config_resource.py | 92 +- .../web/models/site_config_resource_py3.py | 248 ++++ .../site_configuration_snapshot_info.py | 4 +- .../site_configuration_snapshot_info_py3.py | 55 + .../mgmt/web/models/site_extension_info.py | 44 +- .../web/models/site_extension_info_py3.py | 128 +++ .../azure/mgmt/web/models/site_instance.py | 4 +- .../mgmt/web/models/site_instance_py3.py | 50 + .../azure/mgmt/web/models/site_limits.py | 10 +- .../azure/mgmt/web/models/site_limits_py3.py | 36 + .../azure/mgmt/web/models/site_logs_config.py | 12 +- .../mgmt/web/models/site_logs_config_py3.py | 61 + .../azure/mgmt/web/models/site_machine_key.py | 12 +- .../mgmt/web/models/site_machine_key_py3.py | 40 + .../mgmt/web/models/site_patch_resource.py | 34 +- .../web/models/site_patch_resource_py3.py | 230 ++++ .../web/models/site_php_error_log_flag.py | 12 +- .../web/models/site_php_error_log_flag_py3.py | 61 + .../azure/mgmt/web/models/site_py3.py | 243 ++++ .../azure/mgmt/web/models/site_seal.py | 10 +- .../azure/mgmt/web/models/site_seal_py3.py | 34 + .../mgmt/web/models/site_seal_request.py | 8 +- .../mgmt/web/models/site_seal_request_py3.py | 33 + .../mgmt/web/models/site_source_control.py | 14 +- .../web/models/site_source_control_py3.py | 69 ++ .../azure/mgmt/web/models/sku_capacity.py | 12 +- .../azure/mgmt/web/models/sku_capacity_py3.py | 40 + .../azure/mgmt/web/models/sku_description.py | 20 +- .../mgmt/web/models/sku_description_py3.py | 57 + .../azure/mgmt/web/models/sku_info.py | 10 +- .../azure/mgmt/web/models/sku_info_py3.py | 36 + .../azure/mgmt/web/models/sku_infos.py | 8 +- .../azure/mgmt/web/models/sku_infos_py3.py | 32 + .../web/models/slot_config_names_resource.py | 8 +- .../models/slot_config_names_resource_py3.py | 53 + .../azure/mgmt/web/models/slot_difference.py | 4 +- .../mgmt/web/models/slot_difference_py3.py | 83 ++ .../azure/mgmt/web/models/slot_swap_status.py | 4 +- .../mgmt/web/models/slot_swap_status_py3.py | 46 + .../web/models/slow_requests_based_trigger.py | 10 +- .../models/slow_requests_based_trigger_py3.py | 36 + .../azure/mgmt/web/models/snapshot.py | 4 +- .../azure/mgmt/web/models/snapshot_py3.py | 50 + .../web/models/snapshot_recovery_request.py | 20 +- .../models/snapshot_recovery_request_py3.py | 74 ++ .../web/models/snapshot_recovery_target.py | 8 +- .../models/snapshot_recovery_target_py3.py | 37 + .../azure/mgmt/web/models/solution.py | 18 +- .../azure/mgmt/web/models/solution_py3.py | 53 + .../azure/mgmt/web/models/source_control.py | 14 +- .../mgmt/web/models/source_control_py3.py | 65 ++ .../mgmt/web/models/stack_major_version.py | 12 +- .../web/models/stack_major_version_py3.py | 41 + .../mgmt/web/models/stack_minor_version.py | 10 +- .../web/models/stack_minor_version_py3.py | 37 + .../azure/mgmt/web/models/stamp_capacity.py | 24 +- .../mgmt/web/models/stamp_capacity_py3.py | 74 ++ .../web/models/status_codes_based_trigger.py | 14 +- .../models/status_codes_based_trigger_py3.py | 44 + .../web/models/storage_migration_options.py | 19 +- .../models/storage_migration_options_py3.py | 69 ++ .../web/models/storage_migration_response.py | 4 +- .../models/storage_migration_response_py3.py | 51 + .../mgmt/web/models/string_dictionary.py | 6 +- .../mgmt/web/models/string_dictionary_py3.py | 49 + .../mgmt/web/models/tld_legal_agreement.py | 20 +- .../web/models/tld_legal_agreement_py3.py | 48 + .../azure/mgmt/web/models/top_level_domain.py | 6 +- .../top_level_domain_agreement_option.py | 8 +- .../top_level_domain_agreement_option_py3.py | 36 + .../mgmt/web/models/top_level_domain_py3.py | 55 + .../mgmt/web/models/triggered_job_history.py | 6 +- .../web/models/triggered_job_history_py3.py | 50 + .../mgmt/web/models/triggered_job_run.py | 24 +- .../mgmt/web/models/triggered_job_run_py3.py | 91 ++ .../mgmt/web/models/triggered_web_job.py | 24 +- .../mgmt/web/models/triggered_web_job_py3.py | 92 ++ azure-mgmt-web/azure/mgmt/web/models/usage.py | 4 +- .../azure/mgmt/web/models/usage_py3.py | 91 ++ azure-mgmt-web/azure/mgmt/web/models/user.py | 18 +- .../azure/mgmt/web/models/user_py3.py | 69 ++ .../azure/mgmt/web/models/validate_request.py | 32 +- .../mgmt/web/models/validate_request_py3.py | 74 ++ .../mgmt/web/models/validate_response.py | 8 +- .../web/models/validate_response_error.py | 8 +- .../web/models/validate_response_error_py3.py | 32 + .../mgmt/web/models/validate_response_py3.py | 32 + .../mgmt/web/models/virtual_application.py | 12 +- .../web/models/virtual_application_py3.py | 41 + .../mgmt/web/models/virtual_directory.py | 8 +- .../mgmt/web/models/virtual_directory_py3.py | 32 + .../mgmt/web/models/virtual_ip_mapping.py | 12 +- .../mgmt/web/models/virtual_ip_mapping_py3.py | 40 + .../web/models/virtual_network_profile.py | 8 +- .../web/models/virtual_network_profile_py3.py | 48 + .../azure/mgmt/web/models/vnet_gateway.py | 13 +- .../azure/mgmt/web/models/vnet_gateway_py3.py | 58 + .../azure/mgmt/web/models/vnet_info.py | 10 +- .../azure/mgmt/web/models/vnet_info_py3.py | 76 ++ .../azure/mgmt/web/models/vnet_parameters.py | 10 +- .../mgmt/web/models/vnet_parameters_py3.py | 57 + .../azure/mgmt/web/models/vnet_route.py | 12 +- .../azure/mgmt/web/models/vnet_route_py3.py | 72 ++ .../models/vnet_validation_failure_details.py | 8 +- .../vnet_validation_failure_details_py3.py | 53 + .../models/vnet_validation_test_failure.py | 8 +- .../vnet_validation_test_failure_py3.py | 54 + .../mgmt/web/models/web_app_collection.py | 10 +- .../mgmt/web/models/web_app_collection_py3.py | 42 + .../azure/mgmt/web/models/web_job.py | 18 +- .../azure/mgmt/web/models/web_job_py3.py | 79 ++ .../web_site_management_client_enums.py | 118 +- .../azure/mgmt/web/models/worker_pool.py | 12 +- .../azure/mgmt/web/models/worker_pool_py3.py | 53 + .../mgmt/web/models/worker_pool_resource.py | 14 +- .../web/models/worker_pool_resource_py3.py | 72 ++ ...p_service_certificate_orders_operations.py | 98 +- .../app_service_environments_operations.py | 280 ++--- .../app_service_plans_operations.py | 50 +- .../mgmt/web/operations/domains_operations.py | 50 +- .../web/operations/web_apps_operations.py | 1013 +++++------------ .../mgmt/web/web_site_management_client.py | 9 +- 434 files changed, 16487 insertions(+), 2834 deletions(-) create mode 100644 azure-mgmt-web/azure/mgmt/web/models/abnormal_time_period_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/address_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/address_response_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/analysis_data_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/analysis_definition_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/api_definition_info_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_order_patch_resource_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_order_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_patch_resource_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_resource_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/app_service_environment_patch_resource_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/app_service_environment_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/app_service_environment_resource_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/app_service_plan_patch_resource_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/app_service_plan_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/application_logs_config_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/application_stack_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/auto_heal_actions_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/auto_heal_custom_action_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/auto_heal_rules_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/auto_heal_triggers_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/azure_blob_storage_application_logs_config_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/azure_blob_storage_http_logs_config_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/azure_table_storage_application_logs_config_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/backup_item_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/backup_request_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/backup_schedule_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/billing_meter_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/capability_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/certificate_details_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/certificate_email_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/certificate_order_action_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/certificate_patch_resource_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/certificate_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/cloning_info_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/conn_string_info_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/conn_string_value_type_pair_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/connection_string_dictionary_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/contact_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/continuous_web_job_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/cors_settings_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/csm_move_resource_envelope_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/csm_operation_description_properties_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/csm_operation_description_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/csm_operation_display_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/csm_publishing_profile_options_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/csm_slot_entity_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/csm_usage_quota_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/custom_hostname_analysis_result_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/data_source_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/data_table_response_column_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/data_table_response_object_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/database_backup_setting_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/default_error_response_error_details_item_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/default_error_response_error_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/default_error_response_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/deleted_site_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/deployment_locations_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/deployment_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/detector_abnormal_time_period_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/detector_definition_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/detector_info_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/detector_response_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/diagnostic_analysis_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/diagnostic_category_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/diagnostic_data_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/diagnostic_detector_response_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/diagnostic_metric_sample_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/diagnostic_metric_set_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/dimension_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/domain_availablility_check_result_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/domain_control_center_sso_request_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/domain_ownership_identifier_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/domain_patch_resource_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/domain_purchase_consent_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/domain_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/domain_recommendation_search_parameters_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/enabled_config_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/error_entity_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/error_response_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/experiments_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/file_system_application_logs_config_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/file_system_http_logs_config_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/function_envelope_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/function_secrets_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/geo_region_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/global_csm_sku_description_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/handler_mapping_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/host_name_binding_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/host_name_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/host_name_ssl_state_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/hosting_environment_deployment_info_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/hosting_environment_diagnostics_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/hosting_environment_profile_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/http_logs_config_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/hybrid_connection_key_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/hybrid_connection_limits_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/hybrid_connection_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/identifier_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/ip_security_restriction_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/localizable_string_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/managed_service_identity_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/metric_availabilily_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/metric_availability_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/metric_definition_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/metric_specification_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/migrate_my_sql_request_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/migrate_my_sql_status_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/ms_deploy_log_entry_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/ms_deploy_log_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/ms_deploy_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/ms_deploy_status_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/name_identifier_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/name_value_pair_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/network_access_control_entry_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/network_features_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/operation_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/perf_mon_response_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/perf_mon_sample_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/perf_mon_set_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/premier_add_on_offer_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/premier_add_on_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/process_info_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/process_module_info_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/process_thread_info_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/proxy_only_resource_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/public_certificate_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/push_settings_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/ramp_up_rule_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/recommendation_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/recommendation_rule_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/reissue_certificate_order_request_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/relay_service_connection_entity_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/rendering_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/renew_certificate_order_request_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/requests_based_trigger_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/resource_health_metadata_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/resource_metric_availability_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/resource_metric_definition_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/resource_metric_name_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/resource_metric_property_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/resource_metric_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/resource_metric_value_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/resource_name_availability_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/resource_name_availability_request_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/resource_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/response_meta_data_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/restore_request_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/restore_response_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/service_specification_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/site_auth_settings_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/site_cloneability_criterion_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/site_cloneability_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/site_config_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/site_config_resource_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/site_configuration_snapshot_info_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/site_extension_info_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/site_instance_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/site_limits_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/site_logs_config_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/site_machine_key_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/site_patch_resource_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/site_php_error_log_flag_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/site_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/site_seal_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/site_seal_request_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/site_source_control_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/sku_capacity_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/sku_description_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/sku_info_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/sku_infos_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/slot_config_names_resource_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/slot_difference_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/slot_swap_status_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/slow_requests_based_trigger_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/snapshot_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/snapshot_recovery_request_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/snapshot_recovery_target_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/solution_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/source_control_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/stack_major_version_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/stack_minor_version_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/stamp_capacity_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/status_codes_based_trigger_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/storage_migration_options_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/storage_migration_response_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/string_dictionary_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/tld_legal_agreement_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/top_level_domain_agreement_option_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/top_level_domain_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/triggered_job_history_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/triggered_job_run_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/triggered_web_job_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/usage_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/user_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/validate_request_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/validate_response_error_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/validate_response_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/virtual_application_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/virtual_directory_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/virtual_ip_mapping_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/virtual_network_profile_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/vnet_gateway_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/vnet_info_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/vnet_parameters_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/vnet_route_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/vnet_validation_failure_details_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/vnet_validation_test_failure_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/web_app_collection_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/web_job_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/worker_pool_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/worker_pool_resource_py3.py diff --git a/azure-mgmt-web/azure/mgmt/web/models/__init__.py b/azure-mgmt-web/azure/mgmt/web/models/__init__.py index 1e376153b5a4..3e8d506ff635 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/__init__.py +++ b/azure-mgmt-web/azure/mgmt/web/models/__init__.py @@ -9,219 +9,434 @@ # regenerated. # -------------------------------------------------------------------------- -from .app_service_certificate import AppServiceCertificate -from .app_service_certificate_resource import AppServiceCertificateResource -from .certificate_details import CertificateDetails -from .app_service_certificate_order import AppServiceCertificateOrder -from .app_service_certificate_order_patch_resource import AppServiceCertificateOrderPatchResource -from .app_service_certificate_patch_resource import AppServiceCertificatePatchResource -from .certificate_email import CertificateEmail -from .certificate_order_action import CertificateOrderAction -from .reissue_certificate_order_request import ReissueCertificateOrderRequest -from .renew_certificate_order_request import RenewCertificateOrderRequest -from .site_seal import SiteSeal -from .site_seal_request import SiteSealRequest -from .vnet_route import VnetRoute -from .vnet_info import VnetInfo -from .vnet_gateway import VnetGateway -from .user import User -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 -from .hybrid_connection_key import HybridConnectionKey -from .hybrid_connection import HybridConnection -from .proxy_only_resource import ProxyOnlyResource -from .managed_service_identity import ManagedServiceIdentity -from .slot_swap_status import SlotSwapStatus -from .cloning_info import CloningInfo -from .hosting_environment_profile import HostingEnvironmentProfile -from .ip_security_restriction import IpSecurityRestriction -from .api_definition_info import ApiDefinitionInfo -from .cors_settings import CorsSettings -from .auto_heal_custom_action import AutoHealCustomAction -from .auto_heal_actions import AutoHealActions -from .slow_requests_based_trigger import SlowRequestsBasedTrigger -from .status_codes_based_trigger import StatusCodesBasedTrigger -from .requests_based_trigger import RequestsBasedTrigger -from .auto_heal_triggers import AutoHealTriggers -from .auto_heal_rules import AutoHealRules -from .site_limits import SiteLimits -from .ramp_up_rule import RampUpRule -from .experiments import Experiments -from .virtual_directory import VirtualDirectory -from .virtual_application import VirtualApplication -from .handler_mapping import HandlerMapping -from .site_machine_key import SiteMachineKey -from .conn_string_info import ConnStringInfo -from .name_value_pair import NameValuePair -from .site_config import SiteConfig -from .host_name_ssl_state import HostNameSslState -from .site import Site -from .capability import Capability -from .sku_capacity import SkuCapacity -from .sku_description import SkuDescription -from .app_service_plan import AppServicePlan -from .resource import Resource -from .name_identifier import NameIdentifier -from .metric_availability import MetricAvailability -from .dimension import Dimension -from .metric_specification import MetricSpecification -from .service_specification import ServiceSpecification -from .csm_operation_description_properties import CsmOperationDescriptionProperties -from .csm_operation_display import CsmOperationDisplay -from .csm_operation_description import CsmOperationDescription -from .address import Address -from .contact import Contact -from .host_name import HostName -from .domain_purchase_consent import DomainPurchaseConsent -from .domain import Domain -from .domain_availablility_check_result import DomainAvailablilityCheckResult -from .domain_control_center_sso_request import DomainControlCenterSsoRequest -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 -from .certificate import Certificate -from .certificate_patch_resource import CertificatePatchResource -from .virtual_network_profile import VirtualNetworkProfile -from .worker_pool import WorkerPool -from .virtual_ip_mapping import VirtualIPMapping -from .stamp_capacity import StampCapacity -from .network_access_control_entry import NetworkAccessControlEntry -from .app_service_environment import AppServiceEnvironment -from .localizable_string import LocalizableString -from .csm_usage_quota import CsmUsageQuota -from .error_entity import ErrorEntity -from .default_error_response_error_details_item import DefaultErrorResponseErrorDetailsItem -from .default_error_response_error import DefaultErrorResponseError -from .default_error_response import DefaultErrorResponse, DefaultErrorResponseException -from .operation import Operation -from .resource_metric_property import ResourceMetricProperty -from .resource_metric_value import ResourceMetricValue -from .resource_metric import ResourceMetric -from .web_app_collection import WebAppCollection -from .deleted_site import DeletedSite -from .solution import Solution -from .detector_abnormal_time_period import DetectorAbnormalTimePeriod -from .abnormal_time_period import AbnormalTimePeriod -from .detector_definition import DetectorDefinition -from .diagnostic_metric_sample import DiagnosticMetricSample -from .diagnostic_metric_set import DiagnosticMetricSet -from .data_source import DataSource -from .response_meta_data import ResponseMetaData -from .analysis_data import AnalysisData -from .analysis_definition import AnalysisDefinition -from .data_table_response_column import DataTableResponseColumn -from .data_table_response_object import DataTableResponseObject -from .detector_info import DetectorInfo -from .rendering import Rendering -from .diagnostic_data import DiagnosticData -from .detector_response import DetectorResponse -from .diagnostic_analysis import DiagnosticAnalysis -from .diagnostic_category import DiagnosticCategory -from .diagnostic_detector_response import DiagnosticDetectorResponse -from .stack_minor_version import StackMinorVersion -from .stack_major_version import StackMajorVersion -from .application_stack import ApplicationStack -from .recommendation import Recommendation -from .recommendation_rule import RecommendationRule -from .resource_health_metadata import ResourceHealthMetadata -from .billing_meter import BillingMeter -from .csm_move_resource_envelope import CsmMoveResourceEnvelope -from .geo_region import GeoRegion -from .hosting_environment_deployment_info import HostingEnvironmentDeploymentInfo -from .deployment_locations import DeploymentLocations -from .global_csm_sku_description import GlobalCsmSkuDescription -from .premier_add_on_offer import PremierAddOnOffer -from .resource_name_availability import ResourceNameAvailability -from .resource_name_availability_request import ResourceNameAvailabilityRequest -from .sku_infos import SkuInfos -from .source_control import SourceControl -from .validate_request import ValidateRequest -from .validate_response_error import ValidateResponseError -from .validate_response import ValidateResponse -from .vnet_parameters import VnetParameters -from .vnet_validation_test_failure import VnetValidationTestFailure -from .vnet_validation_failure_details import VnetValidationFailureDetails -from .file_system_application_logs_config import FileSystemApplicationLogsConfig -from .azure_table_storage_application_logs_config import AzureTableStorageApplicationLogsConfig -from .azure_blob_storage_application_logs_config import AzureBlobStorageApplicationLogsConfig -from .application_logs_config import ApplicationLogsConfig -from .azure_blob_storage_http_logs_config import AzureBlobStorageHttpLogsConfig -from .database_backup_setting import DatabaseBackupSetting -from .backup_item import BackupItem -from .backup_schedule import BackupSchedule -from .backup_request import BackupRequest -from .conn_string_value_type_pair import ConnStringValueTypePair -from .connection_string_dictionary import ConnectionStringDictionary -from .continuous_web_job import ContinuousWebJob -from .csm_publishing_profile_options import CsmPublishingProfileOptions -from .csm_slot_entity import CsmSlotEntity -from .custom_hostname_analysis_result import CustomHostnameAnalysisResult -from .deployment import Deployment -from .enabled_config import EnabledConfig -from .file_system_http_logs_config import FileSystemHttpLogsConfig -from .function_envelope import FunctionEnvelope -from .function_secrets import FunctionSecrets -from .host_name_binding import HostNameBinding -from .http_logs_config import HttpLogsConfig -from .ms_deploy import MSDeploy -from .ms_deploy_log_entry import MSDeployLogEntry -from .ms_deploy_log import MSDeployLog -from .ms_deploy_status import MSDeployStatus -from .migrate_my_sql_request import MigrateMySqlRequest -from .migrate_my_sql_status import MigrateMySqlStatus -from .relay_service_connection_entity import RelayServiceConnectionEntity -from .network_features import NetworkFeatures -from .perf_mon_sample import PerfMonSample -from .perf_mon_set import PerfMonSet -from .perf_mon_response import PerfMonResponse -from .premier_add_on import PremierAddOn -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 -from .site_config_resource import SiteConfigResource -from .site_configuration_snapshot_info import SiteConfigurationSnapshotInfo -from .site_extension_info import SiteExtensionInfo -from .site_instance import SiteInstance -from .site_logs_config import SiteLogsConfig -from .site_patch_resource import SitePatchResource -from .site_php_error_log_flag import SitePhpErrorLogFlag -from .site_source_control import SiteSourceControl -from .slot_config_names_resource import SlotConfigNamesResource -from .slot_difference import SlotDifference -from .snapshot import Snapshot -from .storage_migration_options import StorageMigrationOptions -from .storage_migration_response import StorageMigrationResponse -from .string_dictionary import StringDictionary -from .triggered_job_run import TriggeredJobRun -from .triggered_job_history import TriggeredJobHistory -from .triggered_web_job import TriggeredWebJob -from .web_job import WebJob -from .address_response import AddressResponse -from .app_service_environment_resource import AppServiceEnvironmentResource -from .app_service_environment_patch_resource import AppServiceEnvironmentPatchResource -from .hosting_environment_diagnostics import HostingEnvironmentDiagnostics -from .metric_availabilily import MetricAvailabilily -from .metric_definition import MetricDefinition -from .sku_info import SkuInfo -from .usage import Usage -from .worker_pool_resource import WorkerPoolResource -from .app_service_plan_patch_resource import AppServicePlanPatchResource -from .hybrid_connection_limits import HybridConnectionLimits +try: + from .app_service_certificate_py3 import AppServiceCertificate + from .app_service_certificate_resource_py3 import AppServiceCertificateResource + from .certificate_details_py3 import CertificateDetails + from .app_service_certificate_order_py3 import AppServiceCertificateOrder + from .app_service_certificate_order_patch_resource_py3 import AppServiceCertificateOrderPatchResource + from .app_service_certificate_patch_resource_py3 import AppServiceCertificatePatchResource + from .certificate_email_py3 import CertificateEmail + from .certificate_order_action_py3 import CertificateOrderAction + from .reissue_certificate_order_request_py3 import ReissueCertificateOrderRequest + from .renew_certificate_order_request_py3 import RenewCertificateOrderRequest + from .site_seal_py3 import SiteSeal + from .site_seal_request_py3 import SiteSealRequest + from .vnet_route_py3 import VnetRoute + from .vnet_info_py3 import VnetInfo + from .vnet_gateway_py3 import VnetGateway + from .user_py3 import User + from .snapshot_recovery_target_py3 import SnapshotRecoveryTarget + from .snapshot_recovery_request_py3 import SnapshotRecoveryRequest + from .resource_metric_availability_py3 import ResourceMetricAvailability + from .resource_metric_name_py3 import ResourceMetricName + from .resource_metric_definition_py3 import ResourceMetricDefinition + from .push_settings_py3 import PushSettings + from .identifier_py3 import Identifier + from .hybrid_connection_key_py3 import HybridConnectionKey + from .hybrid_connection_py3 import HybridConnection + from .proxy_only_resource_py3 import ProxyOnlyResource + from .managed_service_identity_py3 import ManagedServiceIdentity + from .slot_swap_status_py3 import SlotSwapStatus + from .cloning_info_py3 import CloningInfo + from .hosting_environment_profile_py3 import HostingEnvironmentProfile + from .ip_security_restriction_py3 import IpSecurityRestriction + from .api_definition_info_py3 import ApiDefinitionInfo + from .cors_settings_py3 import CorsSettings + from .auto_heal_custom_action_py3 import AutoHealCustomAction + from .auto_heal_actions_py3 import AutoHealActions + from .slow_requests_based_trigger_py3 import SlowRequestsBasedTrigger + from .status_codes_based_trigger_py3 import StatusCodesBasedTrigger + from .requests_based_trigger_py3 import RequestsBasedTrigger + from .auto_heal_triggers_py3 import AutoHealTriggers + from .auto_heal_rules_py3 import AutoHealRules + from .site_limits_py3 import SiteLimits + from .ramp_up_rule_py3 import RampUpRule + from .experiments_py3 import Experiments + from .virtual_directory_py3 import VirtualDirectory + from .virtual_application_py3 import VirtualApplication + from .handler_mapping_py3 import HandlerMapping + from .site_machine_key_py3 import SiteMachineKey + from .conn_string_info_py3 import ConnStringInfo + from .name_value_pair_py3 import NameValuePair + from .site_config_py3 import SiteConfig + from .host_name_ssl_state_py3 import HostNameSslState + from .site_py3 import Site + from .capability_py3 import Capability + from .sku_capacity_py3 import SkuCapacity + from .sku_description_py3 import SkuDescription + from .app_service_plan_py3 import AppServicePlan + from .resource_py3 import Resource + from .name_identifier_py3 import NameIdentifier + from .metric_availability_py3 import MetricAvailability + from .dimension_py3 import Dimension + from .metric_specification_py3 import MetricSpecification + from .service_specification_py3 import ServiceSpecification + from .csm_operation_description_properties_py3 import CsmOperationDescriptionProperties + from .csm_operation_display_py3 import CsmOperationDisplay + from .csm_operation_description_py3 import CsmOperationDescription + from .address_py3 import Address + from .contact_py3 import Contact + from .host_name_py3 import HostName + from .domain_purchase_consent_py3 import DomainPurchaseConsent + from .domain_py3 import Domain + from .domain_availablility_check_result_py3 import DomainAvailablilityCheckResult + from .domain_control_center_sso_request_py3 import DomainControlCenterSsoRequest + from .domain_ownership_identifier_py3 import DomainOwnershipIdentifier + from .domain_patch_resource_py3 import DomainPatchResource + from .domain_recommendation_search_parameters_py3 import DomainRecommendationSearchParameters + from .error_response_py3 import ErrorResponse, ErrorResponseException + from .tld_legal_agreement_py3 import TldLegalAgreement + from .top_level_domain_py3 import TopLevelDomain + from .top_level_domain_agreement_option_py3 import TopLevelDomainAgreementOption + from .certificate_py3 import Certificate + from .certificate_patch_resource_py3 import CertificatePatchResource + from .virtual_network_profile_py3 import VirtualNetworkProfile + from .worker_pool_py3 import WorkerPool + from .virtual_ip_mapping_py3 import VirtualIPMapping + from .stamp_capacity_py3 import StampCapacity + from .network_access_control_entry_py3 import NetworkAccessControlEntry + from .app_service_environment_py3 import AppServiceEnvironment + from .localizable_string_py3 import LocalizableString + from .csm_usage_quota_py3 import CsmUsageQuota + from .error_entity_py3 import ErrorEntity + from .default_error_response_error_details_item_py3 import DefaultErrorResponseErrorDetailsItem + from .default_error_response_error_py3 import DefaultErrorResponseError + from .default_error_response_py3 import DefaultErrorResponse, DefaultErrorResponseException + from .operation_py3 import Operation + from .resource_metric_property_py3 import ResourceMetricProperty + from .resource_metric_value_py3 import ResourceMetricValue + from .resource_metric_py3 import ResourceMetric + from .web_app_collection_py3 import WebAppCollection + from .deleted_site_py3 import DeletedSite + from .solution_py3 import Solution + from .detector_abnormal_time_period_py3 import DetectorAbnormalTimePeriod + from .abnormal_time_period_py3 import AbnormalTimePeriod + from .detector_definition_py3 import DetectorDefinition + from .diagnostic_metric_sample_py3 import DiagnosticMetricSample + from .diagnostic_metric_set_py3 import DiagnosticMetricSet + from .data_source_py3 import DataSource + from .response_meta_data_py3 import ResponseMetaData + from .analysis_data_py3 import AnalysisData + from .analysis_definition_py3 import AnalysisDefinition + from .data_table_response_column_py3 import DataTableResponseColumn + from .data_table_response_object_py3 import DataTableResponseObject + from .detector_info_py3 import DetectorInfo + from .rendering_py3 import Rendering + from .diagnostic_data_py3 import DiagnosticData + from .detector_response_py3 import DetectorResponse + from .diagnostic_analysis_py3 import DiagnosticAnalysis + from .diagnostic_category_py3 import DiagnosticCategory + from .diagnostic_detector_response_py3 import DiagnosticDetectorResponse + from .stack_minor_version_py3 import StackMinorVersion + from .stack_major_version_py3 import StackMajorVersion + from .application_stack_py3 import ApplicationStack + from .recommendation_py3 import Recommendation + from .recommendation_rule_py3 import RecommendationRule + from .resource_health_metadata_py3 import ResourceHealthMetadata + from .billing_meter_py3 import BillingMeter + from .csm_move_resource_envelope_py3 import CsmMoveResourceEnvelope + from .geo_region_py3 import GeoRegion + from .hosting_environment_deployment_info_py3 import HostingEnvironmentDeploymentInfo + from .deployment_locations_py3 import DeploymentLocations + from .global_csm_sku_description_py3 import GlobalCsmSkuDescription + from .premier_add_on_offer_py3 import PremierAddOnOffer + from .resource_name_availability_py3 import ResourceNameAvailability + from .resource_name_availability_request_py3 import ResourceNameAvailabilityRequest + from .sku_infos_py3 import SkuInfos + from .source_control_py3 import SourceControl + from .validate_request_py3 import ValidateRequest + from .validate_response_error_py3 import ValidateResponseError + from .validate_response_py3 import ValidateResponse + from .vnet_parameters_py3 import VnetParameters + from .vnet_validation_test_failure_py3 import VnetValidationTestFailure + from .vnet_validation_failure_details_py3 import VnetValidationFailureDetails + from .file_system_application_logs_config_py3 import FileSystemApplicationLogsConfig + from .azure_table_storage_application_logs_config_py3 import AzureTableStorageApplicationLogsConfig + from .azure_blob_storage_application_logs_config_py3 import AzureBlobStorageApplicationLogsConfig + from .application_logs_config_py3 import ApplicationLogsConfig + from .azure_blob_storage_http_logs_config_py3 import AzureBlobStorageHttpLogsConfig + from .database_backup_setting_py3 import DatabaseBackupSetting + from .backup_item_py3 import BackupItem + from .backup_schedule_py3 import BackupSchedule + from .backup_request_py3 import BackupRequest + from .conn_string_value_type_pair_py3 import ConnStringValueTypePair + from .connection_string_dictionary_py3 import ConnectionStringDictionary + from .continuous_web_job_py3 import ContinuousWebJob + from .csm_publishing_profile_options_py3 import CsmPublishingProfileOptions + from .csm_slot_entity_py3 import CsmSlotEntity + from .custom_hostname_analysis_result_py3 import CustomHostnameAnalysisResult + from .deployment_py3 import Deployment + from .enabled_config_py3 import EnabledConfig + from .file_system_http_logs_config_py3 import FileSystemHttpLogsConfig + from .function_envelope_py3 import FunctionEnvelope + from .function_secrets_py3 import FunctionSecrets + from .host_name_binding_py3 import HostNameBinding + from .http_logs_config_py3 import HttpLogsConfig + from .ms_deploy_py3 import MSDeploy + from .ms_deploy_log_entry_py3 import MSDeployLogEntry + from .ms_deploy_log_py3 import MSDeployLog + from .ms_deploy_status_py3 import MSDeployStatus + from .migrate_my_sql_request_py3 import MigrateMySqlRequest + from .migrate_my_sql_status_py3 import MigrateMySqlStatus + from .relay_service_connection_entity_py3 import RelayServiceConnectionEntity + from .network_features_py3 import NetworkFeatures + from .perf_mon_sample_py3 import PerfMonSample + from .perf_mon_set_py3 import PerfMonSet + from .perf_mon_response_py3 import PerfMonResponse + from .premier_add_on_py3 import PremierAddOn + from .process_thread_info_py3 import ProcessThreadInfo + from .process_module_info_py3 import ProcessModuleInfo + from .process_info_py3 import ProcessInfo + from .public_certificate_py3 import PublicCertificate + from .restore_request_py3 import RestoreRequest + from .restore_response_py3 import RestoreResponse + from .site_auth_settings_py3 import SiteAuthSettings + from .site_cloneability_criterion_py3 import SiteCloneabilityCriterion + from .site_cloneability_py3 import SiteCloneability + from .site_config_resource_py3 import SiteConfigResource + from .site_configuration_snapshot_info_py3 import SiteConfigurationSnapshotInfo + from .site_extension_info_py3 import SiteExtensionInfo + from .site_instance_py3 import SiteInstance + from .site_logs_config_py3 import SiteLogsConfig + from .site_patch_resource_py3 import SitePatchResource + from .site_php_error_log_flag_py3 import SitePhpErrorLogFlag + from .site_source_control_py3 import SiteSourceControl + from .slot_config_names_resource_py3 import SlotConfigNamesResource + from .slot_difference_py3 import SlotDifference + from .snapshot_py3 import Snapshot + from .storage_migration_options_py3 import StorageMigrationOptions + from .storage_migration_response_py3 import StorageMigrationResponse + from .string_dictionary_py3 import StringDictionary + from .triggered_job_run_py3 import TriggeredJobRun + from .triggered_job_history_py3 import TriggeredJobHistory + from .triggered_web_job_py3 import TriggeredWebJob + from .web_job_py3 import WebJob + from .address_response_py3 import AddressResponse + from .app_service_environment_resource_py3 import AppServiceEnvironmentResource + from .app_service_environment_patch_resource_py3 import AppServiceEnvironmentPatchResource + from .hosting_environment_diagnostics_py3 import HostingEnvironmentDiagnostics + from .metric_availabilily_py3 import MetricAvailabilily + from .metric_definition_py3 import MetricDefinition + from .sku_info_py3 import SkuInfo + from .usage_py3 import Usage + from .worker_pool_resource_py3 import WorkerPoolResource + from .app_service_plan_patch_resource_py3 import AppServicePlanPatchResource + from .hybrid_connection_limits_py3 import HybridConnectionLimits +except (SyntaxError, ImportError): + from .app_service_certificate import AppServiceCertificate + from .app_service_certificate_resource import AppServiceCertificateResource + from .certificate_details import CertificateDetails + from .app_service_certificate_order import AppServiceCertificateOrder + from .app_service_certificate_order_patch_resource import AppServiceCertificateOrderPatchResource + from .app_service_certificate_patch_resource import AppServiceCertificatePatchResource + from .certificate_email import CertificateEmail + from .certificate_order_action import CertificateOrderAction + from .reissue_certificate_order_request import ReissueCertificateOrderRequest + from .renew_certificate_order_request import RenewCertificateOrderRequest + from .site_seal import SiteSeal + from .site_seal_request import SiteSealRequest + from .vnet_route import VnetRoute + from .vnet_info import VnetInfo + from .vnet_gateway import VnetGateway + from .user import User + 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 + from .hybrid_connection_key import HybridConnectionKey + from .hybrid_connection import HybridConnection + from .proxy_only_resource import ProxyOnlyResource + from .managed_service_identity import ManagedServiceIdentity + from .slot_swap_status import SlotSwapStatus + from .cloning_info import CloningInfo + from .hosting_environment_profile import HostingEnvironmentProfile + from .ip_security_restriction import IpSecurityRestriction + from .api_definition_info import ApiDefinitionInfo + from .cors_settings import CorsSettings + from .auto_heal_custom_action import AutoHealCustomAction + from .auto_heal_actions import AutoHealActions + from .slow_requests_based_trigger import SlowRequestsBasedTrigger + from .status_codes_based_trigger import StatusCodesBasedTrigger + from .requests_based_trigger import RequestsBasedTrigger + from .auto_heal_triggers import AutoHealTriggers + from .auto_heal_rules import AutoHealRules + from .site_limits import SiteLimits + from .ramp_up_rule import RampUpRule + from .experiments import Experiments + from .virtual_directory import VirtualDirectory + from .virtual_application import VirtualApplication + from .handler_mapping import HandlerMapping + from .site_machine_key import SiteMachineKey + from .conn_string_info import ConnStringInfo + from .name_value_pair import NameValuePair + from .site_config import SiteConfig + from .host_name_ssl_state import HostNameSslState + from .site import Site + from .capability import Capability + from .sku_capacity import SkuCapacity + from .sku_description import SkuDescription + from .app_service_plan import AppServicePlan + from .resource import Resource + from .name_identifier import NameIdentifier + from .metric_availability import MetricAvailability + from .dimension import Dimension + from .metric_specification import MetricSpecification + from .service_specification import ServiceSpecification + from .csm_operation_description_properties import CsmOperationDescriptionProperties + from .csm_operation_display import CsmOperationDisplay + from .csm_operation_description import CsmOperationDescription + from .address import Address + from .contact import Contact + from .host_name import HostName + from .domain_purchase_consent import DomainPurchaseConsent + from .domain import Domain + from .domain_availablility_check_result import DomainAvailablilityCheckResult + from .domain_control_center_sso_request import DomainControlCenterSsoRequest + 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 + from .certificate import Certificate + from .certificate_patch_resource import CertificatePatchResource + from .virtual_network_profile import VirtualNetworkProfile + from .worker_pool import WorkerPool + from .virtual_ip_mapping import VirtualIPMapping + from .stamp_capacity import StampCapacity + from .network_access_control_entry import NetworkAccessControlEntry + from .app_service_environment import AppServiceEnvironment + from .localizable_string import LocalizableString + from .csm_usage_quota import CsmUsageQuota + from .error_entity import ErrorEntity + from .default_error_response_error_details_item import DefaultErrorResponseErrorDetailsItem + from .default_error_response_error import DefaultErrorResponseError + from .default_error_response import DefaultErrorResponse, DefaultErrorResponseException + from .operation import Operation + from .resource_metric_property import ResourceMetricProperty + from .resource_metric_value import ResourceMetricValue + from .resource_metric import ResourceMetric + from .web_app_collection import WebAppCollection + from .deleted_site import DeletedSite + from .solution import Solution + from .detector_abnormal_time_period import DetectorAbnormalTimePeriod + from .abnormal_time_period import AbnormalTimePeriod + from .detector_definition import DetectorDefinition + from .diagnostic_metric_sample import DiagnosticMetricSample + from .diagnostic_metric_set import DiagnosticMetricSet + from .data_source import DataSource + from .response_meta_data import ResponseMetaData + from .analysis_data import AnalysisData + from .analysis_definition import AnalysisDefinition + from .data_table_response_column import DataTableResponseColumn + from .data_table_response_object import DataTableResponseObject + from .detector_info import DetectorInfo + from .rendering import Rendering + from .diagnostic_data import DiagnosticData + from .detector_response import DetectorResponse + from .diagnostic_analysis import DiagnosticAnalysis + from .diagnostic_category import DiagnosticCategory + from .diagnostic_detector_response import DiagnosticDetectorResponse + from .stack_minor_version import StackMinorVersion + from .stack_major_version import StackMajorVersion + from .application_stack import ApplicationStack + from .recommendation import Recommendation + from .recommendation_rule import RecommendationRule + from .resource_health_metadata import ResourceHealthMetadata + from .billing_meter import BillingMeter + from .csm_move_resource_envelope import CsmMoveResourceEnvelope + from .geo_region import GeoRegion + from .hosting_environment_deployment_info import HostingEnvironmentDeploymentInfo + from .deployment_locations import DeploymentLocations + from .global_csm_sku_description import GlobalCsmSkuDescription + from .premier_add_on_offer import PremierAddOnOffer + from .resource_name_availability import ResourceNameAvailability + from .resource_name_availability_request import ResourceNameAvailabilityRequest + from .sku_infos import SkuInfos + from .source_control import SourceControl + from .validate_request import ValidateRequest + from .validate_response_error import ValidateResponseError + from .validate_response import ValidateResponse + from .vnet_parameters import VnetParameters + from .vnet_validation_test_failure import VnetValidationTestFailure + from .vnet_validation_failure_details import VnetValidationFailureDetails + from .file_system_application_logs_config import FileSystemApplicationLogsConfig + from .azure_table_storage_application_logs_config import AzureTableStorageApplicationLogsConfig + from .azure_blob_storage_application_logs_config import AzureBlobStorageApplicationLogsConfig + from .application_logs_config import ApplicationLogsConfig + from .azure_blob_storage_http_logs_config import AzureBlobStorageHttpLogsConfig + from .database_backup_setting import DatabaseBackupSetting + from .backup_item import BackupItem + from .backup_schedule import BackupSchedule + from .backup_request import BackupRequest + from .conn_string_value_type_pair import ConnStringValueTypePair + from .connection_string_dictionary import ConnectionStringDictionary + from .continuous_web_job import ContinuousWebJob + from .csm_publishing_profile_options import CsmPublishingProfileOptions + from .csm_slot_entity import CsmSlotEntity + from .custom_hostname_analysis_result import CustomHostnameAnalysisResult + from .deployment import Deployment + from .enabled_config import EnabledConfig + from .file_system_http_logs_config import FileSystemHttpLogsConfig + from .function_envelope import FunctionEnvelope + from .function_secrets import FunctionSecrets + from .host_name_binding import HostNameBinding + from .http_logs_config import HttpLogsConfig + from .ms_deploy import MSDeploy + from .ms_deploy_log_entry import MSDeployLogEntry + from .ms_deploy_log import MSDeployLog + from .ms_deploy_status import MSDeployStatus + from .migrate_my_sql_request import MigrateMySqlRequest + from .migrate_my_sql_status import MigrateMySqlStatus + from .relay_service_connection_entity import RelayServiceConnectionEntity + from .network_features import NetworkFeatures + from .perf_mon_sample import PerfMonSample + from .perf_mon_set import PerfMonSet + from .perf_mon_response import PerfMonResponse + from .premier_add_on import PremierAddOn + 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 + from .site_config_resource import SiteConfigResource + from .site_configuration_snapshot_info import SiteConfigurationSnapshotInfo + from .site_extension_info import SiteExtensionInfo + from .site_instance import SiteInstance + from .site_logs_config import SiteLogsConfig + from .site_patch_resource import SitePatchResource + from .site_php_error_log_flag import SitePhpErrorLogFlag + from .site_source_control import SiteSourceControl + from .slot_config_names_resource import SlotConfigNamesResource + from .slot_difference import SlotDifference + from .snapshot import Snapshot + from .storage_migration_options import StorageMigrationOptions + from .storage_migration_response import StorageMigrationResponse + from .string_dictionary import StringDictionary + from .triggered_job_run import TriggeredJobRun + from .triggered_job_history import TriggeredJobHistory + from .triggered_web_job import TriggeredWebJob + from .web_job import WebJob + from .address_response import AddressResponse + from .app_service_environment_resource import AppServiceEnvironmentResource + from .app_service_environment_patch_resource import AppServiceEnvironmentPatchResource + from .hosting_environment_diagnostics import HostingEnvironmentDiagnostics + from .metric_availabilily import MetricAvailabilily + from .metric_definition import MetricDefinition + from .sku_info import SkuInfo + from .usage import Usage + from .worker_pool_resource import WorkerPoolResource + from .app_service_plan_patch_resource import AppServicePlanPatchResource + from .hybrid_connection_limits import HybridConnectionLimits from .app_service_certificate_order_paged import AppServiceCertificateOrderPaged from .app_service_certificate_resource_paged import AppServiceCertificateResourcePaged from .csm_operation_description_paged import CsmOperationDescriptionPaged diff --git a/azure-mgmt-web/azure/mgmt/web/models/abnormal_time_period.py b/azure-mgmt-web/azure/mgmt/web/models/abnormal_time_period.py index d2b01c9e5999..1e2a3eebde83 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/abnormal_time_period.py +++ b/azure-mgmt-web/azure/mgmt/web/models/abnormal_time_period.py @@ -32,9 +32,9 @@ class AbnormalTimePeriod(Model): 'solutions': {'key': 'solutions', 'type': '[Solution]'}, } - def __init__(self, start_time=None, end_time=None, events=None, solutions=None): - super(AbnormalTimePeriod, self).__init__() - self.start_time = start_time - self.end_time = end_time - self.events = events - self.solutions = solutions + def __init__(self, **kwargs): + super(AbnormalTimePeriod, self).__init__(**kwargs) + self.start_time = kwargs.get('start_time', None) + self.end_time = kwargs.get('end_time', None) + self.events = kwargs.get('events', None) + self.solutions = kwargs.get('solutions', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/abnormal_time_period_py3.py b/azure-mgmt-web/azure/mgmt/web/models/abnormal_time_period_py3.py new file mode 100644 index 000000000000..7b621b2aa297 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/abnormal_time_period_py3.py @@ -0,0 +1,40 @@ +# 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 AbnormalTimePeriod(Model): + """Class representing Abnormal Time Period identified in diagnosis. + + :param start_time: Start time of the downtime + :type start_time: datetime + :param end_time: End time of the downtime + :type end_time: datetime + :param events: List of Possible Cause of downtime + :type events: list[~azure.mgmt.web.models.DetectorAbnormalTimePeriod] + :param solutions: List of proposed solutions + :type solutions: list[~azure.mgmt.web.models.Solution] + """ + + _attribute_map = { + 'start_time': {'key': 'startTime', 'type': 'iso-8601'}, + 'end_time': {'key': 'endTime', 'type': 'iso-8601'}, + 'events': {'key': 'events', 'type': '[DetectorAbnormalTimePeriod]'}, + 'solutions': {'key': 'solutions', 'type': '[Solution]'}, + } + + def __init__(self, *, start_time=None, end_time=None, events=None, solutions=None, **kwargs) -> None: + super(AbnormalTimePeriod, self).__init__(**kwargs) + self.start_time = start_time + self.end_time = end_time + self.events = events + self.solutions = solutions diff --git a/azure-mgmt-web/azure/mgmt/web/models/address.py b/azure-mgmt-web/azure/mgmt/web/models/address.py index 9b8956e9ed18..712c11c55bf6 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/address.py +++ b/azure-mgmt-web/azure/mgmt/web/models/address.py @@ -15,17 +15,19 @@ class Address(Model): """Address information for domain registration. - :param address1: First line of an Address. + All required parameters must be populated in order to send to Azure. + + :param address1: Required. First line of an Address. :type address1: str :param address2: The second line of the Address. Optional. :type address2: str - :param city: The city for the address. + :param city: Required. The city for the address. :type city: str - :param country: The country for the address. + :param country: Required. The country for the address. :type country: str - :param postal_code: The postal code for the address. + :param postal_code: Required. The postal code for the address. :type postal_code: str - :param state: The state or province for the address. + :param state: Required. The state or province for the address. :type state: str """ @@ -46,11 +48,11 @@ class Address(Model): 'state': {'key': 'state', 'type': 'str'}, } - def __init__(self, address1, city, country, postal_code, state, address2=None): - super(Address, self).__init__() - self.address1 = address1 - self.address2 = address2 - self.city = city - self.country = country - self.postal_code = postal_code - self.state = state + def __init__(self, **kwargs): + super(Address, self).__init__(**kwargs) + self.address1 = kwargs.get('address1', None) + self.address2 = kwargs.get('address2', None) + self.city = kwargs.get('city', None) + self.country = kwargs.get('country', None) + self.postal_code = kwargs.get('postal_code', None) + self.state = kwargs.get('state', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/address_py3.py b/azure-mgmt-web/azure/mgmt/web/models/address_py3.py new file mode 100644 index 000000000000..5f7c235ed217 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/address_py3.py @@ -0,0 +1,58 @@ +# 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 Address(Model): + """Address information for domain registration. + + All required parameters must be populated in order to send to Azure. + + :param address1: Required. First line of an Address. + :type address1: str + :param address2: The second line of the Address. Optional. + :type address2: str + :param city: Required. The city for the address. + :type city: str + :param country: Required. The country for the address. + :type country: str + :param postal_code: Required. The postal code for the address. + :type postal_code: str + :param state: Required. The state or province for the address. + :type state: str + """ + + _validation = { + 'address1': {'required': True}, + 'city': {'required': True}, + 'country': {'required': True}, + 'postal_code': {'required': True}, + 'state': {'required': True}, + } + + _attribute_map = { + 'address1': {'key': 'address1', 'type': 'str'}, + 'address2': {'key': 'address2', 'type': 'str'}, + 'city': {'key': 'city', 'type': 'str'}, + 'country': {'key': 'country', 'type': 'str'}, + 'postal_code': {'key': 'postalCode', 'type': 'str'}, + 'state': {'key': 'state', 'type': 'str'}, + } + + def __init__(self, *, address1: str, city: str, country: str, postal_code: str, state: str, address2: str=None, **kwargs) -> None: + super(Address, self).__init__(**kwargs) + self.address1 = address1 + self.address2 = address2 + self.city = city + self.country = country + self.postal_code = postal_code + self.state = state diff --git a/azure-mgmt-web/azure/mgmt/web/models/address_response.py b/azure-mgmt-web/azure/mgmt/web/models/address_response.py index 7bb9c356952b..851a713cc4ee 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/address_response.py +++ b/azure-mgmt-web/azure/mgmt/web/models/address_response.py @@ -34,9 +34,9 @@ class AddressResponse(Model): 'vip_mappings': {'key': 'vipMappings', 'type': '[VirtualIPMapping]'}, } - def __init__(self, service_ip_address=None, internal_ip_address=None, outbound_ip_addresses=None, vip_mappings=None): - super(AddressResponse, self).__init__() - self.service_ip_address = service_ip_address - self.internal_ip_address = internal_ip_address - self.outbound_ip_addresses = outbound_ip_addresses - self.vip_mappings = vip_mappings + def __init__(self, **kwargs): + super(AddressResponse, self).__init__(**kwargs) + self.service_ip_address = kwargs.get('service_ip_address', None) + self.internal_ip_address = kwargs.get('internal_ip_address', None) + self.outbound_ip_addresses = kwargs.get('outbound_ip_addresses', None) + self.vip_mappings = kwargs.get('vip_mappings', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/address_response_py3.py b/azure-mgmt-web/azure/mgmt/web/models/address_response_py3.py new file mode 100644 index 000000000000..5268c2dce078 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/address_response_py3.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 AddressResponse(Model): + """Describes main public IP address and any extra virtual IPs. + + :param service_ip_address: Main public virtual IP. + :type service_ip_address: str + :param internal_ip_address: Virtual Network internal IP address of the App + Service Environment if it is in internal load-balancing mode. + :type internal_ip_address: str + :param outbound_ip_addresses: IP addresses appearing on outbound + connections. + :type outbound_ip_addresses: list[str] + :param vip_mappings: Additional virtual IPs. + :type vip_mappings: list[~azure.mgmt.web.models.VirtualIPMapping] + """ + + _attribute_map = { + 'service_ip_address': {'key': 'serviceIpAddress', 'type': 'str'}, + 'internal_ip_address': {'key': 'internalIpAddress', 'type': 'str'}, + 'outbound_ip_addresses': {'key': 'outboundIpAddresses', 'type': '[str]'}, + 'vip_mappings': {'key': 'vipMappings', 'type': '[VirtualIPMapping]'}, + } + + def __init__(self, *, service_ip_address: str=None, internal_ip_address: str=None, outbound_ip_addresses=None, vip_mappings=None, **kwargs) -> None: + super(AddressResponse, self).__init__(**kwargs) + self.service_ip_address = service_ip_address + self.internal_ip_address = internal_ip_address + self.outbound_ip_addresses = outbound_ip_addresses + self.vip_mappings = vip_mappings diff --git a/azure-mgmt-web/azure/mgmt/web/models/analysis_data.py b/azure-mgmt-web/azure/mgmt/web/models/analysis_data.py index 648935998a8f..0c2606f3ba50 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/analysis_data.py +++ b/azure-mgmt-web/azure/mgmt/web/models/analysis_data.py @@ -35,10 +35,10 @@ class AnalysisData(Model): 'detector_meta_data': {'key': 'detectorMetaData', 'type': 'ResponseMetaData'}, } - def __init__(self, source=None, detector_definition=None, metrics=None, data=None, detector_meta_data=None): - super(AnalysisData, self).__init__() - self.source = source - self.detector_definition = detector_definition - self.metrics = metrics - self.data = data - self.detector_meta_data = detector_meta_data + def __init__(self, **kwargs): + super(AnalysisData, self).__init__(**kwargs) + self.source = kwargs.get('source', None) + self.detector_definition = kwargs.get('detector_definition', None) + self.metrics = kwargs.get('metrics', None) + self.data = kwargs.get('data', None) + self.detector_meta_data = kwargs.get('detector_meta_data', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/analysis_data_py3.py b/azure-mgmt-web/azure/mgmt/web/models/analysis_data_py3.py new file mode 100644 index 000000000000..38d0cb227509 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/analysis_data_py3.py @@ -0,0 +1,44 @@ +# 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 AnalysisData(Model): + """Class Representing Detector Evidence used for analysis. + + :param source: Name of the Detector + :type source: str + :param detector_definition: Detector Definition + :type detector_definition: ~azure.mgmt.web.models.DetectorDefinition + :param metrics: Source Metrics + :type metrics: list[~azure.mgmt.web.models.DiagnosticMetricSet] + :param data: Additional Source Data + :type data: list[list[~azure.mgmt.web.models.NameValuePair]] + :param detector_meta_data: Detector Meta Data + :type detector_meta_data: ~azure.mgmt.web.models.ResponseMetaData + """ + + _attribute_map = { + 'source': {'key': 'source', 'type': 'str'}, + 'detector_definition': {'key': 'detectorDefinition', 'type': 'DetectorDefinition'}, + 'metrics': {'key': 'metrics', 'type': '[DiagnosticMetricSet]'}, + 'data': {'key': 'data', 'type': '[[NameValuePair]]'}, + 'detector_meta_data': {'key': 'detectorMetaData', 'type': 'ResponseMetaData'}, + } + + def __init__(self, *, source: str=None, detector_definition=None, metrics=None, data=None, detector_meta_data=None, **kwargs) -> None: + super(AnalysisData, self).__init__(**kwargs) + self.source = source + self.detector_definition = detector_definition + self.metrics = metrics + self.data = data + self.detector_meta_data = detector_meta_data diff --git a/azure-mgmt-web/azure/mgmt/web/models/analysis_definition.py b/azure-mgmt-web/azure/mgmt/web/models/analysis_definition.py index 3cdc5f3bf839..58943eea9d91 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/analysis_definition.py +++ b/azure-mgmt-web/azure/mgmt/web/models/analysis_definition.py @@ -45,6 +45,6 @@ class AnalysisDefinition(ProxyOnlyResource): 'description': {'key': 'properties.description', 'type': 'str'}, } - def __init__(self, kind=None): - super(AnalysisDefinition, self).__init__(kind=kind) + def __init__(self, **kwargs): + super(AnalysisDefinition, self).__init__(**kwargs) self.description = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/analysis_definition_py3.py b/azure-mgmt-web/azure/mgmt/web/models/analysis_definition_py3.py new file mode 100644 index 000000000000..f3697219fad0 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/analysis_definition_py3.py @@ -0,0 +1,50 @@ +# 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_py3 import ProxyOnlyResource + + +class AnalysisDefinition(ProxyOnlyResource): + """Definition of Analysis. + + 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 + :ivar description: Description of the Analysis + :vartype description: str + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'description': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'description': {'key': 'properties.description', 'type': 'str'}, + } + + def __init__(self, *, kind: str=None, **kwargs) -> None: + super(AnalysisDefinition, self).__init__(kind=kind, **kwargs) + self.description = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/api_definition_info.py b/azure-mgmt-web/azure/mgmt/web/models/api_definition_info.py index 63d8e2be4c4e..ea39cea45caf 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/api_definition_info.py +++ b/azure-mgmt-web/azure/mgmt/web/models/api_definition_info.py @@ -23,6 +23,6 @@ class ApiDefinitionInfo(Model): 'url': {'key': 'url', 'type': 'str'}, } - def __init__(self, url=None): - super(ApiDefinitionInfo, self).__init__() - self.url = url + def __init__(self, **kwargs): + super(ApiDefinitionInfo, self).__init__(**kwargs) + self.url = kwargs.get('url', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/api_definition_info_py3.py b/azure-mgmt-web/azure/mgmt/web/models/api_definition_info_py3.py new file mode 100644 index 000000000000..c871cfac7df2 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/api_definition_info_py3.py @@ -0,0 +1,28 @@ +# 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 ApiDefinitionInfo(Model): + """Information about the formal API definition for the app. + + :param url: The URL of the API definition. + :type url: str + """ + + _attribute_map = { + 'url': {'key': 'url', 'type': 'str'}, + } + + def __init__(self, *, url: str=None, **kwargs) -> None: + super(ApiDefinitionInfo, self).__init__(**kwargs) + self.url = url diff --git a/azure-mgmt-web/azure/mgmt/web/models/app_service_certificate.py b/azure-mgmt-web/azure/mgmt/web/models/app_service_certificate.py index ddeb88a33f07..a678f8540c30 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/app_service_certificate.py +++ b/azure-mgmt-web/azure/mgmt/web/models/app_service_certificate.py @@ -42,8 +42,8 @@ class AppServiceCertificate(Model): 'provisioning_state': {'key': 'provisioningState', 'type': 'KeyVaultSecretStatus'}, } - def __init__(self, key_vault_id=None, key_vault_secret_name=None): - super(AppServiceCertificate, self).__init__() - self.key_vault_id = key_vault_id - self.key_vault_secret_name = key_vault_secret_name + def __init__(self, **kwargs): + super(AppServiceCertificate, self).__init__(**kwargs) + self.key_vault_id = kwargs.get('key_vault_id', None) + self.key_vault_secret_name = kwargs.get('key_vault_secret_name', None) self.provisioning_state = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_order.py b/azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_order.py index bf72656661c5..187b8ef08aca 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_order.py +++ b/azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_order.py @@ -18,13 +18,15 @@ class AppServiceCertificateOrder(Resource): Variables are only populated by the server, and will be ignored when sending a request. + All required parameters must be populated in order to send to Azure. + :ivar id: Resource Id. :vartype id: str :ivar name: Resource Name. :vartype name: str :param kind: Kind of resource. :type kind: str - :param location: Resource Location. + :param location: Required. Resource Location. :type location: str :ivar type: Resource type. :vartype type: str @@ -42,8 +44,9 @@ class AppServiceCertificateOrder(Resource): :type validity_in_years: int :param key_size: Certificate key size. Default value: 2048 . :type key_size: int - :param product_type: Certificate product type. Possible values include: - 'StandardDomainValidatedSsl', 'StandardDomainValidatedWildCardSsl' + :param product_type: Required. Certificate product type. Possible values + include: 'StandardDomainValidatedSsl', + 'StandardDomainValidatedWildCardSsl' :type product_type: str or ~azure.mgmt.web.models.CertificateProductType :param auto_renew: true if the certificate should be automatically renewed when it expires; otherwise, false. @@ -131,19 +134,19 @@ class AppServiceCertificateOrder(Resource): 'next_auto_renewal_time_stamp': {'key': 'properties.nextAutoRenewalTimeStamp', 'type': 'iso-8601'}, } - def __init__(self, location, product_type, kind=None, tags=None, certificates=None, distinguished_name=None, validity_in_years=1, key_size=2048, auto_renew=True, csr=None): - super(AppServiceCertificateOrder, self).__init__(kind=kind, location=location, tags=tags) - self.certificates = certificates - self.distinguished_name = distinguished_name + def __init__(self, **kwargs): + super(AppServiceCertificateOrder, self).__init__(**kwargs) + self.certificates = kwargs.get('certificates', None) + self.distinguished_name = kwargs.get('distinguished_name', None) self.domain_verification_token = None - self.validity_in_years = validity_in_years - self.key_size = key_size - self.product_type = product_type - self.auto_renew = auto_renew + self.validity_in_years = kwargs.get('validity_in_years', 1) + self.key_size = kwargs.get('key_size', 2048) + self.product_type = kwargs.get('product_type', None) + self.auto_renew = kwargs.get('auto_renew', True) self.provisioning_state = None self.status = None self.signed_certificate = None - self.csr = csr + self.csr = kwargs.get('csr', None) self.intermediate = None self.root = None self.serial_number = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_order_patch_resource.py b/azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_order_patch_resource.py index d8e89475dd34..131e707b8ac6 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_order_patch_resource.py +++ b/azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_order_patch_resource.py @@ -18,6 +18,8 @@ class AppServiceCertificateOrderPatchResource(ProxyOnlyResource): Variables are only populated by the server, and will be ignored when sending a request. + All required parameters must be populated in order to send to Azure. + :ivar id: Resource Id. :vartype id: str :ivar name: Resource Name. @@ -38,8 +40,9 @@ class AppServiceCertificateOrderPatchResource(ProxyOnlyResource): :type validity_in_years: int :param key_size: Certificate key size. Default value: 2048 . :type key_size: int - :param product_type: Certificate product type. Possible values include: - 'StandardDomainValidatedSsl', 'StandardDomainValidatedWildCardSsl' + :param product_type: Required. Certificate product type. Possible values + include: 'StandardDomainValidatedSsl', + 'StandardDomainValidatedWildCardSsl' :type product_type: str or ~azure.mgmt.web.models.CertificateProductType :param auto_renew: true if the certificate should be automatically renewed when it expires; otherwise, false. @@ -124,19 +127,19 @@ class AppServiceCertificateOrderPatchResource(ProxyOnlyResource): 'next_auto_renewal_time_stamp': {'key': 'properties.nextAutoRenewalTimeStamp', 'type': 'iso-8601'}, } - def __init__(self, product_type, kind=None, certificates=None, distinguished_name=None, validity_in_years=1, key_size=2048, auto_renew=True, csr=None): - super(AppServiceCertificateOrderPatchResource, self).__init__(kind=kind) - self.certificates = certificates - self.distinguished_name = distinguished_name + def __init__(self, **kwargs): + super(AppServiceCertificateOrderPatchResource, self).__init__(**kwargs) + self.certificates = kwargs.get('certificates', None) + self.distinguished_name = kwargs.get('distinguished_name', None) self.domain_verification_token = None - self.validity_in_years = validity_in_years - self.key_size = key_size - self.product_type = product_type - self.auto_renew = auto_renew + self.validity_in_years = kwargs.get('validity_in_years', 1) + self.key_size = kwargs.get('key_size', 2048) + self.product_type = kwargs.get('product_type', None) + self.auto_renew = kwargs.get('auto_renew', True) self.provisioning_state = None self.status = None self.signed_certificate = None - self.csr = csr + self.csr = kwargs.get('csr', None) self.intermediate = None self.root = None self.serial_number = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_order_patch_resource_py3.py b/azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_order_patch_resource_py3.py new file mode 100644 index 000000000000..650d9bf98f18 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_order_patch_resource_py3.py @@ -0,0 +1,150 @@ +# 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_py3 import ProxyOnlyResource + + +class AppServiceCertificateOrderPatchResource(ProxyOnlyResource): + """ARM resource for a certificate order that is purchased through Azure. + + Variables are only populated by the server, and will be ignored when + sending a request. + + All required parameters must be populated in order to send to Azure. + + :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 certificates: State of the Key Vault secret. + :type certificates: dict[str, + ~azure.mgmt.web.models.AppServiceCertificate] + :param distinguished_name: Certificate distinguished name. + :type distinguished_name: str + :ivar domain_verification_token: Domain verification token. + :vartype domain_verification_token: str + :param validity_in_years: Duration in years (must be between 1 and 3). + Default value: 1 . + :type validity_in_years: int + :param key_size: Certificate key size. Default value: 2048 . + :type key_size: int + :param product_type: Required. Certificate product type. Possible values + include: 'StandardDomainValidatedSsl', + 'StandardDomainValidatedWildCardSsl' + :type product_type: str or ~azure.mgmt.web.models.CertificateProductType + :param auto_renew: true if the certificate should be + automatically renewed when it expires; otherwise, false. + Default value: True . + :type auto_renew: bool + :ivar provisioning_state: Status of certificate order. Possible values + include: 'Succeeded', 'Failed', 'Canceled', 'InProgress', 'Deleting' + :vartype provisioning_state: str or + ~azure.mgmt.web.models.ProvisioningState + :ivar status: Current order status. Possible values include: + 'Pendingissuance', 'Issued', 'Revoked', 'Canceled', 'Denied', + 'Pendingrevocation', 'PendingRekey', 'Unused', 'Expired', 'NotSubmitted' + :vartype status: str or ~azure.mgmt.web.models.CertificateOrderStatus + :ivar signed_certificate: Signed certificate. + :vartype signed_certificate: ~azure.mgmt.web.models.CertificateDetails + :param csr: Last CSR that was created for this order. + :type csr: str + :ivar intermediate: Intermediate certificate. + :vartype intermediate: ~azure.mgmt.web.models.CertificateDetails + :ivar root: Root certificate. + :vartype root: ~azure.mgmt.web.models.CertificateDetails + :ivar serial_number: Current serial number of the certificate. + :vartype serial_number: str + :ivar last_certificate_issuance_time: Certificate last issuance time. + :vartype last_certificate_issuance_time: datetime + :ivar expiration_time: Certificate expiration time. + :vartype expiration_time: datetime + :ivar is_private_key_external: true if private key is + external; otherwise, false. + :vartype is_private_key_external: bool + :ivar app_service_certificate_not_renewable_reasons: Reasons why App + Service Certificate is not renewable at the current moment. + :vartype app_service_certificate_not_renewable_reasons: list[str] + :ivar next_auto_renewal_time_stamp: Time stamp when the certificate would + be auto renewed next + :vartype next_auto_renewal_time_stamp: datetime + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'domain_verification_token': {'readonly': True}, + 'validity_in_years': {'maximum': 3, 'minimum': 1}, + 'product_type': {'required': True}, + 'provisioning_state': {'readonly': True}, + 'status': {'readonly': True}, + 'signed_certificate': {'readonly': True}, + 'intermediate': {'readonly': True}, + 'root': {'readonly': True}, + 'serial_number': {'readonly': True}, + 'last_certificate_issuance_time': {'readonly': True}, + 'expiration_time': {'readonly': True}, + 'is_private_key_external': {'readonly': True}, + 'app_service_certificate_not_renewable_reasons': {'readonly': True}, + 'next_auto_renewal_time_stamp': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'certificates': {'key': 'properties.certificates', 'type': '{AppServiceCertificate}'}, + 'distinguished_name': {'key': 'properties.distinguishedName', 'type': 'str'}, + 'domain_verification_token': {'key': 'properties.domainVerificationToken', 'type': 'str'}, + 'validity_in_years': {'key': 'properties.validityInYears', 'type': 'int'}, + 'key_size': {'key': 'properties.keySize', 'type': 'int'}, + 'product_type': {'key': 'properties.productType', 'type': 'CertificateProductType'}, + 'auto_renew': {'key': 'properties.autoRenew', 'type': 'bool'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'ProvisioningState'}, + 'status': {'key': 'properties.status', 'type': 'CertificateOrderStatus'}, + 'signed_certificate': {'key': 'properties.signedCertificate', 'type': 'CertificateDetails'}, + 'csr': {'key': 'properties.csr', 'type': 'str'}, + 'intermediate': {'key': 'properties.intermediate', 'type': 'CertificateDetails'}, + 'root': {'key': 'properties.root', 'type': 'CertificateDetails'}, + 'serial_number': {'key': 'properties.serialNumber', 'type': 'str'}, + 'last_certificate_issuance_time': {'key': 'properties.lastCertificateIssuanceTime', 'type': 'iso-8601'}, + 'expiration_time': {'key': 'properties.expirationTime', 'type': 'iso-8601'}, + 'is_private_key_external': {'key': 'properties.isPrivateKeyExternal', 'type': 'bool'}, + 'app_service_certificate_not_renewable_reasons': {'key': 'properties.appServiceCertificateNotRenewableReasons', 'type': '[str]'}, + 'next_auto_renewal_time_stamp': {'key': 'properties.nextAutoRenewalTimeStamp', 'type': 'iso-8601'}, + } + + def __init__(self, *, product_type, kind: str=None, certificates=None, distinguished_name: str=None, validity_in_years: int=1, key_size: int=2048, auto_renew: bool=True, csr: str=None, **kwargs) -> None: + super(AppServiceCertificateOrderPatchResource, self).__init__(kind=kind, **kwargs) + self.certificates = certificates + self.distinguished_name = distinguished_name + self.domain_verification_token = None + self.validity_in_years = validity_in_years + self.key_size = key_size + self.product_type = product_type + self.auto_renew = auto_renew + self.provisioning_state = None + self.status = None + self.signed_certificate = None + self.csr = csr + self.intermediate = None + self.root = None + self.serial_number = None + self.last_certificate_issuance_time = None + self.expiration_time = None + self.is_private_key_external = None + self.app_service_certificate_not_renewable_reasons = None + self.next_auto_renewal_time_stamp = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_order_py3.py b/azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_order_py3.py new file mode 100644 index 000000000000..f4c276d210b2 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_order_py3.py @@ -0,0 +1,157 @@ +# 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 .resource_py3 import Resource + + +class AppServiceCertificateOrder(Resource): + """SSL certificate purchase order. + + Variables are only populated by the server, and will be ignored when + sending a request. + + All required parameters must be populated in order to send to Azure. + + :ivar id: Resource Id. + :vartype id: str + :ivar name: Resource Name. + :vartype name: str + :param kind: Kind of resource. + :type kind: str + :param location: Required. Resource Location. + :type location: str + :ivar type: Resource type. + :vartype type: str + :param tags: Resource tags. + :type tags: dict[str, str] + :param certificates: State of the Key Vault secret. + :type certificates: dict[str, + ~azure.mgmt.web.models.AppServiceCertificate] + :param distinguished_name: Certificate distinguished name. + :type distinguished_name: str + :ivar domain_verification_token: Domain verification token. + :vartype domain_verification_token: str + :param validity_in_years: Duration in years (must be between 1 and 3). + Default value: 1 . + :type validity_in_years: int + :param key_size: Certificate key size. Default value: 2048 . + :type key_size: int + :param product_type: Required. Certificate product type. Possible values + include: 'StandardDomainValidatedSsl', + 'StandardDomainValidatedWildCardSsl' + :type product_type: str or ~azure.mgmt.web.models.CertificateProductType + :param auto_renew: true if the certificate should be + automatically renewed when it expires; otherwise, false. + Default value: True . + :type auto_renew: bool + :ivar provisioning_state: Status of certificate order. Possible values + include: 'Succeeded', 'Failed', 'Canceled', 'InProgress', 'Deleting' + :vartype provisioning_state: str or + ~azure.mgmt.web.models.ProvisioningState + :ivar status: Current order status. Possible values include: + 'Pendingissuance', 'Issued', 'Revoked', 'Canceled', 'Denied', + 'Pendingrevocation', 'PendingRekey', 'Unused', 'Expired', 'NotSubmitted' + :vartype status: str or ~azure.mgmt.web.models.CertificateOrderStatus + :ivar signed_certificate: Signed certificate. + :vartype signed_certificate: ~azure.mgmt.web.models.CertificateDetails + :param csr: Last CSR that was created for this order. + :type csr: str + :ivar intermediate: Intermediate certificate. + :vartype intermediate: ~azure.mgmt.web.models.CertificateDetails + :ivar root: Root certificate. + :vartype root: ~azure.mgmt.web.models.CertificateDetails + :ivar serial_number: Current serial number of the certificate. + :vartype serial_number: str + :ivar last_certificate_issuance_time: Certificate last issuance time. + :vartype last_certificate_issuance_time: datetime + :ivar expiration_time: Certificate expiration time. + :vartype expiration_time: datetime + :ivar is_private_key_external: true if private key is + external; otherwise, false. + :vartype is_private_key_external: bool + :ivar app_service_certificate_not_renewable_reasons: Reasons why App + Service Certificate is not renewable at the current moment. + :vartype app_service_certificate_not_renewable_reasons: list[str] + :ivar next_auto_renewal_time_stamp: Time stamp when the certificate would + be auto renewed next + :vartype next_auto_renewal_time_stamp: datetime + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'location': {'required': True}, + 'type': {'readonly': True}, + 'domain_verification_token': {'readonly': True}, + 'validity_in_years': {'maximum': 3, 'minimum': 1}, + 'product_type': {'required': True}, + 'provisioning_state': {'readonly': True}, + 'status': {'readonly': True}, + 'signed_certificate': {'readonly': True}, + 'intermediate': {'readonly': True}, + 'root': {'readonly': True}, + 'serial_number': {'readonly': True}, + 'last_certificate_issuance_time': {'readonly': True}, + 'expiration_time': {'readonly': True}, + 'is_private_key_external': {'readonly': True}, + 'app_service_certificate_not_renewable_reasons': {'readonly': True}, + 'next_auto_renewal_time_stamp': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'location': {'key': 'location', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, + 'certificates': {'key': 'properties.certificates', 'type': '{AppServiceCertificate}'}, + 'distinguished_name': {'key': 'properties.distinguishedName', 'type': 'str'}, + 'domain_verification_token': {'key': 'properties.domainVerificationToken', 'type': 'str'}, + 'validity_in_years': {'key': 'properties.validityInYears', 'type': 'int'}, + 'key_size': {'key': 'properties.keySize', 'type': 'int'}, + 'product_type': {'key': 'properties.productType', 'type': 'CertificateProductType'}, + 'auto_renew': {'key': 'properties.autoRenew', 'type': 'bool'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'ProvisioningState'}, + 'status': {'key': 'properties.status', 'type': 'CertificateOrderStatus'}, + 'signed_certificate': {'key': 'properties.signedCertificate', 'type': 'CertificateDetails'}, + 'csr': {'key': 'properties.csr', 'type': 'str'}, + 'intermediate': {'key': 'properties.intermediate', 'type': 'CertificateDetails'}, + 'root': {'key': 'properties.root', 'type': 'CertificateDetails'}, + 'serial_number': {'key': 'properties.serialNumber', 'type': 'str'}, + 'last_certificate_issuance_time': {'key': 'properties.lastCertificateIssuanceTime', 'type': 'iso-8601'}, + 'expiration_time': {'key': 'properties.expirationTime', 'type': 'iso-8601'}, + 'is_private_key_external': {'key': 'properties.isPrivateKeyExternal', 'type': 'bool'}, + 'app_service_certificate_not_renewable_reasons': {'key': 'properties.appServiceCertificateNotRenewableReasons', 'type': '[str]'}, + 'next_auto_renewal_time_stamp': {'key': 'properties.nextAutoRenewalTimeStamp', 'type': 'iso-8601'}, + } + + def __init__(self, *, location: str, product_type, kind: str=None, tags=None, certificates=None, distinguished_name: str=None, validity_in_years: int=1, key_size: int=2048, auto_renew: bool=True, csr: str=None, **kwargs) -> None: + super(AppServiceCertificateOrder, self).__init__(kind=kind, location=location, tags=tags, **kwargs) + self.certificates = certificates + self.distinguished_name = distinguished_name + self.domain_verification_token = None + self.validity_in_years = validity_in_years + self.key_size = key_size + self.product_type = product_type + self.auto_renew = auto_renew + self.provisioning_state = None + self.status = None + self.signed_certificate = None + self.csr = csr + self.intermediate = None + self.root = None + self.serial_number = None + self.last_certificate_issuance_time = None + self.expiration_time = None + self.is_private_key_external = None + self.app_service_certificate_not_renewable_reasons = None + self.next_auto_renewal_time_stamp = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_patch_resource.py b/azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_patch_resource.py index 396fb0c5a54b..fb6bea6358a4 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_patch_resource.py +++ b/azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_patch_resource.py @@ -58,8 +58,8 @@ class AppServiceCertificatePatchResource(ProxyOnlyResource): 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'KeyVaultSecretStatus'}, } - def __init__(self, kind=None, key_vault_id=None, key_vault_secret_name=None): - super(AppServiceCertificatePatchResource, self).__init__(kind=kind) - self.key_vault_id = key_vault_id - self.key_vault_secret_name = key_vault_secret_name + def __init__(self, **kwargs): + super(AppServiceCertificatePatchResource, self).__init__(**kwargs) + self.key_vault_id = kwargs.get('key_vault_id', None) + self.key_vault_secret_name = kwargs.get('key_vault_secret_name', None) self.provisioning_state = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_patch_resource_py3.py b/azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_patch_resource_py3.py new file mode 100644 index 000000000000..73d3ebb90422 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_patch_resource_py3.py @@ -0,0 +1,65 @@ +# 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_py3 import ProxyOnlyResource + + +class AppServiceCertificatePatchResource(ProxyOnlyResource): + """Key Vault container ARM resource for a certificate that is purchased + through Azure. + + 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 key_vault_id: Key Vault resource Id. + :type key_vault_id: str + :param key_vault_secret_name: Key Vault secret name. + :type key_vault_secret_name: str + :ivar provisioning_state: Status of the Key Vault secret. Possible values + include: 'Initialized', 'WaitingOnCertificateOrder', 'Succeeded', + 'CertificateOrderFailed', 'OperationNotPermittedOnKeyVault', + 'AzureServiceUnauthorizedToAccessKeyVault', 'KeyVaultDoesNotExist', + 'KeyVaultSecretDoesNotExist', 'UnknownError', 'ExternalPrivateKey', + 'Unknown' + :vartype provisioning_state: str or + ~azure.mgmt.web.models.KeyVaultSecretStatus + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'provisioning_state': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'key_vault_id': {'key': 'properties.keyVaultId', 'type': 'str'}, + 'key_vault_secret_name': {'key': 'properties.keyVaultSecretName', 'type': 'str'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'KeyVaultSecretStatus'}, + } + + def __init__(self, *, kind: str=None, key_vault_id: str=None, key_vault_secret_name: str=None, **kwargs) -> None: + super(AppServiceCertificatePatchResource, self).__init__(kind=kind, **kwargs) + self.key_vault_id = key_vault_id + self.key_vault_secret_name = key_vault_secret_name + self.provisioning_state = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_py3.py b/azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_py3.py new file mode 100644 index 000000000000..e30db2b48566 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_py3.py @@ -0,0 +1,49 @@ +# 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 AppServiceCertificate(Model): + """Key Vault container for a certificate that is purchased through Azure. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :param key_vault_id: Key Vault resource Id. + :type key_vault_id: str + :param key_vault_secret_name: Key Vault secret name. + :type key_vault_secret_name: str + :ivar provisioning_state: Status of the Key Vault secret. Possible values + include: 'Initialized', 'WaitingOnCertificateOrder', 'Succeeded', + 'CertificateOrderFailed', 'OperationNotPermittedOnKeyVault', + 'AzureServiceUnauthorizedToAccessKeyVault', 'KeyVaultDoesNotExist', + 'KeyVaultSecretDoesNotExist', 'UnknownError', 'ExternalPrivateKey', + 'Unknown' + :vartype provisioning_state: str or + ~azure.mgmt.web.models.KeyVaultSecretStatus + """ + + _validation = { + 'provisioning_state': {'readonly': True}, + } + + _attribute_map = { + 'key_vault_id': {'key': 'keyVaultId', 'type': 'str'}, + 'key_vault_secret_name': {'key': 'keyVaultSecretName', 'type': 'str'}, + 'provisioning_state': {'key': 'provisioningState', 'type': 'KeyVaultSecretStatus'}, + } + + def __init__(self, *, key_vault_id: str=None, key_vault_secret_name: str=None, **kwargs) -> None: + super(AppServiceCertificate, self).__init__(**kwargs) + self.key_vault_id = key_vault_id + self.key_vault_secret_name = key_vault_secret_name + self.provisioning_state = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_resource.py b/azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_resource.py index b326f42f3a47..be01e27689f9 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_resource.py +++ b/azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_resource.py @@ -19,13 +19,15 @@ class AppServiceCertificateResource(Resource): Variables are only populated by the server, and will be ignored when sending a request. + All required parameters must be populated in order to send to Azure. + :ivar id: Resource Id. :vartype id: str :ivar name: Resource Name. :vartype name: str :param kind: Kind of resource. :type kind: str - :param location: Resource Location. + :param location: Required. Resource Location. :type location: str :ivar type: Resource type. :vartype type: str @@ -65,8 +67,8 @@ class AppServiceCertificateResource(Resource): 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'KeyVaultSecretStatus'}, } - def __init__(self, location, kind=None, tags=None, key_vault_id=None, key_vault_secret_name=None): - super(AppServiceCertificateResource, self).__init__(kind=kind, location=location, tags=tags) - self.key_vault_id = key_vault_id - self.key_vault_secret_name = key_vault_secret_name + def __init__(self, **kwargs): + super(AppServiceCertificateResource, self).__init__(**kwargs) + self.key_vault_id = kwargs.get('key_vault_id', None) + self.key_vault_secret_name = kwargs.get('key_vault_secret_name', None) self.provisioning_state = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_resource_py3.py b/azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_resource_py3.py new file mode 100644 index 000000000000..2b55619d18a3 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_resource_py3.py @@ -0,0 +1,74 @@ +# 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 .resource_py3 import Resource + + +class AppServiceCertificateResource(Resource): + """Key Vault container ARM resource for a certificate that is purchased + through Azure. + + Variables are only populated by the server, and will be ignored when + sending a request. + + All required parameters must be populated in order to send to Azure. + + :ivar id: Resource Id. + :vartype id: str + :ivar name: Resource Name. + :vartype name: str + :param kind: Kind of resource. + :type kind: str + :param location: Required. Resource Location. + :type location: str + :ivar type: Resource type. + :vartype type: str + :param tags: Resource tags. + :type tags: dict[str, str] + :param key_vault_id: Key Vault resource Id. + :type key_vault_id: str + :param key_vault_secret_name: Key Vault secret name. + :type key_vault_secret_name: str + :ivar provisioning_state: Status of the Key Vault secret. Possible values + include: 'Initialized', 'WaitingOnCertificateOrder', 'Succeeded', + 'CertificateOrderFailed', 'OperationNotPermittedOnKeyVault', + 'AzureServiceUnauthorizedToAccessKeyVault', 'KeyVaultDoesNotExist', + 'KeyVaultSecretDoesNotExist', 'UnknownError', 'ExternalPrivateKey', + 'Unknown' + :vartype provisioning_state: str or + ~azure.mgmt.web.models.KeyVaultSecretStatus + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'location': {'required': True}, + 'type': {'readonly': True}, + 'provisioning_state': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'location': {'key': 'location', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, + 'key_vault_id': {'key': 'properties.keyVaultId', 'type': 'str'}, + 'key_vault_secret_name': {'key': 'properties.keyVaultSecretName', 'type': 'str'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'KeyVaultSecretStatus'}, + } + + def __init__(self, *, location: str, kind: str=None, tags=None, key_vault_id: str=None, key_vault_secret_name: str=None, **kwargs) -> None: + super(AppServiceCertificateResource, self).__init__(kind=kind, location=location, tags=tags, **kwargs) + self.key_vault_id = key_vault_id + self.key_vault_secret_name = key_vault_secret_name + self.provisioning_state = None 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..0188bc2cf194 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 @@ -18,9 +18,12 @@ class AppServiceEnvironment(Model): Variables are only populated by the server, and will be ignored when sending a request. - :param name: Name of the App Service Environment. + All required parameters must be populated in order to send to Azure. + + :param name: Required. Name of the App Service Environment. :type name: str - :param location: Location of the App Service Environment, e.g. "West US". + :param location: Required. Location of the App Service Environment, e.g. + "West US". :type location: str :ivar provisioning_state: Provisioning state of the App Service Environment. Possible values include: 'Succeeded', 'Failed', 'Canceled', @@ -37,7 +40,7 @@ class AppServiceEnvironment(Model): :type vnet_resource_group_name: str :param vnet_subnet_name: Subnet of the Virtual Network. :type vnet_subnet_name: str - :param virtual_network: Description of the Virtual Network. + :param virtual_network: Required. Description of the Virtual Network. :type virtual_network: ~azure.mgmt.web.models.VirtualNetworkProfile :param internal_load_balancing_mode: Specifies which endpoints to serve internally in the Virtual Network for the App Service Environment. @@ -48,8 +51,8 @@ class AppServiceEnvironment(Model): :type multi_size: str :param multi_role_count: Number of front-end instances. :type multi_role_count: int - :param worker_pools: Description of worker pools with worker size IDs, VM - sizes, and number of workers in each pool. + :param worker_pools: Required. Description of worker pools with worker + size IDs, VM sizes, and number of workers in each pool. :type worker_pools: list[~azure.mgmt.web.models.WorkerPool] :param ipssl_address_count: Number of IP SSL addresses reserved for the App Service Environment. @@ -188,26 +191,26 @@ class AppServiceEnvironment(Model): 'user_whitelisted_ip_ranges': {'key': 'userWhitelistedIpRanges', 'type': '[str]'}, } - 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): - super(AppServiceEnvironment, self).__init__() - self.name = name - self.location = location + def __init__(self, **kwargs): + super(AppServiceEnvironment, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.location = kwargs.get('location', None) self.provisioning_state = None self.status = None - self.vnet_name = vnet_name - self.vnet_resource_group_name = vnet_resource_group_name - self.vnet_subnet_name = vnet_subnet_name - self.virtual_network = virtual_network - self.internal_load_balancing_mode = internal_load_balancing_mode - self.multi_size = multi_size - self.multi_role_count = multi_role_count - self.worker_pools = worker_pools - self.ipssl_address_count = ipssl_address_count + self.vnet_name = kwargs.get('vnet_name', None) + self.vnet_resource_group_name = kwargs.get('vnet_resource_group_name', None) + self.vnet_subnet_name = kwargs.get('vnet_subnet_name', None) + self.virtual_network = kwargs.get('virtual_network', None) + self.internal_load_balancing_mode = kwargs.get('internal_load_balancing_mode', None) + self.multi_size = kwargs.get('multi_size', None) + self.multi_role_count = kwargs.get('multi_role_count', None) + self.worker_pools = kwargs.get('worker_pools', None) + self.ipssl_address_count = kwargs.get('ipssl_address_count', None) self.database_edition = None self.database_service_objective = None self.upgrade_domains = None self.subscription_id = None - self.dns_suffix = dns_suffix + self.dns_suffix = kwargs.get('dns_suffix', None) self.last_action = None self.last_action_result = None self.allowed_multi_sizes = None @@ -215,14 +218,14 @@ def __init__(self, name, location, virtual_network, worker_pools, vnet_name=None self.maximum_number_of_machines = None self.vip_mappings = None self.environment_capacities = None - self.network_access_control_list = network_access_control_list + self.network_access_control_list = kwargs.get('network_access_control_list', None) self.environment_is_healthy = None self.environment_status = None self.resource_group = None - self.front_end_scale_factor = front_end_scale_factor + self.front_end_scale_factor = kwargs.get('front_end_scale_factor', None) self.default_front_end_scale_factor = None - self.api_management_account_id = api_management_account_id - self.suspended = suspended - self.dynamic_cache_enabled = dynamic_cache_enabled - self.cluster_settings = cluster_settings - self.user_whitelisted_ip_ranges = user_whitelisted_ip_ranges + self.api_management_account_id = kwargs.get('api_management_account_id', None) + self.suspended = kwargs.get('suspended', None) + self.dynamic_cache_enabled = kwargs.get('dynamic_cache_enabled', None) + self.cluster_settings = kwargs.get('cluster_settings', None) + self.user_whitelisted_ip_ranges = kwargs.get('user_whitelisted_ip_ranges', None) 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..d64026258130 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 @@ -18,6 +18,8 @@ class AppServiceEnvironmentPatchResource(ProxyOnlyResource): Variables are only populated by the server, and will be ignored when sending a request. + All required parameters must be populated in order to send to Azure. + :ivar id: Resource Id. :vartype id: str :ivar name: Resource Name. @@ -26,10 +28,11 @@ class AppServiceEnvironmentPatchResource(ProxyOnlyResource): :type kind: str :ivar type: Resource type. :vartype type: str - :param app_service_environment_patch_resource_name: Name of the App - Service Environment. + :param app_service_environment_patch_resource_name: Required. Name of the + App Service Environment. :type app_service_environment_patch_resource_name: str - :param location: Location of the App Service Environment, e.g. "West US". + :param location: Required. Location of the App Service Environment, e.g. + "West US". :type location: str :ivar provisioning_state: Provisioning state of the App Service Environment. Possible values include: 'Succeeded', 'Failed', 'Canceled', @@ -46,7 +49,7 @@ class AppServiceEnvironmentPatchResource(ProxyOnlyResource): :type vnet_resource_group_name: str :param vnet_subnet_name: Subnet of the Virtual Network. :type vnet_subnet_name: str - :param virtual_network: Description of the Virtual Network. + :param virtual_network: Required. Description of the Virtual Network. :type virtual_network: ~azure.mgmt.web.models.VirtualNetworkProfile :param internal_load_balancing_mode: Specifies which endpoints to serve internally in the Virtual Network for the App Service Environment. @@ -57,8 +60,8 @@ class AppServiceEnvironmentPatchResource(ProxyOnlyResource): :type multi_size: str :param multi_role_count: Number of front-end instances. :type multi_role_count: int - :param worker_pools: Description of worker pools with worker size IDs, VM - sizes, and number of workers in each pool. + :param worker_pools: Required. Description of worker pools with worker + size IDs, VM sizes, and number of workers in each pool. :type worker_pools: list[~azure.mgmt.web.models.WorkerPool] :param ipssl_address_count: Number of IP SSL addresses reserved for the App Service Environment. @@ -204,26 +207,26 @@ class AppServiceEnvironmentPatchResource(ProxyOnlyResource): 'user_whitelisted_ip_ranges': {'key': 'properties.userWhitelistedIpRanges', 'type': '[str]'}, } - 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): - super(AppServiceEnvironmentPatchResource, self).__init__(kind=kind) - self.app_service_environment_patch_resource_name = app_service_environment_patch_resource_name - self.location = location + def __init__(self, **kwargs): + super(AppServiceEnvironmentPatchResource, self).__init__(**kwargs) + self.app_service_environment_patch_resource_name = kwargs.get('app_service_environment_patch_resource_name', None) + self.location = kwargs.get('location', None) self.provisioning_state = None self.status = None - self.vnet_name = vnet_name - self.vnet_resource_group_name = vnet_resource_group_name - self.vnet_subnet_name = vnet_subnet_name - self.virtual_network = virtual_network - self.internal_load_balancing_mode = internal_load_balancing_mode - self.multi_size = multi_size - self.multi_role_count = multi_role_count - self.worker_pools = worker_pools - self.ipssl_address_count = ipssl_address_count + self.vnet_name = kwargs.get('vnet_name', None) + self.vnet_resource_group_name = kwargs.get('vnet_resource_group_name', None) + self.vnet_subnet_name = kwargs.get('vnet_subnet_name', None) + self.virtual_network = kwargs.get('virtual_network', None) + self.internal_load_balancing_mode = kwargs.get('internal_load_balancing_mode', None) + self.multi_size = kwargs.get('multi_size', None) + self.multi_role_count = kwargs.get('multi_role_count', None) + self.worker_pools = kwargs.get('worker_pools', None) + self.ipssl_address_count = kwargs.get('ipssl_address_count', None) self.database_edition = None self.database_service_objective = None self.upgrade_domains = None self.subscription_id = None - self.dns_suffix = dns_suffix + self.dns_suffix = kwargs.get('dns_suffix', None) self.last_action = None self.last_action_result = None self.allowed_multi_sizes = None @@ -231,14 +234,14 @@ def __init__(self, app_service_environment_patch_resource_name, location, virtua self.maximum_number_of_machines = None self.vip_mappings = None self.environment_capacities = None - self.network_access_control_list = network_access_control_list + self.network_access_control_list = kwargs.get('network_access_control_list', None) self.environment_is_healthy = None self.environment_status = None self.resource_group = None - self.front_end_scale_factor = front_end_scale_factor + self.front_end_scale_factor = kwargs.get('front_end_scale_factor', None) self.default_front_end_scale_factor = None - self.api_management_account_id = api_management_account_id - self.suspended = suspended - self.dynamic_cache_enabled = dynamic_cache_enabled - self.cluster_settings = cluster_settings - self.user_whitelisted_ip_ranges = user_whitelisted_ip_ranges + self.api_management_account_id = kwargs.get('api_management_account_id', None) + self.suspended = kwargs.get('suspended', None) + self.dynamic_cache_enabled = kwargs.get('dynamic_cache_enabled', None) + self.cluster_settings = kwargs.get('cluster_settings', None) + self.user_whitelisted_ip_ranges = kwargs.get('user_whitelisted_ip_ranges', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/app_service_environment_patch_resource_py3.py b/azure-mgmt-web/azure/mgmt/web/models/app_service_environment_patch_resource_py3.py new file mode 100644 index 000000000000..a2a18b0fd543 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/app_service_environment_patch_resource_py3.py @@ -0,0 +1,247 @@ +# 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_py3 import ProxyOnlyResource + + +class AppServiceEnvironmentPatchResource(ProxyOnlyResource): + """ARM resource for a app service enviroment. + + Variables are only populated by the server, and will be ignored when + sending a request. + + All required parameters must be populated in order to send to Azure. + + :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 app_service_environment_patch_resource_name: Required. Name of the + App Service Environment. + :type app_service_environment_patch_resource_name: str + :param location: Required. Location of the App Service Environment, e.g. + "West US". + :type location: str + :ivar provisioning_state: Provisioning state of the App Service + Environment. Possible values include: 'Succeeded', 'Failed', 'Canceled', + 'InProgress', 'Deleting' + :vartype provisioning_state: str or + ~azure.mgmt.web.models.ProvisioningState + :ivar status: Current status of the App Service Environment. Possible + values include: 'Preparing', 'Ready', 'Scaling', 'Deleting' + :vartype status: str or ~azure.mgmt.web.models.HostingEnvironmentStatus + :param vnet_name: Name of the Virtual Network for the App Service + Environment. + :type vnet_name: str + :param vnet_resource_group_name: Resource group of the Virtual Network. + :type vnet_resource_group_name: str + :param vnet_subnet_name: Subnet of the Virtual Network. + :type vnet_subnet_name: str + :param virtual_network: Required. Description of the Virtual Network. + :type virtual_network: ~azure.mgmt.web.models.VirtualNetworkProfile + :param internal_load_balancing_mode: Specifies which endpoints to serve + internally in the Virtual Network for the App Service Environment. + Possible values include: 'None', 'Web', 'Publishing' + :type internal_load_balancing_mode: str or + ~azure.mgmt.web.models.InternalLoadBalancingMode + :param multi_size: Front-end VM size, e.g. "Medium", "Large". + :type multi_size: str + :param multi_role_count: Number of front-end instances. + :type multi_role_count: int + :param worker_pools: Required. Description of worker pools with worker + size IDs, VM sizes, and number of workers in each pool. + :type worker_pools: list[~azure.mgmt.web.models.WorkerPool] + :param ipssl_address_count: Number of IP SSL addresses reserved for the + App Service Environment. + :type ipssl_address_count: int + :ivar database_edition: Edition of the metadata database for the App + Service Environment, e.g. "Standard". + :vartype database_edition: str + :ivar database_service_objective: Service objective of the metadata + database for the App Service Environment, e.g. "S0". + :vartype database_service_objective: str + :ivar upgrade_domains: Number of upgrade domains of the App Service + Environment. + :vartype upgrade_domains: int + :ivar subscription_id: Subscription of the App Service Environment. + :vartype subscription_id: str + :param dns_suffix: DNS suffix of the App Service Environment. + :type dns_suffix: str + :ivar last_action: Last deployment action on the App Service Environment. + :vartype last_action: str + :ivar last_action_result: Result of the last deployment action on the App + Service Environment. + :vartype last_action_result: str + :ivar allowed_multi_sizes: List of comma separated strings describing + which VM sizes are allowed for front-ends. + :vartype allowed_multi_sizes: str + :ivar allowed_worker_sizes: List of comma separated strings describing + which VM sizes are allowed for workers. + :vartype allowed_worker_sizes: str + :ivar maximum_number_of_machines: Maximum number of VMs in the App Service + Environment. + :vartype maximum_number_of_machines: int + :ivar vip_mappings: Description of IP SSL mapping for the App Service + Environment. + :vartype vip_mappings: list[~azure.mgmt.web.models.VirtualIPMapping] + :ivar environment_capacities: Current total, used, and available worker + capacities. + :vartype environment_capacities: + list[~azure.mgmt.web.models.StampCapacity] + :param network_access_control_list: Access control list for controlling + traffic to the App Service Environment. + :type network_access_control_list: + list[~azure.mgmt.web.models.NetworkAccessControlEntry] + :ivar environment_is_healthy: True/false indicating whether the App + Service Environment is healthy. + :vartype environment_is_healthy: bool + :ivar environment_status: Detailed message about with results of the last + check of the App Service Environment. + :vartype environment_status: str + :ivar resource_group: Resource group of the App Service Environment. + :vartype resource_group: str + :param front_end_scale_factor: Scale factor for front-ends. + :type front_end_scale_factor: int + :ivar default_front_end_scale_factor: Default Scale Factor for FrontEnds. + :vartype default_front_end_scale_factor: int + :param api_management_account_id: API Management Account associated with + the App Service Environment. + :type api_management_account_id: str + :param suspended: true if the App Service Environment is + suspended; otherwise, false. The environment can be + suspended, e.g. when the management endpoint is no longer available + (most likely because NSG blocked the incoming traffic). + :type suspended: bool + :param dynamic_cache_enabled: True/false indicating whether the App + Service Environment is suspended. The environment can be suspended e.g. + when the management endpoint is no longer available + (most likely because NSG blocked the incoming traffic). + :type dynamic_cache_enabled: bool + :param cluster_settings: Custom settings for changing the behavior of the + App Service Environment. + :type cluster_settings: list[~azure.mgmt.web.models.NameValuePair] + :param user_whitelisted_ip_ranges: User added ip ranges to whitelist on + ASE db + :type user_whitelisted_ip_ranges: list[str] + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'app_service_environment_patch_resource_name': {'required': True}, + 'location': {'required': True}, + 'provisioning_state': {'readonly': True}, + 'status': {'readonly': True}, + 'virtual_network': {'required': True}, + 'worker_pools': {'required': True}, + 'database_edition': {'readonly': True}, + 'database_service_objective': {'readonly': True}, + 'upgrade_domains': {'readonly': True}, + 'subscription_id': {'readonly': True}, + 'last_action': {'readonly': True}, + 'last_action_result': {'readonly': True}, + 'allowed_multi_sizes': {'readonly': True}, + 'allowed_worker_sizes': {'readonly': True}, + 'maximum_number_of_machines': {'readonly': True}, + 'vip_mappings': {'readonly': True}, + 'environment_capacities': {'readonly': True}, + 'environment_is_healthy': {'readonly': True}, + 'environment_status': {'readonly': True}, + 'resource_group': {'readonly': True}, + 'default_front_end_scale_factor': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'app_service_environment_patch_resource_name': {'key': 'properties.name', 'type': 'str'}, + 'location': {'key': 'properties.location', 'type': 'str'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'ProvisioningState'}, + 'status': {'key': 'properties.status', 'type': 'HostingEnvironmentStatus'}, + 'vnet_name': {'key': 'properties.vnetName', 'type': 'str'}, + 'vnet_resource_group_name': {'key': 'properties.vnetResourceGroupName', 'type': 'str'}, + 'vnet_subnet_name': {'key': 'properties.vnetSubnetName', 'type': 'str'}, + 'virtual_network': {'key': 'properties.virtualNetwork', 'type': 'VirtualNetworkProfile'}, + 'internal_load_balancing_mode': {'key': 'properties.internalLoadBalancingMode', 'type': 'InternalLoadBalancingMode'}, + 'multi_size': {'key': 'properties.multiSize', 'type': 'str'}, + 'multi_role_count': {'key': 'properties.multiRoleCount', 'type': 'int'}, + 'worker_pools': {'key': 'properties.workerPools', 'type': '[WorkerPool]'}, + 'ipssl_address_count': {'key': 'properties.ipsslAddressCount', 'type': 'int'}, + 'database_edition': {'key': 'properties.databaseEdition', 'type': 'str'}, + 'database_service_objective': {'key': 'properties.databaseServiceObjective', 'type': 'str'}, + 'upgrade_domains': {'key': 'properties.upgradeDomains', 'type': 'int'}, + 'subscription_id': {'key': 'properties.subscriptionId', 'type': 'str'}, + 'dns_suffix': {'key': 'properties.dnsSuffix', 'type': 'str'}, + 'last_action': {'key': 'properties.lastAction', 'type': 'str'}, + 'last_action_result': {'key': 'properties.lastActionResult', 'type': 'str'}, + 'allowed_multi_sizes': {'key': 'properties.allowedMultiSizes', 'type': 'str'}, + 'allowed_worker_sizes': {'key': 'properties.allowedWorkerSizes', 'type': 'str'}, + 'maximum_number_of_machines': {'key': 'properties.maximumNumberOfMachines', 'type': 'int'}, + 'vip_mappings': {'key': 'properties.vipMappings', 'type': '[VirtualIPMapping]'}, + 'environment_capacities': {'key': 'properties.environmentCapacities', 'type': '[StampCapacity]'}, + 'network_access_control_list': {'key': 'properties.networkAccessControlList', 'type': '[NetworkAccessControlEntry]'}, + 'environment_is_healthy': {'key': 'properties.environmentIsHealthy', 'type': 'bool'}, + 'environment_status': {'key': 'properties.environmentStatus', 'type': 'str'}, + 'resource_group': {'key': 'properties.resourceGroup', 'type': 'str'}, + 'front_end_scale_factor': {'key': 'properties.frontEndScaleFactor', 'type': 'int'}, + 'default_front_end_scale_factor': {'key': 'properties.defaultFrontEndScaleFactor', 'type': 'int'}, + 'api_management_account_id': {'key': 'properties.apiManagementAccountId', 'type': 'str'}, + 'suspended': {'key': 'properties.suspended', 'type': 'bool'}, + 'dynamic_cache_enabled': {'key': 'properties.dynamicCacheEnabled', 'type': 'bool'}, + 'cluster_settings': {'key': 'properties.clusterSettings', 'type': '[NameValuePair]'}, + 'user_whitelisted_ip_ranges': {'key': 'properties.userWhitelistedIpRanges', 'type': '[str]'}, + } + + def __init__(self, *, app_service_environment_patch_resource_name: str, location: str, virtual_network, worker_pools, kind: str=None, vnet_name: str=None, vnet_resource_group_name: str=None, vnet_subnet_name: str=None, internal_load_balancing_mode=None, multi_size: str=None, multi_role_count: int=None, ipssl_address_count: int=None, dns_suffix: str=None, network_access_control_list=None, front_end_scale_factor: int=None, api_management_account_id: str=None, suspended: bool=None, dynamic_cache_enabled: bool=None, cluster_settings=None, user_whitelisted_ip_ranges=None, **kwargs) -> None: + super(AppServiceEnvironmentPatchResource, self).__init__(kind=kind, **kwargs) + self.app_service_environment_patch_resource_name = app_service_environment_patch_resource_name + self.location = location + self.provisioning_state = None + self.status = None + self.vnet_name = vnet_name + self.vnet_resource_group_name = vnet_resource_group_name + self.vnet_subnet_name = vnet_subnet_name + self.virtual_network = virtual_network + self.internal_load_balancing_mode = internal_load_balancing_mode + self.multi_size = multi_size + self.multi_role_count = multi_role_count + self.worker_pools = worker_pools + self.ipssl_address_count = ipssl_address_count + self.database_edition = None + self.database_service_objective = None + self.upgrade_domains = None + self.subscription_id = None + self.dns_suffix = dns_suffix + self.last_action = None + self.last_action_result = None + self.allowed_multi_sizes = None + self.allowed_worker_sizes = None + self.maximum_number_of_machines = None + self.vip_mappings = None + self.environment_capacities = None + self.network_access_control_list = network_access_control_list + self.environment_is_healthy = None + self.environment_status = None + self.resource_group = None + self.front_end_scale_factor = front_end_scale_factor + self.default_front_end_scale_factor = None + self.api_management_account_id = api_management_account_id + self.suspended = suspended + self.dynamic_cache_enabled = dynamic_cache_enabled + self.cluster_settings = cluster_settings + self.user_whitelisted_ip_ranges = user_whitelisted_ip_ranges diff --git a/azure-mgmt-web/azure/mgmt/web/models/app_service_environment_py3.py b/azure-mgmt-web/azure/mgmt/web/models/app_service_environment_py3.py new file mode 100644 index 000000000000..fd0968e50c29 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/app_service_environment_py3.py @@ -0,0 +1,231 @@ +# 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 AppServiceEnvironment(Model): + """Description of an App Service Environment. + + Variables are only populated by the server, and will be ignored when + sending a request. + + All required parameters must be populated in order to send to Azure. + + :param name: Required. Name of the App Service Environment. + :type name: str + :param location: Required. Location of the App Service Environment, e.g. + "West US". + :type location: str + :ivar provisioning_state: Provisioning state of the App Service + Environment. Possible values include: 'Succeeded', 'Failed', 'Canceled', + 'InProgress', 'Deleting' + :vartype provisioning_state: str or + ~azure.mgmt.web.models.ProvisioningState + :ivar status: Current status of the App Service Environment. Possible + values include: 'Preparing', 'Ready', 'Scaling', 'Deleting' + :vartype status: str or ~azure.mgmt.web.models.HostingEnvironmentStatus + :param vnet_name: Name of the Virtual Network for the App Service + Environment. + :type vnet_name: str + :param vnet_resource_group_name: Resource group of the Virtual Network. + :type vnet_resource_group_name: str + :param vnet_subnet_name: Subnet of the Virtual Network. + :type vnet_subnet_name: str + :param virtual_network: Required. Description of the Virtual Network. + :type virtual_network: ~azure.mgmt.web.models.VirtualNetworkProfile + :param internal_load_balancing_mode: Specifies which endpoints to serve + internally in the Virtual Network for the App Service Environment. + Possible values include: 'None', 'Web', 'Publishing' + :type internal_load_balancing_mode: str or + ~azure.mgmt.web.models.InternalLoadBalancingMode + :param multi_size: Front-end VM size, e.g. "Medium", "Large". + :type multi_size: str + :param multi_role_count: Number of front-end instances. + :type multi_role_count: int + :param worker_pools: Required. Description of worker pools with worker + size IDs, VM sizes, and number of workers in each pool. + :type worker_pools: list[~azure.mgmt.web.models.WorkerPool] + :param ipssl_address_count: Number of IP SSL addresses reserved for the + App Service Environment. + :type ipssl_address_count: int + :ivar database_edition: Edition of the metadata database for the App + Service Environment, e.g. "Standard". + :vartype database_edition: str + :ivar database_service_objective: Service objective of the metadata + database for the App Service Environment, e.g. "S0". + :vartype database_service_objective: str + :ivar upgrade_domains: Number of upgrade domains of the App Service + Environment. + :vartype upgrade_domains: int + :ivar subscription_id: Subscription of the App Service Environment. + :vartype subscription_id: str + :param dns_suffix: DNS suffix of the App Service Environment. + :type dns_suffix: str + :ivar last_action: Last deployment action on the App Service Environment. + :vartype last_action: str + :ivar last_action_result: Result of the last deployment action on the App + Service Environment. + :vartype last_action_result: str + :ivar allowed_multi_sizes: List of comma separated strings describing + which VM sizes are allowed for front-ends. + :vartype allowed_multi_sizes: str + :ivar allowed_worker_sizes: List of comma separated strings describing + which VM sizes are allowed for workers. + :vartype allowed_worker_sizes: str + :ivar maximum_number_of_machines: Maximum number of VMs in the App Service + Environment. + :vartype maximum_number_of_machines: int + :ivar vip_mappings: Description of IP SSL mapping for the App Service + Environment. + :vartype vip_mappings: list[~azure.mgmt.web.models.VirtualIPMapping] + :ivar environment_capacities: Current total, used, and available worker + capacities. + :vartype environment_capacities: + list[~azure.mgmt.web.models.StampCapacity] + :param network_access_control_list: Access control list for controlling + traffic to the App Service Environment. + :type network_access_control_list: + list[~azure.mgmt.web.models.NetworkAccessControlEntry] + :ivar environment_is_healthy: True/false indicating whether the App + Service Environment is healthy. + :vartype environment_is_healthy: bool + :ivar environment_status: Detailed message about with results of the last + check of the App Service Environment. + :vartype environment_status: str + :ivar resource_group: Resource group of the App Service Environment. + :vartype resource_group: str + :param front_end_scale_factor: Scale factor for front-ends. + :type front_end_scale_factor: int + :ivar default_front_end_scale_factor: Default Scale Factor for FrontEnds. + :vartype default_front_end_scale_factor: int + :param api_management_account_id: API Management Account associated with + the App Service Environment. + :type api_management_account_id: str + :param suspended: true if the App Service Environment is + suspended; otherwise, false. The environment can be + suspended, e.g. when the management endpoint is no longer available + (most likely because NSG blocked the incoming traffic). + :type suspended: bool + :param dynamic_cache_enabled: True/false indicating whether the App + Service Environment is suspended. The environment can be suspended e.g. + when the management endpoint is no longer available + (most likely because NSG blocked the incoming traffic). + :type dynamic_cache_enabled: bool + :param cluster_settings: Custom settings for changing the behavior of the + App Service Environment. + :type cluster_settings: list[~azure.mgmt.web.models.NameValuePair] + :param user_whitelisted_ip_ranges: User added ip ranges to whitelist on + ASE db + :type user_whitelisted_ip_ranges: list[str] + """ + + _validation = { + 'name': {'required': True}, + 'location': {'required': True}, + 'provisioning_state': {'readonly': True}, + 'status': {'readonly': True}, + 'virtual_network': {'required': True}, + 'worker_pools': {'required': True}, + 'database_edition': {'readonly': True}, + 'database_service_objective': {'readonly': True}, + 'upgrade_domains': {'readonly': True}, + 'subscription_id': {'readonly': True}, + 'last_action': {'readonly': True}, + 'last_action_result': {'readonly': True}, + 'allowed_multi_sizes': {'readonly': True}, + 'allowed_worker_sizes': {'readonly': True}, + 'maximum_number_of_machines': {'readonly': True}, + 'vip_mappings': {'readonly': True}, + 'environment_capacities': {'readonly': True}, + 'environment_is_healthy': {'readonly': True}, + 'environment_status': {'readonly': True}, + 'resource_group': {'readonly': True}, + 'default_front_end_scale_factor': {'readonly': True}, + } + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'location': {'key': 'location', 'type': 'str'}, + 'provisioning_state': {'key': 'provisioningState', 'type': 'ProvisioningState'}, + 'status': {'key': 'status', 'type': 'HostingEnvironmentStatus'}, + 'vnet_name': {'key': 'vnetName', 'type': 'str'}, + 'vnet_resource_group_name': {'key': 'vnetResourceGroupName', 'type': 'str'}, + 'vnet_subnet_name': {'key': 'vnetSubnetName', 'type': 'str'}, + 'virtual_network': {'key': 'virtualNetwork', 'type': 'VirtualNetworkProfile'}, + 'internal_load_balancing_mode': {'key': 'internalLoadBalancingMode', 'type': 'InternalLoadBalancingMode'}, + 'multi_size': {'key': 'multiSize', 'type': 'str'}, + 'multi_role_count': {'key': 'multiRoleCount', 'type': 'int'}, + 'worker_pools': {'key': 'workerPools', 'type': '[WorkerPool]'}, + 'ipssl_address_count': {'key': 'ipsslAddressCount', 'type': 'int'}, + 'database_edition': {'key': 'databaseEdition', 'type': 'str'}, + 'database_service_objective': {'key': 'databaseServiceObjective', 'type': 'str'}, + 'upgrade_domains': {'key': 'upgradeDomains', 'type': 'int'}, + 'subscription_id': {'key': 'subscriptionId', 'type': 'str'}, + 'dns_suffix': {'key': 'dnsSuffix', 'type': 'str'}, + 'last_action': {'key': 'lastAction', 'type': 'str'}, + 'last_action_result': {'key': 'lastActionResult', 'type': 'str'}, + 'allowed_multi_sizes': {'key': 'allowedMultiSizes', 'type': 'str'}, + 'allowed_worker_sizes': {'key': 'allowedWorkerSizes', 'type': 'str'}, + 'maximum_number_of_machines': {'key': 'maximumNumberOfMachines', 'type': 'int'}, + 'vip_mappings': {'key': 'vipMappings', 'type': '[VirtualIPMapping]'}, + 'environment_capacities': {'key': 'environmentCapacities', 'type': '[StampCapacity]'}, + 'network_access_control_list': {'key': 'networkAccessControlList', 'type': '[NetworkAccessControlEntry]'}, + 'environment_is_healthy': {'key': 'environmentIsHealthy', 'type': 'bool'}, + 'environment_status': {'key': 'environmentStatus', 'type': 'str'}, + 'resource_group': {'key': 'resourceGroup', 'type': 'str'}, + 'front_end_scale_factor': {'key': 'frontEndScaleFactor', 'type': 'int'}, + 'default_front_end_scale_factor': {'key': 'defaultFrontEndScaleFactor', 'type': 'int'}, + 'api_management_account_id': {'key': 'apiManagementAccountId', 'type': 'str'}, + 'suspended': {'key': 'suspended', 'type': 'bool'}, + 'dynamic_cache_enabled': {'key': 'dynamicCacheEnabled', 'type': 'bool'}, + 'cluster_settings': {'key': 'clusterSettings', 'type': '[NameValuePair]'}, + 'user_whitelisted_ip_ranges': {'key': 'userWhitelistedIpRanges', 'type': '[str]'}, + } + + def __init__(self, *, name: str, location: str, virtual_network, worker_pools, vnet_name: str=None, vnet_resource_group_name: str=None, vnet_subnet_name: str=None, internal_load_balancing_mode=None, multi_size: str=None, multi_role_count: int=None, ipssl_address_count: int=None, dns_suffix: str=None, network_access_control_list=None, front_end_scale_factor: int=None, api_management_account_id: str=None, suspended: bool=None, dynamic_cache_enabled: bool=None, cluster_settings=None, user_whitelisted_ip_ranges=None, **kwargs) -> None: + super(AppServiceEnvironment, self).__init__(**kwargs) + self.name = name + self.location = location + self.provisioning_state = None + self.status = None + self.vnet_name = vnet_name + self.vnet_resource_group_name = vnet_resource_group_name + self.vnet_subnet_name = vnet_subnet_name + self.virtual_network = virtual_network + self.internal_load_balancing_mode = internal_load_balancing_mode + self.multi_size = multi_size + self.multi_role_count = multi_role_count + self.worker_pools = worker_pools + self.ipssl_address_count = ipssl_address_count + self.database_edition = None + self.database_service_objective = None + self.upgrade_domains = None + self.subscription_id = None + self.dns_suffix = dns_suffix + self.last_action = None + self.last_action_result = None + self.allowed_multi_sizes = None + self.allowed_worker_sizes = None + self.maximum_number_of_machines = None + self.vip_mappings = None + self.environment_capacities = None + self.network_access_control_list = network_access_control_list + self.environment_is_healthy = None + self.environment_status = None + self.resource_group = None + self.front_end_scale_factor = front_end_scale_factor + self.default_front_end_scale_factor = None + self.api_management_account_id = api_management_account_id + self.suspended = suspended + self.dynamic_cache_enabled = dynamic_cache_enabled + self.cluster_settings = cluster_settings + self.user_whitelisted_ip_ranges = user_whitelisted_ip_ranges 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..c51a186cb590 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 @@ -18,23 +18,25 @@ class AppServiceEnvironmentResource(Resource): Variables are only populated by the server, and will be ignored when sending a request. + All required parameters must be populated in order to send to Azure. + :ivar id: Resource Id. :vartype id: str :ivar name: Resource Name. :vartype name: str :param kind: Kind of resource. :type kind: str - :param location: Resource Location. + :param location: Required. Resource Location. :type location: str :ivar type: Resource type. :vartype type: str :param tags: Resource tags. :type tags: dict[str, str] - :param app_service_environment_resource_name: Name of the App Service - Environment. + :param app_service_environment_resource_name: Required. Name of the App + Service Environment. :type app_service_environment_resource_name: str - :param app_service_environment_resource_location: Location of the App - Service Environment, e.g. "West US". + :param app_service_environment_resource_location: Required. Location of + the App Service Environment, e.g. "West US". :type app_service_environment_resource_location: str :ivar provisioning_state: Provisioning state of the App Service Environment. Possible values include: 'Succeeded', 'Failed', 'Canceled', @@ -51,7 +53,7 @@ class AppServiceEnvironmentResource(Resource): :type vnet_resource_group_name: str :param vnet_subnet_name: Subnet of the Virtual Network. :type vnet_subnet_name: str - :param virtual_network: Description of the Virtual Network. + :param virtual_network: Required. Description of the Virtual Network. :type virtual_network: ~azure.mgmt.web.models.VirtualNetworkProfile :param internal_load_balancing_mode: Specifies which endpoints to serve internally in the Virtual Network for the App Service Environment. @@ -62,8 +64,8 @@ class AppServiceEnvironmentResource(Resource): :type multi_size: str :param multi_role_count: Number of front-end instances. :type multi_role_count: int - :param worker_pools: Description of worker pools with worker size IDs, VM - sizes, and number of workers in each pool. + :param worker_pools: Required. Description of worker pools with worker + size IDs, VM sizes, and number of workers in each pool. :type worker_pools: list[~azure.mgmt.web.models.WorkerPool] :param ipssl_address_count: Number of IP SSL addresses reserved for the App Service Environment. @@ -212,26 +214,26 @@ class AppServiceEnvironmentResource(Resource): 'user_whitelisted_ip_ranges': {'key': 'properties.userWhitelistedIpRanges', 'type': '[str]'}, } - 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): - 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 + def __init__(self, **kwargs): + super(AppServiceEnvironmentResource, self).__init__(**kwargs) + self.app_service_environment_resource_name = kwargs.get('app_service_environment_resource_name', None) + self.app_service_environment_resource_location = kwargs.get('app_service_environment_resource_location', None) self.provisioning_state = None self.status = None - self.vnet_name = vnet_name - self.vnet_resource_group_name = vnet_resource_group_name - self.vnet_subnet_name = vnet_subnet_name - self.virtual_network = virtual_network - self.internal_load_balancing_mode = internal_load_balancing_mode - self.multi_size = multi_size - self.multi_role_count = multi_role_count - self.worker_pools = worker_pools - self.ipssl_address_count = ipssl_address_count + self.vnet_name = kwargs.get('vnet_name', None) + self.vnet_resource_group_name = kwargs.get('vnet_resource_group_name', None) + self.vnet_subnet_name = kwargs.get('vnet_subnet_name', None) + self.virtual_network = kwargs.get('virtual_network', None) + self.internal_load_balancing_mode = kwargs.get('internal_load_balancing_mode', None) + self.multi_size = kwargs.get('multi_size', None) + self.multi_role_count = kwargs.get('multi_role_count', None) + self.worker_pools = kwargs.get('worker_pools', None) + self.ipssl_address_count = kwargs.get('ipssl_address_count', None) self.database_edition = None self.database_service_objective = None self.upgrade_domains = None self.subscription_id = None - self.dns_suffix = dns_suffix + self.dns_suffix = kwargs.get('dns_suffix', None) self.last_action = None self.last_action_result = None self.allowed_multi_sizes = None @@ -239,14 +241,14 @@ def __init__(self, location, app_service_environment_resource_name, app_service_ self.maximum_number_of_machines = None self.vip_mappings = None self.environment_capacities = None - self.network_access_control_list = network_access_control_list + self.network_access_control_list = kwargs.get('network_access_control_list', None) self.environment_is_healthy = None self.environment_status = None self.resource_group = None - self.front_end_scale_factor = front_end_scale_factor + self.front_end_scale_factor = kwargs.get('front_end_scale_factor', None) self.default_front_end_scale_factor = None - self.api_management_account_id = api_management_account_id - self.suspended = suspended - self.dynamic_cache_enabled = dynamic_cache_enabled - self.cluster_settings = cluster_settings - self.user_whitelisted_ip_ranges = user_whitelisted_ip_ranges + self.api_management_account_id = kwargs.get('api_management_account_id', None) + self.suspended = kwargs.get('suspended', None) + self.dynamic_cache_enabled = kwargs.get('dynamic_cache_enabled', None) + self.cluster_settings = kwargs.get('cluster_settings', None) + self.user_whitelisted_ip_ranges = kwargs.get('user_whitelisted_ip_ranges', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/app_service_environment_resource_py3.py b/azure-mgmt-web/azure/mgmt/web/models/app_service_environment_resource_py3.py new file mode 100644 index 000000000000..bcefe1f2fa7f --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/app_service_environment_resource_py3.py @@ -0,0 +1,254 @@ +# 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 .resource_py3 import Resource + + +class AppServiceEnvironmentResource(Resource): + """App Service Environment ARM resource. + + Variables are only populated by the server, and will be ignored when + sending a request. + + All required parameters must be populated in order to send to Azure. + + :ivar id: Resource Id. + :vartype id: str + :ivar name: Resource Name. + :vartype name: str + :param kind: Kind of resource. + :type kind: str + :param location: Required. Resource Location. + :type location: str + :ivar type: Resource type. + :vartype type: str + :param tags: Resource tags. + :type tags: dict[str, str] + :param app_service_environment_resource_name: Required. Name of the App + Service Environment. + :type app_service_environment_resource_name: str + :param app_service_environment_resource_location: Required. Location of + the App Service Environment, e.g. "West US". + :type app_service_environment_resource_location: str + :ivar provisioning_state: Provisioning state of the App Service + Environment. Possible values include: 'Succeeded', 'Failed', 'Canceled', + 'InProgress', 'Deleting' + :vartype provisioning_state: str or + ~azure.mgmt.web.models.ProvisioningState + :ivar status: Current status of the App Service Environment. Possible + values include: 'Preparing', 'Ready', 'Scaling', 'Deleting' + :vartype status: str or ~azure.mgmt.web.models.HostingEnvironmentStatus + :param vnet_name: Name of the Virtual Network for the App Service + Environment. + :type vnet_name: str + :param vnet_resource_group_name: Resource group of the Virtual Network. + :type vnet_resource_group_name: str + :param vnet_subnet_name: Subnet of the Virtual Network. + :type vnet_subnet_name: str + :param virtual_network: Required. Description of the Virtual Network. + :type virtual_network: ~azure.mgmt.web.models.VirtualNetworkProfile + :param internal_load_balancing_mode: Specifies which endpoints to serve + internally in the Virtual Network for the App Service Environment. + Possible values include: 'None', 'Web', 'Publishing' + :type internal_load_balancing_mode: str or + ~azure.mgmt.web.models.InternalLoadBalancingMode + :param multi_size: Front-end VM size, e.g. "Medium", "Large". + :type multi_size: str + :param multi_role_count: Number of front-end instances. + :type multi_role_count: int + :param worker_pools: Required. Description of worker pools with worker + size IDs, VM sizes, and number of workers in each pool. + :type worker_pools: list[~azure.mgmt.web.models.WorkerPool] + :param ipssl_address_count: Number of IP SSL addresses reserved for the + App Service Environment. + :type ipssl_address_count: int + :ivar database_edition: Edition of the metadata database for the App + Service Environment, e.g. "Standard". + :vartype database_edition: str + :ivar database_service_objective: Service objective of the metadata + database for the App Service Environment, e.g. "S0". + :vartype database_service_objective: str + :ivar upgrade_domains: Number of upgrade domains of the App Service + Environment. + :vartype upgrade_domains: int + :ivar subscription_id: Subscription of the App Service Environment. + :vartype subscription_id: str + :param dns_suffix: DNS suffix of the App Service Environment. + :type dns_suffix: str + :ivar last_action: Last deployment action on the App Service Environment. + :vartype last_action: str + :ivar last_action_result: Result of the last deployment action on the App + Service Environment. + :vartype last_action_result: str + :ivar allowed_multi_sizes: List of comma separated strings describing + which VM sizes are allowed for front-ends. + :vartype allowed_multi_sizes: str + :ivar allowed_worker_sizes: List of comma separated strings describing + which VM sizes are allowed for workers. + :vartype allowed_worker_sizes: str + :ivar maximum_number_of_machines: Maximum number of VMs in the App Service + Environment. + :vartype maximum_number_of_machines: int + :ivar vip_mappings: Description of IP SSL mapping for the App Service + Environment. + :vartype vip_mappings: list[~azure.mgmt.web.models.VirtualIPMapping] + :ivar environment_capacities: Current total, used, and available worker + capacities. + :vartype environment_capacities: + list[~azure.mgmt.web.models.StampCapacity] + :param network_access_control_list: Access control list for controlling + traffic to the App Service Environment. + :type network_access_control_list: + list[~azure.mgmt.web.models.NetworkAccessControlEntry] + :ivar environment_is_healthy: True/false indicating whether the App + Service Environment is healthy. + :vartype environment_is_healthy: bool + :ivar environment_status: Detailed message about with results of the last + check of the App Service Environment. + :vartype environment_status: str + :ivar resource_group: Resource group of the App Service Environment. + :vartype resource_group: str + :param front_end_scale_factor: Scale factor for front-ends. + :type front_end_scale_factor: int + :ivar default_front_end_scale_factor: Default Scale Factor for FrontEnds. + :vartype default_front_end_scale_factor: int + :param api_management_account_id: API Management Account associated with + the App Service Environment. + :type api_management_account_id: str + :param suspended: true if the App Service Environment is + suspended; otherwise, false. The environment can be + suspended, e.g. when the management endpoint is no longer available + (most likely because NSG blocked the incoming traffic). + :type suspended: bool + :param dynamic_cache_enabled: True/false indicating whether the App + Service Environment is suspended. The environment can be suspended e.g. + when the management endpoint is no longer available + (most likely because NSG blocked the incoming traffic). + :type dynamic_cache_enabled: bool + :param cluster_settings: Custom settings for changing the behavior of the + App Service Environment. + :type cluster_settings: list[~azure.mgmt.web.models.NameValuePair] + :param user_whitelisted_ip_ranges: User added ip ranges to whitelist on + ASE db + :type user_whitelisted_ip_ranges: list[str] + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'location': {'required': True}, + 'type': {'readonly': True}, + 'app_service_environment_resource_name': {'required': True}, + 'app_service_environment_resource_location': {'required': True}, + 'provisioning_state': {'readonly': True}, + 'status': {'readonly': True}, + 'virtual_network': {'required': True}, + 'worker_pools': {'required': True}, + 'database_edition': {'readonly': True}, + 'database_service_objective': {'readonly': True}, + 'upgrade_domains': {'readonly': True}, + 'subscription_id': {'readonly': True}, + 'last_action': {'readonly': True}, + 'last_action_result': {'readonly': True}, + 'allowed_multi_sizes': {'readonly': True}, + 'allowed_worker_sizes': {'readonly': True}, + 'maximum_number_of_machines': {'readonly': True}, + 'vip_mappings': {'readonly': True}, + 'environment_capacities': {'readonly': True}, + 'environment_is_healthy': {'readonly': True}, + 'environment_status': {'readonly': True}, + 'resource_group': {'readonly': True}, + 'default_front_end_scale_factor': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'location': {'key': 'location', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, + 'app_service_environment_resource_name': {'key': 'properties.name', 'type': 'str'}, + 'app_service_environment_resource_location': {'key': 'properties.location', 'type': 'str'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'ProvisioningState'}, + 'status': {'key': 'properties.status', 'type': 'HostingEnvironmentStatus'}, + 'vnet_name': {'key': 'properties.vnetName', 'type': 'str'}, + 'vnet_resource_group_name': {'key': 'properties.vnetResourceGroupName', 'type': 'str'}, + 'vnet_subnet_name': {'key': 'properties.vnetSubnetName', 'type': 'str'}, + 'virtual_network': {'key': 'properties.virtualNetwork', 'type': 'VirtualNetworkProfile'}, + 'internal_load_balancing_mode': {'key': 'properties.internalLoadBalancingMode', 'type': 'InternalLoadBalancingMode'}, + 'multi_size': {'key': 'properties.multiSize', 'type': 'str'}, + 'multi_role_count': {'key': 'properties.multiRoleCount', 'type': 'int'}, + 'worker_pools': {'key': 'properties.workerPools', 'type': '[WorkerPool]'}, + 'ipssl_address_count': {'key': 'properties.ipsslAddressCount', 'type': 'int'}, + 'database_edition': {'key': 'properties.databaseEdition', 'type': 'str'}, + 'database_service_objective': {'key': 'properties.databaseServiceObjective', 'type': 'str'}, + 'upgrade_domains': {'key': 'properties.upgradeDomains', 'type': 'int'}, + 'subscription_id': {'key': 'properties.subscriptionId', 'type': 'str'}, + 'dns_suffix': {'key': 'properties.dnsSuffix', 'type': 'str'}, + 'last_action': {'key': 'properties.lastAction', 'type': 'str'}, + 'last_action_result': {'key': 'properties.lastActionResult', 'type': 'str'}, + 'allowed_multi_sizes': {'key': 'properties.allowedMultiSizes', 'type': 'str'}, + 'allowed_worker_sizes': {'key': 'properties.allowedWorkerSizes', 'type': 'str'}, + 'maximum_number_of_machines': {'key': 'properties.maximumNumberOfMachines', 'type': 'int'}, + 'vip_mappings': {'key': 'properties.vipMappings', 'type': '[VirtualIPMapping]'}, + 'environment_capacities': {'key': 'properties.environmentCapacities', 'type': '[StampCapacity]'}, + 'network_access_control_list': {'key': 'properties.networkAccessControlList', 'type': '[NetworkAccessControlEntry]'}, + 'environment_is_healthy': {'key': 'properties.environmentIsHealthy', 'type': 'bool'}, + 'environment_status': {'key': 'properties.environmentStatus', 'type': 'str'}, + 'resource_group': {'key': 'properties.resourceGroup', 'type': 'str'}, + 'front_end_scale_factor': {'key': 'properties.frontEndScaleFactor', 'type': 'int'}, + 'default_front_end_scale_factor': {'key': 'properties.defaultFrontEndScaleFactor', 'type': 'int'}, + 'api_management_account_id': {'key': 'properties.apiManagementAccountId', 'type': 'str'}, + 'suspended': {'key': 'properties.suspended', 'type': 'bool'}, + 'dynamic_cache_enabled': {'key': 'properties.dynamicCacheEnabled', 'type': 'bool'}, + 'cluster_settings': {'key': 'properties.clusterSettings', 'type': '[NameValuePair]'}, + 'user_whitelisted_ip_ranges': {'key': 'properties.userWhitelistedIpRanges', 'type': '[str]'}, + } + + def __init__(self, *, location: str, app_service_environment_resource_name: str, app_service_environment_resource_location: str, virtual_network, worker_pools, kind: str=None, tags=None, vnet_name: str=None, vnet_resource_group_name: str=None, vnet_subnet_name: str=None, internal_load_balancing_mode=None, multi_size: str=None, multi_role_count: int=None, ipssl_address_count: int=None, dns_suffix: str=None, network_access_control_list=None, front_end_scale_factor: int=None, api_management_account_id: str=None, suspended: bool=None, dynamic_cache_enabled: bool=None, cluster_settings=None, user_whitelisted_ip_ranges=None, **kwargs) -> None: + super(AppServiceEnvironmentResource, self).__init__(kind=kind, location=location, tags=tags, **kwargs) + self.app_service_environment_resource_name = app_service_environment_resource_name + self.app_service_environment_resource_location = app_service_environment_resource_location + self.provisioning_state = None + self.status = None + self.vnet_name = vnet_name + self.vnet_resource_group_name = vnet_resource_group_name + self.vnet_subnet_name = vnet_subnet_name + self.virtual_network = virtual_network + self.internal_load_balancing_mode = internal_load_balancing_mode + self.multi_size = multi_size + self.multi_role_count = multi_role_count + self.worker_pools = worker_pools + self.ipssl_address_count = ipssl_address_count + self.database_edition = None + self.database_service_objective = None + self.upgrade_domains = None + self.subscription_id = None + self.dns_suffix = dns_suffix + self.last_action = None + self.last_action_result = None + self.allowed_multi_sizes = None + self.allowed_worker_sizes = None + self.maximum_number_of_machines = None + self.vip_mappings = None + self.environment_capacities = None + self.network_access_control_list = network_access_control_list + self.environment_is_healthy = None + self.environment_status = None + self.resource_group = None + self.front_end_scale_factor = front_end_scale_factor + self.default_front_end_scale_factor = None + self.api_management_account_id = api_management_account_id + self.suspended = suspended + self.dynamic_cache_enabled = dynamic_cache_enabled + self.cluster_settings = cluster_settings + self.user_whitelisted_ip_ranges = user_whitelisted_ip_ranges 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..3f7258ef8712 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 @@ -18,19 +18,21 @@ class AppServicePlan(Resource): Variables are only populated by the server, and will be ignored when sending a request. + All required parameters must be populated in order to send to Azure. + :ivar id: Resource Id. :vartype id: str :ivar name: Resource Name. :vartype name: str :param kind: Kind of resource. :type kind: str - :param location: Resource Location. + :param location: Required. Resource Location. :type location: str :ivar type: Resource type. :vartype type: str :param tags: Resource tags. :type tags: dict[str, str] - :param app_service_plan_name: Name for the App Service plan. + :param app_service_plan_name: Required. Name for the App Service plan. :type app_service_plan_name: str :param worker_tier_name: Target worker tier assigned to the App Service plan. @@ -124,23 +126,23 @@ class AppServicePlan(Resource): '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): - 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 + def __init__(self, **kwargs): + super(AppServicePlan, self).__init__(**kwargs) + self.app_service_plan_name = kwargs.get('app_service_plan_name', None) + self.worker_tier_name = kwargs.get('worker_tier_name', None) self.status = None self.subscription = None - self.admin_site_name = admin_site_name - self.hosting_environment_profile = hosting_environment_profile + self.admin_site_name = kwargs.get('admin_site_name', None) + self.hosting_environment_profile = kwargs.get('hosting_environment_profile', None) self.maximum_number_of_workers = None self.geo_region = None - self.per_site_scaling = per_site_scaling + self.per_site_scaling = kwargs.get('per_site_scaling', False) self.number_of_sites = None - self.is_spot = is_spot - self.spot_expiration_time = spot_expiration_time + self.is_spot = kwargs.get('is_spot', None) + self.spot_expiration_time = kwargs.get('spot_expiration_time', None) self.resource_group = None - self.reserved = reserved - self.target_worker_count = target_worker_count - self.target_worker_size_id = target_worker_size_id + self.reserved = kwargs.get('reserved', False) + self.target_worker_count = kwargs.get('target_worker_count', None) + self.target_worker_size_id = kwargs.get('target_worker_size_id', None) self.provisioning_state = None - self.sku = sku + self.sku = kwargs.get('sku', 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..f7bee7ea7449 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 @@ -18,6 +18,8 @@ class AppServicePlanPatchResource(ProxyOnlyResource): Variables are only populated by the server, and will be ignored when sending a request. + All required parameters must be populated in order to send to Azure. + :ivar id: Resource Id. :vartype id: str :ivar name: Resource Name. @@ -26,8 +28,8 @@ 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. + :param app_service_plan_patch_resource_name: Required. 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. @@ -115,22 +117,22 @@ class AppServicePlanPatchResource(ProxyOnlyResource): '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): - 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 + def __init__(self, **kwargs): + super(AppServicePlanPatchResource, self).__init__(**kwargs) + self.app_service_plan_patch_resource_name = kwargs.get('app_service_plan_patch_resource_name', None) + self.worker_tier_name = kwargs.get('worker_tier_name', None) self.status = None self.subscription = None - self.admin_site_name = admin_site_name - self.hosting_environment_profile = hosting_environment_profile + self.admin_site_name = kwargs.get('admin_site_name', None) + self.hosting_environment_profile = kwargs.get('hosting_environment_profile', None) self.maximum_number_of_workers = None self.geo_region = None - self.per_site_scaling = per_site_scaling + self.per_site_scaling = kwargs.get('per_site_scaling', False) self.number_of_sites = None - self.is_spot = is_spot - self.spot_expiration_time = spot_expiration_time + self.is_spot = kwargs.get('is_spot', None) + self.spot_expiration_time = kwargs.get('spot_expiration_time', None) self.resource_group = None - self.reserved = reserved - self.target_worker_count = target_worker_count - self.target_worker_size_id = target_worker_size_id + self.reserved = kwargs.get('reserved', False) + self.target_worker_count = kwargs.get('target_worker_count', None) + self.target_worker_size_id = kwargs.get('target_worker_size_id', None) self.provisioning_state = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/app_service_plan_patch_resource_py3.py b/azure-mgmt-web/azure/mgmt/web/models/app_service_plan_patch_resource_py3.py new file mode 100644 index 000000000000..4703daa63be4 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/app_service_plan_patch_resource_py3.py @@ -0,0 +1,138 @@ +# 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_py3 import ProxyOnlyResource + + +class AppServicePlanPatchResource(ProxyOnlyResource): + """ARM resource for a app service plan. + + Variables are only populated by the server, and will be ignored when + sending a request. + + All required parameters must be populated in order to send to Azure. + + :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 app_service_plan_patch_resource_name: Required. 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 + :ivar status: App Service plan status. Possible values include: 'Ready', + 'Pending', 'Creating' + :vartype status: str or ~azure.mgmt.web.models.StatusOptions + :ivar subscription: App Service plan subscription. + :vartype subscription: str + :param admin_site_name: App Service plan administration site. + :type admin_site_name: str + :param hosting_environment_profile: Specification for the App Service + Environment to use for the App Service plan. + :type hosting_environment_profile: + ~azure.mgmt.web.models.HostingEnvironmentProfile + :ivar maximum_number_of_workers: Maximum number of instances that can be + assigned to this App Service plan. + :vartype maximum_number_of_workers: int + :ivar geo_region: Geographical location for the App Service plan. + :vartype geo_region: str + :param per_site_scaling: If true, apps assigned to this App + Service plan can be scaled independently. + If false, apps assigned to this App Service plan will scale + to all instances of the plan. Default value: False . + :type per_site_scaling: bool + :ivar number_of_sites: Number of apps assigned to this App Service plan. + :vartype number_of_sites: int + :param is_spot: If true, this App Service Plan owns spot + instances. + :type is_spot: bool + :param spot_expiration_time: The time when the server farm expires. Valid + only if it is a spot server farm. + :type spot_expiration_time: datetime + :ivar resource_group: Resource group of the App Service plan. + :vartype resource_group: str + :param reserved: If Linux app service plan true, + false otherwise. Default value: False . + :type reserved: bool + :param target_worker_count: Scaling worker count. + :type target_worker_count: int + :param target_worker_size_id: Scaling worker size ID. + :type target_worker_size_id: int + :ivar provisioning_state: Provisioning state of the App Service + Environment. Possible values include: 'Succeeded', 'Failed', 'Canceled', + 'InProgress', 'Deleting' + :vartype provisioning_state: str or + ~azure.mgmt.web.models.ProvisioningState + """ + + _validation = { + '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}, + 'geo_region': {'readonly': True}, + 'number_of_sites': {'readonly': True}, + 'resource_group': {'readonly': True}, + 'provisioning_state': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + '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'}, + 'admin_site_name': {'key': 'properties.adminSiteName', 'type': 'str'}, + 'hosting_environment_profile': {'key': 'properties.hostingEnvironmentProfile', 'type': 'HostingEnvironmentProfile'}, + 'maximum_number_of_workers': {'key': 'properties.maximumNumberOfWorkers', 'type': 'int'}, + 'geo_region': {'key': 'properties.geoRegion', 'type': 'str'}, + 'per_site_scaling': {'key': 'properties.perSiteScaling', 'type': 'bool'}, + 'number_of_sites': {'key': 'properties.numberOfSites', 'type': 'int'}, + 'is_spot': {'key': 'properties.isSpot', 'type': 'bool'}, + 'spot_expiration_time': {'key': 'properties.spotExpirationTime', 'type': 'iso-8601'}, + 'resource_group': {'key': 'properties.resourceGroup', 'type': 'str'}, + 'reserved': {'key': 'properties.reserved', '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: str, kind: str=None, worker_tier_name: str=None, admin_site_name: str=None, hosting_environment_profile=None, per_site_scaling: bool=False, is_spot: bool=None, spot_expiration_time=None, reserved: bool=False, target_worker_count: int=None, target_worker_size_id: int=None, **kwargs) -> None: + super(AppServicePlanPatchResource, self).__init__(kind=kind, **kwargs) + 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 + self.admin_site_name = admin_site_name + self.hosting_environment_profile = hosting_environment_profile + self.maximum_number_of_workers = None + self.geo_region = None + self.per_site_scaling = per_site_scaling + self.number_of_sites = None + self.is_spot = is_spot + self.spot_expiration_time = spot_expiration_time + self.resource_group = None + self.reserved = reserved + 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_py3.py b/azure-mgmt-web/azure/mgmt/web/models/app_service_plan_py3.py new file mode 100644 index 000000000000..dd8ff1f5e490 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/app_service_plan_py3.py @@ -0,0 +1,148 @@ +# 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 .resource_py3 import Resource + + +class AppServicePlan(Resource): + """App Service plan. + + Variables are only populated by the server, and will be ignored when + sending a request. + + All required parameters must be populated in order to send to Azure. + + :ivar id: Resource Id. + :vartype id: str + :ivar name: Resource Name. + :vartype name: str + :param kind: Kind of resource. + :type kind: str + :param location: Required. Resource Location. + :type location: str + :ivar type: Resource type. + :vartype type: str + :param tags: Resource tags. + :type tags: dict[str, str] + :param app_service_plan_name: Required. Name for the App Service plan. + :type app_service_plan_name: str + :param worker_tier_name: Target worker tier assigned to the App Service + plan. + :type worker_tier_name: str + :ivar status: App Service plan status. Possible values include: 'Ready', + 'Pending', 'Creating' + :vartype status: str or ~azure.mgmt.web.models.StatusOptions + :ivar subscription: App Service plan subscription. + :vartype subscription: str + :param admin_site_name: App Service plan administration site. + :type admin_site_name: str + :param hosting_environment_profile: Specification for the App Service + Environment to use for the App Service plan. + :type hosting_environment_profile: + ~azure.mgmt.web.models.HostingEnvironmentProfile + :ivar maximum_number_of_workers: Maximum number of instances that can be + assigned to this App Service plan. + :vartype maximum_number_of_workers: int + :ivar geo_region: Geographical location for the App Service plan. + :vartype geo_region: str + :param per_site_scaling: If true, apps assigned to this App + Service plan can be scaled independently. + If false, apps assigned to this App Service plan will scale + to all instances of the plan. Default value: False . + :type per_site_scaling: bool + :ivar number_of_sites: Number of apps assigned to this App Service plan. + :vartype number_of_sites: int + :param is_spot: If true, this App Service Plan owns spot + instances. + :type is_spot: bool + :param spot_expiration_time: The time when the server farm expires. Valid + only if it is a spot server farm. + :type spot_expiration_time: datetime + :ivar resource_group: Resource group of the App Service plan. + :vartype resource_group: str + :param reserved: If Linux app service plan true, + false otherwise. Default value: False . + :type reserved: bool + :param target_worker_count: Scaling worker count. + :type target_worker_count: int + :param target_worker_size_id: Scaling worker size ID. + :type target_worker_size_id: int + :ivar provisioning_state: Provisioning state of the App Service + Environment. Possible values include: 'Succeeded', 'Failed', 'Canceled', + 'InProgress', 'Deleting' + :vartype provisioning_state: str or + ~azure.mgmt.web.models.ProvisioningState + :param sku: + :type sku: ~azure.mgmt.web.models.SkuDescription + """ + + _validation = { + 'id': {'readonly': True}, + '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}, + 'geo_region': {'readonly': True}, + 'number_of_sites': {'readonly': True}, + 'resource_group': {'readonly': True}, + 'provisioning_state': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + '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'}, + 'admin_site_name': {'key': 'properties.adminSiteName', 'type': 'str'}, + 'hosting_environment_profile': {'key': 'properties.hostingEnvironmentProfile', 'type': 'HostingEnvironmentProfile'}, + 'maximum_number_of_workers': {'key': 'properties.maximumNumberOfWorkers', 'type': 'int'}, + 'geo_region': {'key': 'properties.geoRegion', 'type': 'str'}, + 'per_site_scaling': {'key': 'properties.perSiteScaling', 'type': 'bool'}, + 'number_of_sites': {'key': 'properties.numberOfSites', 'type': 'int'}, + 'is_spot': {'key': 'properties.isSpot', 'type': 'bool'}, + 'spot_expiration_time': {'key': 'properties.spotExpirationTime', 'type': 'iso-8601'}, + 'resource_group': {'key': 'properties.resourceGroup', 'type': 'str'}, + 'reserved': {'key': 'properties.reserved', '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: str, app_service_plan_name: str, kind: str=None, tags=None, worker_tier_name: str=None, admin_site_name: str=None, hosting_environment_profile=None, per_site_scaling: bool=False, is_spot: bool=None, spot_expiration_time=None, reserved: bool=False, target_worker_count: int=None, target_worker_size_id: int=None, sku=None, **kwargs) -> None: + super(AppServicePlan, self).__init__(kind=kind, location=location, tags=tags, **kwargs) + self.app_service_plan_name = app_service_plan_name + self.worker_tier_name = worker_tier_name + self.status = None + self.subscription = None + self.admin_site_name = admin_site_name + self.hosting_environment_profile = hosting_environment_profile + self.maximum_number_of_workers = None + self.geo_region = None + self.per_site_scaling = per_site_scaling + self.number_of_sites = None + self.is_spot = is_spot + self.spot_expiration_time = spot_expiration_time + self.resource_group = None + self.reserved = reserved + self.target_worker_count = target_worker_count + self.target_worker_size_id = target_worker_size_id + self.provisioning_state = None + self.sku = sku diff --git a/azure-mgmt-web/azure/mgmt/web/models/application_logs_config.py b/azure-mgmt-web/azure/mgmt/web/models/application_logs_config.py index b9a7bb1ebb58..d6a74fa876db 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/application_logs_config.py +++ b/azure-mgmt-web/azure/mgmt/web/models/application_logs_config.py @@ -32,8 +32,8 @@ class ApplicationLogsConfig(Model): 'azure_blob_storage': {'key': 'azureBlobStorage', 'type': 'AzureBlobStorageApplicationLogsConfig'}, } - def __init__(self, file_system=None, azure_table_storage=None, azure_blob_storage=None): - super(ApplicationLogsConfig, self).__init__() - self.file_system = file_system - self.azure_table_storage = azure_table_storage - self.azure_blob_storage = azure_blob_storage + def __init__(self, **kwargs): + super(ApplicationLogsConfig, self).__init__(**kwargs) + self.file_system = kwargs.get('file_system', None) + self.azure_table_storage = kwargs.get('azure_table_storage', None) + self.azure_blob_storage = kwargs.get('azure_blob_storage', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/application_logs_config_py3.py b/azure-mgmt-web/azure/mgmt/web/models/application_logs_config_py3.py new file mode 100644 index 000000000000..a548ed73ad7c --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/application_logs_config_py3.py @@ -0,0 +1,39 @@ +# 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 ApplicationLogsConfig(Model): + """Application logs configuration. + + :param file_system: Application logs to file system configuration. + :type file_system: ~azure.mgmt.web.models.FileSystemApplicationLogsConfig + :param azure_table_storage: Application logs to azure table storage + configuration. + :type azure_table_storage: + ~azure.mgmt.web.models.AzureTableStorageApplicationLogsConfig + :param azure_blob_storage: Application logs to blob storage configuration. + :type azure_blob_storage: + ~azure.mgmt.web.models.AzureBlobStorageApplicationLogsConfig + """ + + _attribute_map = { + 'file_system': {'key': 'fileSystem', 'type': 'FileSystemApplicationLogsConfig'}, + 'azure_table_storage': {'key': 'azureTableStorage', 'type': 'AzureTableStorageApplicationLogsConfig'}, + 'azure_blob_storage': {'key': 'azureBlobStorage', 'type': 'AzureBlobStorageApplicationLogsConfig'}, + } + + def __init__(self, *, file_system=None, azure_table_storage=None, azure_blob_storage=None, **kwargs) -> None: + super(ApplicationLogsConfig, self).__init__(**kwargs) + self.file_system = file_system + self.azure_table_storage = azure_table_storage + self.azure_blob_storage = azure_blob_storage diff --git a/azure-mgmt-web/azure/mgmt/web/models/application_stack.py b/azure-mgmt-web/azure/mgmt/web/models/application_stack.py index ba8fceaef641..5611a8e82717 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/application_stack.py +++ b/azure-mgmt-web/azure/mgmt/web/models/application_stack.py @@ -35,10 +35,10 @@ class ApplicationStack(Model): 'frameworks': {'key': 'frameworks', 'type': '[ApplicationStack]'}, } - def __init__(self, name=None, display=None, dependency=None, major_versions=None, frameworks=None): - super(ApplicationStack, self).__init__() - self.name = name - self.display = display - self.dependency = dependency - self.major_versions = major_versions - self.frameworks = frameworks + def __init__(self, **kwargs): + super(ApplicationStack, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.display = kwargs.get('display', None) + self.dependency = kwargs.get('dependency', None) + self.major_versions = kwargs.get('major_versions', None) + self.frameworks = kwargs.get('frameworks', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/application_stack_py3.py b/azure-mgmt-web/azure/mgmt/web/models/application_stack_py3.py new file mode 100644 index 000000000000..38aac1d8aa47 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/application_stack_py3.py @@ -0,0 +1,44 @@ +# 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 ApplicationStack(Model): + """Application stack. + + :param name: Application stack name. + :type name: str + :param display: Application stack display name. + :type display: str + :param dependency: Application stack dependency. + :type dependency: str + :param major_versions: List of major versions available. + :type major_versions: list[~azure.mgmt.web.models.StackMajorVersion] + :param frameworks: List of frameworks associated with application stack. + :type frameworks: list[~azure.mgmt.web.models.ApplicationStack] + """ + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'display': {'key': 'display', 'type': 'str'}, + 'dependency': {'key': 'dependency', 'type': 'str'}, + 'major_versions': {'key': 'majorVersions', 'type': '[StackMajorVersion]'}, + 'frameworks': {'key': 'frameworks', 'type': '[ApplicationStack]'}, + } + + def __init__(self, *, name: str=None, display: str=None, dependency: str=None, major_versions=None, frameworks=None, **kwargs) -> None: + super(ApplicationStack, self).__init__(**kwargs) + self.name = name + self.display = display + self.dependency = dependency + self.major_versions = major_versions + self.frameworks = frameworks diff --git a/azure-mgmt-web/azure/mgmt/web/models/auto_heal_actions.py b/azure-mgmt-web/azure/mgmt/web/models/auto_heal_actions.py index f1595e9be056..01626a1790e4 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/auto_heal_actions.py +++ b/azure-mgmt-web/azure/mgmt/web/models/auto_heal_actions.py @@ -31,8 +31,8 @@ class AutoHealActions(Model): 'min_process_execution_time': {'key': 'minProcessExecutionTime', 'type': 'str'}, } - def __init__(self, action_type=None, custom_action=None, min_process_execution_time=None): - super(AutoHealActions, self).__init__() - self.action_type = action_type - self.custom_action = custom_action - self.min_process_execution_time = min_process_execution_time + def __init__(self, **kwargs): + super(AutoHealActions, self).__init__(**kwargs) + self.action_type = kwargs.get('action_type', None) + self.custom_action = kwargs.get('custom_action', None) + self.min_process_execution_time = kwargs.get('min_process_execution_time', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/auto_heal_actions_py3.py b/azure-mgmt-web/azure/mgmt/web/models/auto_heal_actions_py3.py new file mode 100644 index 000000000000..c02ab3fea6f9 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/auto_heal_actions_py3.py @@ -0,0 +1,38 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class AutoHealActions(Model): + """Actions which to take by the auto-heal module when a rule is triggered. + + :param action_type: Predefined action to be taken. Possible values + include: 'Recycle', 'LogEvent', 'CustomAction' + :type action_type: str or ~azure.mgmt.web.models.AutoHealActionType + :param custom_action: Custom action to be taken. + :type custom_action: ~azure.mgmt.web.models.AutoHealCustomAction + :param min_process_execution_time: Minimum time the process must execute + before taking the action + :type min_process_execution_time: str + """ + + _attribute_map = { + 'action_type': {'key': 'actionType', 'type': 'AutoHealActionType'}, + 'custom_action': {'key': 'customAction', 'type': 'AutoHealCustomAction'}, + 'min_process_execution_time': {'key': 'minProcessExecutionTime', 'type': 'str'}, + } + + def __init__(self, *, action_type=None, custom_action=None, min_process_execution_time: str=None, **kwargs) -> None: + super(AutoHealActions, self).__init__(**kwargs) + self.action_type = action_type + self.custom_action = custom_action + self.min_process_execution_time = min_process_execution_time diff --git a/azure-mgmt-web/azure/mgmt/web/models/auto_heal_custom_action.py b/azure-mgmt-web/azure/mgmt/web/models/auto_heal_custom_action.py index e015fce2b903..d034dc301007 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/auto_heal_custom_action.py +++ b/azure-mgmt-web/azure/mgmt/web/models/auto_heal_custom_action.py @@ -27,7 +27,7 @@ class AutoHealCustomAction(Model): 'parameters': {'key': 'parameters', 'type': 'str'}, } - def __init__(self, exe=None, parameters=None): - super(AutoHealCustomAction, self).__init__() - self.exe = exe - self.parameters = parameters + def __init__(self, **kwargs): + super(AutoHealCustomAction, self).__init__(**kwargs) + self.exe = kwargs.get('exe', None) + self.parameters = kwargs.get('parameters', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/auto_heal_custom_action_py3.py b/azure-mgmt-web/azure/mgmt/web/models/auto_heal_custom_action_py3.py new file mode 100644 index 000000000000..bd1f4208adb2 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/auto_heal_custom_action_py3.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 AutoHealCustomAction(Model): + """Custom action to be executed + when an auto heal rule is triggered. + + :param exe: Executable to be run. + :type exe: str + :param parameters: Parameters for the executable. + :type parameters: str + """ + + _attribute_map = { + 'exe': {'key': 'exe', 'type': 'str'}, + 'parameters': {'key': 'parameters', 'type': 'str'}, + } + + def __init__(self, *, exe: str=None, parameters: str=None, **kwargs) -> None: + super(AutoHealCustomAction, self).__init__(**kwargs) + self.exe = exe + self.parameters = parameters diff --git a/azure-mgmt-web/azure/mgmt/web/models/auto_heal_rules.py b/azure-mgmt-web/azure/mgmt/web/models/auto_heal_rules.py index 2cdc14a5fead..0c751d639275 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/auto_heal_rules.py +++ b/azure-mgmt-web/azure/mgmt/web/models/auto_heal_rules.py @@ -27,7 +27,7 @@ class AutoHealRules(Model): 'actions': {'key': 'actions', 'type': 'AutoHealActions'}, } - def __init__(self, triggers=None, actions=None): - super(AutoHealRules, self).__init__() - self.triggers = triggers - self.actions = actions + def __init__(self, **kwargs): + super(AutoHealRules, self).__init__(**kwargs) + self.triggers = kwargs.get('triggers', None) + self.actions = kwargs.get('actions', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/auto_heal_rules_py3.py b/azure-mgmt-web/azure/mgmt/web/models/auto_heal_rules_py3.py new file mode 100644 index 000000000000..38fe260c3d88 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/auto_heal_rules_py3.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 AutoHealRules(Model): + """Rules that can be defined for auto-heal. + + :param triggers: Conditions that describe when to execute the auto-heal + actions. + :type triggers: ~azure.mgmt.web.models.AutoHealTriggers + :param actions: Actions to be executed when a rule is triggered. + :type actions: ~azure.mgmt.web.models.AutoHealActions + """ + + _attribute_map = { + 'triggers': {'key': 'triggers', 'type': 'AutoHealTriggers'}, + 'actions': {'key': 'actions', 'type': 'AutoHealActions'}, + } + + def __init__(self, *, triggers=None, actions=None, **kwargs) -> None: + super(AutoHealRules, self).__init__(**kwargs) + self.triggers = triggers + self.actions = actions diff --git a/azure-mgmt-web/azure/mgmt/web/models/auto_heal_triggers.py b/azure-mgmt-web/azure/mgmt/web/models/auto_heal_triggers.py index 4d41496e95f1..6e86339d57eb 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/auto_heal_triggers.py +++ b/azure-mgmt-web/azure/mgmt/web/models/auto_heal_triggers.py @@ -32,9 +32,9 @@ class AutoHealTriggers(Model): 'slow_requests': {'key': 'slowRequests', 'type': 'SlowRequestsBasedTrigger'}, } - def __init__(self, requests=None, private_bytes_in_kb=None, status_codes=None, slow_requests=None): - super(AutoHealTriggers, self).__init__() - self.requests = requests - self.private_bytes_in_kb = private_bytes_in_kb - self.status_codes = status_codes - self.slow_requests = slow_requests + def __init__(self, **kwargs): + super(AutoHealTriggers, self).__init__(**kwargs) + self.requests = kwargs.get('requests', None) + self.private_bytes_in_kb = kwargs.get('private_bytes_in_kb', None) + self.status_codes = kwargs.get('status_codes', None) + self.slow_requests = kwargs.get('slow_requests', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/auto_heal_triggers_py3.py b/azure-mgmt-web/azure/mgmt/web/models/auto_heal_triggers_py3.py new file mode 100644 index 000000000000..59947d2fc4b3 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/auto_heal_triggers_py3.py @@ -0,0 +1,40 @@ +# 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 AutoHealTriggers(Model): + """Triggers for auto-heal. + + :param requests: A rule based on total requests. + :type requests: ~azure.mgmt.web.models.RequestsBasedTrigger + :param private_bytes_in_kb: A rule based on private bytes. + :type private_bytes_in_kb: int + :param status_codes: A rule based on status codes. + :type status_codes: list[~azure.mgmt.web.models.StatusCodesBasedTrigger] + :param slow_requests: A rule based on request execution time. + :type slow_requests: ~azure.mgmt.web.models.SlowRequestsBasedTrigger + """ + + _attribute_map = { + 'requests': {'key': 'requests', 'type': 'RequestsBasedTrigger'}, + 'private_bytes_in_kb': {'key': 'privateBytesInKB', 'type': 'int'}, + 'status_codes': {'key': 'statusCodes', 'type': '[StatusCodesBasedTrigger]'}, + 'slow_requests': {'key': 'slowRequests', 'type': 'SlowRequestsBasedTrigger'}, + } + + def __init__(self, *, requests=None, private_bytes_in_kb: int=None, status_codes=None, slow_requests=None, **kwargs) -> None: + super(AutoHealTriggers, self).__init__(**kwargs) + self.requests = requests + self.private_bytes_in_kb = private_bytes_in_kb + self.status_codes = status_codes + self.slow_requests = slow_requests diff --git a/azure-mgmt-web/azure/mgmt/web/models/azure_blob_storage_application_logs_config.py b/azure-mgmt-web/azure/mgmt/web/models/azure_blob_storage_application_logs_config.py index 0038c7d09545..f159f61ec92d 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/azure_blob_storage_application_logs_config.py +++ b/azure-mgmt-web/azure/mgmt/web/models/azure_blob_storage_application_logs_config.py @@ -33,8 +33,8 @@ class AzureBlobStorageApplicationLogsConfig(Model): 'retention_in_days': {'key': 'retentionInDays', 'type': 'int'}, } - def __init__(self, level=None, sas_url=None, retention_in_days=None): - super(AzureBlobStorageApplicationLogsConfig, self).__init__() - self.level = level - self.sas_url = sas_url - self.retention_in_days = retention_in_days + def __init__(self, **kwargs): + super(AzureBlobStorageApplicationLogsConfig, self).__init__(**kwargs) + self.level = kwargs.get('level', None) + self.sas_url = kwargs.get('sas_url', None) + self.retention_in_days = kwargs.get('retention_in_days', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/azure_blob_storage_application_logs_config_py3.py b/azure-mgmt-web/azure/mgmt/web/models/azure_blob_storage_application_logs_config_py3.py new file mode 100644 index 000000000000..9d8ec9a8d181 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/azure_blob_storage_application_logs_config_py3.py @@ -0,0 +1,40 @@ +# 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 AzureBlobStorageApplicationLogsConfig(Model): + """Application logs azure blob storage configuration. + + :param level: Log level. Possible values include: 'Off', 'Verbose', + 'Information', 'Warning', 'Error' + :type level: str or ~azure.mgmt.web.models.LogLevel + :param sas_url: SAS url to a azure blob container with + read/write/list/delete permissions. + :type sas_url: str + :param retention_in_days: Retention in days. + Remove blobs older than X days. + 0 or lower means no retention. + :type retention_in_days: int + """ + + _attribute_map = { + 'level': {'key': 'level', 'type': 'LogLevel'}, + 'sas_url': {'key': 'sasUrl', 'type': 'str'}, + 'retention_in_days': {'key': 'retentionInDays', 'type': 'int'}, + } + + def __init__(self, *, level=None, sas_url: str=None, retention_in_days: int=None, **kwargs) -> None: + super(AzureBlobStorageApplicationLogsConfig, self).__init__(**kwargs) + self.level = level + self.sas_url = sas_url + self.retention_in_days = retention_in_days diff --git a/azure-mgmt-web/azure/mgmt/web/models/azure_blob_storage_http_logs_config.py b/azure-mgmt-web/azure/mgmt/web/models/azure_blob_storage_http_logs_config.py index 44f0f1fe8cfe..23b4be2198f2 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/azure_blob_storage_http_logs_config.py +++ b/azure-mgmt-web/azure/mgmt/web/models/azure_blob_storage_http_logs_config.py @@ -33,8 +33,8 @@ class AzureBlobStorageHttpLogsConfig(Model): 'enabled': {'key': 'enabled', 'type': 'bool'}, } - def __init__(self, sas_url=None, retention_in_days=None, enabled=None): - super(AzureBlobStorageHttpLogsConfig, self).__init__() - self.sas_url = sas_url - self.retention_in_days = retention_in_days - self.enabled = enabled + def __init__(self, **kwargs): + super(AzureBlobStorageHttpLogsConfig, self).__init__(**kwargs) + self.sas_url = kwargs.get('sas_url', None) + self.retention_in_days = kwargs.get('retention_in_days', None) + self.enabled = kwargs.get('enabled', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/azure_blob_storage_http_logs_config_py3.py b/azure-mgmt-web/azure/mgmt/web/models/azure_blob_storage_http_logs_config_py3.py new file mode 100644 index 000000000000..92ceaa1208a6 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/azure_blob_storage_http_logs_config_py3.py @@ -0,0 +1,40 @@ +# 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 AzureBlobStorageHttpLogsConfig(Model): + """Http logs to azure blob storage configuration. + + :param sas_url: SAS url to a azure blob container with + read/write/list/delete permissions. + :type sas_url: str + :param retention_in_days: Retention in days. + Remove blobs older than X days. + 0 or lower means no retention. + :type retention_in_days: int + :param enabled: True if configuration is enabled, false if it is disabled + and null if configuration is not set. + :type enabled: bool + """ + + _attribute_map = { + 'sas_url': {'key': 'sasUrl', 'type': 'str'}, + 'retention_in_days': {'key': 'retentionInDays', 'type': 'int'}, + 'enabled': {'key': 'enabled', 'type': 'bool'}, + } + + def __init__(self, *, sas_url: str=None, retention_in_days: int=None, enabled: bool=None, **kwargs) -> None: + super(AzureBlobStorageHttpLogsConfig, self).__init__(**kwargs) + self.sas_url = sas_url + self.retention_in_days = retention_in_days + self.enabled = enabled diff --git a/azure-mgmt-web/azure/mgmt/web/models/azure_table_storage_application_logs_config.py b/azure-mgmt-web/azure/mgmt/web/models/azure_table_storage_application_logs_config.py index 67326ab3ed8e..0586a88e2334 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/azure_table_storage_application_logs_config.py +++ b/azure-mgmt-web/azure/mgmt/web/models/azure_table_storage_application_logs_config.py @@ -15,10 +15,12 @@ class AzureTableStorageApplicationLogsConfig(Model): """Application logs to Azure table storage configuration. + All required parameters must be populated in order to send to Azure. + :param level: Log level. Possible values include: 'Off', 'Verbose', 'Information', 'Warning', 'Error' :type level: str or ~azure.mgmt.web.models.LogLevel - :param sas_url: SAS URL to an Azure table with add/query/delete + :param sas_url: Required. SAS URL to an Azure table with add/query/delete permissions. :type sas_url: str """ @@ -32,7 +34,7 @@ class AzureTableStorageApplicationLogsConfig(Model): 'sas_url': {'key': 'sasUrl', 'type': 'str'}, } - def __init__(self, sas_url, level=None): - super(AzureTableStorageApplicationLogsConfig, self).__init__() - self.level = level - self.sas_url = sas_url + def __init__(self, **kwargs): + super(AzureTableStorageApplicationLogsConfig, self).__init__(**kwargs) + self.level = kwargs.get('level', None) + self.sas_url = kwargs.get('sas_url', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/azure_table_storage_application_logs_config_py3.py b/azure-mgmt-web/azure/mgmt/web/models/azure_table_storage_application_logs_config_py3.py new file mode 100644 index 000000000000..5ebf91d3de72 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/azure_table_storage_application_logs_config_py3.py @@ -0,0 +1,40 @@ +# 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 AzureTableStorageApplicationLogsConfig(Model): + """Application logs to Azure table storage configuration. + + All required parameters must be populated in order to send to Azure. + + :param level: Log level. Possible values include: 'Off', 'Verbose', + 'Information', 'Warning', 'Error' + :type level: str or ~azure.mgmt.web.models.LogLevel + :param sas_url: Required. SAS URL to an Azure table with add/query/delete + permissions. + :type sas_url: str + """ + + _validation = { + 'sas_url': {'required': True}, + } + + _attribute_map = { + 'level': {'key': 'level', 'type': 'LogLevel'}, + 'sas_url': {'key': 'sasUrl', 'type': 'str'}, + } + + def __init__(self, *, sas_url: str, level=None, **kwargs) -> None: + super(AzureTableStorageApplicationLogsConfig, self).__init__(**kwargs) + self.level = level + self.sas_url = sas_url diff --git a/azure-mgmt-web/azure/mgmt/web/models/backup_item.py b/azure-mgmt-web/azure/mgmt/web/models/backup_item.py index c51f778fb347..0ad7297687cb 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/backup_item.py +++ b/azure-mgmt-web/azure/mgmt/web/models/backup_item.py @@ -104,8 +104,8 @@ class BackupItem(ProxyOnlyResource): 'website_size_in_bytes': {'key': 'properties.websiteSizeInBytes', 'type': 'long'}, } - def __init__(self, kind=None): - super(BackupItem, self).__init__(kind=kind) + def __init__(self, **kwargs): + super(BackupItem, self).__init__(**kwargs) self.backup_id = None self.storage_account_url = None self.blob_name = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/backup_item_py3.py b/azure-mgmt-web/azure/mgmt/web/models/backup_item_py3.py new file mode 100644 index 000000000000..24d6406bef80 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/backup_item_py3.py @@ -0,0 +1,122 @@ +# 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_py3 import ProxyOnlyResource + + +class BackupItem(ProxyOnlyResource): + """Backup description. + + 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 + :ivar backup_id: Id of the backup. + :vartype backup_id: int + :ivar storage_account_url: SAS URL for the storage account container which + contains this backup. + :vartype storage_account_url: str + :ivar blob_name: Name of the blob which contains data for this backup. + :vartype blob_name: str + :ivar backup_item_name: Name of this backup. + :vartype backup_item_name: str + :ivar status: Backup status. Possible values include: 'InProgress', + 'Failed', 'Succeeded', 'TimedOut', 'Created', 'Skipped', + 'PartiallySucceeded', 'DeleteInProgress', 'DeleteFailed', 'Deleted' + :vartype status: str or ~azure.mgmt.web.models.BackupItemStatus + :ivar size_in_bytes: Size of the backup in bytes. + :vartype size_in_bytes: long + :ivar created: Timestamp of the backup creation. + :vartype created: datetime + :ivar log: Details regarding this backup. Might contain an error message. + :vartype log: str + :ivar databases: List of databases included in the backup. + :vartype databases: list[~azure.mgmt.web.models.DatabaseBackupSetting] + :ivar scheduled: True if this backup has been created due to a schedule + being triggered. + :vartype scheduled: bool + :ivar last_restore_time_stamp: Timestamp of a last restore operation which + used this backup. + :vartype last_restore_time_stamp: datetime + :ivar finished_time_stamp: Timestamp when this backup finished. + :vartype finished_time_stamp: datetime + :ivar correlation_id: Unique correlation identifier. Please use this along + with the timestamp while communicating with Azure support. + :vartype correlation_id: str + :ivar website_size_in_bytes: Size of the original web app which has been + backed up. + :vartype website_size_in_bytes: long + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'backup_id': {'readonly': True}, + 'storage_account_url': {'readonly': True}, + 'blob_name': {'readonly': True}, + 'backup_item_name': {'readonly': True}, + 'status': {'readonly': True}, + 'size_in_bytes': {'readonly': True}, + 'created': {'readonly': True}, + 'log': {'readonly': True}, + 'databases': {'readonly': True}, + 'scheduled': {'readonly': True}, + 'last_restore_time_stamp': {'readonly': True}, + 'finished_time_stamp': {'readonly': True}, + 'correlation_id': {'readonly': True}, + 'website_size_in_bytes': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'backup_id': {'key': 'properties.id', 'type': 'int'}, + 'storage_account_url': {'key': 'properties.storageAccountUrl', 'type': 'str'}, + 'blob_name': {'key': 'properties.blobName', 'type': 'str'}, + 'backup_item_name': {'key': 'properties.name', 'type': 'str'}, + 'status': {'key': 'properties.status', 'type': 'BackupItemStatus'}, + 'size_in_bytes': {'key': 'properties.sizeInBytes', 'type': 'long'}, + 'created': {'key': 'properties.created', 'type': 'iso-8601'}, + 'log': {'key': 'properties.log', 'type': 'str'}, + 'databases': {'key': 'properties.databases', 'type': '[DatabaseBackupSetting]'}, + 'scheduled': {'key': 'properties.scheduled', 'type': 'bool'}, + 'last_restore_time_stamp': {'key': 'properties.lastRestoreTimeStamp', 'type': 'iso-8601'}, + 'finished_time_stamp': {'key': 'properties.finishedTimeStamp', 'type': 'iso-8601'}, + 'correlation_id': {'key': 'properties.correlationId', 'type': 'str'}, + 'website_size_in_bytes': {'key': 'properties.websiteSizeInBytes', 'type': 'long'}, + } + + def __init__(self, *, kind: str=None, **kwargs) -> None: + super(BackupItem, self).__init__(kind=kind, **kwargs) + self.backup_id = None + self.storage_account_url = None + self.blob_name = None + self.backup_item_name = None + self.status = None + self.size_in_bytes = None + self.created = None + self.log = None + self.databases = None + self.scheduled = None + self.last_restore_time_stamp = None + self.finished_time_stamp = None + self.correlation_id = None + self.website_size_in_bytes = 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..9eeb28e28cf0 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/backup_request.py +++ b/azure-mgmt-web/azure/mgmt/web/models/backup_request.py @@ -18,6 +18,8 @@ class BackupRequest(ProxyOnlyResource): Variables are only populated by the server, and will be ignored when sending a request. + All required parameters must be populated in order to send to Azure. + :ivar id: Resource Id. :vartype id: str :ivar name: Resource Name. @@ -26,12 +28,12 @@ class BackupRequest(ProxyOnlyResource): :type kind: str :ivar type: Resource type. :vartype type: str - :param backup_request_name: Name of the backup. + :param backup_request_name: Required. 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 - :param storage_account_url: SAS URL to the container. + :param storage_account_url: Required. SAS URL to the container. :type storage_account_url: str :param backup_schedule: Schedule for the backup if it is executed periodically. @@ -65,11 +67,11 @@ class BackupRequest(ProxyOnlyResource): '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): - 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 + def __init__(self, **kwargs): + super(BackupRequest, self).__init__(**kwargs) + self.backup_request_name = kwargs.get('backup_request_name', None) + self.enabled = kwargs.get('enabled', None) + self.storage_account_url = kwargs.get('storage_account_url', None) + self.backup_schedule = kwargs.get('backup_schedule', None) + self.databases = kwargs.get('databases', None) + self.backup_request_type = kwargs.get('backup_request_type', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/backup_request_py3.py b/azure-mgmt-web/azure/mgmt/web/models/backup_request_py3.py new file mode 100644 index 000000000000..b7ffa99ef06e --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/backup_request_py3.py @@ -0,0 +1,77 @@ +# 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_py3 import ProxyOnlyResource + + +class BackupRequest(ProxyOnlyResource): + """Description of a backup which will be performed. + + Variables are only populated by the server, and will be ignored when + sending a request. + + All required parameters must be populated in order to send to Azure. + + :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 backup_request_name: Required. 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 + :param storage_account_url: Required. SAS URL to the container. + :type storage_account_url: str + :param backup_schedule: Schedule for the backup if it is executed + periodically. + :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}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + '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: str, storage_account_url: str, kind: str=None, enabled: bool=None, backup_schedule=None, databases=None, backup_request_type=None, **kwargs) -> None: + super(BackupRequest, self).__init__(kind=kind, **kwargs) + 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/backup_schedule.py b/azure-mgmt-web/azure/mgmt/web/models/backup_schedule.py index c1267a13c4f0..12cda3fe6bc1 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/backup_schedule.py +++ b/azure-mgmt-web/azure/mgmt/web/models/backup_schedule.py @@ -19,21 +19,23 @@ class BackupSchedule(Model): Variables are only populated by the server, and will be ignored when sending a request. - :param frequency_interval: How often the backup should be executed (e.g. - for weekly backup, this should be set to 7 and FrequencyUnit should be set - to Day). Default value: 7 . + All required parameters must be populated in order to send to Azure. + + :param frequency_interval: Required. How often the backup should be + executed (e.g. for weekly backup, this should be set to 7 and + FrequencyUnit should be set to Day). Default value: 7 . :type frequency_interval: int - :param frequency_unit: The unit of time for how often the backup should be - executed (e.g. for weekly backup, this should be set to Day and + :param frequency_unit: Required. The unit of time for how often the backup + should be executed (e.g. for weekly backup, this should be set to Day and FrequencyInterval should be set to 7). Possible values include: 'Day', 'Hour'. Default value: "Day" . :type frequency_unit: str or ~azure.mgmt.web.models.FrequencyUnit - :param keep_at_least_one_backup: True if the retention policy should - always keep at least one backup in the storage account, regardless how old - it is; false otherwise. Default value: True . + :param keep_at_least_one_backup: Required. True if the retention policy + should always keep at least one backup in the storage account, regardless + how old it is; false otherwise. Default value: True . :type keep_at_least_one_backup: bool - :param retention_period_in_days: After how many days backups should be - deleted. Default value: 30 . + :param retention_period_in_days: Required. After how many days backups + should be deleted. Default value: 30 . :type retention_period_in_days: int :param start_time: When the schedule should start working. :type start_time: datetime @@ -58,11 +60,11 @@ class BackupSchedule(Model): 'last_execution_time': {'key': 'lastExecutionTime', 'type': 'iso-8601'}, } - def __init__(self, frequency_interval=7, frequency_unit="Day", keep_at_least_one_backup=True, retention_period_in_days=30, start_time=None): - super(BackupSchedule, self).__init__() - self.frequency_interval = frequency_interval - self.frequency_unit = frequency_unit - self.keep_at_least_one_backup = keep_at_least_one_backup - self.retention_period_in_days = retention_period_in_days - self.start_time = start_time + def __init__(self, **kwargs): + super(BackupSchedule, self).__init__(**kwargs) + self.frequency_interval = kwargs.get('frequency_interval', 7) + self.frequency_unit = kwargs.get('frequency_unit', "Day") + self.keep_at_least_one_backup = kwargs.get('keep_at_least_one_backup', True) + self.retention_period_in_days = kwargs.get('retention_period_in_days', 30) + self.start_time = kwargs.get('start_time', None) self.last_execution_time = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/backup_schedule_py3.py b/azure-mgmt-web/azure/mgmt/web/models/backup_schedule_py3.py new file mode 100644 index 000000000000..4b8b0d39d163 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/backup_schedule_py3.py @@ -0,0 +1,70 @@ +# 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 BackupSchedule(Model): + """Description of a backup schedule. Describes how often should be the backup + performed and what should be the retention policy. + + Variables are only populated by the server, and will be ignored when + sending a request. + + All required parameters must be populated in order to send to Azure. + + :param frequency_interval: Required. How often the backup should be + executed (e.g. for weekly backup, this should be set to 7 and + FrequencyUnit should be set to Day). Default value: 7 . + :type frequency_interval: int + :param frequency_unit: Required. The unit of time for how often the backup + should be executed (e.g. for weekly backup, this should be set to Day and + FrequencyInterval should be set to 7). Possible values include: 'Day', + 'Hour'. Default value: "Day" . + :type frequency_unit: str or ~azure.mgmt.web.models.FrequencyUnit + :param keep_at_least_one_backup: Required. True if the retention policy + should always keep at least one backup in the storage account, regardless + how old it is; false otherwise. Default value: True . + :type keep_at_least_one_backup: bool + :param retention_period_in_days: Required. After how many days backups + should be deleted. Default value: 30 . + :type retention_period_in_days: int + :param start_time: When the schedule should start working. + :type start_time: datetime + :ivar last_execution_time: Last time when this schedule was triggered. + :vartype last_execution_time: datetime + """ + + _validation = { + 'frequency_interval': {'required': True}, + 'frequency_unit': {'required': True}, + 'keep_at_least_one_backup': {'required': True}, + 'retention_period_in_days': {'required': True}, + 'last_execution_time': {'readonly': True}, + } + + _attribute_map = { + 'frequency_interval': {'key': 'frequencyInterval', 'type': 'int'}, + 'frequency_unit': {'key': 'frequencyUnit', 'type': 'FrequencyUnit'}, + 'keep_at_least_one_backup': {'key': 'keepAtLeastOneBackup', 'type': 'bool'}, + 'retention_period_in_days': {'key': 'retentionPeriodInDays', 'type': 'int'}, + 'start_time': {'key': 'startTime', 'type': 'iso-8601'}, + 'last_execution_time': {'key': 'lastExecutionTime', 'type': 'iso-8601'}, + } + + def __init__(self, *, frequency_interval: int=7, frequency_unit="Day", keep_at_least_one_backup: bool=True, retention_period_in_days: int=30, start_time=None, **kwargs) -> None: + super(BackupSchedule, self).__init__(**kwargs) + self.frequency_interval = frequency_interval + self.frequency_unit = frequency_unit + self.keep_at_least_one_backup = keep_at_least_one_backup + self.retention_period_in_days = retention_period_in_days + self.start_time = start_time + self.last_execution_time = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/billing_meter.py b/azure-mgmt-web/azure/mgmt/web/models/billing_meter.py index cad0a62ae07d..e83d0a976d74 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/billing_meter.py +++ b/azure-mgmt-web/azure/mgmt/web/models/billing_meter.py @@ -57,10 +57,10 @@ class BillingMeter(ProxyOnlyResource): '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 + def __init__(self, **kwargs): + super(BillingMeter, self).__init__(**kwargs) + self.meter_id = kwargs.get('meter_id', None) + self.billing_location = kwargs.get('billing_location', None) + self.short_name = kwargs.get('short_name', None) + self.friendly_name = kwargs.get('friendly_name', None) + self.resource_type = kwargs.get('resource_type', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/billing_meter_py3.py b/azure-mgmt-web/azure/mgmt/web/models/billing_meter_py3.py new file mode 100644 index 000000000000..665932586dee --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/billing_meter_py3.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_py3 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 resource type 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: str=None, meter_id: str=None, billing_location: str=None, short_name: str=None, friendly_name: str=None, resource_type: str=None, **kwargs) -> None: + super(BillingMeter, self).__init__(kind=kind, **kwargs) + 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/capability.py b/azure-mgmt-web/azure/mgmt/web/models/capability.py index d69bc114238c..798ed866cbcf 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/capability.py +++ b/azure-mgmt-web/azure/mgmt/web/models/capability.py @@ -29,8 +29,8 @@ class Capability(Model): 'reason': {'key': 'reason', 'type': 'str'}, } - def __init__(self, name=None, value=None, reason=None): - super(Capability, self).__init__() - self.name = name - self.value = value - self.reason = reason + def __init__(self, **kwargs): + super(Capability, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.value = kwargs.get('value', None) + self.reason = kwargs.get('reason', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/capability_py3.py b/azure-mgmt-web/azure/mgmt/web/models/capability_py3.py new file mode 100644 index 000000000000..3445faa1b7c8 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/capability_py3.py @@ -0,0 +1,36 @@ +# 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 Capability(Model): + """Describes the capabilities/features allowed for a specific SKU. + + :param name: Name of the SKU capability. + :type name: str + :param value: Value of the SKU capability. + :type value: str + :param reason: Reason of the SKU capability. + :type reason: str + """ + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'value': {'key': 'value', 'type': 'str'}, + 'reason': {'key': 'reason', 'type': 'str'}, + } + + def __init__(self, *, name: str=None, value: str=None, reason: str=None, **kwargs) -> None: + super(Capability, self).__init__(**kwargs) + self.name = name + self.value = value + self.reason = reason diff --git a/azure-mgmt-web/azure/mgmt/web/models/certificate.py b/azure-mgmt-web/azure/mgmt/web/models/certificate.py index 5183a1ad5dca..bdf7ba410ff1 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/certificate.py +++ b/azure-mgmt-web/azure/mgmt/web/models/certificate.py @@ -18,13 +18,15 @@ class Certificate(Resource): Variables are only populated by the server, and will be ignored when sending a request. + All required parameters must be populated in order to send to Azure. + :ivar id: Resource Id. :vartype id: str :ivar name: Resource Name. :vartype name: str :param kind: Kind of resource. :type kind: str - :param location: Resource Location. + :param location: Required. Resource Location. :type location: str :ivar type: Resource type. :vartype type: str @@ -48,7 +50,7 @@ class Certificate(Resource): :vartype issue_date: datetime :ivar expiration_date: Certificate expriration date. :vartype expiration_date: datetime - :param password: Certificate password. + :param password: Required. Certificate password. :type password: str :ivar thumbprint: Certificate thumbprint. :vartype thumbprint: str @@ -133,25 +135,25 @@ class Certificate(Resource): 'server_farm_id': {'key': 'properties.serverFarmId', 'type': 'str'}, } - def __init__(self, location, password, kind=None, tags=None, host_names=None, pfx_blob=None, key_vault_id=None, key_vault_secret_name=None, server_farm_id=None): - super(Certificate, self).__init__(kind=kind, location=location, tags=tags) + def __init__(self, **kwargs): + super(Certificate, self).__init__(**kwargs) self.friendly_name = None self.subject_name = None - self.host_names = host_names - self.pfx_blob = pfx_blob + self.host_names = kwargs.get('host_names', None) + self.pfx_blob = kwargs.get('pfx_blob', None) self.site_name = None self.self_link = None self.issuer = None self.issue_date = None self.expiration_date = None - self.password = password + self.password = kwargs.get('password', None) self.thumbprint = None self.valid = None self.cer_blob = None self.public_key_hash = None self.hosting_environment_profile = None - self.key_vault_id = key_vault_id - self.key_vault_secret_name = key_vault_secret_name + self.key_vault_id = kwargs.get('key_vault_id', None) + self.key_vault_secret_name = kwargs.get('key_vault_secret_name', None) self.key_vault_secret_status = None self.geo_region = None - self.server_farm_id = server_farm_id + self.server_farm_id = kwargs.get('server_farm_id', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/certificate_details.py b/azure-mgmt-web/azure/mgmt/web/models/certificate_details.py index fecd8e11d4e7..847767cc4b40 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/certificate_details.py +++ b/azure-mgmt-web/azure/mgmt/web/models/certificate_details.py @@ -62,8 +62,8 @@ class CertificateDetails(Model): 'raw_data': {'key': 'rawData', 'type': 'str'}, } - def __init__(self): - super(CertificateDetails, self).__init__() + def __init__(self, **kwargs): + super(CertificateDetails, self).__init__(**kwargs) self.version = None self.serial_number = None self.thumbprint = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/certificate_details_py3.py b/azure-mgmt-web/azure/mgmt/web/models/certificate_details_py3.py new file mode 100644 index 000000000000..6ea61e10ca94 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/certificate_details_py3.py @@ -0,0 +1,75 @@ +# 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 CertificateDetails(Model): + """SSL certificate details. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar version: Certificate Version. + :vartype version: int + :ivar serial_number: Certificate Serial Number. + :vartype serial_number: str + :ivar thumbprint: Certificate Thumbprint. + :vartype thumbprint: str + :ivar subject: Certificate Subject. + :vartype subject: str + :ivar not_before: Date Certificate is valid from. + :vartype not_before: datetime + :ivar not_after: Date Certificate is valid to. + :vartype not_after: datetime + :ivar signature_algorithm: Certificate Signature algorithm. + :vartype signature_algorithm: str + :ivar issuer: Certificate Issuer. + :vartype issuer: str + :ivar raw_data: Raw certificate data. + :vartype raw_data: str + """ + + _validation = { + 'version': {'readonly': True}, + 'serial_number': {'readonly': True}, + 'thumbprint': {'readonly': True}, + 'subject': {'readonly': True}, + 'not_before': {'readonly': True}, + 'not_after': {'readonly': True}, + 'signature_algorithm': {'readonly': True}, + 'issuer': {'readonly': True}, + 'raw_data': {'readonly': True}, + } + + _attribute_map = { + 'version': {'key': 'version', 'type': 'int'}, + 'serial_number': {'key': 'serialNumber', 'type': 'str'}, + 'thumbprint': {'key': 'thumbprint', 'type': 'str'}, + 'subject': {'key': 'subject', 'type': 'str'}, + 'not_before': {'key': 'notBefore', 'type': 'iso-8601'}, + 'not_after': {'key': 'notAfter', 'type': 'iso-8601'}, + 'signature_algorithm': {'key': 'signatureAlgorithm', 'type': 'str'}, + 'issuer': {'key': 'issuer', 'type': 'str'}, + 'raw_data': {'key': 'rawData', 'type': 'str'}, + } + + def __init__(self, **kwargs) -> None: + super(CertificateDetails, self).__init__(**kwargs) + self.version = None + self.serial_number = None + self.thumbprint = None + self.subject = None + self.not_before = None + self.not_after = None + self.signature_algorithm = None + self.issuer = None + self.raw_data = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/certificate_email.py b/azure-mgmt-web/azure/mgmt/web/models/certificate_email.py index 674c722acc58..a7a1b8666e48 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/certificate_email.py +++ b/azure-mgmt-web/azure/mgmt/web/models/certificate_email.py @@ -47,7 +47,7 @@ class CertificateEmail(ProxyOnlyResource): 'time_stamp': {'key': 'properties.timeStamp', 'type': 'iso-8601'}, } - def __init__(self, kind=None, email_id=None, time_stamp=None): - super(CertificateEmail, self).__init__(kind=kind) - self.email_id = email_id - self.time_stamp = time_stamp + def __init__(self, **kwargs): + super(CertificateEmail, self).__init__(**kwargs) + self.email_id = kwargs.get('email_id', None) + self.time_stamp = kwargs.get('time_stamp', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/certificate_email_py3.py b/azure-mgmt-web/azure/mgmt/web/models/certificate_email_py3.py new file mode 100644 index 000000000000..32255dff53a6 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/certificate_email_py3.py @@ -0,0 +1,53 @@ +# 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_py3 import ProxyOnlyResource + + +class CertificateEmail(ProxyOnlyResource): + """SSL certificate email. + + 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 email_id: Email id. + :type email_id: str + :param time_stamp: Time stamp. + :type time_stamp: datetime + """ + + _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'}, + 'email_id': {'key': 'properties.emailId', 'type': 'str'}, + 'time_stamp': {'key': 'properties.timeStamp', 'type': 'iso-8601'}, + } + + def __init__(self, *, kind: str=None, email_id: str=None, time_stamp=None, **kwargs) -> None: + super(CertificateEmail, self).__init__(kind=kind, **kwargs) + self.email_id = email_id + self.time_stamp = time_stamp 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..90b968f54f3f 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 @@ -53,7 +53,7 @@ class CertificateOrderAction(ProxyOnlyResource): 'created_at': {'key': 'properties.createdAt', 'type': 'iso-8601'}, } - def __init__(self, kind=None, certificate_order_action_type=None, created_at=None): - super(CertificateOrderAction, self).__init__(kind=kind) - self.certificate_order_action_type = certificate_order_action_type - self.created_at = created_at + def __init__(self, **kwargs): + super(CertificateOrderAction, self).__init__(**kwargs) + self.certificate_order_action_type = kwargs.get('certificate_order_action_type', None) + self.created_at = kwargs.get('created_at', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/certificate_order_action_py3.py b/azure-mgmt-web/azure/mgmt/web/models/certificate_order_action_py3.py new file mode 100644 index 000000000000..775fdbd427db --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/certificate_order_action_py3.py @@ -0,0 +1,59 @@ +# 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_py3 import ProxyOnlyResource + + +class CertificateOrderAction(ProxyOnlyResource): + """Certificate order action. + + 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 certificate_order_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 + ~azure.mgmt.web.models.CertificateOrderActionType + :param created_at: Time at which the certificate action was performed. + :type created_at: datetime + """ + + _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'}, + 'certificate_order_action_type': {'key': 'properties.type', 'type': 'CertificateOrderActionType'}, + 'created_at': {'key': 'properties.createdAt', 'type': 'iso-8601'}, + } + + def __init__(self, *, kind: str=None, certificate_order_action_type=None, created_at=None, **kwargs) -> None: + super(CertificateOrderAction, self).__init__(kind=kind, **kwargs) + self.certificate_order_action_type = certificate_order_action_type + self.created_at = created_at 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..9ea811e73399 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 @@ -18,6 +18,8 @@ class CertificatePatchResource(ProxyOnlyResource): Variables are only populated by the server, and will be ignored when sending a request. + All required parameters must be populated in order to send to Azure. + :ivar id: Resource Id. :vartype id: str :ivar name: Resource Name. @@ -44,7 +46,7 @@ class CertificatePatchResource(ProxyOnlyResource): :vartype issue_date: datetime :ivar expiration_date: Certificate expriration date. :vartype expiration_date: datetime - :param password: Certificate password. + :param password: Required. Certificate password. :type password: str :ivar thumbprint: Certificate thumbprint. :vartype thumbprint: str @@ -126,25 +128,25 @@ class CertificatePatchResource(ProxyOnlyResource): 'server_farm_id': {'key': 'properties.serverFarmId', 'type': 'str'}, } - def __init__(self, password, kind=None, host_names=None, pfx_blob=None, key_vault_id=None, key_vault_secret_name=None, server_farm_id=None): - super(CertificatePatchResource, self).__init__(kind=kind) + def __init__(self, **kwargs): + super(CertificatePatchResource, self).__init__(**kwargs) self.friendly_name = None self.subject_name = None - self.host_names = host_names - self.pfx_blob = pfx_blob + self.host_names = kwargs.get('host_names', None) + self.pfx_blob = kwargs.get('pfx_blob', None) self.site_name = None self.self_link = None self.issuer = None self.issue_date = None self.expiration_date = None - self.password = password + self.password = kwargs.get('password', None) self.thumbprint = None self.valid = None self.cer_blob = None self.public_key_hash = None self.hosting_environment_profile = None - self.key_vault_id = key_vault_id - self.key_vault_secret_name = key_vault_secret_name + self.key_vault_id = kwargs.get('key_vault_id', None) + self.key_vault_secret_name = kwargs.get('key_vault_secret_name', None) self.key_vault_secret_status = None self.geo_region = None - self.server_farm_id = server_farm_id + self.server_farm_id = kwargs.get('server_farm_id', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/certificate_patch_resource_py3.py b/azure-mgmt-web/azure/mgmt/web/models/certificate_patch_resource_py3.py new file mode 100644 index 000000000000..b583592cbe24 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/certificate_patch_resource_py3.py @@ -0,0 +1,152 @@ +# 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_py3 import ProxyOnlyResource + + +class CertificatePatchResource(ProxyOnlyResource): + """ARM resource for a certificate. + + Variables are only populated by the server, and will be ignored when + sending a request. + + All required parameters must be populated in order to send to Azure. + + :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 + :ivar friendly_name: Friendly name of the certificate. + :vartype friendly_name: str + :ivar subject_name: Subject name of the certificate. + :vartype subject_name: str + :param host_names: Host names the certificate applies to. + :type host_names: list[str] + :param pfx_blob: Pfx blob. + :type pfx_blob: bytearray + :ivar site_name: App name. + :vartype site_name: str + :ivar self_link: Self link. + :vartype self_link: str + :ivar issuer: Certificate issuer. + :vartype issuer: str + :ivar issue_date: Certificate issue Date. + :vartype issue_date: datetime + :ivar expiration_date: Certificate expriration date. + :vartype expiration_date: datetime + :param password: Required. Certificate password. + :type password: str + :ivar thumbprint: Certificate thumbprint. + :vartype thumbprint: str + :ivar valid: Is the certificate valid?. + :vartype valid: bool + :ivar cer_blob: Raw bytes of .cer file + :vartype cer_blob: bytearray + :ivar public_key_hash: Public key hash. + :vartype public_key_hash: str + :ivar hosting_environment_profile: Specification for the App Service + Environment to use for the certificate. + :vartype hosting_environment_profile: + ~azure.mgmt.web.models.HostingEnvironmentProfile + :param key_vault_id: Key Vault Csm resource Id. + :type key_vault_id: str + :param key_vault_secret_name: Key Vault secret name. + :type key_vault_secret_name: str + :ivar key_vault_secret_status: Status of the Key Vault secret. Possible + values include: 'Initialized', 'WaitingOnCertificateOrder', 'Succeeded', + 'CertificateOrderFailed', 'OperationNotPermittedOnKeyVault', + 'AzureServiceUnauthorizedToAccessKeyVault', 'KeyVaultDoesNotExist', + 'KeyVaultSecretDoesNotExist', 'UnknownError', 'ExternalPrivateKey', + '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}". + :type server_farm_id: str + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'friendly_name': {'readonly': True}, + 'subject_name': {'readonly': True}, + 'site_name': {'readonly': True}, + 'self_link': {'readonly': True}, + 'issuer': {'readonly': True}, + 'issue_date': {'readonly': True}, + 'expiration_date': {'readonly': True}, + 'password': {'required': True}, + 'thumbprint': {'readonly': True}, + 'valid': {'readonly': True}, + 'cer_blob': {'readonly': True}, + 'public_key_hash': {'readonly': True}, + 'hosting_environment_profile': {'readonly': True}, + 'key_vault_secret_status': {'readonly': True}, + 'geo_region': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'friendly_name': {'key': 'properties.friendlyName', 'type': 'str'}, + 'subject_name': {'key': 'properties.subjectName', 'type': 'str'}, + 'host_names': {'key': 'properties.hostNames', 'type': '[str]'}, + 'pfx_blob': {'key': 'properties.pfxBlob', 'type': 'bytearray'}, + 'site_name': {'key': 'properties.siteName', 'type': 'str'}, + 'self_link': {'key': 'properties.selfLink', 'type': 'str'}, + 'issuer': {'key': 'properties.issuer', 'type': 'str'}, + 'issue_date': {'key': 'properties.issueDate', 'type': 'iso-8601'}, + 'expiration_date': {'key': 'properties.expirationDate', 'type': 'iso-8601'}, + 'password': {'key': 'properties.password', 'type': 'str'}, + 'thumbprint': {'key': 'properties.thumbprint', 'type': 'str'}, + 'valid': {'key': 'properties.valid', 'type': 'bool'}, + 'cer_blob': {'key': 'properties.cerBlob', 'type': 'bytearray'}, + 'public_key_hash': {'key': 'properties.publicKeyHash', 'type': 'str'}, + 'hosting_environment_profile': {'key': 'properties.hostingEnvironmentProfile', 'type': 'HostingEnvironmentProfile'}, + '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'}, + } + + def __init__(self, *, password: str, kind: str=None, host_names=None, pfx_blob: bytearray=None, key_vault_id: str=None, key_vault_secret_name: str=None, server_farm_id: str=None, **kwargs) -> None: + super(CertificatePatchResource, self).__init__(kind=kind, **kwargs) + self.friendly_name = None + self.subject_name = None + self.host_names = host_names + self.pfx_blob = pfx_blob + self.site_name = None + self.self_link = None + self.issuer = None + self.issue_date = None + self.expiration_date = None + self.password = password + self.thumbprint = None + self.valid = None + self.cer_blob = None + self.public_key_hash = None + self.hosting_environment_profile = None + 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_py3.py b/azure-mgmt-web/azure/mgmt/web/models/certificate_py3.py new file mode 100644 index 000000000000..e3878b9bf774 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/certificate_py3.py @@ -0,0 +1,159 @@ +# 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 .resource_py3 import Resource + + +class Certificate(Resource): + """SSL certificate for an app. + + Variables are only populated by the server, and will be ignored when + sending a request. + + All required parameters must be populated in order to send to Azure. + + :ivar id: Resource Id. + :vartype id: str + :ivar name: Resource Name. + :vartype name: str + :param kind: Kind of resource. + :type kind: str + :param location: Required. Resource Location. + :type location: str + :ivar type: Resource type. + :vartype type: str + :param tags: Resource tags. + :type tags: dict[str, str] + :ivar friendly_name: Friendly name of the certificate. + :vartype friendly_name: str + :ivar subject_name: Subject name of the certificate. + :vartype subject_name: str + :param host_names: Host names the certificate applies to. + :type host_names: list[str] + :param pfx_blob: Pfx blob. + :type pfx_blob: bytearray + :ivar site_name: App name. + :vartype site_name: str + :ivar self_link: Self link. + :vartype self_link: str + :ivar issuer: Certificate issuer. + :vartype issuer: str + :ivar issue_date: Certificate issue Date. + :vartype issue_date: datetime + :ivar expiration_date: Certificate expriration date. + :vartype expiration_date: datetime + :param password: Required. Certificate password. + :type password: str + :ivar thumbprint: Certificate thumbprint. + :vartype thumbprint: str + :ivar valid: Is the certificate valid?. + :vartype valid: bool + :ivar cer_blob: Raw bytes of .cer file + :vartype cer_blob: bytearray + :ivar public_key_hash: Public key hash. + :vartype public_key_hash: str + :ivar hosting_environment_profile: Specification for the App Service + Environment to use for the certificate. + :vartype hosting_environment_profile: + ~azure.mgmt.web.models.HostingEnvironmentProfile + :param key_vault_id: Key Vault Csm resource Id. + :type key_vault_id: str + :param key_vault_secret_name: Key Vault secret name. + :type key_vault_secret_name: str + :ivar key_vault_secret_status: Status of the Key Vault secret. Possible + values include: 'Initialized', 'WaitingOnCertificateOrder', 'Succeeded', + 'CertificateOrderFailed', 'OperationNotPermittedOnKeyVault', + 'AzureServiceUnauthorizedToAccessKeyVault', 'KeyVaultDoesNotExist', + 'KeyVaultSecretDoesNotExist', 'UnknownError', 'ExternalPrivateKey', + '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}". + :type server_farm_id: str + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'location': {'required': True}, + 'type': {'readonly': True}, + 'friendly_name': {'readonly': True}, + 'subject_name': {'readonly': True}, + 'site_name': {'readonly': True}, + 'self_link': {'readonly': True}, + 'issuer': {'readonly': True}, + 'issue_date': {'readonly': True}, + 'expiration_date': {'readonly': True}, + 'password': {'required': True}, + 'thumbprint': {'readonly': True}, + 'valid': {'readonly': True}, + 'cer_blob': {'readonly': True}, + 'public_key_hash': {'readonly': True}, + 'hosting_environment_profile': {'readonly': True}, + 'key_vault_secret_status': {'readonly': True}, + 'geo_region': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'location': {'key': 'location', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, + 'friendly_name': {'key': 'properties.friendlyName', 'type': 'str'}, + 'subject_name': {'key': 'properties.subjectName', 'type': 'str'}, + 'host_names': {'key': 'properties.hostNames', 'type': '[str]'}, + 'pfx_blob': {'key': 'properties.pfxBlob', 'type': 'bytearray'}, + 'site_name': {'key': 'properties.siteName', 'type': 'str'}, + 'self_link': {'key': 'properties.selfLink', 'type': 'str'}, + 'issuer': {'key': 'properties.issuer', 'type': 'str'}, + 'issue_date': {'key': 'properties.issueDate', 'type': 'iso-8601'}, + 'expiration_date': {'key': 'properties.expirationDate', 'type': 'iso-8601'}, + 'password': {'key': 'properties.password', 'type': 'str'}, + 'thumbprint': {'key': 'properties.thumbprint', 'type': 'str'}, + 'valid': {'key': 'properties.valid', 'type': 'bool'}, + 'cer_blob': {'key': 'properties.cerBlob', 'type': 'bytearray'}, + 'public_key_hash': {'key': 'properties.publicKeyHash', 'type': 'str'}, + 'hosting_environment_profile': {'key': 'properties.hostingEnvironmentProfile', 'type': 'HostingEnvironmentProfile'}, + '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'}, + } + + def __init__(self, *, location: str, password: str, kind: str=None, tags=None, host_names=None, pfx_blob: bytearray=None, key_vault_id: str=None, key_vault_secret_name: str=None, server_farm_id: str=None, **kwargs) -> None: + super(Certificate, self).__init__(kind=kind, location=location, tags=tags, **kwargs) + self.friendly_name = None + self.subject_name = None + self.host_names = host_names + self.pfx_blob = pfx_blob + self.site_name = None + self.self_link = None + self.issuer = None + self.issue_date = None + self.expiration_date = None + self.password = password + self.thumbprint = None + self.valid = None + self.cer_blob = None + self.public_key_hash = None + self.hosting_environment_profile = None + 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..233f7df1599c 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/cloning_info.py +++ b/azure-mgmt-web/azure/mgmt/web/models/cloning_info.py @@ -15,6 +15,8 @@ class CloningInfo(Model): """Information needed for cloning operation. + All required parameters must be populated in order to send to Azure. + :param correlation_id: Correlation ID of cloning operation. This ID ties multiple cloning operations together to use the same snapshot. @@ -28,8 +30,8 @@ class CloningInfo(Model): :param clone_source_control: true to clone source control from source app; otherwise, false. :type clone_source_control: bool - :param source_web_app_id: ARM resource ID of the source app. App resource - ID is of the form + :param source_web_app_id: Required. ARM resource ID of the source app. App + resource ID is of the form /subscriptions/{subId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{siteName} for production slots and /subscriptions/{subId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{siteName}/slots/{slotName} @@ -76,16 +78,16 @@ class CloningInfo(Model): '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): - super(CloningInfo, self).__init__() - self.correlation_id = correlation_id - self.overwrite = overwrite - self.clone_custom_host_names = clone_custom_host_names - self.clone_source_control = clone_source_control - self.source_web_app_id = source_web_app_id - self.hosting_environment = hosting_environment - self.app_settings_overrides = app_settings_overrides - 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 + def __init__(self, **kwargs): + super(CloningInfo, self).__init__(**kwargs) + self.correlation_id = kwargs.get('correlation_id', None) + self.overwrite = kwargs.get('overwrite', None) + self.clone_custom_host_names = kwargs.get('clone_custom_host_names', None) + self.clone_source_control = kwargs.get('clone_source_control', None) + self.source_web_app_id = kwargs.get('source_web_app_id', None) + self.hosting_environment = kwargs.get('hosting_environment', None) + self.app_settings_overrides = kwargs.get('app_settings_overrides', None) + self.configure_load_balancing = kwargs.get('configure_load_balancing', None) + self.traffic_manager_profile_id = kwargs.get('traffic_manager_profile_id', None) + self.traffic_manager_profile_name = kwargs.get('traffic_manager_profile_name', None) + self.ignore_quotas = kwargs.get('ignore_quotas', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/cloning_info_py3.py b/azure-mgmt-web/azure/mgmt/web/models/cloning_info_py3.py new file mode 100644 index 000000000000..2540e9b3dd8f --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/cloning_info_py3.py @@ -0,0 +1,93 @@ +# 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 CloningInfo(Model): + """Information needed for cloning operation. + + All required parameters must be populated in order to send to Azure. + + :param correlation_id: Correlation ID of cloning operation. This ID ties + multiple cloning operations + together to use the same snapshot. + :type correlation_id: str + :param overwrite: true to overwrite destination app; + otherwise, false. + :type overwrite: bool + :param clone_custom_host_names: true to clone custom + hostnames from source app; otherwise, false. + :type clone_custom_host_names: bool + :param clone_source_control: true to clone source control + from source app; otherwise, false. + :type clone_source_control: bool + :param source_web_app_id: Required. ARM resource ID of the source app. App + resource ID is of the form + /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 source_web_app_id: str + :param hosting_environment: App Service Environment. + :type hosting_environment: str + :param app_settings_overrides: Application setting overrides for cloned + app. If specified, these settings override the settings cloned + from source app. Otherwise, application settings from source app are + retained. + :type app_settings_overrides: dict[str, str] + :param configure_load_balancing: true to configure load + balancing for source and destination app. + :type configure_load_balancing: bool + :param traffic_manager_profile_id: ARM resource ID of the Traffic Manager + profile to use, if it exists. Traffic Manager resource ID is of the form + /subscriptions/{subId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/trafficManagerProfiles/{profileName}. + :type traffic_manager_profile_id: str + :param traffic_manager_profile_name: Name of Traffic Manager profile to + 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 = { + 'source_web_app_id': {'required': True}, + } + + _attribute_map = { + 'correlation_id': {'key': 'correlationId', 'type': 'str'}, + 'overwrite': {'key': 'overwrite', 'type': 'bool'}, + 'clone_custom_host_names': {'key': 'cloneCustomHostNames', 'type': 'bool'}, + 'clone_source_control': {'key': 'cloneSourceControl', 'type': 'bool'}, + 'source_web_app_id': {'key': 'sourceWebAppId', 'type': 'str'}, + 'hosting_environment': {'key': 'hostingEnvironment', 'type': 'str'}, + 'app_settings_overrides': {'key': 'appSettingsOverrides', 'type': '{str}'}, + '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: str, correlation_id: str=None, overwrite: bool=None, clone_custom_host_names: bool=None, clone_source_control: bool=None, hosting_environment: str=None, app_settings_overrides=None, configure_load_balancing: bool=None, traffic_manager_profile_id: str=None, traffic_manager_profile_name: str=None, ignore_quotas: bool=None, **kwargs) -> None: + super(CloningInfo, self).__init__(**kwargs) + self.correlation_id = correlation_id + self.overwrite = overwrite + self.clone_custom_host_names = clone_custom_host_names + self.clone_source_control = clone_source_control + self.source_web_app_id = source_web_app_id + self.hosting_environment = hosting_environment + self.app_settings_overrides = app_settings_overrides + 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/conn_string_info.py b/azure-mgmt-web/azure/mgmt/web/models/conn_string_info.py index 85f5c197d14e..040fbea5e920 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/conn_string_info.py +++ b/azure-mgmt-web/azure/mgmt/web/models/conn_string_info.py @@ -31,8 +31,8 @@ class ConnStringInfo(Model): 'type': {'key': 'type', 'type': 'ConnectionStringType'}, } - def __init__(self, name=None, connection_string=None, type=None): - super(ConnStringInfo, self).__init__() - self.name = name - self.connection_string = connection_string - self.type = type + def __init__(self, **kwargs): + super(ConnStringInfo, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.connection_string = kwargs.get('connection_string', None) + self.type = kwargs.get('type', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/conn_string_info_py3.py b/azure-mgmt-web/azure/mgmt/web/models/conn_string_info_py3.py new file mode 100644 index 000000000000..24d38593fded --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/conn_string_info_py3.py @@ -0,0 +1,38 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ConnStringInfo(Model): + """Database connection string information. + + :param name: Name of connection string. + :type name: str + :param connection_string: Connection string value. + :type connection_string: str + :param type: Type of database. Possible values include: 'MySql', + 'SQLServer', 'SQLAzure', 'Custom', 'NotificationHub', 'ServiceBus', + 'EventHub', 'ApiHub', 'DocDb', 'RedisCache', 'PostgreSQL' + :type type: str or ~azure.mgmt.web.models.ConnectionStringType + """ + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'connection_string': {'key': 'connectionString', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'ConnectionStringType'}, + } + + def __init__(self, *, name: str=None, connection_string: str=None, type=None, **kwargs) -> None: + super(ConnStringInfo, self).__init__(**kwargs) + self.name = name + self.connection_string = connection_string + self.type = type diff --git a/azure-mgmt-web/azure/mgmt/web/models/conn_string_value_type_pair.py b/azure-mgmt-web/azure/mgmt/web/models/conn_string_value_type_pair.py index a06aab9a003c..8fc0ffe591dd 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/conn_string_value_type_pair.py +++ b/azure-mgmt-web/azure/mgmt/web/models/conn_string_value_type_pair.py @@ -15,9 +15,11 @@ class ConnStringValueTypePair(Model): """Database connection string value to type pair. - :param value: Value of pair. + All required parameters must be populated in order to send to Azure. + + :param value: Required. Value of pair. :type value: str - :param type: Type of database. Possible values include: 'MySql', + :param type: Required. Type of database. Possible values include: 'MySql', 'SQLServer', 'SQLAzure', 'Custom', 'NotificationHub', 'ServiceBus', 'EventHub', 'ApiHub', 'DocDb', 'RedisCache', 'PostgreSQL' :type type: str or ~azure.mgmt.web.models.ConnectionStringType @@ -33,7 +35,7 @@ class ConnStringValueTypePair(Model): 'type': {'key': 'type', 'type': 'ConnectionStringType'}, } - def __init__(self, value, type): - super(ConnStringValueTypePair, self).__init__() - self.value = value - self.type = type + def __init__(self, **kwargs): + super(ConnStringValueTypePair, self).__init__(**kwargs) + self.value = kwargs.get('value', None) + self.type = kwargs.get('type', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/conn_string_value_type_pair_py3.py b/azure-mgmt-web/azure/mgmt/web/models/conn_string_value_type_pair_py3.py new file mode 100644 index 000000000000..e45cabb73a39 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/conn_string_value_type_pair_py3.py @@ -0,0 +1,41 @@ +# 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 ConnStringValueTypePair(Model): + """Database connection string value to type pair. + + All required parameters must be populated in order to send to Azure. + + :param value: Required. Value of pair. + :type value: str + :param type: Required. Type of database. Possible values include: 'MySql', + 'SQLServer', 'SQLAzure', 'Custom', 'NotificationHub', 'ServiceBus', + 'EventHub', 'ApiHub', 'DocDb', 'RedisCache', 'PostgreSQL' + :type type: str or ~azure.mgmt.web.models.ConnectionStringType + """ + + _validation = { + 'value': {'required': True}, + 'type': {'required': True}, + } + + _attribute_map = { + 'value': {'key': 'value', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'ConnectionStringType'}, + } + + def __init__(self, *, value: str, type, **kwargs) -> None: + super(ConnStringValueTypePair, self).__init__(**kwargs) + self.value = value + self.type = type diff --git a/azure-mgmt-web/azure/mgmt/web/models/connection_string_dictionary.py b/azure-mgmt-web/azure/mgmt/web/models/connection_string_dictionary.py index 600fb4f02001..d2e4a7bc5f1a 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/connection_string_dictionary.py +++ b/azure-mgmt-web/azure/mgmt/web/models/connection_string_dictionary.py @@ -45,6 +45,6 @@ class ConnectionStringDictionary(ProxyOnlyResource): 'properties': {'key': 'properties', 'type': '{ConnStringValueTypePair}'}, } - def __init__(self, kind=None, properties=None): - super(ConnectionStringDictionary, self).__init__(kind=kind) - self.properties = properties + def __init__(self, **kwargs): + super(ConnectionStringDictionary, self).__init__(**kwargs) + self.properties = kwargs.get('properties', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/connection_string_dictionary_py3.py b/azure-mgmt-web/azure/mgmt/web/models/connection_string_dictionary_py3.py new file mode 100644 index 000000000000..37848b56ba68 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/connection_string_dictionary_py3.py @@ -0,0 +1,50 @@ +# 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_py3 import ProxyOnlyResource + + +class ConnectionStringDictionary(ProxyOnlyResource): + """String dictionary resource. + + 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 properties: Connection strings. + :type properties: dict[str, + ~azure.mgmt.web.models.ConnStringValueTypePair] + """ + + _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'}, + 'properties': {'key': 'properties', 'type': '{ConnStringValueTypePair}'}, + } + + def __init__(self, *, kind: str=None, properties=None, **kwargs) -> None: + super(ConnectionStringDictionary, self).__init__(kind=kind, **kwargs) + self.properties = properties diff --git a/azure-mgmt-web/azure/mgmt/web/models/contact.py b/azure-mgmt-web/azure/mgmt/web/models/contact.py index 28b3c6749af2..a18a023642d0 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/contact.py +++ b/azure-mgmt-web/azure/mgmt/web/models/contact.py @@ -18,23 +18,25 @@ class Contact(Model): through the Whois directories as per ICANN requirements. + All required parameters must be populated in order to send to Azure. + :param address_mailing: Mailing address. :type address_mailing: ~azure.mgmt.web.models.Address - :param email: Email address. + :param email: Required. Email address. :type email: str :param fax: Fax number. :type fax: str :param job_title: Job title. :type job_title: str - :param name_first: First name. + :param name_first: Required. First name. :type name_first: str - :param name_last: Last name. + :param name_last: Required. Last name. :type name_last: str :param name_middle: Middle name. :type name_middle: str :param organization: Organization contact belongs to. :type organization: str - :param phone: Phone number. + :param phone: Required. Phone number. :type phone: str """ @@ -57,14 +59,14 @@ class Contact(Model): 'phone': {'key': 'phone', 'type': 'str'}, } - def __init__(self, email, name_first, name_last, phone, address_mailing=None, fax=None, job_title=None, name_middle=None, organization=None): - super(Contact, self).__init__() - self.address_mailing = address_mailing - self.email = email - self.fax = fax - self.job_title = job_title - self.name_first = name_first - self.name_last = name_last - self.name_middle = name_middle - self.organization = organization - self.phone = phone + def __init__(self, **kwargs): + super(Contact, self).__init__(**kwargs) + self.address_mailing = kwargs.get('address_mailing', None) + self.email = kwargs.get('email', None) + self.fax = kwargs.get('fax', None) + self.job_title = kwargs.get('job_title', None) + self.name_first = kwargs.get('name_first', None) + self.name_last = kwargs.get('name_last', None) + self.name_middle = kwargs.get('name_middle', None) + self.organization = kwargs.get('organization', None) + self.phone = kwargs.get('phone', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/contact_py3.py b/azure-mgmt-web/azure/mgmt/web/models/contact_py3.py new file mode 100644 index 000000000000..5567ac2cd1b4 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/contact_py3.py @@ -0,0 +1,72 @@ +# 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 Contact(Model): + """Contact information for domain registration. If 'Domain Privacy' option is + not selected then the contact information is made publicly available + through the Whois + directories as per ICANN requirements. + + All required parameters must be populated in order to send to Azure. + + :param address_mailing: Mailing address. + :type address_mailing: ~azure.mgmt.web.models.Address + :param email: Required. Email address. + :type email: str + :param fax: Fax number. + :type fax: str + :param job_title: Job title. + :type job_title: str + :param name_first: Required. First name. + :type name_first: str + :param name_last: Required. Last name. + :type name_last: str + :param name_middle: Middle name. + :type name_middle: str + :param organization: Organization contact belongs to. + :type organization: str + :param phone: Required. Phone number. + :type phone: str + """ + + _validation = { + 'email': {'required': True}, + 'name_first': {'required': True}, + 'name_last': {'required': True}, + 'phone': {'required': True}, + } + + _attribute_map = { + 'address_mailing': {'key': 'addressMailing', 'type': 'Address'}, + 'email': {'key': 'email', 'type': 'str'}, + 'fax': {'key': 'fax', 'type': 'str'}, + 'job_title': {'key': 'jobTitle', 'type': 'str'}, + 'name_first': {'key': 'nameFirst', 'type': 'str'}, + 'name_last': {'key': 'nameLast', 'type': 'str'}, + 'name_middle': {'key': 'nameMiddle', 'type': 'str'}, + 'organization': {'key': 'organization', 'type': 'str'}, + 'phone': {'key': 'phone', 'type': 'str'}, + } + + def __init__(self, *, email: str, name_first: str, name_last: str, phone: str, address_mailing=None, fax: str=None, job_title: str=None, name_middle: str=None, organization: str=None, **kwargs) -> None: + super(Contact, self).__init__(**kwargs) + self.address_mailing = address_mailing + self.email = email + self.fax = fax + self.job_title = job_title + self.name_first = name_first + self.name_last = name_last + self.name_middle = name_middle + self.organization = organization + self.phone = phone 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..5e3e2d22cce5 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 @@ -78,16 +78,16 @@ class ContinuousWebJob(ProxyOnlyResource): '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): - super(ContinuousWebJob, self).__init__(kind=kind) - self.status = status - self.detailed_status = detailed_status - self.log_url = log_url + def __init__(self, **kwargs): + super(ContinuousWebJob, self).__init__(**kwargs) + self.status = kwargs.get('status', None) + self.detailed_status = kwargs.get('detailed_status', None) + self.log_url = kwargs.get('log_url', None) 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.error = error - self.using_sdk = using_sdk - self.settings = settings + self.run_command = kwargs.get('run_command', None) + self.url = kwargs.get('url', None) + self.extra_info_url = kwargs.get('extra_info_url', None) + self.job_type = kwargs.get('job_type', None) + self.error = kwargs.get('error', None) + self.using_sdk = kwargs.get('using_sdk', None) + self.settings = kwargs.get('settings', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/continuous_web_job_py3.py b/azure-mgmt-web/azure/mgmt/web/models/continuous_web_job_py3.py new file mode 100644 index 000000000000..8124a7dc494f --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/continuous_web_job_py3.py @@ -0,0 +1,93 @@ +# 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_py3 import ProxyOnlyResource + + +class ContinuousWebJob(ProxyOnlyResource): + """Continuous Web Job Information. + + 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 status: Job status. Possible values include: 'Initializing', + 'Starting', 'Running', 'PendingRestart', 'Stopped' + :type status: str or ~azure.mgmt.web.models.ContinuousWebJobStatus + :param detailed_status: Detailed status. + :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', + 'Triggered' + :type job_type: str or ~azure.mgmt.web.models.WebJobType + :param error: Error information. + :type error: str + :param using_sdk: Using SDK? + :type using_sdk: bool + :param settings: Job settings. + :type settings: dict[str, object] + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'continuous_web_job_name': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + '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'}, + 'url': {'key': 'properties.url', 'type': 'str'}, + 'extra_info_url': {'key': 'properties.extraInfoUrl', 'type': 'str'}, + 'job_type': {'key': 'properties.jobType', 'type': 'WebJobType'}, + 'error': {'key': 'properties.error', 'type': 'str'}, + 'using_sdk': {'key': 'properties.usingSdk', 'type': 'bool'}, + 'settings': {'key': 'properties.settings', 'type': '{object}'}, + } + + def __init__(self, *, kind: str=None, status=None, detailed_status: str=None, log_url: str=None, run_command: str=None, url: str=None, extra_info_url: str=None, job_type=None, error: str=None, using_sdk: bool=None, settings=None, **kwargs) -> None: + super(ContinuousWebJob, self).__init__(kind=kind, **kwargs) + 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.error = error + self.using_sdk = using_sdk + self.settings = settings diff --git a/azure-mgmt-web/azure/mgmt/web/models/cors_settings.py b/azure-mgmt-web/azure/mgmt/web/models/cors_settings.py index 8b4de3fca608..5096932c5327 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/cors_settings.py +++ b/azure-mgmt-web/azure/mgmt/web/models/cors_settings.py @@ -25,6 +25,6 @@ class CorsSettings(Model): 'allowed_origins': {'key': 'allowedOrigins', 'type': '[str]'}, } - def __init__(self, allowed_origins=None): - super(CorsSettings, self).__init__() - self.allowed_origins = allowed_origins + def __init__(self, **kwargs): + super(CorsSettings, self).__init__(**kwargs) + self.allowed_origins = kwargs.get('allowed_origins', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/cors_settings_py3.py b/azure-mgmt-web/azure/mgmt/web/models/cors_settings_py3.py new file mode 100644 index 000000000000..17c530afdd67 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/cors_settings_py3.py @@ -0,0 +1,30 @@ +# 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 CorsSettings(Model): + """Cross-Origin Resource Sharing (CORS) settings for the app. + + :param allowed_origins: Gets or sets the list of origins that should be + allowed to make cross-origin + calls (for example: http://example.com:12345). Use "*" to allow all. + :type allowed_origins: list[str] + """ + + _attribute_map = { + 'allowed_origins': {'key': 'allowedOrigins', 'type': '[str]'}, + } + + def __init__(self, *, allowed_origins=None, **kwargs) -> None: + super(CorsSettings, self).__init__(**kwargs) + self.allowed_origins = allowed_origins diff --git a/azure-mgmt-web/azure/mgmt/web/models/csm_move_resource_envelope.py b/azure-mgmt-web/azure/mgmt/web/models/csm_move_resource_envelope.py index 8c3093e3fba0..7b8a19d7ca27 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/csm_move_resource_envelope.py +++ b/azure-mgmt-web/azure/mgmt/web/models/csm_move_resource_envelope.py @@ -31,7 +31,7 @@ class CsmMoveResourceEnvelope(Model): 'resources': {'key': 'resources', 'type': '[str]'}, } - def __init__(self, target_resource_group=None, resources=None): - super(CsmMoveResourceEnvelope, self).__init__() - self.target_resource_group = target_resource_group - self.resources = resources + def __init__(self, **kwargs): + super(CsmMoveResourceEnvelope, self).__init__(**kwargs) + self.target_resource_group = kwargs.get('target_resource_group', None) + self.resources = kwargs.get('resources', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/csm_move_resource_envelope_py3.py b/azure-mgmt-web/azure/mgmt/web/models/csm_move_resource_envelope_py3.py new file mode 100644 index 000000000000..45dd9ab318d6 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/csm_move_resource_envelope_py3.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 CsmMoveResourceEnvelope(Model): + """Object with a list of the resources that need to be moved and the resource + group they should be moved to. + + :param target_resource_group: + :type target_resource_group: str + :param resources: + :type resources: list[str] + """ + + _validation = { + 'target_resource_group': {'max_length': 90, 'min_length': 1, 'pattern': r' ^[-\w\._\(\)]+[^\.]$'}, + } + + _attribute_map = { + 'target_resource_group': {'key': 'targetResourceGroup', 'type': 'str'}, + 'resources': {'key': 'resources', 'type': '[str]'}, + } + + def __init__(self, *, target_resource_group: str=None, resources=None, **kwargs) -> None: + super(CsmMoveResourceEnvelope, self).__init__(**kwargs) + self.target_resource_group = target_resource_group + self.resources = resources diff --git a/azure-mgmt-web/azure/mgmt/web/models/csm_operation_description.py b/azure-mgmt-web/azure/mgmt/web/models/csm_operation_description.py index 89ee09ec7fae..d1d7494ac89f 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/csm_operation_description.py +++ b/azure-mgmt-web/azure/mgmt/web/models/csm_operation_description.py @@ -32,9 +32,9 @@ class CsmOperationDescription(Model): 'properties': {'key': 'properties', 'type': 'CsmOperationDescriptionProperties'}, } - def __init__(self, name=None, display=None, origin=None, properties=None): - super(CsmOperationDescription, self).__init__() - self.name = name - self.display = display - self.origin = origin - self.properties = properties + def __init__(self, **kwargs): + super(CsmOperationDescription, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.display = kwargs.get('display', None) + self.origin = kwargs.get('origin', None) + self.properties = kwargs.get('properties', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/csm_operation_description_properties.py b/azure-mgmt-web/azure/mgmt/web/models/csm_operation_description_properties.py index 9cce3fb92aeb..6362aada58a3 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/csm_operation_description_properties.py +++ b/azure-mgmt-web/azure/mgmt/web/models/csm_operation_description_properties.py @@ -23,6 +23,6 @@ class CsmOperationDescriptionProperties(Model): 'service_specification': {'key': 'serviceSpecification', 'type': 'ServiceSpecification'}, } - def __init__(self, service_specification=None): - super(CsmOperationDescriptionProperties, self).__init__() - self.service_specification = service_specification + def __init__(self, **kwargs): + super(CsmOperationDescriptionProperties, self).__init__(**kwargs) + self.service_specification = kwargs.get('service_specification', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/csm_operation_description_properties_py3.py b/azure-mgmt-web/azure/mgmt/web/models/csm_operation_description_properties_py3.py new file mode 100644 index 000000000000..0dff6ebe4d7b --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/csm_operation_description_properties_py3.py @@ -0,0 +1,28 @@ +# 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 CsmOperationDescriptionProperties(Model): + """Properties available for a Microsoft.Web resource provider operation. + + :param service_specification: + :type service_specification: ~azure.mgmt.web.models.ServiceSpecification + """ + + _attribute_map = { + 'service_specification': {'key': 'serviceSpecification', 'type': 'ServiceSpecification'}, + } + + def __init__(self, *, service_specification=None, **kwargs) -> None: + super(CsmOperationDescriptionProperties, self).__init__(**kwargs) + self.service_specification = service_specification diff --git a/azure-mgmt-web/azure/mgmt/web/models/csm_operation_description_py3.py b/azure-mgmt-web/azure/mgmt/web/models/csm_operation_description_py3.py new file mode 100644 index 000000000000..ee5aaaae36bb --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/csm_operation_description_py3.py @@ -0,0 +1,40 @@ +# 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 CsmOperationDescription(Model): + """Description of an operation available for Microsoft.Web resource provider. + + :param name: + :type name: str + :param display: + :type display: ~azure.mgmt.web.models.CsmOperationDisplay + :param origin: + :type origin: str + :param properties: + :type properties: ~azure.mgmt.web.models.CsmOperationDescriptionProperties + """ + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'display': {'key': 'display', 'type': 'CsmOperationDisplay'}, + 'origin': {'key': 'origin', 'type': 'str'}, + 'properties': {'key': 'properties', 'type': 'CsmOperationDescriptionProperties'}, + } + + def __init__(self, *, name: str=None, display=None, origin: str=None, properties=None, **kwargs) -> None: + super(CsmOperationDescription, self).__init__(**kwargs) + self.name = name + self.display = display + self.origin = origin + self.properties = properties diff --git a/azure-mgmt-web/azure/mgmt/web/models/csm_operation_display.py b/azure-mgmt-web/azure/mgmt/web/models/csm_operation_display.py index f0906307021f..82f7c5b55b83 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/csm_operation_display.py +++ b/azure-mgmt-web/azure/mgmt/web/models/csm_operation_display.py @@ -32,9 +32,9 @@ class CsmOperationDisplay(Model): 'description': {'key': 'description', 'type': 'str'}, } - def __init__(self, provider=None, resource=None, operation=None, description=None): - super(CsmOperationDisplay, self).__init__() - self.provider = provider - self.resource = resource - self.operation = operation - self.description = description + def __init__(self, **kwargs): + super(CsmOperationDisplay, self).__init__(**kwargs) + self.provider = kwargs.get('provider', None) + self.resource = kwargs.get('resource', None) + self.operation = kwargs.get('operation', None) + self.description = kwargs.get('description', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/csm_operation_display_py3.py b/azure-mgmt-web/azure/mgmt/web/models/csm_operation_display_py3.py new file mode 100644 index 000000000000..f5645fe2e6cf --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/csm_operation_display_py3.py @@ -0,0 +1,40 @@ +# 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 CsmOperationDisplay(Model): + """Meta data about operation used for display in portal. + + :param provider: + :type provider: str + :param resource: + :type resource: str + :param operation: + :type operation: str + :param description: + :type description: str + """ + + _attribute_map = { + 'provider': {'key': 'provider', 'type': 'str'}, + 'resource': {'key': 'resource', 'type': 'str'}, + 'operation': {'key': 'operation', 'type': 'str'}, + 'description': {'key': 'description', 'type': 'str'}, + } + + def __init__(self, *, provider: str=None, resource: str=None, operation: str=None, description: str=None, **kwargs) -> None: + super(CsmOperationDisplay, self).__init__(**kwargs) + self.provider = provider + self.resource = resource + self.operation = operation + self.description = description diff --git a/azure-mgmt-web/azure/mgmt/web/models/csm_publishing_profile_options.py b/azure-mgmt-web/azure/mgmt/web/models/csm_publishing_profile_options.py index 67897e676cf3..65ab8e37e552 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/csm_publishing_profile_options.py +++ b/azure-mgmt-web/azure/mgmt/web/models/csm_publishing_profile_options.py @@ -26,6 +26,6 @@ class CsmPublishingProfileOptions(Model): 'format': {'key': 'format', 'type': 'str'}, } - def __init__(self, format=None): - super(CsmPublishingProfileOptions, self).__init__() - self.format = format + def __init__(self, **kwargs): + super(CsmPublishingProfileOptions, self).__init__(**kwargs) + self.format = kwargs.get('format', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/csm_publishing_profile_options_py3.py b/azure-mgmt-web/azure/mgmt/web/models/csm_publishing_profile_options_py3.py new file mode 100644 index 000000000000..eee0a5e7c608 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/csm_publishing_profile_options_py3.py @@ -0,0 +1,31 @@ +# 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 CsmPublishingProfileOptions(Model): + """Publishing options for requested profile. + + :param format: Name of the format. Valid values are: + FileZilla3 + WebDeploy -- default + Ftp. Possible values include: 'FileZilla3', 'WebDeploy', 'Ftp' + :type format: str or ~azure.mgmt.web.models.PublishingProfileFormat + """ + + _attribute_map = { + 'format': {'key': 'format', 'type': 'str'}, + } + + def __init__(self, *, format=None, **kwargs) -> None: + super(CsmPublishingProfileOptions, self).__init__(**kwargs) + self.format = format diff --git a/azure-mgmt-web/azure/mgmt/web/models/csm_slot_entity.py b/azure-mgmt-web/azure/mgmt/web/models/csm_slot_entity.py index 06446508086b..4f2b0eb519f7 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/csm_slot_entity.py +++ b/azure-mgmt-web/azure/mgmt/web/models/csm_slot_entity.py @@ -15,10 +15,13 @@ class CsmSlotEntity(Model): """Deployment slot parameters. - :param target_slot: Destination deployment slot during swap operation. + All required parameters must be populated in order to send to Azure. + + :param target_slot: Required. Destination deployment slot during swap + operation. :type target_slot: str - :param preserve_vnet: true to preserve Virtual Network to the - slot during swap; otherwise, false. + :param preserve_vnet: Required. true to preserve Virtual + Network to the slot during swap; otherwise, false. :type preserve_vnet: bool """ @@ -32,7 +35,7 @@ class CsmSlotEntity(Model): 'preserve_vnet': {'key': 'preserveVnet', 'type': 'bool'}, } - def __init__(self, target_slot, preserve_vnet): - super(CsmSlotEntity, self).__init__() - self.target_slot = target_slot - self.preserve_vnet = preserve_vnet + def __init__(self, **kwargs): + super(CsmSlotEntity, self).__init__(**kwargs) + self.target_slot = kwargs.get('target_slot', None) + self.preserve_vnet = kwargs.get('preserve_vnet', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/csm_slot_entity_py3.py b/azure-mgmt-web/azure/mgmt/web/models/csm_slot_entity_py3.py new file mode 100644 index 000000000000..e367bd554d0b --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/csm_slot_entity_py3.py @@ -0,0 +1,41 @@ +# 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 CsmSlotEntity(Model): + """Deployment slot parameters. + + All required parameters must be populated in order to send to Azure. + + :param target_slot: Required. Destination deployment slot during swap + operation. + :type target_slot: str + :param preserve_vnet: Required. true to preserve Virtual + Network to the slot during swap; otherwise, false. + :type preserve_vnet: bool + """ + + _validation = { + 'target_slot': {'required': True}, + 'preserve_vnet': {'required': True}, + } + + _attribute_map = { + 'target_slot': {'key': 'targetSlot', 'type': 'str'}, + 'preserve_vnet': {'key': 'preserveVnet', 'type': 'bool'}, + } + + def __init__(self, *, target_slot: str, preserve_vnet: bool, **kwargs) -> None: + super(CsmSlotEntity, self).__init__(**kwargs) + self.target_slot = target_slot + self.preserve_vnet = preserve_vnet diff --git a/azure-mgmt-web/azure/mgmt/web/models/csm_usage_quota.py b/azure-mgmt-web/azure/mgmt/web/models/csm_usage_quota.py index ce6e4773da6c..6ec31a0dbbab 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/csm_usage_quota.py +++ b/azure-mgmt-web/azure/mgmt/web/models/csm_usage_quota.py @@ -35,10 +35,10 @@ class CsmUsageQuota(Model): 'name': {'key': 'name', 'type': 'LocalizableString'}, } - def __init__(self, unit=None, next_reset_time=None, current_value=None, limit=None, name=None): - super(CsmUsageQuota, self).__init__() - self.unit = unit - self.next_reset_time = next_reset_time - self.current_value = current_value - self.limit = limit - self.name = name + def __init__(self, **kwargs): + super(CsmUsageQuota, self).__init__(**kwargs) + self.unit = kwargs.get('unit', None) + self.next_reset_time = kwargs.get('next_reset_time', None) + self.current_value = kwargs.get('current_value', None) + self.limit = kwargs.get('limit', None) + self.name = kwargs.get('name', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/csm_usage_quota_py3.py b/azure-mgmt-web/azure/mgmt/web/models/csm_usage_quota_py3.py new file mode 100644 index 000000000000..ec46c5675a51 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/csm_usage_quota_py3.py @@ -0,0 +1,44 @@ +# 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 CsmUsageQuota(Model): + """Usage of the quota resource. + + :param unit: Units of measurement for the quota resourse. + :type unit: str + :param next_reset_time: Next reset time for the resource counter. + :type next_reset_time: datetime + :param current_value: The current value of the resource counter. + :type current_value: long + :param limit: The resource limit. + :type limit: long + :param name: Quota name. + :type name: ~azure.mgmt.web.models.LocalizableString + """ + + _attribute_map = { + 'unit': {'key': 'unit', 'type': 'str'}, + 'next_reset_time': {'key': 'nextResetTime', 'type': 'iso-8601'}, + 'current_value': {'key': 'currentValue', 'type': 'long'}, + 'limit': {'key': 'limit', 'type': 'long'}, + 'name': {'key': 'name', 'type': 'LocalizableString'}, + } + + def __init__(self, *, unit: str=None, next_reset_time=None, current_value: int=None, limit: int=None, name=None, **kwargs) -> None: + super(CsmUsageQuota, self).__init__(**kwargs) + self.unit = unit + self.next_reset_time = next_reset_time + self.current_value = current_value + self.limit = limit + self.name = name diff --git a/azure-mgmt-web/azure/mgmt/web/models/custom_hostname_analysis_result.py b/azure-mgmt-web/azure/mgmt/web/models/custom_hostname_analysis_result.py index 6b29a631fb1e..caad9e011ea0 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/custom_hostname_analysis_result.py +++ b/azure-mgmt-web/azure/mgmt/web/models/custom_hostname_analysis_result.py @@ -90,16 +90,16 @@ class CustomHostnameAnalysisResult(ProxyOnlyResource): 'alternate_txt_records': {'key': 'properties.alternateTxtRecords', 'type': '[str]'}, } - def __init__(self, kind=None, c_name_records=None, txt_records=None, a_records=None, alternate_cname_records=None, alternate_txt_records=None): - super(CustomHostnameAnalysisResult, self).__init__(kind=kind) + def __init__(self, **kwargs): + super(CustomHostnameAnalysisResult, self).__init__(**kwargs) self.is_hostname_already_verified = None self.custom_domain_verification_test = None self.custom_domain_verification_failure_info = None self.has_conflict_on_scale_unit = None self.has_conflict_across_subscription = None self.conflicting_app_resource_id = None - self.c_name_records = c_name_records - self.txt_records = txt_records - self.a_records = a_records - self.alternate_cname_records = alternate_cname_records - self.alternate_txt_records = alternate_txt_records + self.c_name_records = kwargs.get('c_name_records', None) + self.txt_records = kwargs.get('txt_records', None) + self.a_records = kwargs.get('a_records', None) + self.alternate_cname_records = kwargs.get('alternate_cname_records', None) + self.alternate_txt_records = kwargs.get('alternate_txt_records', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/custom_hostname_analysis_result_py3.py b/azure-mgmt-web/azure/mgmt/web/models/custom_hostname_analysis_result_py3.py new file mode 100644 index 000000000000..0646bccb298a --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/custom_hostname_analysis_result_py3.py @@ -0,0 +1,105 @@ +# 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_py3 import ProxyOnlyResource + + +class CustomHostnameAnalysisResult(ProxyOnlyResource): + """Custom domain analysis. + + 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 + :ivar is_hostname_already_verified: true if hostname is + already verified; otherwise, false. + :vartype is_hostname_already_verified: bool + :ivar custom_domain_verification_test: DNS verification test result. + Possible values include: 'Passed', 'Failed', 'Skipped' + :vartype custom_domain_verification_test: str or + ~azure.mgmt.web.models.DnsVerificationTestResult + :ivar custom_domain_verification_failure_info: Raw failure information if + DNS verification fails. + :vartype custom_domain_verification_failure_info: + ~azure.mgmt.web.models.ErrorEntity + :ivar has_conflict_on_scale_unit: true if there is a conflict + on a scale unit; otherwise, false. + :vartype has_conflict_on_scale_unit: bool + :ivar has_conflict_across_subscription: true if htere is a + conflict across subscriptions; otherwise, false. + :vartype has_conflict_across_subscription: bool + :ivar conflicting_app_resource_id: Name of the conflicting app on scale + unit if it's within the same subscription. + :vartype conflicting_app_resource_id: str + :param c_name_records: CName records controller can see for this hostname. + :type c_name_records: list[str] + :param txt_records: TXT records controller can see for this hostname. + :type txt_records: list[str] + :param a_records: A records controller can see for this hostname. + :type a_records: list[str] + :param alternate_cname_records: Alternate CName records controller can see + for this hostname. + :type alternate_cname_records: list[str] + :param alternate_txt_records: Alternate TXT records controller can see for + this hostname. + :type alternate_txt_records: list[str] + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'is_hostname_already_verified': {'readonly': True}, + 'custom_domain_verification_test': {'readonly': True}, + 'custom_domain_verification_failure_info': {'readonly': True}, + 'has_conflict_on_scale_unit': {'readonly': True}, + 'has_conflict_across_subscription': {'readonly': True}, + 'conflicting_app_resource_id': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'is_hostname_already_verified': {'key': 'properties.isHostnameAlreadyVerified', 'type': 'bool'}, + 'custom_domain_verification_test': {'key': 'properties.customDomainVerificationTest', 'type': 'DnsVerificationTestResult'}, + 'custom_domain_verification_failure_info': {'key': 'properties.customDomainVerificationFailureInfo', 'type': 'ErrorEntity'}, + 'has_conflict_on_scale_unit': {'key': 'properties.hasConflictOnScaleUnit', 'type': 'bool'}, + 'has_conflict_across_subscription': {'key': 'properties.hasConflictAcrossSubscription', 'type': 'bool'}, + 'conflicting_app_resource_id': {'key': 'properties.conflictingAppResourceId', 'type': 'str'}, + 'c_name_records': {'key': 'properties.cNameRecords', 'type': '[str]'}, + 'txt_records': {'key': 'properties.txtRecords', 'type': '[str]'}, + 'a_records': {'key': 'properties.aRecords', 'type': '[str]'}, + 'alternate_cname_records': {'key': 'properties.alternateCNameRecords', 'type': '[str]'}, + 'alternate_txt_records': {'key': 'properties.alternateTxtRecords', 'type': '[str]'}, + } + + def __init__(self, *, kind: str=None, c_name_records=None, txt_records=None, a_records=None, alternate_cname_records=None, alternate_txt_records=None, **kwargs) -> None: + super(CustomHostnameAnalysisResult, self).__init__(kind=kind, **kwargs) + self.is_hostname_already_verified = None + self.custom_domain_verification_test = None + self.custom_domain_verification_failure_info = None + self.has_conflict_on_scale_unit = None + self.has_conflict_across_subscription = None + self.conflicting_app_resource_id = None + self.c_name_records = c_name_records + self.txt_records = txt_records + self.a_records = a_records + self.alternate_cname_records = alternate_cname_records + self.alternate_txt_records = alternate_txt_records diff --git a/azure-mgmt-web/azure/mgmt/web/models/data_source.py b/azure-mgmt-web/azure/mgmt/web/models/data_source.py index 03793780359a..7a2c50d6e370 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/data_source.py +++ b/azure-mgmt-web/azure/mgmt/web/models/data_source.py @@ -26,7 +26,7 @@ class DataSource(Model): 'data_source_uri': {'key': 'dataSourceUri', 'type': '[NameValuePair]'}, } - def __init__(self, instructions=None, data_source_uri=None): - super(DataSource, self).__init__() - self.instructions = instructions - self.data_source_uri = data_source_uri + def __init__(self, **kwargs): + super(DataSource, self).__init__(**kwargs) + self.instructions = kwargs.get('instructions', None) + self.data_source_uri = kwargs.get('data_source_uri', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/data_source_py3.py b/azure-mgmt-web/azure/mgmt/web/models/data_source_py3.py new file mode 100644 index 000000000000..b6db5b64ff21 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/data_source_py3.py @@ -0,0 +1,32 @@ +# 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 DataSource(Model): + """Class representing data source used by the detectors. + + :param instructions: Instrunctions if any for the data source + :type instructions: list[str] + :param data_source_uri: Datasource Uri Links + :type data_source_uri: list[~azure.mgmt.web.models.NameValuePair] + """ + + _attribute_map = { + 'instructions': {'key': 'instructions', 'type': '[str]'}, + 'data_source_uri': {'key': 'dataSourceUri', 'type': '[NameValuePair]'}, + } + + def __init__(self, *, instructions=None, data_source_uri=None, **kwargs) -> None: + super(DataSource, self).__init__(**kwargs) + self.instructions = instructions + self.data_source_uri = data_source_uri diff --git a/azure-mgmt-web/azure/mgmt/web/models/data_table_response_column.py b/azure-mgmt-web/azure/mgmt/web/models/data_table_response_column.py index 388f033f30b3..8a6230c72956 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/data_table_response_column.py +++ b/azure-mgmt-web/azure/mgmt/web/models/data_table_response_column.py @@ -29,8 +29,8 @@ class DataTableResponseColumn(Model): 'column_type': {'key': 'columnType', 'type': 'str'}, } - def __init__(self, column_name=None, data_type=None, column_type=None): - super(DataTableResponseColumn, self).__init__() - self.column_name = column_name - self.data_type = data_type - self.column_type = column_type + def __init__(self, **kwargs): + super(DataTableResponseColumn, self).__init__(**kwargs) + self.column_name = kwargs.get('column_name', None) + self.data_type = kwargs.get('data_type', None) + self.column_type = kwargs.get('column_type', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/data_table_response_column_py3.py b/azure-mgmt-web/azure/mgmt/web/models/data_table_response_column_py3.py new file mode 100644 index 000000000000..a8a0fa2b1209 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/data_table_response_column_py3.py @@ -0,0 +1,36 @@ +# 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 DataTableResponseColumn(Model): + """Column definition. + + :param column_name: Name of the column + :type column_name: str + :param data_type: Data type which looks like 'String' or 'Int32'. + :type data_type: str + :param column_type: Column Type + :type column_type: str + """ + + _attribute_map = { + 'column_name': {'key': 'columnName', 'type': 'str'}, + 'data_type': {'key': 'dataType', 'type': 'str'}, + 'column_type': {'key': 'columnType', 'type': 'str'}, + } + + def __init__(self, *, column_name: str=None, data_type: str=None, column_type: str=None, **kwargs) -> None: + super(DataTableResponseColumn, self).__init__(**kwargs) + self.column_name = column_name + self.data_type = data_type + self.column_type = column_type diff --git a/azure-mgmt-web/azure/mgmt/web/models/data_table_response_object.py b/azure-mgmt-web/azure/mgmt/web/models/data_table_response_object.py index 3d3ba7bb8e93..28efd2e527f8 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/data_table_response_object.py +++ b/azure-mgmt-web/azure/mgmt/web/models/data_table_response_object.py @@ -29,8 +29,8 @@ class DataTableResponseObject(Model): 'rows': {'key': 'rows', 'type': '[[str]]'}, } - def __init__(self, table_name=None, columns=None, rows=None): - super(DataTableResponseObject, self).__init__() - self.table_name = table_name - self.columns = columns - self.rows = rows + def __init__(self, **kwargs): + super(DataTableResponseObject, self).__init__(**kwargs) + self.table_name = kwargs.get('table_name', None) + self.columns = kwargs.get('columns', None) + self.rows = kwargs.get('rows', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/data_table_response_object_py3.py b/azure-mgmt-web/azure/mgmt/web/models/data_table_response_object_py3.py new file mode 100644 index 000000000000..c5a45a8f311a --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/data_table_response_object_py3.py @@ -0,0 +1,36 @@ +# 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 DataTableResponseObject(Model): + """Data Table which defines columns and raw row values. + + :param table_name: Name of the table + :type table_name: str + :param columns: List of columns with data types + :type columns: list[~azure.mgmt.web.models.DataTableResponseColumn] + :param rows: Raw row values + :type rows: list[list[str]] + """ + + _attribute_map = { + 'table_name': {'key': 'tableName', 'type': 'str'}, + 'columns': {'key': 'columns', 'type': '[DataTableResponseColumn]'}, + 'rows': {'key': 'rows', 'type': '[[str]]'}, + } + + def __init__(self, *, table_name: str=None, columns=None, rows=None, **kwargs) -> None: + super(DataTableResponseObject, self).__init__(**kwargs) + self.table_name = table_name + self.columns = columns + self.rows = rows diff --git a/azure-mgmt-web/azure/mgmt/web/models/database_backup_setting.py b/azure-mgmt-web/azure/mgmt/web/models/database_backup_setting.py index bd54f5fde4a4..a9ea496e18bc 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/database_backup_setting.py +++ b/azure-mgmt-web/azure/mgmt/web/models/database_backup_setting.py @@ -15,8 +15,10 @@ class DatabaseBackupSetting(Model): """Database backup settings. - :param database_type: Database type (e.g. SqlAzure / MySql). Possible - values include: 'SqlAzure', 'MySql', 'LocalMySql', 'PostgreSql' + All required parameters must be populated in order to send to Azure. + + :param database_type: Required. Database type (e.g. SqlAzure / MySql). + Possible values include: 'SqlAzure', 'MySql', 'LocalMySql', 'PostgreSql' :type database_type: str or ~azure.mgmt.web.models.DatabaseType :param name: :type name: str @@ -41,9 +43,9 @@ class DatabaseBackupSetting(Model): 'connection_string': {'key': 'connectionString', 'type': 'str'}, } - def __init__(self, database_type, name=None, connection_string_name=None, connection_string=None): - super(DatabaseBackupSetting, self).__init__() - self.database_type = database_type - self.name = name - self.connection_string_name = connection_string_name - self.connection_string = connection_string + def __init__(self, **kwargs): + super(DatabaseBackupSetting, self).__init__(**kwargs) + self.database_type = kwargs.get('database_type', None) + self.name = kwargs.get('name', None) + self.connection_string_name = kwargs.get('connection_string_name', None) + self.connection_string = kwargs.get('connection_string', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/database_backup_setting_py3.py b/azure-mgmt-web/azure/mgmt/web/models/database_backup_setting_py3.py new file mode 100644 index 000000000000..caeb63246f45 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/database_backup_setting_py3.py @@ -0,0 +1,51 @@ +# 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 DatabaseBackupSetting(Model): + """Database backup settings. + + All required parameters must be populated in order to send to Azure. + + :param database_type: Required. Database type (e.g. SqlAzure / MySql). + Possible values include: 'SqlAzure', 'MySql', 'LocalMySql', 'PostgreSql' + :type database_type: str or ~azure.mgmt.web.models.DatabaseType + :param name: + :type name: str + :param connection_string_name: Contains a connection string name that is + linked to the SiteConfig.ConnectionStrings. + This is used during restore with overwrite connection strings options. + :type connection_string_name: str + :param connection_string: Contains a connection string to a database which + is being backed up or restored. If the restore should happen to a new + database, the database name inside is the new one. + :type connection_string: str + """ + + _validation = { + 'database_type': {'required': True}, + } + + _attribute_map = { + 'database_type': {'key': 'databaseType', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'connection_string_name': {'key': 'connectionStringName', 'type': 'str'}, + 'connection_string': {'key': 'connectionString', 'type': 'str'}, + } + + def __init__(self, *, database_type, name: str=None, connection_string_name: str=None, connection_string: str=None, **kwargs) -> None: + super(DatabaseBackupSetting, self).__init__(**kwargs) + self.database_type = database_type + self.name = name + self.connection_string_name = connection_string_name + self.connection_string = connection_string diff --git a/azure-mgmt-web/azure/mgmt/web/models/default_error_response.py b/azure-mgmt-web/azure/mgmt/web/models/default_error_response.py index 7a16dd576a12..438128e5fc67 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/default_error_response.py +++ b/azure-mgmt-web/azure/mgmt/web/models/default_error_response.py @@ -31,8 +31,8 @@ class DefaultErrorResponse(Model): 'error': {'key': 'error', 'type': 'DefaultErrorResponseError'}, } - def __init__(self): - super(DefaultErrorResponse, self).__init__() + def __init__(self, **kwargs): + super(DefaultErrorResponse, self).__init__(**kwargs) self.error = None 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 index a310e52fd21b..df5d32e35563 100644 --- 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 @@ -46,10 +46,10 @@ class DefaultErrorResponseError(Model): 'innererror': {'key': 'innererror', 'type': 'str'}, } - def __init__(self, details=None): - super(DefaultErrorResponseError, self).__init__() + def __init__(self, **kwargs): + super(DefaultErrorResponseError, self).__init__(**kwargs) self.code = None self.message = None self.target = None - self.details = details + self.details = kwargs.get('details', None) 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 index 7434138df870..7fb1c5ded635 100644 --- 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 @@ -38,8 +38,8 @@ class DefaultErrorResponseErrorDetailsItem(Model): 'target': {'key': 'target', 'type': 'str'}, } - def __init__(self): - super(DefaultErrorResponseErrorDetailsItem, self).__init__() + def __init__(self, **kwargs): + super(DefaultErrorResponseErrorDetailsItem, self).__init__(**kwargs) self.code = None self.message = None self.target = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/default_error_response_error_details_item_py3.py b/azure-mgmt-web/azure/mgmt/web/models/default_error_response_error_details_item_py3.py new file mode 100644 index 000000000000..9a4deb14b49e --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/default_error_response_error_details_item_py3.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, **kwargs) -> None: + super(DefaultErrorResponseErrorDetailsItem, self).__init__(**kwargs) + self.code = None + self.message = None + self.target = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/default_error_response_error_py3.py b/azure-mgmt-web/azure/mgmt/web/models/default_error_response_error_py3.py new file mode 100644 index 000000000000..b8666a06f08a --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/default_error_response_error_py3.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, **kwargs) -> None: + super(DefaultErrorResponseError, self).__init__(**kwargs) + 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_py3.py b/azure-mgmt-web/azure/mgmt/web/models/default_error_response_py3.py new file mode 100644 index 000000000000..f121af5f03b0 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/default_error_response_py3.py @@ -0,0 +1,48 @@ +# 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 +from msrest.exceptions import HttpOperationError + + +class DefaultErrorResponse(Model): + """App Service error response. + + 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 = { + 'error': {'key': 'error', 'type': 'DefaultErrorResponseError'}, + } + + def __init__(self, **kwargs) -> None: + super(DefaultErrorResponse, self).__init__(**kwargs) + self.error = None + + +class DefaultErrorResponseException(HttpOperationError): + """Server responsed with exception of type: 'DefaultErrorResponse'. + + :param deserialize: A deserializer + :param response: Server response to be deserialized. + """ + + def __init__(self, deserialize, response, *args): + + super(DefaultErrorResponseException, self).__init__(deserialize, response, 'DefaultErrorResponse', *args) 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..5aa094a18f0e 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/deleted_site.py +++ b/azure-mgmt-web/azure/mgmt/web/models/deleted_site.py @@ -49,9 +49,9 @@ class DeletedSite(Model): 'slot': {'key': 'slot', 'type': 'str'}, } - def __init__(self, id=None): - super(DeletedSite, self).__init__() - self.id = id + def __init__(self, **kwargs): + super(DeletedSite, self).__init__(**kwargs) + self.id = kwargs.get('id', None) self.deleted_timestamp = None self.subscription = None self.resource_group = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/deleted_site_py3.py b/azure-mgmt-web/azure/mgmt/web/models/deleted_site_py3.py new file mode 100644 index 000000000000..a6d712ebec38 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/deleted_site_py3.py @@ -0,0 +1,59 @@ +# 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 DeletedSite(Model): + """A deleted app. + + 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 + :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 slot: Slot of the deleted site + :vartype slot: str + """ + + _validation = { + 'deleted_timestamp': {'readonly': True}, + 'subscription': {'readonly': True}, + 'resource_group': {'readonly': True}, + 'name': {'readonly': True}, + 'slot': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'int'}, + 'deleted_timestamp': {'key': 'deletedTimestamp', 'type': 'str'}, + 'subscription': {'key': 'subscription', 'type': 'str'}, + 'resource_group': {'key': 'resourceGroup', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'slot': {'key': 'slot', 'type': 'str'}, + } + + def __init__(self, *, id: int=None, **kwargs) -> None: + super(DeletedSite, self).__init__(**kwargs) + self.id = id + self.deleted_timestamp = None + self.subscription = None + self.resource_group = None + self.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..c6ab92e0e999 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/deployment.py +++ b/azure-mgmt-web/azure/mgmt/web/models/deployment.py @@ -72,15 +72,15 @@ class Deployment(ProxyOnlyResource): '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): - super(Deployment, self).__init__(kind=kind) - self.deployment_id = deployment_id - self.status = status - self.message = message - self.author = author - self.deployer = deployer - self.author_email = author_email - self.start_time = start_time - self.end_time = end_time - self.active = active - self.details = details + def __init__(self, **kwargs): + super(Deployment, self).__init__(**kwargs) + self.deployment_id = kwargs.get('deployment_id', None) + self.status = kwargs.get('status', None) + self.message = kwargs.get('message', None) + self.author = kwargs.get('author', None) + self.deployer = kwargs.get('deployer', None) + self.author_email = kwargs.get('author_email', None) + self.start_time = kwargs.get('start_time', None) + self.end_time = kwargs.get('end_time', None) + self.active = kwargs.get('active', None) + self.details = kwargs.get('details', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/deployment_locations.py b/azure-mgmt-web/azure/mgmt/web/models/deployment_locations.py index edda1454a99c..f7cf08b81fa3 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/deployment_locations.py +++ b/azure-mgmt-web/azure/mgmt/web/models/deployment_locations.py @@ -34,8 +34,8 @@ class DeploymentLocations(Model): 'hosting_environment_deployment_infos': {'key': 'hostingEnvironmentDeploymentInfos', 'type': '[HostingEnvironmentDeploymentInfo]'}, } - def __init__(self, locations=None, hosting_environments=None, hosting_environment_deployment_infos=None): - super(DeploymentLocations, self).__init__() - self.locations = locations - self.hosting_environments = hosting_environments - self.hosting_environment_deployment_infos = hosting_environment_deployment_infos + def __init__(self, **kwargs): + super(DeploymentLocations, self).__init__(**kwargs) + self.locations = kwargs.get('locations', None) + self.hosting_environments = kwargs.get('hosting_environments', None) + self.hosting_environment_deployment_infos = kwargs.get('hosting_environment_deployment_infos', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/deployment_locations_py3.py b/azure-mgmt-web/azure/mgmt/web/models/deployment_locations_py3.py new file mode 100644 index 000000000000..19167455ae81 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/deployment_locations_py3.py @@ -0,0 +1,41 @@ +# 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 DeploymentLocations(Model): + """List of available locations (regions or App Service Environments) for + deployment of App Service resources. + + :param locations: Available regions. + :type locations: list[~azure.mgmt.web.models.GeoRegion] + :param hosting_environments: Available App Service Environments with full + descriptions of the environments. + :type hosting_environments: + list[~azure.mgmt.web.models.AppServiceEnvironment] + :param hosting_environment_deployment_infos: Available App Service + Environments with basic information. + :type hosting_environment_deployment_infos: + list[~azure.mgmt.web.models.HostingEnvironmentDeploymentInfo] + """ + + _attribute_map = { + 'locations': {'key': 'locations', 'type': '[GeoRegion]'}, + 'hosting_environments': {'key': 'hostingEnvironments', 'type': '[AppServiceEnvironment]'}, + 'hosting_environment_deployment_infos': {'key': 'hostingEnvironmentDeploymentInfos', 'type': '[HostingEnvironmentDeploymentInfo]'}, + } + + def __init__(self, *, locations=None, hosting_environments=None, hosting_environment_deployment_infos=None, **kwargs) -> None: + super(DeploymentLocations, self).__init__(**kwargs) + self.locations = locations + self.hosting_environments = hosting_environments + self.hosting_environment_deployment_infos = hosting_environment_deployment_infos diff --git a/azure-mgmt-web/azure/mgmt/web/models/deployment_py3.py b/azure-mgmt-web/azure/mgmt/web/models/deployment_py3.py new file mode 100644 index 000000000000..d5f75d46699f --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/deployment_py3.py @@ -0,0 +1,86 @@ +# 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_py3 import ProxyOnlyResource + + +class Deployment(ProxyOnlyResource): + """User crendentials used for publishing activity. + + 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 deployment_id: Identifier for deployment. + :type deployment_id: str + :param status: Deployment status. + :type status: int + :param message: Details about deployment status. + :type message: str + :param author: Who authored the deployment. + :type author: str + :param deployer: Who performed the deployment. + :type deployer: str + :param author_email: Author email. + :type author_email: str + :param start_time: Start time. + :type start_time: datetime + :param end_time: End time. + :type end_time: datetime + :param active: True if deployment is currently active, false if completed + and null if not started. + :type active: bool + :param details: Details on deployment. + :type details: 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'}, + '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'}, + 'active': {'key': 'properties.active', 'type': 'bool'}, + 'details': {'key': 'properties.details', 'type': 'str'}, + } + + def __init__(self, *, kind: str=None, deployment_id: str=None, status: int=None, message: str=None, author: str=None, deployer: str=None, author_email: str=None, start_time=None, end_time=None, active: bool=None, details: str=None, **kwargs) -> None: + super(Deployment, self).__init__(kind=kind, **kwargs) + self.deployment_id = deployment_id + self.status = status + self.message = message + self.author = author + self.deployer = deployer + self.author_email = author_email + self.start_time = start_time + self.end_time = end_time + self.active = active + self.details = details diff --git a/azure-mgmt-web/azure/mgmt/web/models/detector_abnormal_time_period.py b/azure-mgmt-web/azure/mgmt/web/models/detector_abnormal_time_period.py index d1bdbc1cb0c8..79d6784e465e 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/detector_abnormal_time_period.py +++ b/azure-mgmt-web/azure/mgmt/web/models/detector_abnormal_time_period.py @@ -46,13 +46,13 @@ class DetectorAbnormalTimePeriod(Model): 'solutions': {'key': 'solutions', 'type': '[Solution]'}, } - def __init__(self, start_time=None, end_time=None, message=None, source=None, priority=None, meta_data=None, type=None, solutions=None): - super(DetectorAbnormalTimePeriod, self).__init__() - self.start_time = start_time - self.end_time = end_time - self.message = message - self.source = source - self.priority = priority - self.meta_data = meta_data - self.type = type - self.solutions = solutions + def __init__(self, **kwargs): + super(DetectorAbnormalTimePeriod, self).__init__(**kwargs) + self.start_time = kwargs.get('start_time', None) + self.end_time = kwargs.get('end_time', None) + self.message = kwargs.get('message', None) + self.source = kwargs.get('source', None) + self.priority = kwargs.get('priority', None) + self.meta_data = kwargs.get('meta_data', None) + self.type = kwargs.get('type', None) + self.solutions = kwargs.get('solutions', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/detector_abnormal_time_period_py3.py b/azure-mgmt-web/azure/mgmt/web/models/detector_abnormal_time_period_py3.py new file mode 100644 index 000000000000..63507c374c07 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/detector_abnormal_time_period_py3.py @@ -0,0 +1,58 @@ +# 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 DetectorAbnormalTimePeriod(Model): + """Class representing Abnormal Time Period detected. + + :param start_time: Start time of the corelated event + :type start_time: datetime + :param end_time: End time of the corelated event + :type end_time: datetime + :param message: Message describing the event + :type message: str + :param source: Represents the name of the Detector + :type source: str + :param priority: Represents the rank of the Detector + :type priority: float + :param meta_data: Downtime metadata + :type meta_data: list[list[~azure.mgmt.web.models.NameValuePair]] + :param type: Represents the type of the Detector. Possible values include: + 'ServiceIncident', 'AppDeployment', 'AppCrash', 'RuntimeIssueDetected', + 'AseDeployment', 'UserIssue', 'PlatformIssue', 'Other' + :type type: str or ~azure.mgmt.web.models.IssueType + :param solutions: List of proposed solutions + :type solutions: list[~azure.mgmt.web.models.Solution] + """ + + _attribute_map = { + 'start_time': {'key': 'startTime', 'type': 'iso-8601'}, + 'end_time': {'key': 'endTime', 'type': 'iso-8601'}, + 'message': {'key': 'message', 'type': 'str'}, + 'source': {'key': 'source', 'type': 'str'}, + 'priority': {'key': 'priority', 'type': 'float'}, + 'meta_data': {'key': 'metaData', 'type': '[[NameValuePair]]'}, + 'type': {'key': 'type', 'type': 'IssueType'}, + 'solutions': {'key': 'solutions', 'type': '[Solution]'}, + } + + def __init__(self, *, start_time=None, end_time=None, message: str=None, source: str=None, priority: float=None, meta_data=None, type=None, solutions=None, **kwargs) -> None: + super(DetectorAbnormalTimePeriod, self).__init__(**kwargs) + self.start_time = start_time + self.end_time = end_time + self.message = message + self.source = source + self.priority = priority + self.meta_data = meta_data + self.type = type + self.solutions = solutions diff --git a/azure-mgmt-web/azure/mgmt/web/models/detector_definition.py b/azure-mgmt-web/azure/mgmt/web/models/detector_definition.py index 5cfa7e58126f..df4be4fcf342 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/detector_definition.py +++ b/azure-mgmt-web/azure/mgmt/web/models/detector_definition.py @@ -57,8 +57,8 @@ class DetectorDefinition(ProxyOnlyResource): 'is_enabled': {'key': 'properties.isEnabled', 'type': 'bool'}, } - def __init__(self, kind=None): - super(DetectorDefinition, self).__init__(kind=kind) + def __init__(self, **kwargs): + super(DetectorDefinition, self).__init__(**kwargs) self.display_name = None self.description = None self.rank = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/detector_definition_py3.py b/azure-mgmt-web/azure/mgmt/web/models/detector_definition_py3.py new file mode 100644 index 000000000000..0f4e5a33e49c --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/detector_definition_py3.py @@ -0,0 +1,65 @@ +# 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_py3 import ProxyOnlyResource + + +class DetectorDefinition(ProxyOnlyResource): + """Class representing detector definition. + + 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 + :ivar display_name: Display name of the detector + :vartype display_name: str + :ivar description: Description of the detector + :vartype description: str + :ivar rank: Detector Rank + :vartype rank: float + :ivar is_enabled: Flag representing whether detector is enabled or not. + :vartype is_enabled: bool + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'display_name': {'readonly': True}, + 'description': {'readonly': True}, + 'rank': {'readonly': True}, + 'is_enabled': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'display_name': {'key': 'properties.displayName', 'type': 'str'}, + 'description': {'key': 'properties.description', 'type': 'str'}, + 'rank': {'key': 'properties.rank', 'type': 'float'}, + 'is_enabled': {'key': 'properties.isEnabled', 'type': 'bool'}, + } + + def __init__(self, *, kind: str=None, **kwargs) -> None: + super(DetectorDefinition, self).__init__(kind=kind, **kwargs) + self.display_name = None + self.description = None + self.rank = None + self.is_enabled = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/detector_info.py b/azure-mgmt-web/azure/mgmt/web/models/detector_info.py index 4c01fe87ecea..2cc5f88f8eb8 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/detector_info.py +++ b/azure-mgmt-web/azure/mgmt/web/models/detector_info.py @@ -42,8 +42,8 @@ class DetectorInfo(Model): 'support_topic_id': {'key': 'supportTopicId', 'type': 'str'}, } - def __init__(self): - super(DetectorInfo, self).__init__() + def __init__(self, **kwargs): + super(DetectorInfo, self).__init__(**kwargs) self.description = None self.category = None self.sub_category = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/detector_info_py3.py b/azure-mgmt-web/azure/mgmt/web/models/detector_info_py3.py new file mode 100644 index 000000000000..0343c78a5c09 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/detector_info_py3.py @@ -0,0 +1,50 @@ +# 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 DetectorInfo(Model): + """Definition of Detector. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar description: Short description of the detector and its purpose + :vartype description: str + :ivar category: Support Category + :vartype category: str + :ivar sub_category: Support Sub Category + :vartype sub_category: str + :ivar support_topic_id: Support Topic Id + :vartype support_topic_id: str + """ + + _validation = { + 'description': {'readonly': True}, + 'category': {'readonly': True}, + 'sub_category': {'readonly': True}, + 'support_topic_id': {'readonly': True}, + } + + _attribute_map = { + 'description': {'key': 'description', 'type': 'str'}, + 'category': {'key': 'category', 'type': 'str'}, + 'sub_category': {'key': 'subCategory', 'type': 'str'}, + 'support_topic_id': {'key': 'supportTopicId', 'type': 'str'}, + } + + def __init__(self, **kwargs) -> None: + super(DetectorInfo, self).__init__(**kwargs) + self.description = None + self.category = None + self.sub_category = None + self.support_topic_id = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/detector_response.py b/azure-mgmt-web/azure/mgmt/web/models/detector_response.py index bfaf8d33cb36..65a27080a7aa 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/detector_response.py +++ b/azure-mgmt-web/azure/mgmt/web/models/detector_response.py @@ -47,7 +47,7 @@ class DetectorResponse(ProxyOnlyResource): 'dataset': {'key': 'properties.dataset', 'type': '[DiagnosticData]'}, } - def __init__(self, kind=None, metadata=None, dataset=None): - super(DetectorResponse, self).__init__(kind=kind) - self.metadata = metadata - self.dataset = dataset + def __init__(self, **kwargs): + super(DetectorResponse, self).__init__(**kwargs) + self.metadata = kwargs.get('metadata', None) + self.dataset = kwargs.get('dataset', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/detector_response_py3.py b/azure-mgmt-web/azure/mgmt/web/models/detector_response_py3.py new file mode 100644 index 000000000000..62ee24bac96e --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/detector_response_py3.py @@ -0,0 +1,53 @@ +# 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_py3 import ProxyOnlyResource + + +class DetectorResponse(ProxyOnlyResource): + """Class representing Response from Detector. + + 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 metadata: metadata for the detector + :type metadata: ~azure.mgmt.web.models.DetectorInfo + :param dataset: Data Set + :type dataset: list[~azure.mgmt.web.models.DiagnosticData] + """ + + _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'}, + 'metadata': {'key': 'properties.metadata', 'type': 'DetectorInfo'}, + 'dataset': {'key': 'properties.dataset', 'type': '[DiagnosticData]'}, + } + + def __init__(self, *, kind: str=None, metadata=None, dataset=None, **kwargs) -> None: + super(DetectorResponse, self).__init__(kind=kind, **kwargs) + self.metadata = metadata + self.dataset = dataset diff --git a/azure-mgmt-web/azure/mgmt/web/models/diagnostic_analysis.py b/azure-mgmt-web/azure/mgmt/web/models/diagnostic_analysis.py index a902a69adfac..4f81c2feea2d 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/diagnostic_analysis.py +++ b/azure-mgmt-web/azure/mgmt/web/models/diagnostic_analysis.py @@ -59,10 +59,10 @@ class DiagnosticAnalysis(ProxyOnlyResource): 'non_correlated_detectors': {'key': 'properties.nonCorrelatedDetectors', 'type': '[DetectorDefinition]'}, } - def __init__(self, kind=None, start_time=None, end_time=None, abnormal_time_periods=None, payload=None, non_correlated_detectors=None): - super(DiagnosticAnalysis, self).__init__(kind=kind) - self.start_time = start_time - self.end_time = end_time - self.abnormal_time_periods = abnormal_time_periods - self.payload = payload - self.non_correlated_detectors = non_correlated_detectors + def __init__(self, **kwargs): + super(DiagnosticAnalysis, self).__init__(**kwargs) + self.start_time = kwargs.get('start_time', None) + self.end_time = kwargs.get('end_time', None) + self.abnormal_time_periods = kwargs.get('abnormal_time_periods', None) + self.payload = kwargs.get('payload', None) + self.non_correlated_detectors = kwargs.get('non_correlated_detectors', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/diagnostic_analysis_py3.py b/azure-mgmt-web/azure/mgmt/web/models/diagnostic_analysis_py3.py new file mode 100644 index 000000000000..db37d477914b --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/diagnostic_analysis_py3.py @@ -0,0 +1,68 @@ +# 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_py3 import ProxyOnlyResource + + +class DiagnosticAnalysis(ProxyOnlyResource): + """Class representing a diagnostic analysis done on an application. + + 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 start_time: Start time of the period + :type start_time: datetime + :param end_time: End time of the period + :type end_time: datetime + :param abnormal_time_periods: List of time periods. + :type abnormal_time_periods: + list[~azure.mgmt.web.models.AbnormalTimePeriod] + :param payload: Data by each detector + :type payload: list[~azure.mgmt.web.models.AnalysisData] + :param non_correlated_detectors: Data by each detector for detectors that + did not corelate + :type non_correlated_detectors: + list[~azure.mgmt.web.models.DetectorDefinition] + """ + + _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'}, + 'start_time': {'key': 'properties.startTime', 'type': 'iso-8601'}, + 'end_time': {'key': 'properties.endTime', 'type': 'iso-8601'}, + 'abnormal_time_periods': {'key': 'properties.abnormalTimePeriods', 'type': '[AbnormalTimePeriod]'}, + 'payload': {'key': 'properties.payload', 'type': '[AnalysisData]'}, + 'non_correlated_detectors': {'key': 'properties.nonCorrelatedDetectors', 'type': '[DetectorDefinition]'}, + } + + def __init__(self, *, kind: str=None, start_time=None, end_time=None, abnormal_time_periods=None, payload=None, non_correlated_detectors=None, **kwargs) -> None: + super(DiagnosticAnalysis, self).__init__(kind=kind, **kwargs) + self.start_time = start_time + self.end_time = end_time + self.abnormal_time_periods = abnormal_time_periods + self.payload = payload + self.non_correlated_detectors = non_correlated_detectors diff --git a/azure-mgmt-web/azure/mgmt/web/models/diagnostic_category.py b/azure-mgmt-web/azure/mgmt/web/models/diagnostic_category.py index 9bf7d74e5641..12254857ac08 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/diagnostic_category.py +++ b/azure-mgmt-web/azure/mgmt/web/models/diagnostic_category.py @@ -45,6 +45,6 @@ class DiagnosticCategory(ProxyOnlyResource): 'description': {'key': 'properties.description', 'type': 'str'}, } - def __init__(self, kind=None): - super(DiagnosticCategory, self).__init__(kind=kind) + def __init__(self, **kwargs): + super(DiagnosticCategory, self).__init__(**kwargs) self.description = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/diagnostic_category_py3.py b/azure-mgmt-web/azure/mgmt/web/models/diagnostic_category_py3.py new file mode 100644 index 000000000000..615efcf62549 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/diagnostic_category_py3.py @@ -0,0 +1,50 @@ +# 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_py3 import ProxyOnlyResource + + +class DiagnosticCategory(ProxyOnlyResource): + """Class representing detector definition. + + 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 + :ivar description: Description of the diagnostic category + :vartype description: str + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'description': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'description': {'key': 'properties.description', 'type': 'str'}, + } + + def __init__(self, *, kind: str=None, **kwargs) -> None: + super(DiagnosticCategory, self).__init__(kind=kind, **kwargs) + self.description = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/diagnostic_data.py b/azure-mgmt-web/azure/mgmt/web/models/diagnostic_data.py index 7208684bfb30..96cd3ed7d5e2 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/diagnostic_data.py +++ b/azure-mgmt-web/azure/mgmt/web/models/diagnostic_data.py @@ -27,7 +27,7 @@ class DiagnosticData(Model): 'rendering_properties': {'key': 'renderingProperties', 'type': 'Rendering'}, } - def __init__(self, table=None, rendering_properties=None): - super(DiagnosticData, self).__init__() - self.table = table - self.rendering_properties = rendering_properties + def __init__(self, **kwargs): + super(DiagnosticData, self).__init__(**kwargs) + self.table = kwargs.get('table', None) + self.rendering_properties = kwargs.get('rendering_properties', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/diagnostic_data_py3.py b/azure-mgmt-web/azure/mgmt/web/models/diagnostic_data_py3.py new file mode 100644 index 000000000000..bc45e433b578 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/diagnostic_data_py3.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 DiagnosticData(Model): + """Set of data with rendering instructions. + + :param table: Data in table form + :type table: ~azure.mgmt.web.models.DataTableResponseObject + :param rendering_properties: Properties that describe how the table should + be rendered + :type rendering_properties: ~azure.mgmt.web.models.Rendering + """ + + _attribute_map = { + 'table': {'key': 'table', 'type': 'DataTableResponseObject'}, + 'rendering_properties': {'key': 'renderingProperties', 'type': 'Rendering'}, + } + + def __init__(self, *, table=None, rendering_properties=None, **kwargs) -> None: + super(DiagnosticData, self).__init__(**kwargs) + self.table = table + self.rendering_properties = rendering_properties diff --git a/azure-mgmt-web/azure/mgmt/web/models/diagnostic_detector_response.py b/azure-mgmt-web/azure/mgmt/web/models/diagnostic_detector_response.py index 78d94e8718e5..54efec97da7b 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/diagnostic_detector_response.py +++ b/azure-mgmt-web/azure/mgmt/web/models/diagnostic_detector_response.py @@ -67,13 +67,13 @@ class DiagnosticDetectorResponse(ProxyOnlyResource): 'response_meta_data': {'key': 'properties.responseMetaData', 'type': 'ResponseMetaData'}, } - def __init__(self, kind=None, start_time=None, end_time=None, issue_detected=None, detector_definition=None, metrics=None, abnormal_time_periods=None, data=None, response_meta_data=None): - super(DiagnosticDetectorResponse, self).__init__(kind=kind) - self.start_time = start_time - self.end_time = end_time - self.issue_detected = issue_detected - self.detector_definition = detector_definition - self.metrics = metrics - self.abnormal_time_periods = abnormal_time_periods - self.data = data - self.response_meta_data = response_meta_data + def __init__(self, **kwargs): + super(DiagnosticDetectorResponse, self).__init__(**kwargs) + self.start_time = kwargs.get('start_time', None) + self.end_time = kwargs.get('end_time', None) + self.issue_detected = kwargs.get('issue_detected', None) + self.detector_definition = kwargs.get('detector_definition', None) + self.metrics = kwargs.get('metrics', None) + self.abnormal_time_periods = kwargs.get('abnormal_time_periods', None) + self.data = kwargs.get('data', None) + self.response_meta_data = kwargs.get('response_meta_data', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/diagnostic_detector_response_py3.py b/azure-mgmt-web/azure/mgmt/web/models/diagnostic_detector_response_py3.py new file mode 100644 index 000000000000..165d011ecccc --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/diagnostic_detector_response_py3.py @@ -0,0 +1,79 @@ +# 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_py3 import ProxyOnlyResource + + +class DiagnosticDetectorResponse(ProxyOnlyResource): + """Class representing Reponse from Diagnostic Detectors. + + 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 start_time: Start time of the period + :type start_time: datetime + :param end_time: End time of the period + :type end_time: datetime + :param issue_detected: Flag representing Issue was detected. + :type issue_detected: bool + :param detector_definition: Detector's definition + :type detector_definition: ~azure.mgmt.web.models.DetectorDefinition + :param metrics: Metrics provided by the detector + :type metrics: list[~azure.mgmt.web.models.DiagnosticMetricSet] + :param abnormal_time_periods: List of Correlated events found by the + detector + :type abnormal_time_periods: + list[~azure.mgmt.web.models.DetectorAbnormalTimePeriod] + :param data: Additional Data that detector wants to send. + :type data: list[list[~azure.mgmt.web.models.NameValuePair]] + :param response_meta_data: Meta Data + :type response_meta_data: ~azure.mgmt.web.models.ResponseMetaData + """ + + _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'}, + 'start_time': {'key': 'properties.startTime', 'type': 'iso-8601'}, + 'end_time': {'key': 'properties.endTime', 'type': 'iso-8601'}, + 'issue_detected': {'key': 'properties.issueDetected', 'type': 'bool'}, + 'detector_definition': {'key': 'properties.detectorDefinition', 'type': 'DetectorDefinition'}, + 'metrics': {'key': 'properties.metrics', 'type': '[DiagnosticMetricSet]'}, + 'abnormal_time_periods': {'key': 'properties.abnormalTimePeriods', 'type': '[DetectorAbnormalTimePeriod]'}, + 'data': {'key': 'properties.data', 'type': '[[NameValuePair]]'}, + 'response_meta_data': {'key': 'properties.responseMetaData', 'type': 'ResponseMetaData'}, + } + + def __init__(self, *, kind: str=None, start_time=None, end_time=None, issue_detected: bool=None, detector_definition=None, metrics=None, abnormal_time_periods=None, data=None, response_meta_data=None, **kwargs) -> None: + super(DiagnosticDetectorResponse, self).__init__(kind=kind, **kwargs) + self.start_time = start_time + self.end_time = end_time + self.issue_detected = issue_detected + self.detector_definition = detector_definition + self.metrics = metrics + self.abnormal_time_periods = abnormal_time_periods + self.data = data + self.response_meta_data = response_meta_data diff --git a/azure-mgmt-web/azure/mgmt/web/models/diagnostic_metric_sample.py b/azure-mgmt-web/azure/mgmt/web/models/diagnostic_metric_sample.py index 3b43cd9a42d6..fba987dbfbb2 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/diagnostic_metric_sample.py +++ b/azure-mgmt-web/azure/mgmt/web/models/diagnostic_metric_sample.py @@ -46,11 +46,11 @@ class DiagnosticMetricSample(Model): 'is_aggregated': {'key': 'isAggregated', 'type': 'bool'}, } - def __init__(self, timestamp=None, role_instance=None, total=None, maximum=None, minimum=None, is_aggregated=None): - super(DiagnosticMetricSample, self).__init__() - self.timestamp = timestamp - self.role_instance = role_instance - self.total = total - self.maximum = maximum - self.minimum = minimum - self.is_aggregated = is_aggregated + def __init__(self, **kwargs): + super(DiagnosticMetricSample, self).__init__(**kwargs) + self.timestamp = kwargs.get('timestamp', None) + self.role_instance = kwargs.get('role_instance', None) + self.total = kwargs.get('total', None) + self.maximum = kwargs.get('maximum', None) + self.minimum = kwargs.get('minimum', None) + self.is_aggregated = kwargs.get('is_aggregated', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/diagnostic_metric_sample_py3.py b/azure-mgmt-web/azure/mgmt/web/models/diagnostic_metric_sample_py3.py new file mode 100644 index 000000000000..c558571a8ea9 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/diagnostic_metric_sample_py3.py @@ -0,0 +1,56 @@ +# 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 DiagnosticMetricSample(Model): + """Class representing Diagnostic Metric. + + :param timestamp: Time at which metric is measured + :type timestamp: datetime + :param role_instance: Role Instance. Null if this counter is not per + instance + This is returned and should be whichever instance name we desire to be + returned + i.e. CPU and Memory return RDWORKERNAME (LargeDed..._IN_0) + where RDWORKERNAME is Machine name below and RoleInstance name in + parenthesis + :type role_instance: str + :param total: Total value of the metric. If multiple measurements are made + this will have sum of all. + :type total: float + :param maximum: Maximum of the metric sampled during the time period + :type maximum: float + :param minimum: Minimum of the metric sampled during the time period + :type minimum: float + :param is_aggregated: Whether the values are aggregates across all workers + or not + :type is_aggregated: bool + """ + + _attribute_map = { + 'timestamp': {'key': 'timestamp', 'type': 'iso-8601'}, + 'role_instance': {'key': 'roleInstance', 'type': 'str'}, + 'total': {'key': 'total', 'type': 'float'}, + 'maximum': {'key': 'maximum', 'type': 'float'}, + 'minimum': {'key': 'minimum', 'type': 'float'}, + 'is_aggregated': {'key': 'isAggregated', 'type': 'bool'}, + } + + def __init__(self, *, timestamp=None, role_instance: str=None, total: float=None, maximum: float=None, minimum: float=None, is_aggregated: bool=None, **kwargs) -> None: + super(DiagnosticMetricSample, self).__init__(**kwargs) + self.timestamp = timestamp + self.role_instance = role_instance + self.total = total + self.maximum = maximum + self.minimum = minimum + self.is_aggregated = is_aggregated diff --git a/azure-mgmt-web/azure/mgmt/web/models/diagnostic_metric_set.py b/azure-mgmt-web/azure/mgmt/web/models/diagnostic_metric_set.py index e6c97e7d4711..52f58b0931f9 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/diagnostic_metric_set.py +++ b/azure-mgmt-web/azure/mgmt/web/models/diagnostic_metric_set.py @@ -41,11 +41,11 @@ class DiagnosticMetricSet(Model): 'values': {'key': 'values', 'type': '[DiagnosticMetricSample]'}, } - def __init__(self, name=None, unit=None, start_time=None, end_time=None, time_grain=None, values=None): - super(DiagnosticMetricSet, self).__init__() - self.name = name - self.unit = unit - self.start_time = start_time - self.end_time = end_time - self.time_grain = time_grain - self.values = values + def __init__(self, **kwargs): + super(DiagnosticMetricSet, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.unit = kwargs.get('unit', None) + self.start_time = kwargs.get('start_time', None) + self.end_time = kwargs.get('end_time', None) + self.time_grain = kwargs.get('time_grain', None) + self.values = kwargs.get('values', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/diagnostic_metric_set_py3.py b/azure-mgmt-web/azure/mgmt/web/models/diagnostic_metric_set_py3.py new file mode 100644 index 000000000000..1af57065bf85 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/diagnostic_metric_set_py3.py @@ -0,0 +1,51 @@ +# 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 DiagnosticMetricSet(Model): + """Class representing Diagnostic Metric information. + + :param name: Name of the metric + :type name: str + :param unit: Metric's unit + :type unit: str + :param start_time: Start time of the period + :type start_time: datetime + :param end_time: End time of the period + :type end_time: datetime + :param time_grain: Presented time grain. Supported grains at the moment + are PT1M, PT1H, P1D + :type time_grain: str + :param values: Collection of metric values for the selected period based + on the + {Microsoft.Web.Hosting.Administration.DiagnosticMetricSet.TimeGrain} + :type values: list[~azure.mgmt.web.models.DiagnosticMetricSample] + """ + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'unit': {'key': 'unit', 'type': 'str'}, + 'start_time': {'key': 'startTime', 'type': 'iso-8601'}, + 'end_time': {'key': 'endTime', 'type': 'iso-8601'}, + 'time_grain': {'key': 'timeGrain', 'type': 'str'}, + 'values': {'key': 'values', 'type': '[DiagnosticMetricSample]'}, + } + + def __init__(self, *, name: str=None, unit: str=None, start_time=None, end_time=None, time_grain: str=None, values=None, **kwargs) -> None: + super(DiagnosticMetricSet, self).__init__(**kwargs) + self.name = name + self.unit = unit + self.start_time = start_time + self.end_time = end_time + self.time_grain = time_grain + self.values = values diff --git a/azure-mgmt-web/azure/mgmt/web/models/dimension.py b/azure-mgmt-web/azure/mgmt/web/models/dimension.py index 4ae55e1a1931..d4c844f865ca 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/dimension.py +++ b/azure-mgmt-web/azure/mgmt/web/models/dimension.py @@ -34,9 +34,9 @@ class Dimension(Model): 'to_be_exported_for_shoebox': {'key': 'toBeExportedForShoebox', 'type': 'bool'}, } - def __init__(self, name=None, display_name=None, internal_name=None, to_be_exported_for_shoebox=None): - super(Dimension, self).__init__() - self.name = name - self.display_name = display_name - self.internal_name = internal_name - self.to_be_exported_for_shoebox = to_be_exported_for_shoebox + def __init__(self, **kwargs): + super(Dimension, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.display_name = kwargs.get('display_name', None) + self.internal_name = kwargs.get('internal_name', None) + self.to_be_exported_for_shoebox = kwargs.get('to_be_exported_for_shoebox', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/dimension_py3.py b/azure-mgmt-web/azure/mgmt/web/models/dimension_py3.py new file mode 100644 index 000000000000..6ea1212b77fb --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/dimension_py3.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 Dimension(Model): + """Dimension of a resource metric. For e.g. instance specific HTTP requests + for a web app, + where instance name is dimension of the metric HTTP request. + + :param name: + :type name: str + :param display_name: + :type display_name: str + :param internal_name: + :type internal_name: str + :param to_be_exported_for_shoebox: + :type to_be_exported_for_shoebox: bool + """ + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'display_name': {'key': 'displayName', 'type': 'str'}, + 'internal_name': {'key': 'internalName', 'type': 'str'}, + 'to_be_exported_for_shoebox': {'key': 'toBeExportedForShoebox', 'type': 'bool'}, + } + + def __init__(self, *, name: str=None, display_name: str=None, internal_name: str=None, to_be_exported_for_shoebox: bool=None, **kwargs) -> None: + super(Dimension, self).__init__(**kwargs) + self.name = name + self.display_name = display_name + self.internal_name = internal_name + self.to_be_exported_for_shoebox = to_be_exported_for_shoebox diff --git a/azure-mgmt-web/azure/mgmt/web/models/domain.py b/azure-mgmt-web/azure/mgmt/web/models/domain.py index e53ec56f2283..68526b10ca81 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/domain.py +++ b/azure-mgmt-web/azure/mgmt/web/models/domain.py @@ -18,25 +18,27 @@ class Domain(Resource): Variables are only populated by the server, and will be ignored when sending a request. + All required parameters must be populated in order to send to Azure. + :ivar id: Resource Id. :vartype id: str :ivar name: Resource Name. :vartype name: str :param kind: Kind of resource. :type kind: str - :param location: Resource Location. + :param location: Required. Resource Location. :type location: str :ivar type: Resource type. :vartype type: str :param tags: Resource tags. :type tags: dict[str, str] - :param contact_admin: Administrative contact. + :param contact_admin: Required. Administrative contact. :type contact_admin: ~azure.mgmt.web.models.Contact - :param contact_billing: Billing contact. + :param contact_billing: Required. Billing contact. :type contact_billing: ~azure.mgmt.web.models.Contact - :param contact_registrant: Registrant contact. + :param contact_registrant: Required. Registrant contact. :type contact_registrant: ~azure.mgmt.web.models.Contact - :param contact_tech: Technical contact. + :param contact_tech: Required. Technical contact. :type contact_tech: ~azure.mgmt.web.models.Contact :ivar registration_status: Domain registration status. Possible values include: 'Active', 'Awaiting', 'Cancelled', 'Confiscated', 'Disabled', @@ -71,7 +73,7 @@ class Domain(Resource): :ivar managed_host_names: All hostnames derived from the domain and assigned to Azure resources. :vartype managed_host_names: list[~azure.mgmt.web.models.HostName] - :param consent: Legal agreement consent. + :param consent: Required. Legal agreement consent. :type consent: ~azure.mgmt.web.models.DomainPurchaseConsent :ivar domain_not_renewable_reasons: Reasons why domain is not renewable. :vartype domain_not_renewable_reasons: list[str] @@ -137,25 +139,25 @@ class Domain(Resource): 'auth_code': {'key': 'properties.authCode', 'type': 'str'}, } - def __init__(self, location, contact_admin, contact_billing, contact_registrant, contact_tech, consent, kind=None, tags=None, privacy=None, auto_renew=True, dns_type=None, dns_zone_id=None, target_dns_type=None, auth_code=None): - super(Domain, self).__init__(kind=kind, location=location, tags=tags) - self.contact_admin = contact_admin - self.contact_billing = contact_billing - self.contact_registrant = contact_registrant - self.contact_tech = contact_tech + def __init__(self, **kwargs): + super(Domain, self).__init__(**kwargs) + self.contact_admin = kwargs.get('contact_admin', None) + self.contact_billing = kwargs.get('contact_billing', None) + self.contact_registrant = kwargs.get('contact_registrant', None) + self.contact_tech = kwargs.get('contact_tech', None) self.registration_status = None self.provisioning_state = None self.name_servers = None - self.privacy = privacy + self.privacy = kwargs.get('privacy', None) self.created_time = None self.expiration_time = None self.last_renewed_time = None - self.auto_renew = auto_renew + self.auto_renew = kwargs.get('auto_renew', True) self.ready_for_dns_record_management = None self.managed_host_names = None - self.consent = consent + self.consent = kwargs.get('consent', None) self.domain_not_renewable_reasons = None - self.dns_type = dns_type - self.dns_zone_id = dns_zone_id - self.target_dns_type = target_dns_type - self.auth_code = auth_code + self.dns_type = kwargs.get('dns_type', None) + self.dns_zone_id = kwargs.get('dns_zone_id', None) + self.target_dns_type = kwargs.get('target_dns_type', None) + self.auth_code = kwargs.get('auth_code', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/domain_availablility_check_result.py b/azure-mgmt-web/azure/mgmt/web/models/domain_availablility_check_result.py index 19132caf64e5..45ea1738a52f 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/domain_availablility_check_result.py +++ b/azure-mgmt-web/azure/mgmt/web/models/domain_availablility_check_result.py @@ -33,8 +33,8 @@ class DomainAvailablilityCheckResult(Model): 'domain_type': {'key': 'domainType', 'type': 'DomainType'}, } - def __init__(self, name=None, available=None, domain_type=None): - super(DomainAvailablilityCheckResult, self).__init__() - self.name = name - self.available = available - self.domain_type = domain_type + def __init__(self, **kwargs): + super(DomainAvailablilityCheckResult, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.available = kwargs.get('available', None) + self.domain_type = kwargs.get('domain_type', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/domain_availablility_check_result_py3.py b/azure-mgmt-web/azure/mgmt/web/models/domain_availablility_check_result_py3.py new file mode 100644 index 000000000000..58bc30851baf --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/domain_availablility_check_result_py3.py @@ -0,0 +1,40 @@ +# 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 DomainAvailablilityCheckResult(Model): + """Domain availablility check result. + + :param name: Name of the domain. + :type name: str + :param available: true if domain can be purchased using + CreateDomain API; otherwise, false. + :type available: bool + :param domain_type: Valid values are Regular domain: Azure will charge the + full price of domain registration, SoftDeleted: Purchasing this domain + will simply restore it and this operation will not cost anything. Possible + values include: 'Regular', 'SoftDeleted' + :type domain_type: str or ~azure.mgmt.web.models.DomainType + """ + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'available': {'key': 'available', 'type': 'bool'}, + 'domain_type': {'key': 'domainType', 'type': 'DomainType'}, + } + + def __init__(self, *, name: str=None, available: bool=None, domain_type=None, **kwargs) -> None: + super(DomainAvailablilityCheckResult, self).__init__(**kwargs) + self.name = name + self.available = available + self.domain_type = domain_type diff --git a/azure-mgmt-web/azure/mgmt/web/models/domain_control_center_sso_request.py b/azure-mgmt-web/azure/mgmt/web/models/domain_control_center_sso_request.py index 056e5420c991..f132412df926 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/domain_control_center_sso_request.py +++ b/azure-mgmt-web/azure/mgmt/web/models/domain_control_center_sso_request.py @@ -39,8 +39,8 @@ class DomainControlCenterSsoRequest(Model): 'post_parameter_value': {'key': 'postParameterValue', 'type': 'str'}, } - def __init__(self): - super(DomainControlCenterSsoRequest, self).__init__() + def __init__(self, **kwargs): + super(DomainControlCenterSsoRequest, self).__init__(**kwargs) self.url = None self.post_parameter_key = None self.post_parameter_value = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/domain_control_center_sso_request_py3.py b/azure-mgmt-web/azure/mgmt/web/models/domain_control_center_sso_request_py3.py new file mode 100644 index 000000000000..0e3c71311a22 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/domain_control_center_sso_request_py3.py @@ -0,0 +1,46 @@ +# 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 DomainControlCenterSsoRequest(Model): + """Single sign-on request information for domain management. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar url: URL where the single sign-on request is to be made. + :vartype url: str + :ivar post_parameter_key: Post parameter key. + :vartype post_parameter_key: str + :ivar post_parameter_value: Post parameter value. Client should use + 'application/x-www-form-urlencoded' encoding for this value. + :vartype post_parameter_value: str + """ + + _validation = { + 'url': {'readonly': True}, + 'post_parameter_key': {'readonly': True}, + 'post_parameter_value': {'readonly': True}, + } + + _attribute_map = { + 'url': {'key': 'url', 'type': 'str'}, + 'post_parameter_key': {'key': 'postParameterKey', 'type': 'str'}, + 'post_parameter_value': {'key': 'postParameterValue', 'type': 'str'}, + } + + def __init__(self, **kwargs) -> None: + super(DomainControlCenterSsoRequest, self).__init__(**kwargs) + self.url = None + self.post_parameter_key = None + self.post_parameter_value = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/domain_ownership_identifier.py b/azure-mgmt-web/azure/mgmt/web/models/domain_ownership_identifier.py index 14df644e0911..863d26cede05 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/domain_ownership_identifier.py +++ b/azure-mgmt-web/azure/mgmt/web/models/domain_ownership_identifier.py @@ -44,6 +44,6 @@ class DomainOwnershipIdentifier(ProxyOnlyResource): 'ownership_id': {'key': 'properties.ownershipId', 'type': 'str'}, } - def __init__(self, kind=None, ownership_id=None): - super(DomainOwnershipIdentifier, self).__init__(kind=kind) - self.ownership_id = ownership_id + def __init__(self, **kwargs): + super(DomainOwnershipIdentifier, self).__init__(**kwargs) + self.ownership_id = kwargs.get('ownership_id', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/domain_ownership_identifier_py3.py b/azure-mgmt-web/azure/mgmt/web/models/domain_ownership_identifier_py3.py new file mode 100644 index 000000000000..1cb2ea8a81dc --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/domain_ownership_identifier_py3.py @@ -0,0 +1,49 @@ +# 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_py3 import ProxyOnlyResource + + +class DomainOwnershipIdentifier(ProxyOnlyResource): + """Domain ownership Identifier. + + 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 ownership_id: Ownership Id. + :type ownership_id: 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'}, + 'ownership_id': {'key': 'properties.ownershipId', 'type': 'str'}, + } + + def __init__(self, *, kind: str=None, ownership_id: str=None, **kwargs) -> None: + super(DomainOwnershipIdentifier, self).__init__(kind=kind, **kwargs) + self.ownership_id = ownership_id diff --git a/azure-mgmt-web/azure/mgmt/web/models/domain_patch_resource.py b/azure-mgmt-web/azure/mgmt/web/models/domain_patch_resource.py index 1e14116bb04f..84a451a6ef12 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/domain_patch_resource.py +++ b/azure-mgmt-web/azure/mgmt/web/models/domain_patch_resource.py @@ -18,6 +18,8 @@ class DomainPatchResource(ProxyOnlyResource): Variables are only populated by the server, and will be ignored when sending a request. + All required parameters must be populated in order to send to Azure. + :ivar id: Resource Id. :vartype id: str :ivar name: Resource Name. @@ -26,13 +28,13 @@ class DomainPatchResource(ProxyOnlyResource): :type kind: str :ivar type: Resource type. :vartype type: str - :param contact_admin: Administrative contact. + :param contact_admin: Required. Administrative contact. :type contact_admin: ~azure.mgmt.web.models.Contact - :param contact_billing: Billing contact. + :param contact_billing: Required. Billing contact. :type contact_billing: ~azure.mgmt.web.models.Contact - :param contact_registrant: Registrant contact. + :param contact_registrant: Required. Registrant contact. :type contact_registrant: ~azure.mgmt.web.models.Contact - :param contact_tech: Technical contact. + :param contact_tech: Required. Technical contact. :type contact_tech: ~azure.mgmt.web.models.Contact :ivar registration_status: Domain registration status. Possible values include: 'Active', 'Awaiting', 'Cancelled', 'Confiscated', 'Disabled', @@ -67,7 +69,7 @@ class DomainPatchResource(ProxyOnlyResource): :ivar managed_host_names: All hostnames derived from the domain and assigned to Azure resources. :vartype managed_host_names: list[~azure.mgmt.web.models.HostName] - :param consent: Legal agreement consent. + :param consent: Required. Legal agreement consent. :type consent: ~azure.mgmt.web.models.DomainPurchaseConsent :ivar domain_not_renewable_reasons: Reasons why domain is not renewable. :vartype domain_not_renewable_reasons: list[str] @@ -130,25 +132,25 @@ class DomainPatchResource(ProxyOnlyResource): 'auth_code': {'key': 'properties.authCode', 'type': 'str'}, } - def __init__(self, contact_admin, contact_billing, contact_registrant, contact_tech, consent, kind=None, privacy=None, auto_renew=True, dns_type=None, dns_zone_id=None, target_dns_type=None, auth_code=None): - super(DomainPatchResource, self).__init__(kind=kind) - self.contact_admin = contact_admin - self.contact_billing = contact_billing - self.contact_registrant = contact_registrant - self.contact_tech = contact_tech + def __init__(self, **kwargs): + super(DomainPatchResource, self).__init__(**kwargs) + self.contact_admin = kwargs.get('contact_admin', None) + self.contact_billing = kwargs.get('contact_billing', None) + self.contact_registrant = kwargs.get('contact_registrant', None) + self.contact_tech = kwargs.get('contact_tech', None) self.registration_status = None self.provisioning_state = None self.name_servers = None - self.privacy = privacy + self.privacy = kwargs.get('privacy', None) self.created_time = None self.expiration_time = None self.last_renewed_time = None - self.auto_renew = auto_renew + self.auto_renew = kwargs.get('auto_renew', True) self.ready_for_dns_record_management = None self.managed_host_names = None - self.consent = consent + self.consent = kwargs.get('consent', None) self.domain_not_renewable_reasons = None - self.dns_type = dns_type - self.dns_zone_id = dns_zone_id - self.target_dns_type = target_dns_type - self.auth_code = auth_code + self.dns_type = kwargs.get('dns_type', None) + self.dns_zone_id = kwargs.get('dns_zone_id', None) + self.target_dns_type = kwargs.get('target_dns_type', None) + self.auth_code = kwargs.get('auth_code', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/domain_patch_resource_py3.py b/azure-mgmt-web/azure/mgmt/web/models/domain_patch_resource_py3.py new file mode 100644 index 000000000000..d3369591df85 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/domain_patch_resource_py3.py @@ -0,0 +1,156 @@ +# 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_py3 import ProxyOnlyResource + + +class DomainPatchResource(ProxyOnlyResource): + """ARM resource for a domain. + + Variables are only populated by the server, and will be ignored when + sending a request. + + All required parameters must be populated in order to send to Azure. + + :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 contact_admin: Required. Administrative contact. + :type contact_admin: ~azure.mgmt.web.models.Contact + :param contact_billing: Required. Billing contact. + :type contact_billing: ~azure.mgmt.web.models.Contact + :param contact_registrant: Required. Registrant contact. + :type contact_registrant: ~azure.mgmt.web.models.Contact + :param contact_tech: Required. Technical contact. + :type contact_tech: ~azure.mgmt.web.models.Contact + :ivar registration_status: Domain registration status. Possible values + include: 'Active', 'Awaiting', 'Cancelled', 'Confiscated', 'Disabled', + 'Excluded', 'Expired', 'Failed', 'Held', 'Locked', 'Parked', 'Pending', + 'Reserved', 'Reverted', 'Suspended', 'Transferred', 'Unknown', 'Unlocked', + 'Unparked', 'Updated', 'JsonConverterFailed' + :vartype registration_status: str or ~azure.mgmt.web.models.DomainStatus + :ivar provisioning_state: Domain provisioning state. Possible values + include: 'Succeeded', 'Failed', 'Canceled', 'InProgress', 'Deleting' + :vartype provisioning_state: str or + ~azure.mgmt.web.models.ProvisioningState + :ivar name_servers: Name servers. + :vartype name_servers: list[str] + :param privacy: true if domain privacy is enabled for this + domain; otherwise, false. + :type privacy: bool + :ivar created_time: Domain creation timestamp. + :vartype created_time: datetime + :ivar expiration_time: Domain expiration timestamp. + :vartype expiration_time: datetime + :ivar last_renewed_time: Timestamp when the domain was renewed last time. + :vartype last_renewed_time: datetime + :param auto_renew: true if the domain should be automatically + renewed; otherwise, false. Default value: True . + :type auto_renew: bool + :ivar ready_for_dns_record_management: true if Azure can + assign this domain to App Service apps; otherwise, false. + This value will be true if domain registration status is + active and + it is hosted on name servers Azure has programmatic access to. + :vartype ready_for_dns_record_management: bool + :ivar managed_host_names: All hostnames derived from the domain and + assigned to Azure resources. + :vartype managed_host_names: list[~azure.mgmt.web.models.HostName] + :param consent: Required. Legal agreement consent. + :type consent: ~azure.mgmt.web.models.DomainPurchaseConsent + :ivar domain_not_renewable_reasons: Reasons why domain is not renewable. + :vartype domain_not_renewable_reasons: list[str] + :param dns_type: Current DNS type. Possible values include: 'AzureDns', + 'DefaultDomainRegistrarDns' + :type dns_type: str or ~azure.mgmt.web.models.DnsType + :param dns_zone_id: Azure DNS Zone to use + :type dns_zone_id: str + :param target_dns_type: Target DNS type (would be used for migration). + Possible values include: 'AzureDns', 'DefaultDomainRegistrarDns' + :type target_dns_type: str or ~azure.mgmt.web.models.DnsType + :param auth_code: + :type auth_code: str + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'contact_admin': {'required': True}, + 'contact_billing': {'required': True}, + 'contact_registrant': {'required': True}, + 'contact_tech': {'required': True}, + 'registration_status': {'readonly': True}, + 'provisioning_state': {'readonly': True}, + 'name_servers': {'readonly': True}, + 'created_time': {'readonly': True}, + 'expiration_time': {'readonly': True}, + 'last_renewed_time': {'readonly': True}, + 'ready_for_dns_record_management': {'readonly': True}, + 'managed_host_names': {'readonly': True}, + 'consent': {'required': True}, + 'domain_not_renewable_reasons': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'contact_admin': {'key': 'properties.contactAdmin', 'type': 'Contact'}, + 'contact_billing': {'key': 'properties.contactBilling', 'type': 'Contact'}, + 'contact_registrant': {'key': 'properties.contactRegistrant', 'type': 'Contact'}, + 'contact_tech': {'key': 'properties.contactTech', 'type': 'Contact'}, + 'registration_status': {'key': 'properties.registrationStatus', 'type': 'DomainStatus'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'ProvisioningState'}, + 'name_servers': {'key': 'properties.nameServers', 'type': '[str]'}, + 'privacy': {'key': 'properties.privacy', 'type': 'bool'}, + 'created_time': {'key': 'properties.createdTime', 'type': 'iso-8601'}, + 'expiration_time': {'key': 'properties.expirationTime', 'type': 'iso-8601'}, + 'last_renewed_time': {'key': 'properties.lastRenewedTime', 'type': 'iso-8601'}, + 'auto_renew': {'key': 'properties.autoRenew', 'type': 'bool'}, + 'ready_for_dns_record_management': {'key': 'properties.readyForDnsRecordManagement', 'type': 'bool'}, + 'managed_host_names': {'key': 'properties.managedHostNames', 'type': '[HostName]'}, + 'consent': {'key': 'properties.consent', 'type': 'DomainPurchaseConsent'}, + 'domain_not_renewable_reasons': {'key': 'properties.domainNotRenewableReasons', 'type': '[str]'}, + 'dns_type': {'key': 'properties.dnsType', 'type': 'DnsType'}, + 'dns_zone_id': {'key': 'properties.dnsZoneId', 'type': 'str'}, + 'target_dns_type': {'key': 'properties.targetDnsType', 'type': 'DnsType'}, + 'auth_code': {'key': 'properties.authCode', 'type': 'str'}, + } + + def __init__(self, *, contact_admin, contact_billing, contact_registrant, contact_tech, consent, kind: str=None, privacy: bool=None, auto_renew: bool=True, dns_type=None, dns_zone_id: str=None, target_dns_type=None, auth_code: str=None, **kwargs) -> None: + super(DomainPatchResource, self).__init__(kind=kind, **kwargs) + self.contact_admin = contact_admin + self.contact_billing = contact_billing + self.contact_registrant = contact_registrant + self.contact_tech = contact_tech + self.registration_status = None + self.provisioning_state = None + self.name_servers = None + self.privacy = privacy + self.created_time = None + self.expiration_time = None + self.last_renewed_time = None + self.auto_renew = auto_renew + self.ready_for_dns_record_management = None + self.managed_host_names = None + self.consent = consent + self.domain_not_renewable_reasons = None + self.dns_type = dns_type + self.dns_zone_id = dns_zone_id + self.target_dns_type = target_dns_type + self.auth_code = auth_code diff --git a/azure-mgmt-web/azure/mgmt/web/models/domain_purchase_consent.py b/azure-mgmt-web/azure/mgmt/web/models/domain_purchase_consent.py index 856204af4921..af78bf0a076b 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/domain_purchase_consent.py +++ b/azure-mgmt-web/azure/mgmt/web/models/domain_purchase_consent.py @@ -32,8 +32,8 @@ class DomainPurchaseConsent(Model): 'agreed_at': {'key': 'agreedAt', 'type': 'iso-8601'}, } - def __init__(self, agreement_keys=None, agreed_by=None, agreed_at=None): - super(DomainPurchaseConsent, self).__init__() - self.agreement_keys = agreement_keys - self.agreed_by = agreed_by - self.agreed_at = agreed_at + def __init__(self, **kwargs): + super(DomainPurchaseConsent, self).__init__(**kwargs) + self.agreement_keys = kwargs.get('agreement_keys', None) + self.agreed_by = kwargs.get('agreed_by', None) + self.agreed_at = kwargs.get('agreed_at', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/domain_purchase_consent_py3.py b/azure-mgmt-web/azure/mgmt/web/models/domain_purchase_consent_py3.py new file mode 100644 index 000000000000..4a88053cccf3 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/domain_purchase_consent_py3.py @@ -0,0 +1,39 @@ +# 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 DomainPurchaseConsent(Model): + """Domain purchase consent object, representing acceptance of applicable legal + agreements. + + :param agreement_keys: List of applicable legal agreement keys. This list + can be retrieved using ListLegalAgreements API under + TopLevelDomain resource. + :type agreement_keys: list[str] + :param agreed_by: Client IP address. + :type agreed_by: str + :param agreed_at: Timestamp when the agreements were accepted. + :type agreed_at: datetime + """ + + _attribute_map = { + 'agreement_keys': {'key': 'agreementKeys', 'type': '[str]'}, + 'agreed_by': {'key': 'agreedBy', 'type': 'str'}, + 'agreed_at': {'key': 'agreedAt', 'type': 'iso-8601'}, + } + + def __init__(self, *, agreement_keys=None, agreed_by: str=None, agreed_at=None, **kwargs) -> None: + super(DomainPurchaseConsent, self).__init__(**kwargs) + self.agreement_keys = agreement_keys + self.agreed_by = agreed_by + self.agreed_at = agreed_at diff --git a/azure-mgmt-web/azure/mgmt/web/models/domain_py3.py b/azure-mgmt-web/azure/mgmt/web/models/domain_py3.py new file mode 100644 index 000000000000..51a886759b12 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/domain_py3.py @@ -0,0 +1,163 @@ +# 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 .resource_py3 import Resource + + +class Domain(Resource): + """Information about a domain. + + Variables are only populated by the server, and will be ignored when + sending a request. + + All required parameters must be populated in order to send to Azure. + + :ivar id: Resource Id. + :vartype id: str + :ivar name: Resource Name. + :vartype name: str + :param kind: Kind of resource. + :type kind: str + :param location: Required. Resource Location. + :type location: str + :ivar type: Resource type. + :vartype type: str + :param tags: Resource tags. + :type tags: dict[str, str] + :param contact_admin: Required. Administrative contact. + :type contact_admin: ~azure.mgmt.web.models.Contact + :param contact_billing: Required. Billing contact. + :type contact_billing: ~azure.mgmt.web.models.Contact + :param contact_registrant: Required. Registrant contact. + :type contact_registrant: ~azure.mgmt.web.models.Contact + :param contact_tech: Required. Technical contact. + :type contact_tech: ~azure.mgmt.web.models.Contact + :ivar registration_status: Domain registration status. Possible values + include: 'Active', 'Awaiting', 'Cancelled', 'Confiscated', 'Disabled', + 'Excluded', 'Expired', 'Failed', 'Held', 'Locked', 'Parked', 'Pending', + 'Reserved', 'Reverted', 'Suspended', 'Transferred', 'Unknown', 'Unlocked', + 'Unparked', 'Updated', 'JsonConverterFailed' + :vartype registration_status: str or ~azure.mgmt.web.models.DomainStatus + :ivar provisioning_state: Domain provisioning state. Possible values + include: 'Succeeded', 'Failed', 'Canceled', 'InProgress', 'Deleting' + :vartype provisioning_state: str or + ~azure.mgmt.web.models.ProvisioningState + :ivar name_servers: Name servers. + :vartype name_servers: list[str] + :param privacy: true if domain privacy is enabled for this + domain; otherwise, false. + :type privacy: bool + :ivar created_time: Domain creation timestamp. + :vartype created_time: datetime + :ivar expiration_time: Domain expiration timestamp. + :vartype expiration_time: datetime + :ivar last_renewed_time: Timestamp when the domain was renewed last time. + :vartype last_renewed_time: datetime + :param auto_renew: true if the domain should be automatically + renewed; otherwise, false. Default value: True . + :type auto_renew: bool + :ivar ready_for_dns_record_management: true if Azure can + assign this domain to App Service apps; otherwise, false. + This value will be true if domain registration status is + active and + it is hosted on name servers Azure has programmatic access to. + :vartype ready_for_dns_record_management: bool + :ivar managed_host_names: All hostnames derived from the domain and + assigned to Azure resources. + :vartype managed_host_names: list[~azure.mgmt.web.models.HostName] + :param consent: Required. Legal agreement consent. + :type consent: ~azure.mgmt.web.models.DomainPurchaseConsent + :ivar domain_not_renewable_reasons: Reasons why domain is not renewable. + :vartype domain_not_renewable_reasons: list[str] + :param dns_type: Current DNS type. Possible values include: 'AzureDns', + 'DefaultDomainRegistrarDns' + :type dns_type: str or ~azure.mgmt.web.models.DnsType + :param dns_zone_id: Azure DNS Zone to use + :type dns_zone_id: str + :param target_dns_type: Target DNS type (would be used for migration). + Possible values include: 'AzureDns', 'DefaultDomainRegistrarDns' + :type target_dns_type: str or ~azure.mgmt.web.models.DnsType + :param auth_code: + :type auth_code: str + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'location': {'required': True}, + 'type': {'readonly': True}, + 'contact_admin': {'required': True}, + 'contact_billing': {'required': True}, + 'contact_registrant': {'required': True}, + 'contact_tech': {'required': True}, + 'registration_status': {'readonly': True}, + 'provisioning_state': {'readonly': True}, + 'name_servers': {'readonly': True}, + 'created_time': {'readonly': True}, + 'expiration_time': {'readonly': True}, + 'last_renewed_time': {'readonly': True}, + 'ready_for_dns_record_management': {'readonly': True}, + 'managed_host_names': {'readonly': True}, + 'consent': {'required': True}, + 'domain_not_renewable_reasons': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'location': {'key': 'location', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, + 'contact_admin': {'key': 'properties.contactAdmin', 'type': 'Contact'}, + 'contact_billing': {'key': 'properties.contactBilling', 'type': 'Contact'}, + 'contact_registrant': {'key': 'properties.contactRegistrant', 'type': 'Contact'}, + 'contact_tech': {'key': 'properties.contactTech', 'type': 'Contact'}, + 'registration_status': {'key': 'properties.registrationStatus', 'type': 'DomainStatus'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'ProvisioningState'}, + 'name_servers': {'key': 'properties.nameServers', 'type': '[str]'}, + 'privacy': {'key': 'properties.privacy', 'type': 'bool'}, + 'created_time': {'key': 'properties.createdTime', 'type': 'iso-8601'}, + 'expiration_time': {'key': 'properties.expirationTime', 'type': 'iso-8601'}, + 'last_renewed_time': {'key': 'properties.lastRenewedTime', 'type': 'iso-8601'}, + 'auto_renew': {'key': 'properties.autoRenew', 'type': 'bool'}, + 'ready_for_dns_record_management': {'key': 'properties.readyForDnsRecordManagement', 'type': 'bool'}, + 'managed_host_names': {'key': 'properties.managedHostNames', 'type': '[HostName]'}, + 'consent': {'key': 'properties.consent', 'type': 'DomainPurchaseConsent'}, + 'domain_not_renewable_reasons': {'key': 'properties.domainNotRenewableReasons', 'type': '[str]'}, + 'dns_type': {'key': 'properties.dnsType', 'type': 'DnsType'}, + 'dns_zone_id': {'key': 'properties.dnsZoneId', 'type': 'str'}, + 'target_dns_type': {'key': 'properties.targetDnsType', 'type': 'DnsType'}, + 'auth_code': {'key': 'properties.authCode', 'type': 'str'}, + } + + def __init__(self, *, location: str, contact_admin, contact_billing, contact_registrant, contact_tech, consent, kind: str=None, tags=None, privacy: bool=None, auto_renew: bool=True, dns_type=None, dns_zone_id: str=None, target_dns_type=None, auth_code: str=None, **kwargs) -> None: + super(Domain, self).__init__(kind=kind, location=location, tags=tags, **kwargs) + self.contact_admin = contact_admin + self.contact_billing = contact_billing + self.contact_registrant = contact_registrant + self.contact_tech = contact_tech + self.registration_status = None + self.provisioning_state = None + self.name_servers = None + self.privacy = privacy + self.created_time = None + self.expiration_time = None + self.last_renewed_time = None + self.auto_renew = auto_renew + self.ready_for_dns_record_management = None + self.managed_host_names = None + self.consent = consent + self.domain_not_renewable_reasons = None + self.dns_type = dns_type + self.dns_zone_id = dns_zone_id + self.target_dns_type = target_dns_type + self.auth_code = auth_code diff --git a/azure-mgmt-web/azure/mgmt/web/models/domain_recommendation_search_parameters.py b/azure-mgmt-web/azure/mgmt/web/models/domain_recommendation_search_parameters.py index 98a31de25204..fe006b4ba3e6 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/domain_recommendation_search_parameters.py +++ b/azure-mgmt-web/azure/mgmt/web/models/domain_recommendation_search_parameters.py @@ -27,7 +27,7 @@ class DomainRecommendationSearchParameters(Model): 'max_domain_recommendations': {'key': 'maxDomainRecommendations', 'type': 'int'}, } - def __init__(self, keywords=None, max_domain_recommendations=None): - super(DomainRecommendationSearchParameters, self).__init__() - self.keywords = keywords - self.max_domain_recommendations = max_domain_recommendations + def __init__(self, **kwargs): + super(DomainRecommendationSearchParameters, self).__init__(**kwargs) + self.keywords = kwargs.get('keywords', None) + self.max_domain_recommendations = kwargs.get('max_domain_recommendations', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/domain_recommendation_search_parameters_py3.py b/azure-mgmt-web/azure/mgmt/web/models/domain_recommendation_search_parameters_py3.py new file mode 100644 index 000000000000..8ea9729bb72e --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/domain_recommendation_search_parameters_py3.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 DomainRecommendationSearchParameters(Model): + """Domain recommendation search parameters. + + :param keywords: Keywords to be used for generating domain + recommendations. + :type keywords: str + :param max_domain_recommendations: Maximum number of recommendations. + :type max_domain_recommendations: int + """ + + _attribute_map = { + 'keywords': {'key': 'keywords', 'type': 'str'}, + 'max_domain_recommendations': {'key': 'maxDomainRecommendations', 'type': 'int'}, + } + + def __init__(self, *, keywords: str=None, max_domain_recommendations: int=None, **kwargs) -> None: + super(DomainRecommendationSearchParameters, self).__init__(**kwargs) + self.keywords = keywords + self.max_domain_recommendations = max_domain_recommendations diff --git a/azure-mgmt-web/azure/mgmt/web/models/enabled_config.py b/azure-mgmt-web/azure/mgmt/web/models/enabled_config.py index 5d44efc6b8ad..81b4f06c3045 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/enabled_config.py +++ b/azure-mgmt-web/azure/mgmt/web/models/enabled_config.py @@ -24,6 +24,6 @@ class EnabledConfig(Model): 'enabled': {'key': 'enabled', 'type': 'bool'}, } - def __init__(self, enabled=None): - super(EnabledConfig, self).__init__() - self.enabled = enabled + def __init__(self, **kwargs): + super(EnabledConfig, self).__init__(**kwargs) + self.enabled = kwargs.get('enabled', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/enabled_config_py3.py b/azure-mgmt-web/azure/mgmt/web/models/enabled_config_py3.py new file mode 100644 index 000000000000..226726aabf4c --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/enabled_config_py3.py @@ -0,0 +1,29 @@ +# 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 EnabledConfig(Model): + """Enabled configuration. + + :param enabled: True if configuration is enabled, false if it is disabled + and null if configuration is not set. + :type enabled: bool + """ + + _attribute_map = { + 'enabled': {'key': 'enabled', 'type': 'bool'}, + } + + def __init__(self, *, enabled: bool=None, **kwargs) -> None: + super(EnabledConfig, self).__init__(**kwargs) + self.enabled = enabled diff --git a/azure-mgmt-web/azure/mgmt/web/models/error_entity.py b/azure-mgmt-web/azure/mgmt/web/models/error_entity.py index f909bd59f684..08f037c599f2 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/error_entity.py +++ b/azure-mgmt-web/azure/mgmt/web/models/error_entity.py @@ -38,11 +38,11 @@ class ErrorEntity(Model): 'message': {'key': 'message', 'type': 'str'}, } - def __init__(self, extended_code=None, message_template=None, parameters=None, inner_errors=None, code=None, message=None): - super(ErrorEntity, self).__init__() - self.extended_code = extended_code - self.message_template = message_template - self.parameters = parameters - self.inner_errors = inner_errors - self.code = code - self.message = message + def __init__(self, **kwargs): + super(ErrorEntity, self).__init__(**kwargs) + self.extended_code = kwargs.get('extended_code', None) + self.message_template = kwargs.get('message_template', None) + self.parameters = kwargs.get('parameters', None) + self.inner_errors = kwargs.get('inner_errors', None) + self.code = kwargs.get('code', None) + self.message = kwargs.get('message', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/error_entity_py3.py b/azure-mgmt-web/azure/mgmt/web/models/error_entity_py3.py new file mode 100644 index 000000000000..d60fe281db68 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/error_entity_py3.py @@ -0,0 +1,48 @@ +# 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 ErrorEntity(Model): + """Body of the error response returned from the API. + + :param extended_code: Type of error. + :type extended_code: str + :param message_template: Message template. + :type message_template: str + :param parameters: Parameters for the template. + :type parameters: list[str] + :param inner_errors: Inner errors. + :type inner_errors: list[~azure.mgmt.web.models.ErrorEntity] + :param code: Basic error code. + :type code: str + :param message: Any details of the error. + :type message: str + """ + + _attribute_map = { + 'extended_code': {'key': 'extendedCode', 'type': 'str'}, + 'message_template': {'key': 'messageTemplate', 'type': 'str'}, + 'parameters': {'key': 'parameters', 'type': '[str]'}, + 'inner_errors': {'key': 'innerErrors', 'type': '[ErrorEntity]'}, + 'code': {'key': 'code', 'type': 'str'}, + 'message': {'key': 'message', 'type': 'str'}, + } + + def __init__(self, *, extended_code: str=None, message_template: str=None, parameters=None, inner_errors=None, code: str=None, message: str=None, **kwargs) -> None: + super(ErrorEntity, self).__init__(**kwargs) + self.extended_code = extended_code + self.message_template = message_template + self.parameters = parameters + self.inner_errors = inner_errors + self.code = code + self.message = message diff --git a/azure-mgmt-web/azure/mgmt/web/models/error_response.py b/azure-mgmt-web/azure/mgmt/web/models/error_response.py index 97176b87f7b3..e20829bcf7b2 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/error_response.py +++ b/azure-mgmt-web/azure/mgmt/web/models/error_response.py @@ -27,10 +27,10 @@ class ErrorResponse(Model): 'message': {'key': 'message', 'type': 'str'}, } - def __init__(self, code=None, message=None): - super(ErrorResponse, self).__init__() - self.code = code - self.message = message + def __init__(self, **kwargs): + super(ErrorResponse, self).__init__(**kwargs) + self.code = kwargs.get('code', None) + self.message = kwargs.get('message', None) class ErrorResponseException(HttpOperationError): diff --git a/azure-mgmt-web/azure/mgmt/web/models/error_response_py3.py b/azure-mgmt-web/azure/mgmt/web/models/error_response_py3.py new file mode 100644 index 000000000000..1b2f05f1d4d6 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/error_response_py3.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 +from msrest.exceptions import HttpOperationError + + +class ErrorResponse(Model): + """Error Response. + + :param code: Error code. + :type code: str + :param message: Error message indicating why the operation failed. + :type message: str + """ + + _attribute_map = { + 'code': {'key': 'code', 'type': 'str'}, + 'message': {'key': 'message', 'type': 'str'}, + } + + def __init__(self, *, code: str=None, message: str=None, **kwargs) -> None: + super(ErrorResponse, self).__init__(**kwargs) + self.code = code + self.message = message + + +class ErrorResponseException(HttpOperationError): + """Server responsed with exception of type: 'ErrorResponse'. + + :param deserialize: A deserializer + :param response: Server response to be deserialized. + """ + + def __init__(self, deserialize, response, *args): + + super(ErrorResponseException, self).__init__(deserialize, response, 'ErrorResponse', *args) diff --git a/azure-mgmt-web/azure/mgmt/web/models/experiments.py b/azure-mgmt-web/azure/mgmt/web/models/experiments.py index 231d82f98a5d..4a74bcf8f935 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/experiments.py +++ b/azure-mgmt-web/azure/mgmt/web/models/experiments.py @@ -23,6 +23,6 @@ class Experiments(Model): 'ramp_up_rules': {'key': 'rampUpRules', 'type': '[RampUpRule]'}, } - def __init__(self, ramp_up_rules=None): - super(Experiments, self).__init__() - self.ramp_up_rules = ramp_up_rules + def __init__(self, **kwargs): + super(Experiments, self).__init__(**kwargs) + self.ramp_up_rules = kwargs.get('ramp_up_rules', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/experiments_py3.py b/azure-mgmt-web/azure/mgmt/web/models/experiments_py3.py new file mode 100644 index 000000000000..16bd1d5ccf09 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/experiments_py3.py @@ -0,0 +1,28 @@ +# 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 Experiments(Model): + """Routing rules in production experiments. + + :param ramp_up_rules: List of ramp-up rules. + :type ramp_up_rules: list[~azure.mgmt.web.models.RampUpRule] + """ + + _attribute_map = { + 'ramp_up_rules': {'key': 'rampUpRules', 'type': '[RampUpRule]'}, + } + + def __init__(self, *, ramp_up_rules=None, **kwargs) -> None: + super(Experiments, self).__init__(**kwargs) + self.ramp_up_rules = ramp_up_rules diff --git a/azure-mgmt-web/azure/mgmt/web/models/file_system_application_logs_config.py b/azure-mgmt-web/azure/mgmt/web/models/file_system_application_logs_config.py index b8ecc8372cc5..469a1bee8590 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/file_system_application_logs_config.py +++ b/azure-mgmt-web/azure/mgmt/web/models/file_system_application_logs_config.py @@ -24,6 +24,6 @@ class FileSystemApplicationLogsConfig(Model): 'level': {'key': 'level', 'type': 'LogLevel'}, } - def __init__(self, level="Off"): - super(FileSystemApplicationLogsConfig, self).__init__() - self.level = level + def __init__(self, **kwargs): + super(FileSystemApplicationLogsConfig, self).__init__(**kwargs) + self.level = kwargs.get('level', "Off") diff --git a/azure-mgmt-web/azure/mgmt/web/models/file_system_application_logs_config_py3.py b/azure-mgmt-web/azure/mgmt/web/models/file_system_application_logs_config_py3.py new file mode 100644 index 000000000000..d18bbfa42a33 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/file_system_application_logs_config_py3.py @@ -0,0 +1,29 @@ +# 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 FileSystemApplicationLogsConfig(Model): + """Application logs to file system configuration. + + :param level: Log level. Possible values include: 'Off', 'Verbose', + 'Information', 'Warning', 'Error'. Default value: "Off" . + :type level: str or ~azure.mgmt.web.models.LogLevel + """ + + _attribute_map = { + 'level': {'key': 'level', 'type': 'LogLevel'}, + } + + def __init__(self, *, level="Off", **kwargs) -> None: + super(FileSystemApplicationLogsConfig, self).__init__(**kwargs) + self.level = level diff --git a/azure-mgmt-web/azure/mgmt/web/models/file_system_http_logs_config.py b/azure-mgmt-web/azure/mgmt/web/models/file_system_http_logs_config.py index 0c38657cac46..d7be6474900f 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/file_system_http_logs_config.py +++ b/azure-mgmt-web/azure/mgmt/web/models/file_system_http_logs_config.py @@ -39,8 +39,8 @@ class FileSystemHttpLogsConfig(Model): 'enabled': {'key': 'enabled', 'type': 'bool'}, } - def __init__(self, retention_in_mb=None, retention_in_days=None, enabled=None): - super(FileSystemHttpLogsConfig, self).__init__() - self.retention_in_mb = retention_in_mb - self.retention_in_days = retention_in_days - self.enabled = enabled + def __init__(self, **kwargs): + super(FileSystemHttpLogsConfig, self).__init__(**kwargs) + self.retention_in_mb = kwargs.get('retention_in_mb', None) + self.retention_in_days = kwargs.get('retention_in_days', None) + self.enabled = kwargs.get('enabled', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/file_system_http_logs_config_py3.py b/azure-mgmt-web/azure/mgmt/web/models/file_system_http_logs_config_py3.py new file mode 100644 index 000000000000..b5101a8c103d --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/file_system_http_logs_config_py3.py @@ -0,0 +1,46 @@ +# 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 FileSystemHttpLogsConfig(Model): + """Http logs to file system configuration. + + :param retention_in_mb: Maximum size in megabytes that http log files can + use. + When reached old log files will be removed to make space for new ones. + Value can range between 25 and 100. + :type retention_in_mb: int + :param retention_in_days: Retention in days. + Remove files older than X days. + 0 or lower means no retention. + :type retention_in_days: int + :param enabled: True if configuration is enabled, false if it is disabled + and null if configuration is not set. + :type enabled: bool + """ + + _validation = { + 'retention_in_mb': {'maximum': 100, 'minimum': 25}, + } + + _attribute_map = { + 'retention_in_mb': {'key': 'retentionInMb', 'type': 'int'}, + 'retention_in_days': {'key': 'retentionInDays', 'type': 'int'}, + 'enabled': {'key': 'enabled', 'type': 'bool'}, + } + + def __init__(self, *, retention_in_mb: int=None, retention_in_days: int=None, enabled: bool=None, **kwargs) -> None: + super(FileSystemHttpLogsConfig, self).__init__(**kwargs) + self.retention_in_mb = retention_in_mb + self.retention_in_days = retention_in_days + self.enabled = enabled 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..6e19dd9fb439 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/function_envelope.py +++ b/azure-mgmt-web/azure/mgmt/web/models/function_envelope.py @@ -73,15 +73,15 @@ class FunctionEnvelope(ProxyOnlyResource): 'test_data': {'key': 'properties.testData', '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): - super(FunctionEnvelope, self).__init__(kind=kind) + def __init__(self, **kwargs): + super(FunctionEnvelope, self).__init__(**kwargs) self.function_envelope_name = None self.function_app_id = None - self.script_root_path_href = script_root_path_href - self.script_href = script_href - self.config_href = config_href - self.secrets_file_href = secrets_file_href - self.href = href - self.config = config - self.files = files - self.test_data = test_data + self.script_root_path_href = kwargs.get('script_root_path_href', None) + self.script_href = kwargs.get('script_href', None) + self.config_href = kwargs.get('config_href', None) + self.secrets_file_href = kwargs.get('secrets_file_href', None) + self.href = kwargs.get('href', None) + self.config = kwargs.get('config', None) + self.files = kwargs.get('files', None) + self.test_data = kwargs.get('test_data', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/function_envelope_py3.py b/azure-mgmt-web/azure/mgmt/web/models/function_envelope_py3.py new file mode 100644 index 000000000000..2386521c5fa8 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/function_envelope_py3.py @@ -0,0 +1,87 @@ +# 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_py3 import ProxyOnlyResource + + +class FunctionEnvelope(ProxyOnlyResource): + """Web Job Information. + + 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 + :ivar function_envelope_name: Function name. + :vartype function_envelope_name: str + :ivar function_app_id: Function App ID. + :vartype function_app_id: str + :param script_root_path_href: Script root path URI. + :type script_root_path_href: str + :param script_href: Script URI. + :type script_href: str + :param config_href: Config URI. + :type config_href: str + :param secrets_file_href: Secrets file URI. + :type secrets_file_href: str + :param href: Function URI. + :type href: str + :param config: Config information. + :type config: object + :param files: File list. + :type files: dict[str, str] + :param test_data: Test data used when testing via the Azure Portal. + :type test_data: str + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'function_envelope_name': {'readonly': True}, + 'function_app_id': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + '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'}, + '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'}, + } + + def __init__(self, *, kind: str=None, script_root_path_href: str=None, script_href: str=None, config_href: str=None, secrets_file_href: str=None, href: str=None, config=None, files=None, test_data: str=None, **kwargs) -> None: + super(FunctionEnvelope, self).__init__(kind=kind, **kwargs) + self.function_envelope_name = None + self.function_app_id = None + self.script_root_path_href = script_root_path_href + self.script_href = script_href + self.config_href = config_href + self.secrets_file_href = secrets_file_href + self.href = href + self.config = config + self.files = files + self.test_data = test_data 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..6f0746e1e7c8 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/function_secrets.py +++ b/azure-mgmt-web/azure/mgmt/web/models/function_secrets.py @@ -47,7 +47,7 @@ class FunctionSecrets(ProxyOnlyResource): 'trigger_url': {'key': 'properties.triggerUrl', 'type': 'str'}, } - def __init__(self, kind=None, key=None, trigger_url=None): - super(FunctionSecrets, self).__init__(kind=kind) - self.key = key - self.trigger_url = trigger_url + def __init__(self, **kwargs): + super(FunctionSecrets, self).__init__(**kwargs) + self.key = kwargs.get('key', None) + self.trigger_url = kwargs.get('trigger_url', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/function_secrets_py3.py b/azure-mgmt-web/azure/mgmt/web/models/function_secrets_py3.py new file mode 100644 index 000000000000..6b351eae0cbe --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/function_secrets_py3.py @@ -0,0 +1,53 @@ +# 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_py3 import ProxyOnlyResource + + +class FunctionSecrets(ProxyOnlyResource): + """Function secrets. + + 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 key: Secret key. + :type key: str + :param trigger_url: Trigger URL. + :type trigger_url: 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'}, + 'key': {'key': 'properties.key', 'type': 'str'}, + 'trigger_url': {'key': 'properties.triggerUrl', 'type': 'str'}, + } + + def __init__(self, *, kind: str=None, key: str=None, trigger_url: str=None, **kwargs) -> None: + super(FunctionSecrets, self).__init__(kind=kind, **kwargs) + self.key = key + self.trigger_url = trigger_url 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..c59c3987e0f5 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/geo_region.py +++ b/azure-mgmt-web/azure/mgmt/web/models/geo_region.py @@ -53,8 +53,8 @@ class GeoRegion(ProxyOnlyResource): 'display_name': {'key': 'properties.displayName', 'type': 'str'}, } - def __init__(self, kind=None): - super(GeoRegion, self).__init__(kind=kind) + def __init__(self, **kwargs): + super(GeoRegion, self).__init__(**kwargs) self.geo_region_name = None self.description = None self.display_name = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/geo_region_py3.py b/azure-mgmt-web/azure/mgmt/web/models/geo_region_py3.py new file mode 100644 index 000000000000..2729ae2b843d --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/geo_region_py3.py @@ -0,0 +1,60 @@ +# 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_py3 import ProxyOnlyResource + + +class GeoRegion(ProxyOnlyResource): + """Geographical region. + + 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 + :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. + :vartype display_name: str + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'geo_region_name': {'readonly': True}, + 'description': {'readonly': True}, + 'display_name': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + '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: str=None, **kwargs) -> None: + super(GeoRegion, self).__init__(kind=kind, **kwargs) + self.geo_region_name = None + self.description = None + self.display_name = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/global_csm_sku_description.py b/azure-mgmt-web/azure/mgmt/web/models/global_csm_sku_description.py index c47cd7e4511b..3e360b658faf 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/global_csm_sku_description.py +++ b/azure-mgmt-web/azure/mgmt/web/models/global_csm_sku_description.py @@ -42,12 +42,12 @@ class GlobalCsmSkuDescription(Model): 'capabilities': {'key': 'capabilities', 'type': '[Capability]'}, } - def __init__(self, name=None, tier=None, size=None, family=None, capacity=None, locations=None, capabilities=None): - super(GlobalCsmSkuDescription, self).__init__() - self.name = name - self.tier = tier - self.size = size - self.family = family - self.capacity = capacity - self.locations = locations - self.capabilities = capabilities + def __init__(self, **kwargs): + super(GlobalCsmSkuDescription, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.tier = kwargs.get('tier', None) + self.size = kwargs.get('size', None) + self.family = kwargs.get('family', None) + self.capacity = kwargs.get('capacity', None) + self.locations = kwargs.get('locations', None) + self.capabilities = kwargs.get('capabilities', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/global_csm_sku_description_py3.py b/azure-mgmt-web/azure/mgmt/web/models/global_csm_sku_description_py3.py new file mode 100644 index 000000000000..4ee7bee2a0f0 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/global_csm_sku_description_py3.py @@ -0,0 +1,53 @@ +# 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 GlobalCsmSkuDescription(Model): + """A Global SKU Description. + + :param name: Name of the resource SKU. + :type name: str + :param tier: Service Tier of the resource SKU. + :type tier: str + :param size: Size specifier of the resource SKU. + :type size: str + :param family: Family code of the resource SKU. + :type family: str + :param capacity: Min, max, and default scale values of the SKU. + :type capacity: ~azure.mgmt.web.models.SkuCapacity + :param locations: Locations of the SKU. + :type locations: list[str] + :param capabilities: Capabilities of the SKU, e.g., is traffic manager + enabled? + :type capabilities: list[~azure.mgmt.web.models.Capability] + """ + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'tier': {'key': 'tier', 'type': 'str'}, + 'size': {'key': 'size', 'type': 'str'}, + 'family': {'key': 'family', 'type': 'str'}, + 'capacity': {'key': 'capacity', 'type': 'SkuCapacity'}, + 'locations': {'key': 'locations', 'type': '[str]'}, + 'capabilities': {'key': 'capabilities', 'type': '[Capability]'}, + } + + def __init__(self, *, name: str=None, tier: str=None, size: str=None, family: str=None, capacity=None, locations=None, capabilities=None, **kwargs) -> None: + super(GlobalCsmSkuDescription, self).__init__(**kwargs) + self.name = name + self.tier = tier + self.size = size + self.family = family + self.capacity = capacity + self.locations = locations + self.capabilities = capabilities diff --git a/azure-mgmt-web/azure/mgmt/web/models/handler_mapping.py b/azure-mgmt-web/azure/mgmt/web/models/handler_mapping.py index fd3819684997..842f09c77aa4 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/handler_mapping.py +++ b/azure-mgmt-web/azure/mgmt/web/models/handler_mapping.py @@ -34,8 +34,8 @@ class HandlerMapping(Model): 'arguments': {'key': 'arguments', 'type': 'str'}, } - def __init__(self, extension=None, script_processor=None, arguments=None): - super(HandlerMapping, self).__init__() - self.extension = extension - self.script_processor = script_processor - self.arguments = arguments + def __init__(self, **kwargs): + super(HandlerMapping, self).__init__(**kwargs) + self.extension = kwargs.get('extension', None) + self.script_processor = kwargs.get('script_processor', None) + self.arguments = kwargs.get('arguments', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/handler_mapping_py3.py b/azure-mgmt-web/azure/mgmt/web/models/handler_mapping_py3.py new file mode 100644 index 000000000000..a2facf93b3fa --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/handler_mapping_py3.py @@ -0,0 +1,41 @@ +# 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 HandlerMapping(Model): + """The IIS handler mappings used to define which handler processes HTTP + requests with certain extension. + For example, it is used to configure php-cgi.exe process to handle all HTTP + requests with *.php extension. + + :param extension: Requests with this extension will be handled using the + specified FastCGI application. + :type extension: str + :param script_processor: The absolute path to the FastCGI application. + :type script_processor: str + :param arguments: Command-line arguments to be passed to the script + processor. + :type arguments: str + """ + + _attribute_map = { + 'extension': {'key': 'extension', 'type': 'str'}, + 'script_processor': {'key': 'scriptProcessor', 'type': 'str'}, + 'arguments': {'key': 'arguments', 'type': 'str'}, + } + + def __init__(self, *, extension: str=None, script_processor: str=None, arguments: str=None, **kwargs) -> None: + super(HandlerMapping, self).__init__(**kwargs) + self.extension = extension + self.script_processor = script_processor + self.arguments = arguments diff --git a/azure-mgmt-web/azure/mgmt/web/models/host_name.py b/azure-mgmt-web/azure/mgmt/web/models/host_name.py index 3df8649876dd..35dd11a2ff51 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/host_name.py +++ b/azure-mgmt-web/azure/mgmt/web/models/host_name.py @@ -46,11 +46,11 @@ class HostName(Model): 'host_name_type': {'key': 'hostNameType', 'type': 'HostNameType'}, } - def __init__(self, name=None, site_names=None, azure_resource_name=None, azure_resource_type=None, custom_host_name_dns_record_type=None, host_name_type=None): - super(HostName, self).__init__() - self.name = name - self.site_names = site_names - self.azure_resource_name = azure_resource_name - self.azure_resource_type = azure_resource_type - self.custom_host_name_dns_record_type = custom_host_name_dns_record_type - self.host_name_type = host_name_type + def __init__(self, **kwargs): + super(HostName, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.site_names = kwargs.get('site_names', None) + self.azure_resource_name = kwargs.get('azure_resource_name', None) + self.azure_resource_type = kwargs.get('azure_resource_type', None) + self.custom_host_name_dns_record_type = kwargs.get('custom_host_name_dns_record_type', None) + self.host_name_type = kwargs.get('host_name_type', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/host_name_binding.py b/azure-mgmt-web/azure/mgmt/web/models/host_name_binding.py index a494c196dbe6..6d728d0a158b 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/host_name_binding.py +++ b/azure-mgmt-web/azure/mgmt/web/models/host_name_binding.py @@ -75,14 +75,14 @@ class HostNameBinding(ProxyOnlyResource): 'virtual_ip': {'key': 'properties.virtualIP', 'type': 'str'}, } - def __init__(self, kind=None, site_name=None, domain_id=None, azure_resource_name=None, azure_resource_type=None, custom_host_name_dns_record_type=None, host_name_type=None, ssl_state=None, thumbprint=None): - super(HostNameBinding, self).__init__(kind=kind) - self.site_name = site_name - self.domain_id = domain_id - self.azure_resource_name = azure_resource_name - self.azure_resource_type = azure_resource_type - self.custom_host_name_dns_record_type = custom_host_name_dns_record_type - self.host_name_type = host_name_type - self.ssl_state = ssl_state - self.thumbprint = thumbprint + def __init__(self, **kwargs): + super(HostNameBinding, self).__init__(**kwargs) + self.site_name = kwargs.get('site_name', None) + self.domain_id = kwargs.get('domain_id', None) + self.azure_resource_name = kwargs.get('azure_resource_name', None) + self.azure_resource_type = kwargs.get('azure_resource_type', None) + self.custom_host_name_dns_record_type = kwargs.get('custom_host_name_dns_record_type', None) + self.host_name_type = kwargs.get('host_name_type', None) + self.ssl_state = kwargs.get('ssl_state', None) + self.thumbprint = kwargs.get('thumbprint', None) self.virtual_ip = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/host_name_binding_py3.py b/azure-mgmt-web/azure/mgmt/web/models/host_name_binding_py3.py new file mode 100644 index 000000000000..a22b74356b87 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/host_name_binding_py3.py @@ -0,0 +1,88 @@ +# 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_py3 import ProxyOnlyResource + + +class HostNameBinding(ProxyOnlyResource): + """A hostname binding object. + + 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 site_name: App Service app name. + :type site_name: str + :param domain_id: Fully qualified ARM domain resource URI. + :type domain_id: str + :param azure_resource_name: Azure resource name. + :type azure_resource_name: str + :param azure_resource_type: Azure resource type. Possible values include: + 'Website', 'TrafficManager' + :type azure_resource_type: str or ~azure.mgmt.web.models.AzureResourceType + :param custom_host_name_dns_record_type: Custom DNS record type. Possible + values include: 'CName', 'A' + :type custom_host_name_dns_record_type: str or + ~azure.mgmt.web.models.CustomHostNameDnsRecordType + :param host_name_type: Hostname type. Possible values include: 'Verified', + 'Managed' + :type host_name_type: str or ~azure.mgmt.web.models.HostNameType + :param ssl_state: SSL type. Possible values include: 'Disabled', + 'SniEnabled', 'IpBasedEnabled' + :type ssl_state: str or ~azure.mgmt.web.models.SslState + :param thumbprint: SSL certificate thumbprint + :type thumbprint: str + :ivar virtual_ip: Virtual IP address assigned to the hostname if IP based + SSL is enabled. + :vartype virtual_ip: str + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'virtual_ip': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'site_name': {'key': 'properties.siteName', 'type': 'str'}, + 'domain_id': {'key': 'properties.domainId', 'type': 'str'}, + 'azure_resource_name': {'key': 'properties.azureResourceName', 'type': 'str'}, + 'azure_resource_type': {'key': 'properties.azureResourceType', 'type': 'AzureResourceType'}, + 'custom_host_name_dns_record_type': {'key': 'properties.customHostNameDnsRecordType', 'type': 'CustomHostNameDnsRecordType'}, + 'host_name_type': {'key': 'properties.hostNameType', 'type': 'HostNameType'}, + 'ssl_state': {'key': 'properties.sslState', 'type': 'SslState'}, + 'thumbprint': {'key': 'properties.thumbprint', 'type': 'str'}, + 'virtual_ip': {'key': 'properties.virtualIP', 'type': 'str'}, + } + + def __init__(self, *, kind: str=None, site_name: str=None, domain_id: str=None, azure_resource_name: str=None, azure_resource_type=None, custom_host_name_dns_record_type=None, host_name_type=None, ssl_state=None, thumbprint: str=None, **kwargs) -> None: + super(HostNameBinding, self).__init__(kind=kind, **kwargs) + self.site_name = site_name + self.domain_id = domain_id + self.azure_resource_name = azure_resource_name + self.azure_resource_type = azure_resource_type + self.custom_host_name_dns_record_type = custom_host_name_dns_record_type + self.host_name_type = host_name_type + self.ssl_state = ssl_state + self.thumbprint = thumbprint + self.virtual_ip = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/host_name_py3.py b/azure-mgmt-web/azure/mgmt/web/models/host_name_py3.py new file mode 100644 index 000000000000..7ba3d8375ff2 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/host_name_py3.py @@ -0,0 +1,56 @@ +# 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 HostName(Model): + """Details of a hostname derived from a domain. + + :param name: Name of the hostname. + :type name: str + :param site_names: List of apps the hostname is assigned to. This list + will have more than one app only if the hostname is pointing to a Traffic + Manager. + :type site_names: list[str] + :param azure_resource_name: Name of the Azure resource the hostname is + assigned to. If it is assigned to a Traffic Manager then it will be the + Traffic Manager name otherwise it will be the app name. + :type azure_resource_name: str + :param azure_resource_type: Type of the Azure resource the hostname is + assigned to. Possible values include: 'Website', 'TrafficManager' + :type azure_resource_type: str or ~azure.mgmt.web.models.AzureResourceType + :param custom_host_name_dns_record_type: Type of the DNS record. Possible + values include: 'CName', 'A' + :type custom_host_name_dns_record_type: str or + ~azure.mgmt.web.models.CustomHostNameDnsRecordType + :param host_name_type: Type of the hostname. Possible values include: + 'Verified', 'Managed' + :type host_name_type: str or ~azure.mgmt.web.models.HostNameType + """ + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'site_names': {'key': 'siteNames', 'type': '[str]'}, + 'azure_resource_name': {'key': 'azureResourceName', 'type': 'str'}, + 'azure_resource_type': {'key': 'azureResourceType', 'type': 'AzureResourceType'}, + 'custom_host_name_dns_record_type': {'key': 'customHostNameDnsRecordType', 'type': 'CustomHostNameDnsRecordType'}, + 'host_name_type': {'key': 'hostNameType', 'type': 'HostNameType'}, + } + + def __init__(self, *, name: str=None, site_names=None, azure_resource_name: str=None, azure_resource_type=None, custom_host_name_dns_record_type=None, host_name_type=None, **kwargs) -> None: + super(HostName, self).__init__(**kwargs) + self.name = name + self.site_names = site_names + self.azure_resource_name = azure_resource_name + self.azure_resource_type = azure_resource_type + self.custom_host_name_dns_record_type = custom_host_name_dns_record_type + self.host_name_type = host_name_type diff --git a/azure-mgmt-web/azure/mgmt/web/models/host_name_ssl_state.py b/azure-mgmt-web/azure/mgmt/web/models/host_name_ssl_state.py index 1a95322cf81e..3b0c32f1f108 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/host_name_ssl_state.py +++ b/azure-mgmt-web/azure/mgmt/web/models/host_name_ssl_state.py @@ -41,11 +41,11 @@ class HostNameSslState(Model): 'host_type': {'key': 'hostType', 'type': 'HostType'}, } - def __init__(self, name=None, ssl_state=None, virtual_ip=None, thumbprint=None, to_update=None, host_type=None): - super(HostNameSslState, self).__init__() - self.name = name - self.ssl_state = ssl_state - self.virtual_ip = virtual_ip - self.thumbprint = thumbprint - self.to_update = to_update - self.host_type = host_type + def __init__(self, **kwargs): + super(HostNameSslState, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.ssl_state = kwargs.get('ssl_state', None) + self.virtual_ip = kwargs.get('virtual_ip', None) + self.thumbprint = kwargs.get('thumbprint', None) + self.to_update = kwargs.get('to_update', None) + self.host_type = kwargs.get('host_type', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/host_name_ssl_state_py3.py b/azure-mgmt-web/azure/mgmt/web/models/host_name_ssl_state_py3.py new file mode 100644 index 000000000000..422e32c25371 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/host_name_ssl_state_py3.py @@ -0,0 +1,51 @@ +# 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 HostNameSslState(Model): + """SSL-enabled hostname. + + :param name: Hostname. + :type name: str + :param ssl_state: SSL type. Possible values include: 'Disabled', + 'SniEnabled', 'IpBasedEnabled' + :type ssl_state: str or ~azure.mgmt.web.models.SslState + :param virtual_ip: Virtual IP address assigned to the hostname if IP based + SSL is enabled. + :type virtual_ip: str + :param thumbprint: SSL certificate thumbprint. + :type thumbprint: str + :param to_update: Set to true to update existing hostname. + :type to_update: bool + :param host_type: Indicates whether the hostname is a standard or + repository hostname. Possible values include: 'Standard', 'Repository' + :type host_type: str or ~azure.mgmt.web.models.HostType + """ + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'ssl_state': {'key': 'sslState', 'type': 'SslState'}, + 'virtual_ip': {'key': 'virtualIP', 'type': 'str'}, + 'thumbprint': {'key': 'thumbprint', 'type': 'str'}, + 'to_update': {'key': 'toUpdate', 'type': 'bool'}, + 'host_type': {'key': 'hostType', 'type': 'HostType'}, + } + + def __init__(self, *, name: str=None, ssl_state=None, virtual_ip: str=None, thumbprint: str=None, to_update: bool=None, host_type=None, **kwargs) -> None: + super(HostNameSslState, self).__init__(**kwargs) + self.name = name + self.ssl_state = ssl_state + self.virtual_ip = virtual_ip + self.thumbprint = thumbprint + self.to_update = to_update + self.host_type = host_type diff --git a/azure-mgmt-web/azure/mgmt/web/models/hosting_environment_deployment_info.py b/azure-mgmt-web/azure/mgmt/web/models/hosting_environment_deployment_info.py index c625f9361fb9..d0d634503293 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/hosting_environment_deployment_info.py +++ b/azure-mgmt-web/azure/mgmt/web/models/hosting_environment_deployment_info.py @@ -26,7 +26,7 @@ class HostingEnvironmentDeploymentInfo(Model): 'location': {'key': 'location', 'type': 'str'}, } - def __init__(self, name=None, location=None): - super(HostingEnvironmentDeploymentInfo, self).__init__() - self.name = name - self.location = location + def __init__(self, **kwargs): + super(HostingEnvironmentDeploymentInfo, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.location = kwargs.get('location', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/hosting_environment_deployment_info_py3.py b/azure-mgmt-web/azure/mgmt/web/models/hosting_environment_deployment_info_py3.py new file mode 100644 index 000000000000..10e6b5a03d4e --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/hosting_environment_deployment_info_py3.py @@ -0,0 +1,32 @@ +# 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 HostingEnvironmentDeploymentInfo(Model): + """Information needed to create resources on an App Service Environment. + + :param name: Name of the App Service Environment. + :type name: str + :param location: Location of the App Service Environment. + :type location: str + """ + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'location': {'key': 'location', 'type': 'str'}, + } + + def __init__(self, *, name: str=None, location: str=None, **kwargs) -> None: + super(HostingEnvironmentDeploymentInfo, self).__init__(**kwargs) + self.name = name + self.location = location diff --git a/azure-mgmt-web/azure/mgmt/web/models/hosting_environment_diagnostics.py b/azure-mgmt-web/azure/mgmt/web/models/hosting_environment_diagnostics.py index 648e8704252a..26dc8c283fc7 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/hosting_environment_diagnostics.py +++ b/azure-mgmt-web/azure/mgmt/web/models/hosting_environment_diagnostics.py @@ -26,7 +26,7 @@ class HostingEnvironmentDiagnostics(Model): 'diagnosics_output': {'key': 'diagnosicsOutput', 'type': 'str'}, } - def __init__(self, name=None, diagnosics_output=None): - super(HostingEnvironmentDiagnostics, self).__init__() - self.name = name - self.diagnosics_output = diagnosics_output + def __init__(self, **kwargs): + super(HostingEnvironmentDiagnostics, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.diagnosics_output = kwargs.get('diagnosics_output', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/hosting_environment_diagnostics_py3.py b/azure-mgmt-web/azure/mgmt/web/models/hosting_environment_diagnostics_py3.py new file mode 100644 index 000000000000..35ecd49c8939 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/hosting_environment_diagnostics_py3.py @@ -0,0 +1,32 @@ +# 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 HostingEnvironmentDiagnostics(Model): + """Diagnostics for an App Service Environment. + + :param name: Name/identifier of the diagnostics. + :type name: str + :param diagnosics_output: Diagnostics output. + :type diagnosics_output: str + """ + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'diagnosics_output': {'key': 'diagnosicsOutput', 'type': 'str'}, + } + + def __init__(self, *, name: str=None, diagnosics_output: str=None, **kwargs) -> None: + super(HostingEnvironmentDiagnostics, self).__init__(**kwargs) + self.name = name + self.diagnosics_output = diagnosics_output diff --git a/azure-mgmt-web/azure/mgmt/web/models/hosting_environment_profile.py b/azure-mgmt-web/azure/mgmt/web/models/hosting_environment_profile.py index f40f022aba2b..de68d8bc558e 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/hosting_environment_profile.py +++ b/azure-mgmt-web/azure/mgmt/web/models/hosting_environment_profile.py @@ -37,8 +37,8 @@ class HostingEnvironmentProfile(Model): 'type': {'key': 'type', 'type': 'str'}, } - def __init__(self, id=None): - super(HostingEnvironmentProfile, self).__init__() - self.id = id + def __init__(self, **kwargs): + super(HostingEnvironmentProfile, self).__init__(**kwargs) + self.id = kwargs.get('id', None) self.name = None self.type = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/hosting_environment_profile_py3.py b/azure-mgmt-web/azure/mgmt/web/models/hosting_environment_profile_py3.py new file mode 100644 index 000000000000..1440d596bbdc --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/hosting_environment_profile_py3.py @@ -0,0 +1,44 @@ +# 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 HostingEnvironmentProfile(Model): + """Specification for an App Service Environment to use for this resource. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :param id: Resource ID of the App Service Environment. + :type id: str + :ivar name: Name of the App Service Environment. + :vartype name: str + :ivar type: Resource type of the App Service Environment. + :vartype type: str + """ + + _validation = { + 'name': {'readonly': True}, + 'type': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + } + + def __init__(self, *, id: str=None, **kwargs) -> None: + super(HostingEnvironmentProfile, self).__init__(**kwargs) + self.id = id + self.name = None + self.type = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/http_logs_config.py b/azure-mgmt-web/azure/mgmt/web/models/http_logs_config.py index 95cb408652f5..505bf25e8aab 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/http_logs_config.py +++ b/azure-mgmt-web/azure/mgmt/web/models/http_logs_config.py @@ -27,7 +27,7 @@ class HttpLogsConfig(Model): 'azure_blob_storage': {'key': 'azureBlobStorage', 'type': 'AzureBlobStorageHttpLogsConfig'}, } - def __init__(self, file_system=None, azure_blob_storage=None): - super(HttpLogsConfig, self).__init__() - self.file_system = file_system - self.azure_blob_storage = azure_blob_storage + def __init__(self, **kwargs): + super(HttpLogsConfig, self).__init__(**kwargs) + self.file_system = kwargs.get('file_system', None) + self.azure_blob_storage = kwargs.get('azure_blob_storage', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/http_logs_config_py3.py b/azure-mgmt-web/azure/mgmt/web/models/http_logs_config_py3.py new file mode 100644 index 000000000000..5169867f67c3 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/http_logs_config_py3.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 HttpLogsConfig(Model): + """Http logs configuration. + + :param file_system: Http logs to file system configuration. + :type file_system: ~azure.mgmt.web.models.FileSystemHttpLogsConfig + :param azure_blob_storage: Http logs to azure blob storage configuration. + :type azure_blob_storage: + ~azure.mgmt.web.models.AzureBlobStorageHttpLogsConfig + """ + + _attribute_map = { + 'file_system': {'key': 'fileSystem', 'type': 'FileSystemHttpLogsConfig'}, + 'azure_blob_storage': {'key': 'azureBlobStorage', 'type': 'AzureBlobStorageHttpLogsConfig'}, + } + + def __init__(self, *, file_system=None, azure_blob_storage=None, **kwargs) -> None: + super(HttpLogsConfig, self).__init__(**kwargs) + self.file_system = file_system + self.azure_blob_storage = azure_blob_storage diff --git a/azure-mgmt-web/azure/mgmt/web/models/hybrid_connection.py b/azure-mgmt-web/azure/mgmt/web/models/hybrid_connection.py index 3f9b259f4082..7397552b22f8 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/hybrid_connection.py +++ b/azure-mgmt-web/azure/mgmt/web/models/hybrid_connection.py @@ -69,13 +69,13 @@ class HybridConnection(ProxyOnlyResource): 'service_bus_suffix': {'key': 'properties.serviceBusSuffix', 'type': 'str'}, } - def __init__(self, kind=None, service_bus_namespace=None, relay_name=None, relay_arm_uri=None, hostname=None, port=None, send_key_name=None, send_key_value=None, service_bus_suffix=None): - super(HybridConnection, self).__init__(kind=kind) - self.service_bus_namespace = service_bus_namespace - self.relay_name = relay_name - self.relay_arm_uri = relay_arm_uri - self.hostname = hostname - self.port = port - self.send_key_name = send_key_name - self.send_key_value = send_key_value - self.service_bus_suffix = service_bus_suffix + def __init__(self, **kwargs): + super(HybridConnection, self).__init__(**kwargs) + self.service_bus_namespace = kwargs.get('service_bus_namespace', None) + self.relay_name = kwargs.get('relay_name', None) + self.relay_arm_uri = kwargs.get('relay_arm_uri', None) + self.hostname = kwargs.get('hostname', None) + self.port = kwargs.get('port', None) + self.send_key_name = kwargs.get('send_key_name', None) + self.send_key_value = kwargs.get('send_key_value', None) + self.service_bus_suffix = kwargs.get('service_bus_suffix', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/hybrid_connection_key.py b/azure-mgmt-web/azure/mgmt/web/models/hybrid_connection_key.py index 6cf7f1f35bff..a0a0b0d9ac2e 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/hybrid_connection_key.py +++ b/azure-mgmt-web/azure/mgmt/web/models/hybrid_connection_key.py @@ -50,7 +50,7 @@ class HybridConnectionKey(ProxyOnlyResource): 'send_key_value': {'key': 'properties.sendKeyValue', 'type': 'str'}, } - def __init__(self, kind=None): - super(HybridConnectionKey, self).__init__(kind=kind) + def __init__(self, **kwargs): + super(HybridConnectionKey, self).__init__(**kwargs) self.send_key_name = None self.send_key_value = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/hybrid_connection_key_py3.py b/azure-mgmt-web/azure/mgmt/web/models/hybrid_connection_key_py3.py new file mode 100644 index 000000000000..530723c95418 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/hybrid_connection_key_py3.py @@ -0,0 +1,56 @@ +# 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_py3 import ProxyOnlyResource + + +class HybridConnectionKey(ProxyOnlyResource): + """Hybrid Connection key contract. This has the send key name and value for a + Hybrid Connection. + + 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 + :ivar send_key_name: The name of the send key. + :vartype send_key_name: str + :ivar send_key_value: The value of the send key. + :vartype send_key_value: str + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'send_key_name': {'readonly': True}, + 'send_key_value': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'send_key_name': {'key': 'properties.sendKeyName', 'type': 'str'}, + 'send_key_value': {'key': 'properties.sendKeyValue', 'type': 'str'}, + } + + def __init__(self, *, kind: str=None, **kwargs) -> None: + super(HybridConnectionKey, self).__init__(kind=kind, **kwargs) + self.send_key_name = None + self.send_key_value = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/hybrid_connection_limits.py b/azure-mgmt-web/azure/mgmt/web/models/hybrid_connection_limits.py index c0a32902b946..60a219ea069a 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/hybrid_connection_limits.py +++ b/azure-mgmt-web/azure/mgmt/web/models/hybrid_connection_limits.py @@ -50,7 +50,7 @@ class HybridConnectionLimits(ProxyOnlyResource): 'maximum': {'key': 'properties.maximum', 'type': 'int'}, } - def __init__(self, kind=None): - super(HybridConnectionLimits, self).__init__(kind=kind) + def __init__(self, **kwargs): + super(HybridConnectionLimits, self).__init__(**kwargs) self.current = None self.maximum = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/hybrid_connection_limits_py3.py b/azure-mgmt-web/azure/mgmt/web/models/hybrid_connection_limits_py3.py new file mode 100644 index 000000000000..4049c9f85c0d --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/hybrid_connection_limits_py3.py @@ -0,0 +1,56 @@ +# 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_py3 import ProxyOnlyResource + + +class HybridConnectionLimits(ProxyOnlyResource): + """Hybrid Connection limits contract. This is used to return the plan limits + of Hybrid Connections. + + 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 + :ivar current: The current number of Hybrid Connections. + :vartype current: int + :ivar maximum: The maximum number of Hybrid Connections allowed. + :vartype maximum: int + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'current': {'readonly': True}, + 'maximum': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'current': {'key': 'properties.current', 'type': 'int'}, + 'maximum': {'key': 'properties.maximum', 'type': 'int'}, + } + + def __init__(self, *, kind: str=None, **kwargs) -> None: + super(HybridConnectionLimits, self).__init__(kind=kind, **kwargs) + self.current = None + self.maximum = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/hybrid_connection_py3.py b/azure-mgmt-web/azure/mgmt/web/models/hybrid_connection_py3.py new file mode 100644 index 000000000000..6136525e9fb7 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/hybrid_connection_py3.py @@ -0,0 +1,81 @@ +# 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_py3 import ProxyOnlyResource + + +class HybridConnection(ProxyOnlyResource): + """Hybrid Connection contract. This is used to configure a Hybrid Connection. + + 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 service_bus_namespace: The name of the Service Bus namespace. + :type service_bus_namespace: str + :param relay_name: The name of the Service Bus relay. + :type relay_name: str + :param relay_arm_uri: The ARM URI to the Service Bus relay. + :type relay_arm_uri: str + :param hostname: The hostname of the endpoint. + :type hostname: str + :param port: The port of the endpoint. + :type port: int + :param send_key_name: The name of the Service Bus key which has Send + permissions. This is used to authenticate to Service Bus. + :type send_key_name: str + :param send_key_value: The value of the Service Bus key. This is used to + authenticate to Service Bus. In ARM this key will not be returned + normally, use the POST /listKeys API instead. + :type send_key_value: str + :param service_bus_suffix: The suffix for the service bus endpoint. By + default this is .servicebus.windows.net + :type service_bus_suffix: 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'}, + 'service_bus_namespace': {'key': 'properties.serviceBusNamespace', 'type': 'str'}, + 'relay_name': {'key': 'properties.relayName', 'type': 'str'}, + 'relay_arm_uri': {'key': 'properties.relayArmUri', 'type': 'str'}, + 'hostname': {'key': 'properties.hostname', 'type': 'str'}, + 'port': {'key': 'properties.port', 'type': 'int'}, + 'send_key_name': {'key': 'properties.sendKeyName', 'type': 'str'}, + 'send_key_value': {'key': 'properties.sendKeyValue', 'type': 'str'}, + 'service_bus_suffix': {'key': 'properties.serviceBusSuffix', 'type': 'str'}, + } + + def __init__(self, *, kind: str=None, service_bus_namespace: str=None, relay_name: str=None, relay_arm_uri: str=None, hostname: str=None, port: int=None, send_key_name: str=None, send_key_value: str=None, service_bus_suffix: str=None, **kwargs) -> None: + super(HybridConnection, self).__init__(kind=kind, **kwargs) + self.service_bus_namespace = service_bus_namespace + self.relay_name = relay_name + self.relay_arm_uri = relay_arm_uri + self.hostname = hostname + self.port = port + self.send_key_name = send_key_name + self.send_key_value = send_key_value + self.service_bus_suffix = service_bus_suffix diff --git a/azure-mgmt-web/azure/mgmt/web/models/identifier.py b/azure-mgmt-web/azure/mgmt/web/models/identifier.py index e1c7f9e1b847..061636f5e53d 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/identifier.py +++ b/azure-mgmt-web/azure/mgmt/web/models/identifier.py @@ -44,6 +44,6 @@ class Identifier(ProxyOnlyResource): 'identifier_id': {'key': 'properties.id', 'type': 'str'}, } - def __init__(self, kind=None, identifier_id=None): - super(Identifier, self).__init__(kind=kind) - self.identifier_id = identifier_id + def __init__(self, **kwargs): + super(Identifier, self).__init__(**kwargs) + self.identifier_id = kwargs.get('identifier_id', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/identifier_py3.py b/azure-mgmt-web/azure/mgmt/web/models/identifier_py3.py new file mode 100644 index 000000000000..12771f227839 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/identifier_py3.py @@ -0,0 +1,49 @@ +# 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_py3 import ProxyOnlyResource + + +class Identifier(ProxyOnlyResource): + """A domain specific resource identifier. + + 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 identifier_id: String representation of the identity. + :type identifier_id: 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'}, + 'identifier_id': {'key': 'properties.id', 'type': 'str'}, + } + + def __init__(self, *, kind: str=None, identifier_id: str=None, **kwargs) -> None: + super(Identifier, self).__init__(kind=kind, **kwargs) + self.identifier_id = identifier_id diff --git a/azure-mgmt-web/azure/mgmt/web/models/ip_security_restriction.py b/azure-mgmt-web/azure/mgmt/web/models/ip_security_restriction.py index de6ad1d3c6ab..5a1b16ba64d4 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/ip_security_restriction.py +++ b/azure-mgmt-web/azure/mgmt/web/models/ip_security_restriction.py @@ -15,7 +15,10 @@ class IpSecurityRestriction(Model): """IP security restriction on an app. - :param ip_address: IP address the security restriction is valid for. + All required parameters must be populated in order to send to Azure. + + :param ip_address: Required. IP address the security restriction is valid + for. :type ip_address: str :param subnet_mask: Subnet mask for the range of IP addresses the restriction is valid for. @@ -31,7 +34,7 @@ class IpSecurityRestriction(Model): 'subnet_mask': {'key': 'subnetMask', 'type': 'str'}, } - def __init__(self, ip_address, subnet_mask=None): - super(IpSecurityRestriction, self).__init__() - self.ip_address = ip_address - self.subnet_mask = subnet_mask + def __init__(self, **kwargs): + super(IpSecurityRestriction, self).__init__(**kwargs) + self.ip_address = kwargs.get('ip_address', None) + self.subnet_mask = kwargs.get('subnet_mask', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/ip_security_restriction_py3.py b/azure-mgmt-web/azure/mgmt/web/models/ip_security_restriction_py3.py new file mode 100644 index 000000000000..1abf651f9978 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/ip_security_restriction_py3.py @@ -0,0 +1,40 @@ +# 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 IpSecurityRestriction(Model): + """IP security restriction on an app. + + All required parameters must be populated in order to send to Azure. + + :param ip_address: Required. IP address the security restriction is valid + for. + :type ip_address: str + :param subnet_mask: Subnet mask for the range of IP addresses the + restriction is valid for. + :type subnet_mask: str + """ + + _validation = { + 'ip_address': {'required': True}, + } + + _attribute_map = { + 'ip_address': {'key': 'ipAddress', 'type': 'str'}, + 'subnet_mask': {'key': 'subnetMask', 'type': 'str'}, + } + + def __init__(self, *, ip_address: str, subnet_mask: str=None, **kwargs) -> None: + super(IpSecurityRestriction, self).__init__(**kwargs) + self.ip_address = ip_address + self.subnet_mask = subnet_mask diff --git a/azure-mgmt-web/azure/mgmt/web/models/localizable_string.py b/azure-mgmt-web/azure/mgmt/web/models/localizable_string.py index 05f0ad489a22..528d58067000 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/localizable_string.py +++ b/azure-mgmt-web/azure/mgmt/web/models/localizable_string.py @@ -26,7 +26,7 @@ class LocalizableString(Model): 'localized_value': {'key': 'localizedValue', 'type': 'str'}, } - def __init__(self, value=None, localized_value=None): - super(LocalizableString, self).__init__() - self.value = value - self.localized_value = localized_value + def __init__(self, **kwargs): + super(LocalizableString, self).__init__(**kwargs) + self.value = kwargs.get('value', None) + self.localized_value = kwargs.get('localized_value', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/localizable_string_py3.py b/azure-mgmt-web/azure/mgmt/web/models/localizable_string_py3.py new file mode 100644 index 000000000000..156fcfd26d33 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/localizable_string_py3.py @@ -0,0 +1,32 @@ +# 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 LocalizableString(Model): + """Localizable string object containing the name and a localized value. + + :param value: Non-localized name. + :type value: str + :param localized_value: Localized name. + :type localized_value: str + """ + + _attribute_map = { + 'value': {'key': 'value', 'type': 'str'}, + 'localized_value': {'key': 'localizedValue', 'type': 'str'}, + } + + def __init__(self, *, value: str=None, localized_value: str=None, **kwargs) -> None: + super(LocalizableString, self).__init__(**kwargs) + self.value = value + self.localized_value = localized_value 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 4e33e830ae33..3b89a39c5cc1 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 @@ -38,8 +38,8 @@ class ManagedServiceIdentity(Model): 'principal_id': {'key': 'principalId', 'type': 'str'}, } - def __init__(self, type=None): - super(ManagedServiceIdentity, self).__init__() - self.type = type + def __init__(self, **kwargs): + super(ManagedServiceIdentity, self).__init__(**kwargs) + self.type = kwargs.get('type', None) self.tenant_id = None self.principal_id = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/managed_service_identity_py3.py b/azure-mgmt-web/azure/mgmt/web/models/managed_service_identity_py3.py new file mode 100644 index 000000000000..c174551d8f8f --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/managed_service_identity_py3.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 ManagedServiceIdentity(Model): + """Managed service identity. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :param type: Type of managed service identity. Possible values include: + 'SystemAssigned' + :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 + """ + + _validation = { + 'tenant_id': {'readonly': True}, + 'principal_id': {'readonly': True}, + } + + _attribute_map = { + 'type': {'key': 'type', 'type': 'str'}, + 'tenant_id': {'key': 'tenantId', 'type': 'str'}, + 'principal_id': {'key': 'principalId', 'type': 'str'}, + } + + def __init__(self, *, type=None, **kwargs) -> None: + super(ManagedServiceIdentity, self).__init__(**kwargs) + self.type = type + self.tenant_id = None + self.principal_id = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/metric_availabilily.py b/azure-mgmt-web/azure/mgmt/web/models/metric_availabilily.py index 7524fb413748..2b6ea5bbedd4 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/metric_availabilily.py +++ b/azure-mgmt-web/azure/mgmt/web/models/metric_availabilily.py @@ -26,7 +26,7 @@ class MetricAvailabilily(Model): 'retention': {'key': 'retention', 'type': 'str'}, } - def __init__(self, time_grain=None, retention=None): - super(MetricAvailabilily, self).__init__() - self.time_grain = time_grain - self.retention = retention + def __init__(self, **kwargs): + super(MetricAvailabilily, self).__init__(**kwargs) + self.time_grain = kwargs.get('time_grain', None) + self.retention = kwargs.get('retention', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/metric_availabilily_py3.py b/azure-mgmt-web/azure/mgmt/web/models/metric_availabilily_py3.py new file mode 100644 index 000000000000..1e9eb6c69e48 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/metric_availabilily_py3.py @@ -0,0 +1,32 @@ +# 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 MetricAvailabilily(Model): + """Metric availability and retention. + + :param time_grain: Time grain. + :type time_grain: str + :param retention: Retention period for the current time grain. + :type retention: str + """ + + _attribute_map = { + 'time_grain': {'key': 'timeGrain', 'type': 'str'}, + 'retention': {'key': 'retention', 'type': 'str'}, + } + + def __init__(self, *, time_grain: str=None, retention: str=None, **kwargs) -> None: + super(MetricAvailabilily, self).__init__(**kwargs) + self.time_grain = time_grain + self.retention = retention diff --git a/azure-mgmt-web/azure/mgmt/web/models/metric_availability.py b/azure-mgmt-web/azure/mgmt/web/models/metric_availability.py index 36213f96530a..895c406bbbee 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/metric_availability.py +++ b/azure-mgmt-web/azure/mgmt/web/models/metric_availability.py @@ -26,7 +26,7 @@ class MetricAvailability(Model): 'blob_duration': {'key': 'blobDuration', 'type': 'str'}, } - def __init__(self, time_grain=None, blob_duration=None): - super(MetricAvailability, self).__init__() - self.time_grain = time_grain - self.blob_duration = blob_duration + def __init__(self, **kwargs): + super(MetricAvailability, self).__init__(**kwargs) + self.time_grain = kwargs.get('time_grain', None) + self.blob_duration = kwargs.get('blob_duration', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/metric_availability_py3.py b/azure-mgmt-web/azure/mgmt/web/models/metric_availability_py3.py new file mode 100644 index 000000000000..67057c02aa1f --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/metric_availability_py3.py @@ -0,0 +1,32 @@ +# 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 MetricAvailability(Model): + """Retention policy of a resource metric. + + :param time_grain: + :type time_grain: str + :param blob_duration: + :type blob_duration: str + """ + + _attribute_map = { + 'time_grain': {'key': 'timeGrain', 'type': 'str'}, + 'blob_duration': {'key': 'blobDuration', 'type': 'str'}, + } + + def __init__(self, *, time_grain: str=None, blob_duration: str=None, **kwargs) -> None: + super(MetricAvailability, self).__init__(**kwargs) + self.time_grain = time_grain + self.blob_duration = blob_duration 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..2c9c99bbc3c7 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/metric_definition.py +++ b/azure-mgmt-web/azure/mgmt/web/models/metric_definition.py @@ -63,8 +63,8 @@ class MetricDefinition(ProxyOnlyResource): 'display_name': {'key': 'properties.displayName', 'type': 'str'}, } - def __init__(self, kind=None): - super(MetricDefinition, self).__init__(kind=kind) + def __init__(self, **kwargs): + super(MetricDefinition, self).__init__(**kwargs) self.metric_definition_name = None self.unit = None self.primary_aggregation_type = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/metric_definition_py3.py b/azure-mgmt-web/azure/mgmt/web/models/metric_definition_py3.py new file mode 100644 index 000000000000..b5cdff7d4618 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/metric_definition_py3.py @@ -0,0 +1,72 @@ +# 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_py3 import ProxyOnlyResource + + +class MetricDefinition(ProxyOnlyResource): + """Metadata for a metric. + + 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 + :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. + :vartype primary_aggregation_type: str + :ivar metric_availabilities: List of time grains supported for the metric + together with retention period. + :vartype metric_availabilities: + list[~azure.mgmt.web.models.MetricAvailabilily] + :ivar display_name: Friendly name shown in the UI. + :vartype display_name: str + """ + + _validation = { + '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}, + 'display_name': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + '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]'}, + 'display_name': {'key': 'properties.displayName', 'type': 'str'}, + } + + def __init__(self, *, kind: str=None, **kwargs) -> None: + super(MetricDefinition, self).__init__(kind=kind, **kwargs) + self.metric_definition_name = None + self.unit = None + self.primary_aggregation_type = None + self.metric_availabilities = None + self.display_name = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/metric_specification.py b/azure-mgmt-web/azure/mgmt/web/models/metric_specification.py index 5d7b06ad95cf..2238547b4a22 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/metric_specification.py +++ b/azure-mgmt-web/azure/mgmt/web/models/metric_specification.py @@ -65,20 +65,20 @@ class MetricSpecification(Model): 'availabilities': {'key': 'availabilities', 'type': '[MetricAvailability]'}, } - def __init__(self, name=None, display_name=None, display_description=None, unit=None, aggregation_type=None, supports_instance_level_aggregation=None, enable_regional_mdm_account=None, source_mdm_account=None, source_mdm_namespace=None, metric_filter_pattern=None, fill_gap_with_zero=None, is_internal=None, dimensions=None, category=None, availabilities=None): - super(MetricSpecification, self).__init__() - self.name = name - self.display_name = display_name - self.display_description = display_description - self.unit = unit - self.aggregation_type = aggregation_type - self.supports_instance_level_aggregation = supports_instance_level_aggregation - self.enable_regional_mdm_account = enable_regional_mdm_account - self.source_mdm_account = source_mdm_account - self.source_mdm_namespace = source_mdm_namespace - self.metric_filter_pattern = metric_filter_pattern - self.fill_gap_with_zero = fill_gap_with_zero - self.is_internal = is_internal - self.dimensions = dimensions - self.category = category - self.availabilities = availabilities + def __init__(self, **kwargs): + super(MetricSpecification, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.display_name = kwargs.get('display_name', None) + self.display_description = kwargs.get('display_description', None) + self.unit = kwargs.get('unit', None) + self.aggregation_type = kwargs.get('aggregation_type', None) + self.supports_instance_level_aggregation = kwargs.get('supports_instance_level_aggregation', None) + self.enable_regional_mdm_account = kwargs.get('enable_regional_mdm_account', None) + self.source_mdm_account = kwargs.get('source_mdm_account', None) + self.source_mdm_namespace = kwargs.get('source_mdm_namespace', None) + self.metric_filter_pattern = kwargs.get('metric_filter_pattern', None) + self.fill_gap_with_zero = kwargs.get('fill_gap_with_zero', None) + self.is_internal = kwargs.get('is_internal', None) + self.dimensions = kwargs.get('dimensions', None) + self.category = kwargs.get('category', None) + self.availabilities = kwargs.get('availabilities', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/metric_specification_py3.py b/azure-mgmt-web/azure/mgmt/web/models/metric_specification_py3.py new file mode 100644 index 000000000000..95e68beb7c4e --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/metric_specification_py3.py @@ -0,0 +1,84 @@ +# 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 MetricSpecification(Model): + """Definition of a single resource metric. + + :param name: + :type name: str + :param display_name: + :type display_name: str + :param display_description: + :type display_description: str + :param unit: + :type unit: str + :param aggregation_type: + :type aggregation_type: str + :param supports_instance_level_aggregation: + :type supports_instance_level_aggregation: bool + :param enable_regional_mdm_account: + :type enable_regional_mdm_account: bool + :param source_mdm_account: + :type source_mdm_account: str + :param source_mdm_namespace: + :type source_mdm_namespace: str + :param metric_filter_pattern: + :type metric_filter_pattern: str + :param fill_gap_with_zero: + :type fill_gap_with_zero: bool + :param is_internal: + :type is_internal: bool + :param dimensions: + :type dimensions: list[~azure.mgmt.web.models.Dimension] + :param category: + :type category: str + :param availabilities: + :type availabilities: list[~azure.mgmt.web.models.MetricAvailability] + """ + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'display_name': {'key': 'displayName', 'type': 'str'}, + 'display_description': {'key': 'displayDescription', 'type': 'str'}, + 'unit': {'key': 'unit', 'type': 'str'}, + 'aggregation_type': {'key': 'aggregationType', 'type': 'str'}, + 'supports_instance_level_aggregation': {'key': 'supportsInstanceLevelAggregation', 'type': 'bool'}, + 'enable_regional_mdm_account': {'key': 'enableRegionalMdmAccount', 'type': 'bool'}, + 'source_mdm_account': {'key': 'sourceMdmAccount', 'type': 'str'}, + 'source_mdm_namespace': {'key': 'sourceMdmNamespace', 'type': 'str'}, + 'metric_filter_pattern': {'key': 'metricFilterPattern', 'type': 'str'}, + 'fill_gap_with_zero': {'key': 'fillGapWithZero', 'type': 'bool'}, + 'is_internal': {'key': 'isInternal', 'type': 'bool'}, + 'dimensions': {'key': 'dimensions', 'type': '[Dimension]'}, + 'category': {'key': 'category', 'type': 'str'}, + 'availabilities': {'key': 'availabilities', 'type': '[MetricAvailability]'}, + } + + def __init__(self, *, name: str=None, display_name: str=None, display_description: str=None, unit: str=None, aggregation_type: str=None, supports_instance_level_aggregation: bool=None, enable_regional_mdm_account: bool=None, source_mdm_account: str=None, source_mdm_namespace: str=None, metric_filter_pattern: str=None, fill_gap_with_zero: bool=None, is_internal: bool=None, dimensions=None, category: str=None, availabilities=None, **kwargs) -> None: + super(MetricSpecification, self).__init__(**kwargs) + self.name = name + self.display_name = display_name + self.display_description = display_description + self.unit = unit + self.aggregation_type = aggregation_type + self.supports_instance_level_aggregation = supports_instance_level_aggregation + self.enable_regional_mdm_account = enable_regional_mdm_account + self.source_mdm_account = source_mdm_account + self.source_mdm_namespace = source_mdm_namespace + self.metric_filter_pattern = metric_filter_pattern + self.fill_gap_with_zero = fill_gap_with_zero + self.is_internal = is_internal + self.dimensions = dimensions + self.category = category + self.availabilities = availabilities diff --git a/azure-mgmt-web/azure/mgmt/web/models/migrate_my_sql_request.py b/azure-mgmt-web/azure/mgmt/web/models/migrate_my_sql_request.py index b9a98043e997..92a54e815858 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/migrate_my_sql_request.py +++ b/azure-mgmt-web/azure/mgmt/web/models/migrate_my_sql_request.py @@ -18,6 +18,8 @@ class MigrateMySqlRequest(ProxyOnlyResource): Variables are only populated by the server, and will be ignored when sending a request. + All required parameters must be populated in order to send to Azure. + :ivar id: Resource Id. :vartype id: str :ivar name: Resource Name. @@ -26,10 +28,11 @@ class MigrateMySqlRequest(ProxyOnlyResource): :type kind: str :ivar type: Resource type. :vartype type: str - :param connection_string: Connection string to the remote MySQL database. + :param connection_string: Required. Connection string to the remote MySQL + database. :type connection_string: str - :param migration_type: The type of migration operation to be done. - Possible values include: 'LocalToRemote', 'RemoteToLocal' + :param migration_type: Required. The type of migration operation to be + done. Possible values include: 'LocalToRemote', 'RemoteToLocal' :type migration_type: str or ~azure.mgmt.web.models.MySqlMigrationType """ @@ -50,7 +53,7 @@ class MigrateMySqlRequest(ProxyOnlyResource): 'migration_type': {'key': 'properties.migrationType', 'type': 'MySqlMigrationType'}, } - def __init__(self, connection_string, migration_type, kind=None): - super(MigrateMySqlRequest, self).__init__(kind=kind) - self.connection_string = connection_string - self.migration_type = migration_type + def __init__(self, **kwargs): + super(MigrateMySqlRequest, self).__init__(**kwargs) + self.connection_string = kwargs.get('connection_string', None) + self.migration_type = kwargs.get('migration_type', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/migrate_my_sql_request_py3.py b/azure-mgmt-web/azure/mgmt/web/models/migrate_my_sql_request_py3.py new file mode 100644 index 000000000000..6b0f07c19f7e --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/migrate_my_sql_request_py3.py @@ -0,0 +1,59 @@ +# 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_py3 import ProxyOnlyResource + + +class MigrateMySqlRequest(ProxyOnlyResource): + """MySQL migration request. + + Variables are only populated by the server, and will be ignored when + sending a request. + + All required parameters must be populated in order to send to Azure. + + :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 connection_string: Required. Connection string to the remote MySQL + database. + :type connection_string: str + :param migration_type: Required. The type of migration operation to be + done. Possible values include: 'LocalToRemote', 'RemoteToLocal' + :type migration_type: str or ~azure.mgmt.web.models.MySqlMigrationType + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'connection_string': {'required': True}, + 'migration_type': {'required': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'connection_string': {'key': 'properties.connectionString', 'type': 'str'}, + 'migration_type': {'key': 'properties.migrationType', 'type': 'MySqlMigrationType'}, + } + + def __init__(self, *, connection_string: str, migration_type, kind: str=None, **kwargs) -> None: + super(MigrateMySqlRequest, self).__init__(kind=kind, **kwargs) + self.connection_string = connection_string + self.migration_type = migration_type diff --git a/azure-mgmt-web/azure/mgmt/web/models/migrate_my_sql_status.py b/azure-mgmt-web/azure/mgmt/web/models/migrate_my_sql_status.py index e0842f2b4f33..9970ba240603 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/migrate_my_sql_status.py +++ b/azure-mgmt-web/azure/mgmt/web/models/migrate_my_sql_status.py @@ -55,8 +55,8 @@ class MigrateMySqlStatus(ProxyOnlyResource): 'local_my_sql_enabled': {'key': 'properties.localMySqlEnabled', 'type': 'bool'}, } - def __init__(self, kind=None): - super(MigrateMySqlStatus, self).__init__(kind=kind) + def __init__(self, **kwargs): + super(MigrateMySqlStatus, self).__init__(**kwargs) self.migration_operation_status = None self.operation_id = None self.local_my_sql_enabled = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/migrate_my_sql_status_py3.py b/azure-mgmt-web/azure/mgmt/web/models/migrate_my_sql_status_py3.py new file mode 100644 index 000000000000..e35882fcd27d --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/migrate_my_sql_status_py3.py @@ -0,0 +1,62 @@ +# 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_py3 import ProxyOnlyResource + + +class MigrateMySqlStatus(ProxyOnlyResource): + """MySQL migration status. + + 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 + :ivar migration_operation_status: Status of the migration task. Possible + values include: 'InProgress', 'Failed', 'Succeeded', 'TimedOut', 'Created' + :vartype migration_operation_status: str or + ~azure.mgmt.web.models.OperationStatus + :ivar operation_id: Operation ID for the migration task. + :vartype operation_id: str + :ivar local_my_sql_enabled: True if the web app has in app MySql enabled + :vartype local_my_sql_enabled: bool + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'migration_operation_status': {'readonly': True}, + 'operation_id': {'readonly': True}, + 'local_my_sql_enabled': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'migration_operation_status': {'key': 'properties.migrationOperationStatus', 'type': 'OperationStatus'}, + 'operation_id': {'key': 'properties.operationId', 'type': 'str'}, + 'local_my_sql_enabled': {'key': 'properties.localMySqlEnabled', 'type': 'bool'}, + } + + def __init__(self, *, kind: str=None, **kwargs) -> None: + super(MigrateMySqlStatus, self).__init__(kind=kind, **kwargs) + self.migration_operation_status = None + self.operation_id = None + self.local_my_sql_enabled = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/ms_deploy.py b/azure-mgmt-web/azure/mgmt/web/models/ms_deploy.py index 28c4c4594ebd..1a481f2596fc 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/ms_deploy.py +++ b/azure-mgmt-web/azure/mgmt/web/models/ms_deploy.py @@ -72,12 +72,12 @@ class MSDeploy(ProxyOnlyResource): 'app_offline': {'key': 'properties.appOffline', 'type': 'bool'}, } - def __init__(self, kind=None, package_uri=None, connection_string=None, db_type=None, set_parameters_xml_file_uri=None, set_parameters=None, skip_app_data=None, app_offline=None): - super(MSDeploy, self).__init__(kind=kind) - self.package_uri = package_uri - self.connection_string = connection_string - self.db_type = db_type - self.set_parameters_xml_file_uri = set_parameters_xml_file_uri - self.set_parameters = set_parameters - self.skip_app_data = skip_app_data - self.app_offline = app_offline + def __init__(self, **kwargs): + super(MSDeploy, self).__init__(**kwargs) + self.package_uri = kwargs.get('package_uri', None) + self.connection_string = kwargs.get('connection_string', None) + self.db_type = kwargs.get('db_type', None) + self.set_parameters_xml_file_uri = kwargs.get('set_parameters_xml_file_uri', None) + self.set_parameters = kwargs.get('set_parameters', None) + self.skip_app_data = kwargs.get('skip_app_data', None) + self.app_offline = kwargs.get('app_offline', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/ms_deploy_log.py b/azure-mgmt-web/azure/mgmt/web/models/ms_deploy_log.py index df7088ddf559..59b147b5285f 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/ms_deploy_log.py +++ b/azure-mgmt-web/azure/mgmt/web/models/ms_deploy_log.py @@ -45,6 +45,6 @@ class MSDeployLog(ProxyOnlyResource): 'entries': {'key': 'properties.entries', 'type': '[MSDeployLogEntry]'}, } - def __init__(self, kind=None): - super(MSDeployLog, self).__init__(kind=kind) + def __init__(self, **kwargs): + super(MSDeployLog, self).__init__(**kwargs) self.entries = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/ms_deploy_log_entry.py b/azure-mgmt-web/azure/mgmt/web/models/ms_deploy_log_entry.py index 8037d67f531d..0995ed12ee4a 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/ms_deploy_log_entry.py +++ b/azure-mgmt-web/azure/mgmt/web/models/ms_deploy_log_entry.py @@ -39,8 +39,8 @@ class MSDeployLogEntry(Model): 'message': {'key': 'message', 'type': 'str'}, } - def __init__(self): - super(MSDeployLogEntry, self).__init__() + def __init__(self, **kwargs): + super(MSDeployLogEntry, self).__init__(**kwargs) self.time = None self.type = None self.message = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/ms_deploy_log_entry_py3.py b/azure-mgmt-web/azure/mgmt/web/models/ms_deploy_log_entry_py3.py new file mode 100644 index 000000000000..5b45f11a6cbb --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/ms_deploy_log_entry_py3.py @@ -0,0 +1,46 @@ +# 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 MSDeployLogEntry(Model): + """MSDeploy log entry. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar time: Timestamp of log entry + :vartype time: datetime + :ivar type: Log entry type. Possible values include: 'Message', 'Warning', + 'Error' + :vartype type: str or ~azure.mgmt.web.models.MSDeployLogEntryType + :ivar message: Log entry message + :vartype message: str + """ + + _validation = { + 'time': {'readonly': True}, + 'type': {'readonly': True}, + 'message': {'readonly': True}, + } + + _attribute_map = { + 'time': {'key': 'time', 'type': 'iso-8601'}, + 'type': {'key': 'type', 'type': 'MSDeployLogEntryType'}, + 'message': {'key': 'message', 'type': 'str'}, + } + + def __init__(self, **kwargs) -> None: + super(MSDeployLogEntry, self).__init__(**kwargs) + self.time = None + self.type = None + self.message = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/ms_deploy_log_py3.py b/azure-mgmt-web/azure/mgmt/web/models/ms_deploy_log_py3.py new file mode 100644 index 000000000000..9a087a46e372 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/ms_deploy_log_py3.py @@ -0,0 +1,50 @@ +# 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_py3 import ProxyOnlyResource + + +class MSDeployLog(ProxyOnlyResource): + """MSDeploy log. + + 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 + :ivar entries: List of log entry messages + :vartype entries: list[~azure.mgmt.web.models.MSDeployLogEntry] + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'entries': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'entries': {'key': 'properties.entries', 'type': '[MSDeployLogEntry]'}, + } + + def __init__(self, *, kind: str=None, **kwargs) -> None: + super(MSDeployLog, self).__init__(kind=kind, **kwargs) + self.entries = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/ms_deploy_py3.py b/azure-mgmt-web/azure/mgmt/web/models/ms_deploy_py3.py new file mode 100644 index 000000000000..13c3a742dc66 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/ms_deploy_py3.py @@ -0,0 +1,83 @@ +# 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_py3 import ProxyOnlyResource + + +class MSDeploy(ProxyOnlyResource): + """MSDeploy ARM PUT information. + + 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 package_uri: Package URI + :type package_uri: str + :param connection_string: SQL Connection String + :type connection_string: str + :param db_type: Database Type + :type db_type: str + :param set_parameters_xml_file_uri: URI of MSDeploy Parameters file. Must + not be set if SetParameters is used. + :type set_parameters_xml_file_uri: str + :param set_parameters: MSDeploy Parameters. Must not be set if + SetParametersXmlFileUri is used. + :type set_parameters: dict[str, str] + :param skip_app_data: Controls whether the MSDeploy operation skips the + App_Data directory. + If set to true, the existing App_Data directory on the + destination + will not be deleted, and any App_Data directory in the source will be + ignored. + Setting is false by default. + :type skip_app_data: bool + :param app_offline: Sets the AppOffline rule while the MSDeploy operation + executes. + Setting is false by default. + :type app_offline: bool + """ + + _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'}, + 'package_uri': {'key': 'properties.packageUri', 'type': 'str'}, + 'connection_string': {'key': 'properties.connectionString', 'type': 'str'}, + 'db_type': {'key': 'properties.dbType', 'type': 'str'}, + 'set_parameters_xml_file_uri': {'key': 'properties.setParametersXmlFileUri', 'type': 'str'}, + 'set_parameters': {'key': 'properties.setParameters', 'type': '{str}'}, + 'skip_app_data': {'key': 'properties.skipAppData', 'type': 'bool'}, + 'app_offline': {'key': 'properties.appOffline', 'type': 'bool'}, + } + + def __init__(self, *, kind: str=None, package_uri: str=None, connection_string: str=None, db_type: str=None, set_parameters_xml_file_uri: str=None, set_parameters=None, skip_app_data: bool=None, app_offline: bool=None, **kwargs) -> None: + super(MSDeploy, self).__init__(kind=kind, **kwargs) + self.package_uri = package_uri + self.connection_string = connection_string + self.db_type = db_type + self.set_parameters_xml_file_uri = set_parameters_xml_file_uri + self.set_parameters = set_parameters + self.skip_app_data = skip_app_data + self.app_offline = app_offline diff --git a/azure-mgmt-web/azure/mgmt/web/models/ms_deploy_status.py b/azure-mgmt-web/azure/mgmt/web/models/ms_deploy_status.py index d18f357a754d..eecea2c691af 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/ms_deploy_status.py +++ b/azure-mgmt-web/azure/mgmt/web/models/ms_deploy_status.py @@ -63,8 +63,8 @@ class MSDeployStatus(ProxyOnlyResource): 'complete': {'key': 'properties.complete', 'type': 'bool'}, } - def __init__(self, kind=None): - super(MSDeployStatus, self).__init__(kind=kind) + def __init__(self, **kwargs): + super(MSDeployStatus, self).__init__(**kwargs) self.deployer = None self.provisioning_state = None self.start_time = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/ms_deploy_status_py3.py b/azure-mgmt-web/azure/mgmt/web/models/ms_deploy_status_py3.py new file mode 100644 index 000000000000..5a45d0afa408 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/ms_deploy_status_py3.py @@ -0,0 +1,72 @@ +# 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_py3 import ProxyOnlyResource + + +class MSDeployStatus(ProxyOnlyResource): + """MSDeploy ARM response. + + 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 + :ivar deployer: Username of deployer + :vartype deployer: str + :ivar provisioning_state: Provisioning state. Possible values include: + 'accepted', 'running', 'succeeded', 'failed', 'canceled' + :vartype provisioning_state: str or + ~azure.mgmt.web.models.MSDeployProvisioningState + :ivar start_time: Start time of deploy operation + :vartype start_time: datetime + :ivar end_time: End time of deploy operation + :vartype end_time: datetime + :ivar complete: Whether the deployment operation has completed + :vartype complete: bool + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'deployer': {'readonly': True}, + 'provisioning_state': {'readonly': True}, + 'start_time': {'readonly': True}, + 'end_time': {'readonly': True}, + 'complete': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'deployer': {'key': 'properties.deployer', 'type': 'str'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'MSDeployProvisioningState'}, + 'start_time': {'key': 'properties.startTime', 'type': 'iso-8601'}, + 'end_time': {'key': 'properties.endTime', 'type': 'iso-8601'}, + 'complete': {'key': 'properties.complete', 'type': 'bool'}, + } + + def __init__(self, *, kind: str=None, **kwargs) -> None: + super(MSDeployStatus, self).__init__(kind=kind, **kwargs) + self.deployer = None + self.provisioning_state = None + self.start_time = None + self.end_time = None + self.complete = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/name_identifier.py b/azure-mgmt-web/azure/mgmt/web/models/name_identifier.py index e539125ff5d2..cfc47d475f44 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/name_identifier.py +++ b/azure-mgmt-web/azure/mgmt/web/models/name_identifier.py @@ -23,6 +23,6 @@ class NameIdentifier(Model): 'name': {'key': 'name', 'type': 'str'}, } - def __init__(self, name=None): - super(NameIdentifier, self).__init__() - self.name = name + def __init__(self, **kwargs): + super(NameIdentifier, self).__init__(**kwargs) + self.name = kwargs.get('name', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/name_identifier_py3.py b/azure-mgmt-web/azure/mgmt/web/models/name_identifier_py3.py new file mode 100644 index 000000000000..5eb7d2fa73f1 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/name_identifier_py3.py @@ -0,0 +1,28 @@ +# 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 NameIdentifier(Model): + """Identifies an object. + + :param name: Name of the object. + :type name: str + """ + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + } + + def __init__(self, *, name: str=None, **kwargs) -> None: + super(NameIdentifier, self).__init__(**kwargs) + self.name = name diff --git a/azure-mgmt-web/azure/mgmt/web/models/name_value_pair.py b/azure-mgmt-web/azure/mgmt/web/models/name_value_pair.py index 649b62089621..c199f066bb33 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/name_value_pair.py +++ b/azure-mgmt-web/azure/mgmt/web/models/name_value_pair.py @@ -26,7 +26,7 @@ class NameValuePair(Model): 'value': {'key': 'value', 'type': 'str'}, } - def __init__(self, name=None, value=None): - super(NameValuePair, self).__init__() - self.name = name - self.value = value + def __init__(self, **kwargs): + super(NameValuePair, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.value = kwargs.get('value', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/name_value_pair_py3.py b/azure-mgmt-web/azure/mgmt/web/models/name_value_pair_py3.py new file mode 100644 index 000000000000..5c5ff6300715 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/name_value_pair_py3.py @@ -0,0 +1,32 @@ +# 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 NameValuePair(Model): + """Name value pair. + + :param name: Pair name. + :type name: str + :param value: Pair value. + :type value: str + """ + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'value': {'key': 'value', 'type': 'str'}, + } + + def __init__(self, *, name: str=None, value: str=None, **kwargs) -> None: + super(NameValuePair, self).__init__(**kwargs) + self.name = name + self.value = value diff --git a/azure-mgmt-web/azure/mgmt/web/models/network_access_control_entry.py b/azure-mgmt-web/azure/mgmt/web/models/network_access_control_entry.py index d6688e09ad4e..2a0409421970 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/network_access_control_entry.py +++ b/azure-mgmt-web/azure/mgmt/web/models/network_access_control_entry.py @@ -32,9 +32,9 @@ class NetworkAccessControlEntry(Model): 'remote_subnet': {'key': 'remoteSubnet', 'type': 'str'}, } - def __init__(self, action=None, description=None, order=None, remote_subnet=None): - super(NetworkAccessControlEntry, self).__init__() - self.action = action - self.description = description - self.order = order - self.remote_subnet = remote_subnet + def __init__(self, **kwargs): + super(NetworkAccessControlEntry, self).__init__(**kwargs) + self.action = kwargs.get('action', None) + self.description = kwargs.get('description', None) + self.order = kwargs.get('order', None) + self.remote_subnet = kwargs.get('remote_subnet', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/network_access_control_entry_py3.py b/azure-mgmt-web/azure/mgmt/web/models/network_access_control_entry_py3.py new file mode 100644 index 000000000000..7bec93865b8a --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/network_access_control_entry_py3.py @@ -0,0 +1,40 @@ +# 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 NetworkAccessControlEntry(Model): + """Network access control entry. + + :param action: Action object. Possible values include: 'Permit', 'Deny' + :type action: str or ~azure.mgmt.web.models.AccessControlEntryAction + :param description: Description of network access control entry. + :type description: str + :param order: Order of precedence. + :type order: int + :param remote_subnet: Remote subnet. + :type remote_subnet: str + """ + + _attribute_map = { + 'action': {'key': 'action', 'type': 'AccessControlEntryAction'}, + 'description': {'key': 'description', 'type': 'str'}, + 'order': {'key': 'order', 'type': 'int'}, + 'remote_subnet': {'key': 'remoteSubnet', 'type': 'str'}, + } + + def __init__(self, *, action=None, description: str=None, order: int=None, remote_subnet: str=None, **kwargs) -> None: + super(NetworkAccessControlEntry, self).__init__(**kwargs) + self.action = action + self.description = description + self.order = order + self.remote_subnet = remote_subnet diff --git a/azure-mgmt-web/azure/mgmt/web/models/network_features.py b/azure-mgmt-web/azure/mgmt/web/models/network_features.py index 332bde6a2de7..9e6e0472f730 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/network_features.py +++ b/azure-mgmt-web/azure/mgmt/web/models/network_features.py @@ -60,8 +60,8 @@ class NetworkFeatures(ProxyOnlyResource): 'hybrid_connections_v2': {'key': 'properties.hybridConnectionsV2', 'type': '[HybridConnection]'}, } - def __init__(self, kind=None): - super(NetworkFeatures, self).__init__(kind=kind) + def __init__(self, **kwargs): + super(NetworkFeatures, self).__init__(**kwargs) self.virtual_network_name = None self.virtual_network_connection = None self.hybrid_connections = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/network_features_py3.py b/azure-mgmt-web/azure/mgmt/web/models/network_features_py3.py new file mode 100644 index 000000000000..c5913cb9e91b --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/network_features_py3.py @@ -0,0 +1,68 @@ +# 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_py3 import ProxyOnlyResource + + +class NetworkFeatures(ProxyOnlyResource): + """Full view of network features for an app (presently VNET integration and + Hybrid Connections). + + 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 + :ivar virtual_network_name: The Virtual Network name. + :vartype virtual_network_name: str + :ivar virtual_network_connection: The Virtual Network summary view. + :vartype virtual_network_connection: ~azure.mgmt.web.models.VnetInfo + :ivar hybrid_connections: The Hybrid Connections summary view. + :vartype hybrid_connections: + list[~azure.mgmt.web.models.RelayServiceConnectionEntity] + :ivar hybrid_connections_v2: The Hybrid Connection V2 (Service Bus) view. + :vartype hybrid_connections_v2: + list[~azure.mgmt.web.models.HybridConnection] + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'virtual_network_name': {'readonly': True}, + 'virtual_network_connection': {'readonly': True}, + 'hybrid_connections': {'readonly': True}, + 'hybrid_connections_v2': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'virtual_network_name': {'key': 'properties.virtualNetworkName', 'type': 'str'}, + 'virtual_network_connection': {'key': 'properties.virtualNetworkConnection', 'type': 'VnetInfo'}, + 'hybrid_connections': {'key': 'properties.hybridConnections', 'type': '[RelayServiceConnectionEntity]'}, + 'hybrid_connections_v2': {'key': 'properties.hybridConnectionsV2', 'type': '[HybridConnection]'}, + } + + def __init__(self, *, kind: str=None, **kwargs) -> None: + super(NetworkFeatures, self).__init__(kind=kind, **kwargs) + self.virtual_network_name = None + self.virtual_network_connection = None + self.hybrid_connections = None + self.hybrid_connections_v2 = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/operation.py b/azure-mgmt-web/azure/mgmt/web/models/operation.py index 36d0e4253d22..4decbf424068 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/operation.py +++ b/azure-mgmt-web/azure/mgmt/web/models/operation.py @@ -45,13 +45,13 @@ class Operation(Model): 'geo_master_operation_id': {'key': 'geoMasterOperationId', 'type': 'str'}, } - def __init__(self, id=None, name=None, status=None, errors=None, created_time=None, modified_time=None, expiration_time=None, geo_master_operation_id=None): - super(Operation, self).__init__() - self.id = id - self.name = name - self.status = status - self.errors = errors - self.created_time = created_time - self.modified_time = modified_time - self.expiration_time = expiration_time - self.geo_master_operation_id = geo_master_operation_id + def __init__(self, **kwargs): + super(Operation, self).__init__(**kwargs) + self.id = kwargs.get('id', None) + self.name = kwargs.get('name', None) + self.status = kwargs.get('status', None) + self.errors = kwargs.get('errors', None) + self.created_time = kwargs.get('created_time', None) + self.modified_time = kwargs.get('modified_time', None) + self.expiration_time = kwargs.get('expiration_time', None) + self.geo_master_operation_id = kwargs.get('geo_master_operation_id', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/operation_py3.py b/azure-mgmt-web/azure/mgmt/web/models/operation_py3.py new file mode 100644 index 000000000000..2c22ca4513d3 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/operation_py3.py @@ -0,0 +1,57 @@ +# 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 Operation(Model): + """An operation on a resource. + + :param id: Operation ID. + :type id: str + :param name: Operation name. + :type name: str + :param status: The current status of the operation. Possible values + include: 'InProgress', 'Failed', 'Succeeded', 'TimedOut', 'Created' + :type status: str or ~azure.mgmt.web.models.OperationStatus + :param errors: Any errors associate with the operation. + :type errors: list[~azure.mgmt.web.models.ErrorEntity] + :param created_time: Time when operation has started. + :type created_time: datetime + :param modified_time: Time when operation has been updated. + :type modified_time: datetime + :param expiration_time: Time when operation will expire. + :type expiration_time: datetime + :param geo_master_operation_id: Applicable only for stamp operation ids. + :type geo_master_operation_id: str + """ + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'status': {'key': 'status', 'type': 'OperationStatus'}, + 'errors': {'key': 'errors', 'type': '[ErrorEntity]'}, + 'created_time': {'key': 'createdTime', 'type': 'iso-8601'}, + 'modified_time': {'key': 'modifiedTime', 'type': 'iso-8601'}, + 'expiration_time': {'key': 'expirationTime', 'type': 'iso-8601'}, + 'geo_master_operation_id': {'key': 'geoMasterOperationId', 'type': 'str'}, + } + + def __init__(self, *, id: str=None, name: str=None, status=None, errors=None, created_time=None, modified_time=None, expiration_time=None, geo_master_operation_id: str=None, **kwargs) -> None: + super(Operation, self).__init__(**kwargs) + self.id = id + self.name = name + self.status = status + self.errors = errors + self.created_time = created_time + self.modified_time = modified_time + self.expiration_time = expiration_time + self.geo_master_operation_id = geo_master_operation_id diff --git a/azure-mgmt-web/azure/mgmt/web/models/perf_mon_response.py b/azure-mgmt-web/azure/mgmt/web/models/perf_mon_response.py index b3e8a5864d52..13b539362a90 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/perf_mon_response.py +++ b/azure-mgmt-web/azure/mgmt/web/models/perf_mon_response.py @@ -29,8 +29,8 @@ class PerfMonResponse(Model): 'data': {'key': 'data', 'type': 'PerfMonSet'}, } - def __init__(self, code=None, message=None, data=None): - super(PerfMonResponse, self).__init__() - self.code = code - self.message = message - self.data = data + def __init__(self, **kwargs): + super(PerfMonResponse, self).__init__(**kwargs) + self.code = kwargs.get('code', None) + self.message = kwargs.get('message', None) + self.data = kwargs.get('data', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/perf_mon_response_py3.py b/azure-mgmt-web/azure/mgmt/web/models/perf_mon_response_py3.py new file mode 100644 index 000000000000..7c4f8a6d6026 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/perf_mon_response_py3.py @@ -0,0 +1,36 @@ +# 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 PerfMonResponse(Model): + """Performance monitor API response. + + :param code: The response code. + :type code: str + :param message: The message. + :type message: str + :param data: The performance monitor counters. + :type data: ~azure.mgmt.web.models.PerfMonSet + """ + + _attribute_map = { + 'code': {'key': 'code', 'type': 'str'}, + 'message': {'key': 'message', 'type': 'str'}, + 'data': {'key': 'data', 'type': 'PerfMonSet'}, + } + + def __init__(self, *, code: str=None, message: str=None, data=None, **kwargs) -> None: + super(PerfMonResponse, self).__init__(**kwargs) + self.code = code + self.message = message + self.data = data 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..59350baef1e9 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 @@ -32,9 +32,9 @@ class PerfMonSample(Model): 'core_count': {'key': 'coreCount', 'type': 'int'}, } - def __init__(self, time=None, instance_name=None, value=None, core_count=None): - super(PerfMonSample, self).__init__() - self.time = time - self.instance_name = instance_name - self.value = value - self.core_count = core_count + def __init__(self, **kwargs): + super(PerfMonSample, self).__init__(**kwargs) + self.time = kwargs.get('time', None) + self.instance_name = kwargs.get('instance_name', None) + self.value = kwargs.get('value', None) + self.core_count = kwargs.get('core_count', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/perf_mon_sample_py3.py b/azure-mgmt-web/azure/mgmt/web/models/perf_mon_sample_py3.py new file mode 100644 index 000000000000..ecd677f263f1 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/perf_mon_sample_py3.py @@ -0,0 +1,40 @@ +# 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 PerfMonSample(Model): + """Performance monitor sample in a set. + + :param time: Point in time for which counter was measured. + :type time: datetime + :param instance_name: Name of the server on which the measurement is made. + :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: str=None, value: float=None, core_count: int=None, **kwargs) -> None: + super(PerfMonSample, self).__init__(**kwargs) + 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/perf_mon_set.py b/azure-mgmt-web/azure/mgmt/web/models/perf_mon_set.py index 6325d0cf6cfd..dc21bb4f164a 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/perf_mon_set.py +++ b/azure-mgmt-web/azure/mgmt/web/models/perf_mon_set.py @@ -35,10 +35,10 @@ class PerfMonSet(Model): 'values': {'key': 'values', 'type': '[PerfMonSample]'}, } - def __init__(self, name=None, start_time=None, end_time=None, time_grain=None, values=None): - super(PerfMonSet, self).__init__() - self.name = name - self.start_time = start_time - self.end_time = end_time - self.time_grain = time_grain - self.values = values + def __init__(self, **kwargs): + super(PerfMonSet, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.start_time = kwargs.get('start_time', None) + self.end_time = kwargs.get('end_time', None) + self.time_grain = kwargs.get('time_grain', None) + self.values = kwargs.get('values', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/perf_mon_set_py3.py b/azure-mgmt-web/azure/mgmt/web/models/perf_mon_set_py3.py new file mode 100644 index 000000000000..18e840f54568 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/perf_mon_set_py3.py @@ -0,0 +1,44 @@ +# 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 PerfMonSet(Model): + """Metric information. + + :param name: Unique key name of the counter. + :type name: str + :param start_time: Start time of the period. + :type start_time: datetime + :param end_time: End time of the period. + :type end_time: datetime + :param time_grain: Presented time grain. + :type time_grain: str + :param values: Collection of workers that are active during this time. + :type values: list[~azure.mgmt.web.models.PerfMonSample] + """ + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'start_time': {'key': 'startTime', 'type': 'iso-8601'}, + 'end_time': {'key': 'endTime', 'type': 'iso-8601'}, + 'time_grain': {'key': 'timeGrain', 'type': 'str'}, + 'values': {'key': 'values', 'type': '[PerfMonSample]'}, + } + + def __init__(self, *, name: str=None, start_time=None, end_time=None, time_grain: str=None, values=None, **kwargs) -> None: + super(PerfMonSet, self).__init__(**kwargs) + self.name = name + self.start_time = start_time + self.end_time = end_time + self.time_grain = time_grain + self.values = values 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..443ae16d40e1 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 @@ -18,13 +18,15 @@ class PremierAddOn(Resource): Variables are only populated by the server, and will be ignored when sending a request. + All required parameters must be populated in order to send to Azure. + :ivar id: Resource Id. :vartype id: str :ivar name: Resource Name. :vartype name: str :param kind: Kind of resource. :type kind: str - :param location: Resource Location. + :param location: Required. Resource Location. :type location: str :ivar type: Resource type. :vartype type: str @@ -72,13 +74,13 @@ class PremierAddOn(Resource): '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): - 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 + def __init__(self, **kwargs): + super(PremierAddOn, self).__init__(**kwargs) + self.sku = kwargs.get('sku', None) + self.product = kwargs.get('product', None) + self.vendor = kwargs.get('vendor', None) + self.premier_add_on_name = kwargs.get('premier_add_on_name', None) + self.premier_add_on_location = kwargs.get('premier_add_on_location', None) + self.premier_add_on_tags = kwargs.get('premier_add_on_tags', None) + self.marketplace_publisher = kwargs.get('marketplace_publisher', None) + self.marketplace_offer = kwargs.get('marketplace_offer', None) 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..cbd4e54f5a91 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 @@ -78,16 +78,16 @@ 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): - 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 - self.privacy_policy_url = privacy_policy_url - self.legal_terms_url = legal_terms_url - self.marketplace_publisher = marketplace_publisher - self.marketplace_offer = marketplace_offer + def __init__(self, **kwargs): + super(PremierAddOnOffer, self).__init__(**kwargs) + self.sku = kwargs.get('sku', None) + self.product = kwargs.get('product', None) + self.vendor = kwargs.get('vendor', None) + self.premier_add_on_offer_name = kwargs.get('premier_add_on_offer_name', None) + self.promo_code_required = kwargs.get('promo_code_required', None) + self.quota = kwargs.get('quota', None) + self.web_hosting_plan_restrictions = kwargs.get('web_hosting_plan_restrictions', None) + self.privacy_policy_url = kwargs.get('privacy_policy_url', None) + self.legal_terms_url = kwargs.get('legal_terms_url', None) + self.marketplace_publisher = kwargs.get('marketplace_publisher', None) + self.marketplace_offer = kwargs.get('marketplace_offer', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/premier_add_on_offer_py3.py b/azure-mgmt-web/azure/mgmt/web/models/premier_add_on_offer_py3.py new file mode 100644 index 000000000000..277e9f04c4b9 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/premier_add_on_offer_py3.py @@ -0,0 +1,93 @@ +# 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_py3 import ProxyOnlyResource + + +class PremierAddOnOffer(ProxyOnlyResource): + """Premier add-on offer. + + 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 sku: Premier add on SKU. + :type sku: str + :param product: Premier add on offer Product. + :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 + :param quota: Premier add on offer Quota. + :type quota: int + :param web_hosting_plan_restrictions: App Service plans this offer is + restricted to. Possible values include: 'None', 'Free', 'Shared', 'Basic', + 'Standard', 'Premium' + :type web_hosting_plan_restrictions: str or + ~azure.mgmt.web.models.AppServicePlanRestrictions + :param privacy_policy_url: Privacy policy URL. + :type privacy_policy_url: str + :param legal_terms_url: Legal terms URL. + :type legal_terms_url: str + :param marketplace_publisher: Marketplace publisher. + :type marketplace_publisher: str + :param marketplace_offer: Marketplace offer. + :type marketplace_offer: 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'}, + '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'}, + 'privacy_policy_url': {'key': 'properties.privacyPolicyUrl', 'type': 'str'}, + 'legal_terms_url': {'key': 'properties.legalTermsUrl', 'type': 'str'}, + 'marketplace_publisher': {'key': 'properties.marketplacePublisher', 'type': 'str'}, + 'marketplace_offer': {'key': 'properties.marketplaceOffer', 'type': 'str'}, + } + + def __init__(self, *, kind: str=None, sku: str=None, product: str=None, vendor: str=None, premier_add_on_offer_name: str=None, promo_code_required: bool=None, quota: int=None, web_hosting_plan_restrictions=None, privacy_policy_url: str=None, legal_terms_url: str=None, marketplace_publisher: str=None, marketplace_offer: str=None, **kwargs) -> None: + super(PremierAddOnOffer, self).__init__(kind=kind, **kwargs) + 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 + self.privacy_policy_url = privacy_policy_url + self.legal_terms_url = legal_terms_url + self.marketplace_publisher = marketplace_publisher + self.marketplace_offer = marketplace_offer diff --git a/azure-mgmt-web/azure/mgmt/web/models/premier_add_on_py3.py b/azure-mgmt-web/azure/mgmt/web/models/premier_add_on_py3.py new file mode 100644 index 000000000000..fa6aceeea48c --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/premier_add_on_py3.py @@ -0,0 +1,86 @@ +# 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 .resource_py3 import Resource + + +class PremierAddOn(Resource): + """Premier add-on. + + Variables are only populated by the server, and will be ignored when + sending a request. + + All required parameters must be populated in order to send to Azure. + + :ivar id: Resource Id. + :vartype id: str + :ivar name: Resource Name. + :vartype name: str + :param kind: Kind of resource. + :type kind: str + :param location: Required. Resource Location. + :type location: str + :ivar type: Resource type. + :vartype type: str + :param tags: Resource tags. + :type tags: dict[str, str] + :param sku: Premier add on SKU. + :type sku: str + :param product: Premier add on Product. + :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. + :type marketplace_offer: str + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'location': {'required': True}, + 'type': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'location': {'key': 'location', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, + '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: str, kind: str=None, tags=None, sku: str=None, product: str=None, vendor: str=None, premier_add_on_name: str=None, premier_add_on_location: str=None, premier_add_on_tags=None, marketplace_publisher: str=None, marketplace_offer: str=None, **kwargs) -> None: + super(PremierAddOn, self).__init__(kind=kind, location=location, tags=tags, **kwargs) + 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/process_info.py b/azure-mgmt-web/azure/mgmt/web/models/process_info.py index ac9316ca7fb6..51cdae331682 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/process_info.py +++ b/azure-mgmt-web/azure/mgmt/web/models/process_info.py @@ -149,41 +149,41 @@ class ProcessInfo(ProxyOnlyResource): '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): - super(ProcessInfo, self).__init__(kind=kind) - self.process_info_id = process_info_id - self.process_info_name = process_info_name - self.href = href - self.mini_dump = mini_dump - 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 - self.parent = parent - self.children = children - self.threads = threads - self.open_file_handles = open_file_handles - self.modules = modules - self.file_name = file_name - self.command_line = command_line - self.user_name = user_name - self.handle_count = handle_count - 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.time_stamp = time_stamp - self.environment_variables = environment_variables - self.is_scm_site = is_scm_site - self.is_web_job = is_web_job - self.description = description + def __init__(self, **kwargs): + super(ProcessInfo, self).__init__(**kwargs) + self.process_info_id = kwargs.get('process_info_id', None) + self.process_info_name = kwargs.get('process_info_name', None) + self.href = kwargs.get('href', None) + self.mini_dump = kwargs.get('mini_dump', None) + self.is_profile_running = kwargs.get('is_profile_running', None) + self.is_iis_profile_running = kwargs.get('is_iis_profile_running', None) + self.iis_profile_timeout_in_seconds = kwargs.get('iis_profile_timeout_in_seconds', None) + self.parent = kwargs.get('parent', None) + self.children = kwargs.get('children', None) + self.threads = kwargs.get('threads', None) + self.open_file_handles = kwargs.get('open_file_handles', None) + self.modules = kwargs.get('modules', None) + self.file_name = kwargs.get('file_name', None) + self.command_line = kwargs.get('command_line', None) + self.user_name = kwargs.get('user_name', None) + self.handle_count = kwargs.get('handle_count', None) + self.module_count = kwargs.get('module_count', None) + self.thread_count = kwargs.get('thread_count', None) + self.start_time = kwargs.get('start_time', None) + self.total_processor_time = kwargs.get('total_processor_time', None) + self.user_processor_time = kwargs.get('user_processor_time', None) + self.privileged_processor_time = kwargs.get('privileged_processor_time', None) + self.working_set64 = kwargs.get('working_set64', None) + self.peak_working_set64 = kwargs.get('peak_working_set64', None) + self.private_memory_size64 = kwargs.get('private_memory_size64', None) + self.virtual_memory_size64 = kwargs.get('virtual_memory_size64', None) + self.peak_virtual_memory_size64 = kwargs.get('peak_virtual_memory_size64', None) + self.paged_system_memory_size64 = kwargs.get('paged_system_memory_size64', None) + self.nonpaged_system_memory_size64 = kwargs.get('nonpaged_system_memory_size64', None) + self.paged_memory_size64 = kwargs.get('paged_memory_size64', None) + self.peak_paged_memory_size64 = kwargs.get('peak_paged_memory_size64', None) + self.time_stamp = kwargs.get('time_stamp', None) + self.environment_variables = kwargs.get('environment_variables', None) + self.is_scm_site = kwargs.get('is_scm_site', None) + self.is_web_job = kwargs.get('is_web_job', None) + self.description = kwargs.get('description', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/process_info_py3.py b/azure-mgmt-web/azure/mgmt/web/models/process_info_py3.py new file mode 100644 index 000000000000..5dc0bc8591c0 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/process_info_py3.py @@ -0,0 +1,189 @@ +# 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_py3 import ProxyOnlyResource + + +class ProcessInfo(ProxyOnlyResource): + """Process Information. + + 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 process_info_id: ARM Identifier for deployment. + :type process_info_id: int + :param process_info_name: Deployment name. + :type process_info_name: str + :param href: HRef URI. + :type href: str + :param mini_dump: Minidump URI. + :type mini_dump: str + :param is_profile_running: Is profile running? + :type is_profile_running: bool + :param is_iis_profile_running: Is the IIS Profile running? + :type is_iis_profile_running: bool + :param iis_profile_timeout_in_seconds: IIS Profile timeout (seconds). + :type iis_profile_timeout_in_seconds: float + :param parent: Parent process. + :type parent: str + :param children: Child process list. + :type children: list[str] + :param threads: Thread list. + :type threads: list[~azure.mgmt.web.models.ProcessThreadInfo] + :param open_file_handles: List of open files. + :type open_file_handles: list[str] + :param modules: List of modules. + :type modules: list[~azure.mgmt.web.models.ProcessModuleInfo] + :param file_name: File name of this process. + :type file_name: str + :param command_line: Command line. + :type command_line: str + :param user_name: User name. + :type user_name: str + :param handle_count: Handle count. + :type handle_count: int + :param module_count: Module count. + :type module_count: int + :param thread_count: Thread count. + :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 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 description: Description of process. + :type description: 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'}, + 'process_info_id': {'key': 'properties.id', 'type': 'int'}, + 'process_info_name': {'key': 'properties.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'}, + '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]'}, + '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'}, + 'description': {'key': 'properties.description', 'type': 'str'}, + } + + def __init__(self, *, kind: str=None, process_info_id: int=None, process_info_name: str=None, href: str=None, mini_dump: str=None, is_profile_running: bool=None, is_iis_profile_running: bool=None, iis_profile_timeout_in_seconds: float=None, parent: str=None, children=None, threads=None, open_file_handles=None, modules=None, file_name: str=None, command_line: str=None, user_name: str=None, handle_count: int=None, module_count: int=None, thread_count: int=None, start_time=None, total_processor_time: str=None, user_processor_time: str=None, privileged_processor_time: str=None, working_set64: int=None, peak_working_set64: int=None, private_memory_size64: int=None, virtual_memory_size64: int=None, peak_virtual_memory_size64: int=None, paged_system_memory_size64: int=None, nonpaged_system_memory_size64: int=None, paged_memory_size64: int=None, peak_paged_memory_size64: int=None, time_stamp=None, environment_variables=None, is_scm_site: bool=None, is_web_job: bool=None, description: str=None, **kwargs) -> None: + super(ProcessInfo, self).__init__(kind=kind, **kwargs) + self.process_info_id = process_info_id + self.process_info_name = process_info_name + self.href = href + self.mini_dump = mini_dump + 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 + self.parent = parent + self.children = children + self.threads = threads + self.open_file_handles = open_file_handles + self.modules = modules + self.file_name = file_name + self.command_line = command_line + self.user_name = user_name + self.handle_count = handle_count + 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.time_stamp = time_stamp + self.environment_variables = environment_variables + self.is_scm_site = is_scm_site + self.is_web_job = is_web_job + 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..5a53481499e7 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 @@ -75,16 +75,16 @@ class ProcessModuleInfo(ProxyOnlyResource): 'language': {'key': 'properties.language', 'type': 'str'}, } - def __init__(self, kind=None, base_address=None, file_name=None, href=None, file_path=None, module_memory_size=None, file_version=None, file_description=None, product=None, product_version=None, is_debug=None, language=None): - super(ProcessModuleInfo, self).__init__(kind=kind) - self.base_address = base_address - self.file_name = file_name - self.href = href - self.file_path = file_path - self.module_memory_size = module_memory_size - self.file_version = file_version - self.file_description = file_description - self.product = product - self.product_version = product_version - self.is_debug = is_debug - self.language = language + def __init__(self, **kwargs): + super(ProcessModuleInfo, self).__init__(**kwargs) + self.base_address = kwargs.get('base_address', None) + self.file_name = kwargs.get('file_name', None) + self.href = kwargs.get('href', None) + self.file_path = kwargs.get('file_path', None) + self.module_memory_size = kwargs.get('module_memory_size', None) + self.file_version = kwargs.get('file_version', None) + self.file_description = kwargs.get('file_description', None) + self.product = kwargs.get('product', None) + self.product_version = kwargs.get('product_version', None) + self.is_debug = kwargs.get('is_debug', None) + self.language = kwargs.get('language', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/process_module_info_py3.py b/azure-mgmt-web/azure/mgmt/web/models/process_module_info_py3.py new file mode 100644 index 000000000000..35f0cd3d9571 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/process_module_info_py3.py @@ -0,0 +1,90 @@ +# 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_py3 import ProxyOnlyResource + + +class ProcessModuleInfo(ProxyOnlyResource): + """Process Module Information. + + 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 base_address: Base address. Used as module identifier in ARM + resource URI. + :type base_address: str + :param file_name: File name. + :type file_name: str + :param href: HRef URI. + :type href: str + :param file_path: File path. + :type file_path: str + :param module_memory_size: Module memory size. + :type module_memory_size: int + :param file_version: File version. + :type file_version: str + :param file_description: File description. + :type file_description: str + :param product: Product name. + :type product: str + :param product_version: Product version. + :type product_version: str + :param is_debug: Is debug? + :type is_debug: bool + :param language: Module language (locale). + :type language: 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'}, + 'base_address': {'key': 'properties.baseAddress', 'type': 'str'}, + 'file_name': {'key': 'properties.fileName', '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'}, + 'product': {'key': 'properties.product', 'type': 'str'}, + 'product_version': {'key': 'properties.productVersion', 'type': 'str'}, + 'is_debug': {'key': 'properties.isDebug', 'type': 'bool'}, + 'language': {'key': 'properties.language', 'type': 'str'}, + } + + def __init__(self, *, kind: str=None, base_address: str=None, file_name: str=None, href: str=None, file_path: str=None, module_memory_size: int=None, file_version: str=None, file_description: str=None, product: str=None, product_version: str=None, is_debug: bool=None, language: str=None, **kwargs) -> None: + super(ProcessModuleInfo, self).__init__(kind=kind, **kwargs) + self.base_address = base_address + self.file_name = file_name + self.href = href + self.file_path = file_path + self.module_memory_size = module_memory_size + self.file_version = file_version + self.file_description = file_description + self.product = product + self.product_version = product_version + self.is_debug = is_debug + self.language = language 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..ca254312f6c1 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 @@ -80,18 +80,18 @@ class ProcessThreadInfo(ProxyOnlyResource): 'wait_reason': {'key': 'properties.waitReason', '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): - super(ProcessThreadInfo, self).__init__(kind=kind) - self.process_thread_info_id = process_thread_info_id - self.href = href - self.process = process - self.start_address = start_address - self.current_priority = current_priority - self.priority_level = priority_level - self.base_priority = base_priority - self.start_time = start_time - self.total_processor_time = total_processor_time - self.user_processor_time = user_processor_time - self.priviledged_processor_time = priviledged_processor_time - self.state = state - self.wait_reason = wait_reason + def __init__(self, **kwargs): + super(ProcessThreadInfo, self).__init__(**kwargs) + self.process_thread_info_id = kwargs.get('process_thread_info_id', None) + self.href = kwargs.get('href', None) + self.process = kwargs.get('process', None) + self.start_address = kwargs.get('start_address', None) + self.current_priority = kwargs.get('current_priority', None) + self.priority_level = kwargs.get('priority_level', None) + self.base_priority = kwargs.get('base_priority', None) + self.start_time = kwargs.get('start_time', None) + self.total_processor_time = kwargs.get('total_processor_time', None) + self.user_processor_time = kwargs.get('user_processor_time', None) + self.priviledged_processor_time = kwargs.get('priviledged_processor_time', None) + self.state = kwargs.get('state', None) + self.wait_reason = kwargs.get('wait_reason', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/process_thread_info_py3.py b/azure-mgmt-web/azure/mgmt/web/models/process_thread_info_py3.py new file mode 100644 index 000000000000..89c943f54419 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/process_thread_info_py3.py @@ -0,0 +1,97 @@ +# 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_py3 import ProxyOnlyResource + + +class ProcessThreadInfo(ProxyOnlyResource): + """Process Thread Information. + + 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 process_thread_info_id: ARM Identifier for deployment. + :type process_thread_info_id: int + :param href: HRef URI. + :type href: str + :param process: Process URI. + :type process: str + :param start_address: Start address. + :type start_address: str + :param current_priority: Current thread priority. + :type current_priority: int + :param priority_level: Thread priority level. + :type priority_level: str + :param base_priority: Base priority. + :type base_priority: int + :param start_time: Start time. + :type start_time: datetime + :param total_processor_time: Total processor time. + :type total_processor_time: str + :param user_processor_time: User processor time. + :type user_processor_time: str + :param priviledged_processor_time: Priviledged processor time. + :type priviledged_processor_time: str + :param state: Thread state. + :type state: str + :param wait_reason: Wait reason. + :type wait_reason: 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'}, + 'process_thread_info_id': {'key': 'properties.id', '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'}, + 'state': {'key': 'properties.state', 'type': 'str'}, + 'wait_reason': {'key': 'properties.waitReason', 'type': 'str'}, + } + + def __init__(self, *, kind: str=None, process_thread_info_id: int=None, href: str=None, process: str=None, start_address: str=None, current_priority: int=None, priority_level: str=None, base_priority: int=None, start_time=None, total_processor_time: str=None, user_processor_time: str=None, priviledged_processor_time: str=None, state: str=None, wait_reason: str=None, **kwargs) -> None: + super(ProcessThreadInfo, self).__init__(kind=kind, **kwargs) + self.process_thread_info_id = process_thread_info_id + self.href = href + self.process = process + self.start_address = start_address + self.current_priority = current_priority + self.priority_level = priority_level + self.base_priority = base_priority + self.start_time = start_time + self.total_processor_time = total_processor_time + self.user_processor_time = user_processor_time + self.priviledged_processor_time = priviledged_processor_time + self.state = state + self.wait_reason = wait_reason diff --git a/azure-mgmt-web/azure/mgmt/web/models/proxy_only_resource.py b/azure-mgmt-web/azure/mgmt/web/models/proxy_only_resource.py index 0a2fbf5b4f9d..88ed8c60bc89 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/proxy_only_resource.py +++ b/azure-mgmt-web/azure/mgmt/web/models/proxy_only_resource.py @@ -42,9 +42,9 @@ class ProxyOnlyResource(Model): 'type': {'key': 'type', 'type': 'str'}, } - def __init__(self, kind=None): - super(ProxyOnlyResource, self).__init__() + def __init__(self, **kwargs): + super(ProxyOnlyResource, self).__init__(**kwargs) self.id = None self.name = None - self.kind = kind + self.kind = kwargs.get('kind', None) self.type = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/proxy_only_resource_py3.py b/azure-mgmt-web/azure/mgmt/web/models/proxy_only_resource_py3.py new file mode 100644 index 000000000000..a5566fb3e5fa --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/proxy_only_resource_py3.py @@ -0,0 +1,50 @@ +# 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 ProxyOnlyResource(Model): + """Azure proxy only resource. This resource is not tracked by Azure Resource + Manager. + + 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 + """ + + _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'}, + } + + def __init__(self, *, kind: str=None, **kwargs) -> None: + super(ProxyOnlyResource, self).__init__(**kwargs) + self.id = None + self.name = None + self.kind = kind + self.type = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/public_certificate.py b/azure-mgmt-web/azure/mgmt/web/models/public_certificate.py index d58a48285391..effb23e18695 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/public_certificate.py +++ b/azure-mgmt-web/azure/mgmt/web/models/public_certificate.py @@ -53,8 +53,8 @@ class PublicCertificate(ProxyOnlyResource): 'thumbprint': {'key': 'properties.thumbprint', 'type': 'str'}, } - def __init__(self, kind=None, blob=None, public_certificate_location=None): - super(PublicCertificate, self).__init__(kind=kind) - self.blob = blob - self.public_certificate_location = public_certificate_location + def __init__(self, **kwargs): + super(PublicCertificate, self).__init__(**kwargs) + self.blob = kwargs.get('blob', None) + self.public_certificate_location = kwargs.get('public_certificate_location', None) self.thumbprint = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/public_certificate_py3.py b/azure-mgmt-web/azure/mgmt/web/models/public_certificate_py3.py new file mode 100644 index 000000000000..1f12e72350ee --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/public_certificate_py3.py @@ -0,0 +1,60 @@ +# 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_py3 import ProxyOnlyResource + + +class PublicCertificate(ProxyOnlyResource): + """Public certificate object. + + 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 blob: Public Certificate byte array + :type blob: bytearray + :param public_certificate_location: Public Certificate Location. Possible + values include: 'CurrentUserMy', 'LocalMachineMy', 'Unknown' + :type public_certificate_location: str or + ~azure.mgmt.web.models.PublicCertificateLocation + :ivar thumbprint: Certificate Thumbprint + :vartype thumbprint: str + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'thumbprint': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'blob': {'key': 'properties.blob', 'type': 'bytearray'}, + 'public_certificate_location': {'key': 'properties.publicCertificateLocation', 'type': 'PublicCertificateLocation'}, + 'thumbprint': {'key': 'properties.thumbprint', 'type': 'str'}, + } + + def __init__(self, *, kind: str=None, blob: bytearray=None, public_certificate_location=None, **kwargs) -> None: + super(PublicCertificate, self).__init__(kind=kind, **kwargs) + self.blob = blob + self.public_certificate_location = public_certificate_location + self.thumbprint = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/push_settings.py b/azure-mgmt-web/azure/mgmt/web/models/push_settings.py index 9c89aa6540ca..acb3cad6ac63 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/push_settings.py +++ b/azure-mgmt-web/azure/mgmt/web/models/push_settings.py @@ -18,6 +18,8 @@ class PushSettings(ProxyOnlyResource): Variables are only populated by the server, and will be ignored when sending a request. + All required parameters must be populated in order to send to Azure. + :ivar id: Resource Id. :vartype id: str :ivar name: Resource Name. @@ -26,8 +28,8 @@ class PushSettings(ProxyOnlyResource): :type kind: str :ivar type: Resource type. :vartype type: str - :param is_push_enabled: Gets or sets a flag indicating whether the Push - endpoint is enabled. + :param is_push_enabled: Required. Gets or sets a flag indicating whether + the Push endpoint is enabled. :type is_push_enabled: bool :param tag_whitelist_json: Gets or sets a JSON string containing a list of tags that are whitelisted for use by the push registration endpoint. @@ -63,9 +65,9 @@ class PushSettings(ProxyOnlyResource): 'dynamic_tags_json': {'key': 'properties.dynamicTagsJson', 'type': 'str'}, } - def __init__(self, is_push_enabled, kind=None, tag_whitelist_json=None, tags_requiring_auth=None, dynamic_tags_json=None): - super(PushSettings, self).__init__(kind=kind) - self.is_push_enabled = is_push_enabled - self.tag_whitelist_json = tag_whitelist_json - self.tags_requiring_auth = tags_requiring_auth - self.dynamic_tags_json = dynamic_tags_json + def __init__(self, **kwargs): + super(PushSettings, self).__init__(**kwargs) + self.is_push_enabled = kwargs.get('is_push_enabled', None) + self.tag_whitelist_json = kwargs.get('tag_whitelist_json', None) + self.tags_requiring_auth = kwargs.get('tags_requiring_auth', None) + self.dynamic_tags_json = kwargs.get('dynamic_tags_json', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/push_settings_py3.py b/azure-mgmt-web/azure/mgmt/web/models/push_settings_py3.py new file mode 100644 index 000000000000..8d41beb1a99d --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/push_settings_py3.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_py3 import ProxyOnlyResource + + +class PushSettings(ProxyOnlyResource): + """Push settings for the App. + + Variables are only populated by the server, and will be ignored when + sending a request. + + All required parameters must be populated in order to send to Azure. + + :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 is_push_enabled: Required. Gets or sets a flag indicating whether + the Push endpoint is enabled. + :type is_push_enabled: bool + :param tag_whitelist_json: Gets or sets a JSON string containing a list of + tags that are whitelisted for use by the push registration endpoint. + :type tag_whitelist_json: str + :param tags_requiring_auth: Gets or sets a JSON string containing a list + of tags that require user authentication to be used in the push + registration endpoint. + Tags can consist of alphanumeric characters and the following: + '_', '@', '#', '.', ':', '-'. + Validation should be performed at the PushRequestHandler. + :type tags_requiring_auth: str + :param dynamic_tags_json: Gets or sets a JSON string containing a list of + dynamic tags that will be evaluated from user claims in the push + registration endpoint. + :type dynamic_tags_json: str + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'is_push_enabled': {'required': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'is_push_enabled': {'key': 'properties.isPushEnabled', 'type': 'bool'}, + 'tag_whitelist_json': {'key': 'properties.tagWhitelistJson', 'type': 'str'}, + 'tags_requiring_auth': {'key': 'properties.tagsRequiringAuth', 'type': 'str'}, + 'dynamic_tags_json': {'key': 'properties.dynamicTagsJson', 'type': 'str'}, + } + + def __init__(self, *, is_push_enabled: bool, kind: str=None, tag_whitelist_json: str=None, tags_requiring_auth: str=None, dynamic_tags_json: str=None, **kwargs) -> None: + super(PushSettings, self).__init__(kind=kind, **kwargs) + self.is_push_enabled = is_push_enabled + self.tag_whitelist_json = tag_whitelist_json + self.tags_requiring_auth = tags_requiring_auth + self.dynamic_tags_json = dynamic_tags_json diff --git a/azure-mgmt-web/azure/mgmt/web/models/ramp_up_rule.py b/azure-mgmt-web/azure/mgmt/web/models/ramp_up_rule.py index ea9c98a44b32..beac73be59d5 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/ramp_up_rule.py +++ b/azure-mgmt-web/azure/mgmt/web/models/ramp_up_rule.py @@ -60,13 +60,13 @@ class RampUpRule(Model): 'name': {'key': 'name', 'type': 'str'}, } - def __init__(self, action_host_name=None, reroute_percentage=None, change_step=None, change_interval_in_minutes=None, min_reroute_percentage=None, max_reroute_percentage=None, change_decision_callback_url=None, name=None): - super(RampUpRule, self).__init__() - self.action_host_name = action_host_name - self.reroute_percentage = reroute_percentage - self.change_step = change_step - self.change_interval_in_minutes = change_interval_in_minutes - self.min_reroute_percentage = min_reroute_percentage - self.max_reroute_percentage = max_reroute_percentage - self.change_decision_callback_url = change_decision_callback_url - self.name = name + def __init__(self, **kwargs): + super(RampUpRule, self).__init__(**kwargs) + self.action_host_name = kwargs.get('action_host_name', None) + self.reroute_percentage = kwargs.get('reroute_percentage', None) + self.change_step = kwargs.get('change_step', None) + self.change_interval_in_minutes = kwargs.get('change_interval_in_minutes', None) + self.min_reroute_percentage = kwargs.get('min_reroute_percentage', None) + self.max_reroute_percentage = kwargs.get('max_reroute_percentage', None) + self.change_decision_callback_url = kwargs.get('change_decision_callback_url', None) + self.name = kwargs.get('name', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/ramp_up_rule_py3.py b/azure-mgmt-web/azure/mgmt/web/models/ramp_up_rule_py3.py new file mode 100644 index 000000000000..224fea9b4023 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/ramp_up_rule_py3.py @@ -0,0 +1,72 @@ +# 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 RampUpRule(Model): + """Routing rules for ramp up testing. This rule allows to redirect static + traffic % to a slot or to gradually change routing % based on performance. + + :param action_host_name: Hostname of a slot to which the traffic will be + redirected if decided to. E.g. myapp-stage.azurewebsites.net. + :type action_host_name: str + :param reroute_percentage: Percentage of the traffic which will be + redirected to ActionHostName. + :type reroute_percentage: float + :param change_step: In auto ramp up scenario this is the step to to + add/remove from ReroutePercentage until it reaches + MinReroutePercentage or MaxReroutePercentage. + Site metrics are checked every N minutes specificed in + ChangeIntervalInMinutes. + Custom decision algorithm can be provided in TiPCallback site extension + which URL can be specified in ChangeDecisionCallbackUrl. + :type change_step: float + :param change_interval_in_minutes: Specifies interval in mimuntes to + reevaluate ReroutePercentage. + :type change_interval_in_minutes: int + :param min_reroute_percentage: Specifies lower boundary above which + ReroutePercentage will stay. + :type min_reroute_percentage: float + :param max_reroute_percentage: Specifies upper boundary below which + ReroutePercentage will stay. + :type max_reroute_percentage: float + :param change_decision_callback_url: Custom decision algorithm can be + provided in TiPCallback site extension which URL can be specified. See + TiPCallback site extension for the scaffold and contracts. + https://www.siteextensions.net/packages/TiPCallback/ + :type change_decision_callback_url: str + :param name: Name of the routing rule. The recommended name would be to + point to the slot which will receive the traffic in the experiment. + :type name: str + """ + + _attribute_map = { + 'action_host_name': {'key': 'actionHostName', 'type': 'str'}, + 'reroute_percentage': {'key': 'reroutePercentage', 'type': 'float'}, + 'change_step': {'key': 'changeStep', 'type': 'float'}, + 'change_interval_in_minutes': {'key': 'changeIntervalInMinutes', 'type': 'int'}, + 'min_reroute_percentage': {'key': 'minReroutePercentage', 'type': 'float'}, + 'max_reroute_percentage': {'key': 'maxReroutePercentage', 'type': 'float'}, + 'change_decision_callback_url': {'key': 'changeDecisionCallbackUrl', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + } + + def __init__(self, *, action_host_name: str=None, reroute_percentage: float=None, change_step: float=None, change_interval_in_minutes: int=None, min_reroute_percentage: float=None, max_reroute_percentage: float=None, change_decision_callback_url: str=None, name: str=None, **kwargs) -> None: + super(RampUpRule, self).__init__(**kwargs) + self.action_host_name = action_host_name + self.reroute_percentage = reroute_percentage + self.change_step = change_step + self.change_interval_in_minutes = change_interval_in_minutes + self.min_reroute_percentage = min_reroute_percentage + self.max_reroute_percentage = max_reroute_percentage + self.change_decision_callback_url = change_decision_callback_url + self.name = name diff --git a/azure-mgmt-web/azure/mgmt/web/models/recommendation.py b/azure-mgmt-web/azure/mgmt/web/models/recommendation.py index bc2ff02a1140..060828030b7f 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/recommendation.py +++ b/azure-mgmt-web/azure/mgmt/web/models/recommendation.py @@ -119,26 +119,26 @@ class Recommendation(ProxyOnlyResource): 'forward_link': {'key': 'properties.forwardLink', 'type': 'str'}, } - 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, 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__(kind=kind) - self.creation_time = creation_time - self.recommendation_id = recommendation_id - self.resource_id = resource_id - self.resource_scope = resource_scope - self.rule_name = rule_name - self.display_name = display_name - self.message = message - self.level = level - self.channels = channels - self.tags = tags - self.action_name = action_name - self.start_time = start_time - self.end_time = end_time - self.next_notification_time = next_notification_time - self.notification_expiration_time = notification_expiration_time - self.notified_time = notified_time - self.score = score - self.is_dynamic = is_dynamic - self.extension_name = extension_name - self.blade_name = blade_name - self.forward_link = forward_link + def __init__(self, **kwargs): + super(Recommendation, self).__init__(**kwargs) + self.creation_time = kwargs.get('creation_time', None) + self.recommendation_id = kwargs.get('recommendation_id', None) + self.resource_id = kwargs.get('resource_id', None) + self.resource_scope = kwargs.get('resource_scope', None) + self.rule_name = kwargs.get('rule_name', None) + self.display_name = kwargs.get('display_name', None) + self.message = kwargs.get('message', None) + self.level = kwargs.get('level', None) + self.channels = kwargs.get('channels', None) + self.tags = kwargs.get('tags', None) + self.action_name = kwargs.get('action_name', None) + self.start_time = kwargs.get('start_time', None) + self.end_time = kwargs.get('end_time', None) + self.next_notification_time = kwargs.get('next_notification_time', None) + self.notification_expiration_time = kwargs.get('notification_expiration_time', None) + self.notified_time = kwargs.get('notified_time', None) + self.score = kwargs.get('score', None) + self.is_dynamic = kwargs.get('is_dynamic', None) + self.extension_name = kwargs.get('extension_name', None) + self.blade_name = kwargs.get('blade_name', None) + self.forward_link = kwargs.get('forward_link', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/recommendation_py3.py b/azure-mgmt-web/azure/mgmt/web/models/recommendation_py3.py new file mode 100644 index 000000000000..5eca6b18103c --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/recommendation_py3.py @@ -0,0 +1,144 @@ +# 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_py3 import ProxyOnlyResource + + +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 + associated with. + :type recommendation_id: str + :param resource_id: Full ARM resource ID string that this recommendation + object is associated with. + :type resource_id: str + :param resource_scope: Name of a resource type this recommendation + applies, e.g. Subscription, ServerFarm, Site. Possible values include: + 'ServerFarm', 'Subscription', 'WebSite' + :type resource_scope: str or ~azure.mgmt.web.models.ResourceScopeType + :param rule_name: Unique name of the rule. + :type rule_name: str + :param display_name: UI friendly name of the rule (may not be unique). + :type display_name: str + :param message: Recommendation text. + :type message: str + :param level: Level indicating how critical this recommendation can + impact. Possible values include: 'Critical', 'Warning', 'Information', + 'NonUrgentSuggestion' + :type level: str or ~azure.mgmt.web.models.NotificationLevel + :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] + :param action_name: Name of action recommended by this object. + :type action_name: str + :param start_time: The beginning time in UTC of a range that the + recommendation refers to. + :type start_time: datetime + :param end_time: The end time in UTC of a range that the recommendation + refers to. + :type end_time: datetime + :param next_notification_time: When to notify this recommendation next in + UTC. Null means that this will never be notified anymore. + :type next_notification_time: datetime + :param notification_expiration_time: Date and time in UTC when this + notification expires. + :type notification_expiration_time: datetime + :param notified_time: Last timestamp in UTC this instance was actually + notified. Null means that this recommendation hasn't been notified yet. + :type notified_time: datetime + :param score: A metric value measured by the rule. + :type score: float + :param is_dynamic: True if this is associated with a dynamically added + rule + :type is_dynamic: bool + :param extension_name: Extension name of the portal if exists. + :type extension_name: str + :param blade_name: Deep link to a blade on the portal. + :type blade_name: str + :param forward_link: Forward link to an external document associated with + the rule. + :type forward_link: 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'}, + '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'}, + 'tags': {'key': 'properties.tags', 'type': '[str]'}, + 'action_name': {'key': 'properties.actionName', '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, *, kind: str=None, creation_time=None, recommendation_id: str=None, resource_id: str=None, resource_scope=None, rule_name: str=None, display_name: str=None, message: str=None, level=None, channels=None, tags=None, action_name: str=None, start_time=None, end_time=None, next_notification_time=None, notification_expiration_time=None, notified_time=None, score: float=None, is_dynamic: bool=None, extension_name: str=None, blade_name: str=None, forward_link: str=None, **kwargs) -> None: + super(Recommendation, self).__init__(kind=kind, **kwargs) + self.creation_time = creation_time + self.recommendation_id = recommendation_id + self.resource_id = resource_id + self.resource_scope = resource_scope + self.rule_name = rule_name + self.display_name = display_name + self.message = message + self.level = level + self.channels = channels + self.tags = tags + self.action_name = action_name + self.start_time = start_time + self.end_time = end_time + self.next_notification_time = next_notification_time + self.notification_expiration_time = notification_expiration_time + self.notified_time = notified_time + self.score = score + self.is_dynamic = is_dynamic + self.extension_name = extension_name + self.blade_name = blade_name + self.forward_link = forward_link 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 cbc61204c922..09d8a19b874f 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/recommendation_rule.py +++ b/azure-mgmt-web/azure/mgmt/web/models/recommendation_rule.py @@ -91,18 +91,18 @@ class RecommendationRule(ProxyOnlyResource): 'forward_link': {'key': 'properties.forwardLink', 'type': 'str'}, } - def __init__(self, kind=None, recommendation_rule_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__(kind=kind) - self.recommendation_rule_name = recommendation_rule_name - self.display_name = display_name - self.message = message - self.recommendation_id = recommendation_id - self.description = description - self.action_name = action_name - self.level = level - self.channels = channels - self.tags = tags - self.is_dynamic = is_dynamic - self.extension_name = extension_name - self.blade_name = blade_name - self.forward_link = forward_link + def __init__(self, **kwargs): + super(RecommendationRule, self).__init__(**kwargs) + self.recommendation_rule_name = kwargs.get('recommendation_rule_name', None) + self.display_name = kwargs.get('display_name', None) + self.message = kwargs.get('message', None) + self.recommendation_id = kwargs.get('recommendation_id', None) + self.description = kwargs.get('description', None) + self.action_name = kwargs.get('action_name', None) + self.level = kwargs.get('level', None) + self.channels = kwargs.get('channels', None) + self.tags = kwargs.get('tags', None) + self.is_dynamic = kwargs.get('is_dynamic', None) + self.extension_name = kwargs.get('extension_name', None) + self.blade_name = kwargs.get('blade_name', None) + self.forward_link = kwargs.get('forward_link', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/recommendation_rule_py3.py b/azure-mgmt-web/azure/mgmt/web/models/recommendation_rule_py3.py new file mode 100644 index 000000000000..544c7d2e3cad --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/recommendation_rule_py3.py @@ -0,0 +1,108 @@ +# 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_py3 import ProxyOnlyResource + + +class RecommendationRule(ProxyOnlyResource): + """Represents a recommendation rule that the recommendation engine can + perform. + + 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_rule_name: Unique name of the rule. + :type recommendation_rule_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). + :type message: str + :param recommendation_id: Recommendation ID of an associated + recommendation object tied to the rule, if exists. + If such an object doesn't exist, it is set to null. + :type recommendation_id: str + :param description: Localized detailed description of the rule. + :type description: str + :param action_name: Name of action that is recommended by this rule in + string. + :type action_name: str + :param level: Level of impact indicating how critical this rule is. + Possible values include: 'Critical', 'Warning', 'Information', + 'NonUrgentSuggestion' + :type level: str or ~azure.mgmt.web.models.NotificationLevel + :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] + :param is_dynamic: True if this is associated with a dynamically added + rule + :type is_dynamic: bool + :param extension_name: Extension name of the portal if exists. Applicable + to dynamic rule only. + :type extension_name: str + :param blade_name: Deep link to a blade on the portal. Applicable to + dynamic rule only. + :type blade_name: str + :param forward_link: Forward link to an external document associated with + the rule. Applicable to dynamic rule only. + :type forward_link: 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'}, + 'recommendation_rule_name': {'key': 'properties.name', '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'}, + 'tags': {'key': 'properties.tags', '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, *, kind: str=None, recommendation_rule_name: str=None, display_name: str=None, message: str=None, recommendation_id: str=None, description: str=None, action_name: str=None, level=None, channels=None, tags=None, is_dynamic: bool=None, extension_name: str=None, blade_name: str=None, forward_link: str=None, **kwargs) -> None: + super(RecommendationRule, self).__init__(kind=kind, **kwargs) + self.recommendation_rule_name = recommendation_rule_name + self.display_name = display_name + self.message = message + self.recommendation_id = recommendation_id + self.description = description + self.action_name = action_name + self.level = level + self.channels = channels + self.tags = tags + self.is_dynamic = is_dynamic + self.extension_name = extension_name + self.blade_name = blade_name + self.forward_link = forward_link diff --git a/azure-mgmt-web/azure/mgmt/web/models/reissue_certificate_order_request.py b/azure-mgmt-web/azure/mgmt/web/models/reissue_certificate_order_request.py index 3f7713649730..d2748321940a 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/reissue_certificate_order_request.py +++ b/azure-mgmt-web/azure/mgmt/web/models/reissue_certificate_order_request.py @@ -55,9 +55,9 @@ class ReissueCertificateOrderRequest(ProxyOnlyResource): 'is_private_key_external': {'key': 'properties.isPrivateKeyExternal', 'type': 'bool'}, } - def __init__(self, kind=None, key_size=None, delay_existing_revoke_in_hours=None, csr=None, is_private_key_external=None): - super(ReissueCertificateOrderRequest, self).__init__(kind=kind) - self.key_size = key_size - self.delay_existing_revoke_in_hours = delay_existing_revoke_in_hours - self.csr = csr - self.is_private_key_external = is_private_key_external + def __init__(self, **kwargs): + super(ReissueCertificateOrderRequest, self).__init__(**kwargs) + self.key_size = kwargs.get('key_size', None) + self.delay_existing_revoke_in_hours = kwargs.get('delay_existing_revoke_in_hours', None) + self.csr = kwargs.get('csr', None) + self.is_private_key_external = kwargs.get('is_private_key_external', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/reissue_certificate_order_request_py3.py b/azure-mgmt-web/azure/mgmt/web/models/reissue_certificate_order_request_py3.py new file mode 100644 index 000000000000..d79a1364aa17 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/reissue_certificate_order_request_py3.py @@ -0,0 +1,63 @@ +# 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_py3 import ProxyOnlyResource + + +class ReissueCertificateOrderRequest(ProxyOnlyResource): + """Class representing certificate reissue request. + + 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 key_size: Certificate Key Size. + :type key_size: int + :param delay_existing_revoke_in_hours: Delay in hours to revoke existing + certificate after the new certificate is issued. + :type delay_existing_revoke_in_hours: int + :param csr: Csr to be used for re-key operation. + :type csr: str + :param is_private_key_external: Should we change the ASC type (from + managed private key to external private key and vice versa). + :type is_private_key_external: bool + """ + + _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'}, + 'key_size': {'key': 'properties.keySize', 'type': 'int'}, + 'delay_existing_revoke_in_hours': {'key': 'properties.delayExistingRevokeInHours', 'type': 'int'}, + 'csr': {'key': 'properties.csr', 'type': 'str'}, + 'is_private_key_external': {'key': 'properties.isPrivateKeyExternal', 'type': 'bool'}, + } + + def __init__(self, *, kind: str=None, key_size: int=None, delay_existing_revoke_in_hours: int=None, csr: str=None, is_private_key_external: bool=None, **kwargs) -> None: + super(ReissueCertificateOrderRequest, self).__init__(kind=kind, **kwargs) + self.key_size = key_size + self.delay_existing_revoke_in_hours = delay_existing_revoke_in_hours + self.csr = csr + self.is_private_key_external = is_private_key_external diff --git a/azure-mgmt-web/azure/mgmt/web/models/relay_service_connection_entity.py b/azure-mgmt-web/azure/mgmt/web/models/relay_service_connection_entity.py index a3dcf67f25c0..d67437d392e4 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/relay_service_connection_entity.py +++ b/azure-mgmt-web/azure/mgmt/web/models/relay_service_connection_entity.py @@ -62,12 +62,12 @@ class RelayServiceConnectionEntity(ProxyOnlyResource): 'biztalk_uri': {'key': 'properties.biztalkUri', 'type': 'str'}, } - def __init__(self, kind=None, entity_name=None, entity_connection_string=None, resource_type=None, resource_connection_string=None, hostname=None, port=None, biztalk_uri=None): - super(RelayServiceConnectionEntity, self).__init__(kind=kind) - self.entity_name = entity_name - self.entity_connection_string = entity_connection_string - self.resource_type = resource_type - self.resource_connection_string = resource_connection_string - self.hostname = hostname - self.port = port - self.biztalk_uri = biztalk_uri + def __init__(self, **kwargs): + super(RelayServiceConnectionEntity, self).__init__(**kwargs) + self.entity_name = kwargs.get('entity_name', None) + self.entity_connection_string = kwargs.get('entity_connection_string', None) + self.resource_type = kwargs.get('resource_type', None) + self.resource_connection_string = kwargs.get('resource_connection_string', None) + self.hostname = kwargs.get('hostname', None) + self.port = kwargs.get('port', None) + self.biztalk_uri = kwargs.get('biztalk_uri', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/relay_service_connection_entity_py3.py b/azure-mgmt-web/azure/mgmt/web/models/relay_service_connection_entity_py3.py new file mode 100644 index 000000000000..a31c498d377a --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/relay_service_connection_entity_py3.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_py3 import ProxyOnlyResource + + +class RelayServiceConnectionEntity(ProxyOnlyResource): + """Hybrid Connection for an App Service 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 entity_name: + :type entity_name: str + :param entity_connection_string: + :type entity_connection_string: str + :param resource_type: + :type resource_type: str + :param resource_connection_string: + :type resource_connection_string: str + :param hostname: + :type hostname: str + :param port: + :type port: int + :param biztalk_uri: + :type biztalk_uri: 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'}, + 'entity_name': {'key': 'properties.entityName', 'type': 'str'}, + 'entity_connection_string': {'key': 'properties.entityConnectionString', 'type': 'str'}, + 'resource_type': {'key': 'properties.resourceType', 'type': 'str'}, + 'resource_connection_string': {'key': 'properties.resourceConnectionString', 'type': 'str'}, + 'hostname': {'key': 'properties.hostname', 'type': 'str'}, + 'port': {'key': 'properties.port', 'type': 'int'}, + 'biztalk_uri': {'key': 'properties.biztalkUri', 'type': 'str'}, + } + + def __init__(self, *, kind: str=None, entity_name: str=None, entity_connection_string: str=None, resource_type: str=None, resource_connection_string: str=None, hostname: str=None, port: int=None, biztalk_uri: str=None, **kwargs) -> None: + super(RelayServiceConnectionEntity, self).__init__(kind=kind, **kwargs) + self.entity_name = entity_name + self.entity_connection_string = entity_connection_string + self.resource_type = resource_type + self.resource_connection_string = resource_connection_string + self.hostname = hostname + self.port = port + self.biztalk_uri = biztalk_uri diff --git a/azure-mgmt-web/azure/mgmt/web/models/rendering.py b/azure-mgmt-web/azure/mgmt/web/models/rendering.py index c8b709727043..3cf7f498121e 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/rendering.py +++ b/azure-mgmt-web/azure/mgmt/web/models/rendering.py @@ -31,8 +31,8 @@ class Rendering(Model): 'description': {'key': 'description', 'type': 'str'}, } - def __init__(self, rendering_type=None, title=None, description=None): - super(Rendering, self).__init__() - self.rendering_type = rendering_type - self.title = title - self.description = description + def __init__(self, **kwargs): + super(Rendering, self).__init__(**kwargs) + self.rendering_type = kwargs.get('rendering_type', None) + self.title = kwargs.get('title', None) + self.description = kwargs.get('description', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/rendering_py3.py b/azure-mgmt-web/azure/mgmt/web/models/rendering_py3.py new file mode 100644 index 000000000000..df9a5069f91f --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/rendering_py3.py @@ -0,0 +1,38 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class Rendering(Model): + """Instructions for rendering the data. + + :param rendering_type: Rendering Type. Possible values include: 'NoGraph', + 'Table', 'TimeSeries', 'TimeSeriesPerInstance' + :type rendering_type: str or ~azure.mgmt.web.models.RenderingType + :param title: Title of data + :type title: str + :param description: Description of the data that will help it be + interpreted + :type description: str + """ + + _attribute_map = { + 'rendering_type': {'key': 'renderingType', 'type': 'RenderingType'}, + 'title': {'key': 'title', 'type': 'str'}, + 'description': {'key': 'description', 'type': 'str'}, + } + + def __init__(self, *, rendering_type=None, title: str=None, description: str=None, **kwargs) -> None: + super(Rendering, self).__init__(**kwargs) + self.rendering_type = rendering_type + self.title = title + self.description = description diff --git a/azure-mgmt-web/azure/mgmt/web/models/renew_certificate_order_request.py b/azure-mgmt-web/azure/mgmt/web/models/renew_certificate_order_request.py index db5bb60f35b3..c7de239be427 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/renew_certificate_order_request.py +++ b/azure-mgmt-web/azure/mgmt/web/models/renew_certificate_order_request.py @@ -51,8 +51,8 @@ class RenewCertificateOrderRequest(ProxyOnlyResource): 'is_private_key_external': {'key': 'properties.isPrivateKeyExternal', 'type': 'bool'}, } - def __init__(self, kind=None, key_size=None, csr=None, is_private_key_external=None): - super(RenewCertificateOrderRequest, self).__init__(kind=kind) - self.key_size = key_size - self.csr = csr - self.is_private_key_external = is_private_key_external + def __init__(self, **kwargs): + super(RenewCertificateOrderRequest, self).__init__(**kwargs) + self.key_size = kwargs.get('key_size', None) + self.csr = kwargs.get('csr', None) + self.is_private_key_external = kwargs.get('is_private_key_external', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/renew_certificate_order_request_py3.py b/azure-mgmt-web/azure/mgmt/web/models/renew_certificate_order_request_py3.py new file mode 100644 index 000000000000..fe1a28ed0225 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/renew_certificate_order_request_py3.py @@ -0,0 +1,58 @@ +# 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_py3 import ProxyOnlyResource + + +class RenewCertificateOrderRequest(ProxyOnlyResource): + """Class representing certificate renew request. + + 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 key_size: Certificate Key Size. + :type key_size: int + :param csr: Csr to be used for re-key operation. + :type csr: str + :param is_private_key_external: Should we change the ASC type (from + managed private key to external private key and vice versa). + :type is_private_key_external: bool + """ + + _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'}, + 'key_size': {'key': 'properties.keySize', 'type': 'int'}, + 'csr': {'key': 'properties.csr', 'type': 'str'}, + 'is_private_key_external': {'key': 'properties.isPrivateKeyExternal', 'type': 'bool'}, + } + + def __init__(self, *, kind: str=None, key_size: int=None, csr: str=None, is_private_key_external: bool=None, **kwargs) -> None: + super(RenewCertificateOrderRequest, self).__init__(kind=kind, **kwargs) + self.key_size = key_size + self.csr = csr + self.is_private_key_external = is_private_key_external diff --git a/azure-mgmt-web/azure/mgmt/web/models/requests_based_trigger.py b/azure-mgmt-web/azure/mgmt/web/models/requests_based_trigger.py index 9452b8342824..ce0c0e4a16f7 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/requests_based_trigger.py +++ b/azure-mgmt-web/azure/mgmt/web/models/requests_based_trigger.py @@ -26,7 +26,7 @@ class RequestsBasedTrigger(Model): 'time_interval': {'key': 'timeInterval', 'type': 'str'}, } - def __init__(self, count=None, time_interval=None): - super(RequestsBasedTrigger, self).__init__() - self.count = count - self.time_interval = time_interval + def __init__(self, **kwargs): + super(RequestsBasedTrigger, self).__init__(**kwargs) + self.count = kwargs.get('count', None) + self.time_interval = kwargs.get('time_interval', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/requests_based_trigger_py3.py b/azure-mgmt-web/azure/mgmt/web/models/requests_based_trigger_py3.py new file mode 100644 index 000000000000..a729212c6372 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/requests_based_trigger_py3.py @@ -0,0 +1,32 @@ +# 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 RequestsBasedTrigger(Model): + """Trigger based on total requests. + + :param count: Request Count. + :type count: int + :param time_interval: Time interval. + :type time_interval: str + """ + + _attribute_map = { + 'count': {'key': 'count', 'type': 'int'}, + 'time_interval': {'key': 'timeInterval', 'type': 'str'}, + } + + def __init__(self, *, count: int=None, time_interval: str=None, **kwargs) -> None: + super(RequestsBasedTrigger, self).__init__(**kwargs) + self.count = count + self.time_interval = time_interval diff --git a/azure-mgmt-web/azure/mgmt/web/models/resource.py b/azure-mgmt-web/azure/mgmt/web/models/resource.py index 0f01dbf64c7c..cadebebdd489 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/resource.py +++ b/azure-mgmt-web/azure/mgmt/web/models/resource.py @@ -18,13 +18,15 @@ class Resource(Model): Variables are only populated by the server, and will be ignored when sending a request. + All required parameters must be populated in order to send to Azure. + :ivar id: Resource Id. :vartype id: str :ivar name: Resource Name. :vartype name: str :param kind: Kind of resource. :type kind: str - :param location: Resource Location. + :param location: Required. Resource Location. :type location: str :ivar type: Resource type. :vartype type: str @@ -48,11 +50,11 @@ class Resource(Model): 'tags': {'key': 'tags', 'type': '{str}'}, } - def __init__(self, location, kind=None, tags=None): - super(Resource, self).__init__() + def __init__(self, **kwargs): + super(Resource, self).__init__(**kwargs) self.id = None self.name = None - self.kind = kind - self.location = location + self.kind = kwargs.get('kind', None) + self.location = kwargs.get('location', None) self.type = None - self.tags = tags + self.tags = kwargs.get('tags', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/resource_health_metadata.py b/azure-mgmt-web/azure/mgmt/web/models/resource_health_metadata.py index 25f2a86c4607..0c6c14f68dc4 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/resource_health_metadata.py +++ b/azure-mgmt-web/azure/mgmt/web/models/resource_health_metadata.py @@ -48,7 +48,7 @@ class ResourceHealthMetadata(ProxyOnlyResource): 'signal_availability': {'key': 'properties.signalAvailability', 'type': 'bool'}, } - def __init__(self, kind=None, category=None, signal_availability=None): - super(ResourceHealthMetadata, self).__init__(kind=kind) - self.category = category - self.signal_availability = signal_availability + def __init__(self, **kwargs): + super(ResourceHealthMetadata, self).__init__(**kwargs) + self.category = kwargs.get('category', None) + self.signal_availability = kwargs.get('signal_availability', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/resource_health_metadata_py3.py b/azure-mgmt-web/azure/mgmt/web/models/resource_health_metadata_py3.py new file mode 100644 index 000000000000..1e151f270086 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/resource_health_metadata_py3.py @@ -0,0 +1,54 @@ +# 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_py3 import ProxyOnlyResource + + +class ResourceHealthMetadata(ProxyOnlyResource): + """Used for getting ResourceHealthCheck settings. + + 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 category: The category that the resource matches in the RHC Policy + File + :type category: str + :param signal_availability: Is there a health signal for the resource + :type signal_availability: bool + """ + + _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'}, + 'category': {'key': 'properties.category', 'type': 'str'}, + 'signal_availability': {'key': 'properties.signalAvailability', 'type': 'bool'}, + } + + def __init__(self, *, kind: str=None, category: str=None, signal_availability: bool=None, **kwargs) -> None: + super(ResourceHealthMetadata, self).__init__(kind=kind, **kwargs) + self.category = category + self.signal_availability = signal_availability diff --git a/azure-mgmt-web/azure/mgmt/web/models/resource_metric.py b/azure-mgmt-web/azure/mgmt/web/models/resource_metric.py index e90d84de81f6..83510a981a62 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/resource_metric.py +++ b/azure-mgmt-web/azure/mgmt/web/models/resource_metric.py @@ -62,8 +62,8 @@ class ResourceMetric(Model): 'properties': {'key': 'properties', 'type': '[ResourceMetricProperty]'}, } - def __init__(self): - super(ResourceMetric, self).__init__() + def __init__(self, **kwargs): + super(ResourceMetric, self).__init__(**kwargs) self.name = None self.unit = None self.time_grain = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/resource_metric_availability.py b/azure-mgmt-web/azure/mgmt/web/models/resource_metric_availability.py index 7736a639de6e..b93c0c5b442e 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/resource_metric_availability.py +++ b/azure-mgmt-web/azure/mgmt/web/models/resource_metric_availability.py @@ -34,7 +34,7 @@ class ResourceMetricAvailability(Model): 'retention': {'key': 'retention', 'type': 'str'}, } - def __init__(self): - super(ResourceMetricAvailability, self).__init__() + def __init__(self, **kwargs): + super(ResourceMetricAvailability, self).__init__(**kwargs) self.time_grain = None self.retention = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/resource_metric_availability_py3.py b/azure-mgmt-web/azure/mgmt/web/models/resource_metric_availability_py3.py new file mode 100644 index 000000000000..abd5414ebb1b --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/resource_metric_availability_py3.py @@ -0,0 +1,40 @@ +# 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 ResourceMetricAvailability(Model): + """Metrics availability and retention. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar time_grain: Time grain . + :vartype time_grain: str + :ivar retention: Retention period for the current time grain. + :vartype retention: str + """ + + _validation = { + 'time_grain': {'readonly': True}, + 'retention': {'readonly': True}, + } + + _attribute_map = { + 'time_grain': {'key': 'timeGrain', 'type': 'str'}, + 'retention': {'key': 'retention', 'type': 'str'}, + } + + def __init__(self, **kwargs) -> None: + super(ResourceMetricAvailability, self).__init__(**kwargs) + self.time_grain = None + self.retention = None 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..4e0a78f03d0a 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 @@ -72,8 +72,8 @@ class ResourceMetricDefinition(ProxyOnlyResource): 'properties': {'key': 'properties.properties', 'type': '{str}'}, } - def __init__(self, kind=None): - super(ResourceMetricDefinition, self).__init__(kind=kind) + def __init__(self, **kwargs): + super(ResourceMetricDefinition, self).__init__(**kwargs) self.resource_metric_definition_name = None self.unit = None self.primary_aggregation_type = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/resource_metric_definition_py3.py b/azure-mgmt-web/azure/mgmt/web/models/resource_metric_definition_py3.py new file mode 100644 index 000000000000..1e1e1f05de9f --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/resource_metric_definition_py3.py @@ -0,0 +1,83 @@ +# 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_py3 import ProxyOnlyResource + + +class ResourceMetricDefinition(ProxyOnlyResource): + """Metadata for the metrics. + + 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 + :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. + :vartype primary_aggregation_type: str + :ivar metric_availabilities: List of time grains supported for the metric + together with retention period. + :vartype metric_availabilities: + 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] + """ + + _validation = { + '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}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + '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: str=None, **kwargs) -> None: + super(ResourceMetricDefinition, self).__init__(kind=kind, **kwargs) + 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/resource_metric_name.py b/azure-mgmt-web/azure/mgmt/web/models/resource_metric_name.py index fc3985dd48f7..a9bc7e08f9e0 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/resource_metric_name.py +++ b/azure-mgmt-web/azure/mgmt/web/models/resource_metric_name.py @@ -34,7 +34,7 @@ class ResourceMetricName(Model): 'localized_value': {'key': 'localizedValue', 'type': 'str'}, } - def __init__(self): - super(ResourceMetricName, self).__init__() + def __init__(self, **kwargs): + super(ResourceMetricName, self).__init__(**kwargs) self.value = None self.localized_value = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/resource_metric_name_py3.py b/azure-mgmt-web/azure/mgmt/web/models/resource_metric_name_py3.py new file mode 100644 index 000000000000..cefb840267a1 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/resource_metric_name_py3.py @@ -0,0 +1,40 @@ +# 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 ResourceMetricName(Model): + """Name of a metric for any resource . + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar value: metric name value. + :vartype value: str + :ivar localized_value: Localized metric name value. + :vartype localized_value: str + """ + + _validation = { + 'value': {'readonly': True}, + 'localized_value': {'readonly': True}, + } + + _attribute_map = { + 'value': {'key': 'value', 'type': 'str'}, + 'localized_value': {'key': 'localizedValue', 'type': 'str'}, + } + + def __init__(self, **kwargs) -> None: + super(ResourceMetricName, self).__init__(**kwargs) + self.value = None + self.localized_value = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/resource_metric_property.py b/azure-mgmt-web/azure/mgmt/web/models/resource_metric_property.py index f9bd040c6801..0a82e61acfe3 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/resource_metric_property.py +++ b/azure-mgmt-web/azure/mgmt/web/models/resource_metric_property.py @@ -26,7 +26,7 @@ class ResourceMetricProperty(Model): 'value': {'key': 'value', 'type': 'str'}, } - def __init__(self, key=None, value=None): - super(ResourceMetricProperty, self).__init__() - self.key = key - self.value = value + def __init__(self, **kwargs): + super(ResourceMetricProperty, self).__init__(**kwargs) + self.key = kwargs.get('key', None) + self.value = kwargs.get('value', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/resource_metric_property_py3.py b/azure-mgmt-web/azure/mgmt/web/models/resource_metric_property_py3.py new file mode 100644 index 000000000000..a31a4d44862d --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/resource_metric_property_py3.py @@ -0,0 +1,32 @@ +# 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 ResourceMetricProperty(Model): + """Resource metric property. + + :param key: Key for resource metric property. + :type key: str + :param value: Value of pair. + :type value: str + """ + + _attribute_map = { + 'key': {'key': 'key', 'type': 'str'}, + 'value': {'key': 'value', 'type': 'str'}, + } + + def __init__(self, *, key: str=None, value: str=None, **kwargs) -> None: + super(ResourceMetricProperty, self).__init__(**kwargs) + self.key = key + self.value = value diff --git a/azure-mgmt-web/azure/mgmt/web/models/resource_metric_py3.py b/azure-mgmt-web/azure/mgmt/web/models/resource_metric_py3.py new file mode 100644 index 000000000000..e15c19f17b07 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/resource_metric_py3.py @@ -0,0 +1,75 @@ +# 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 ResourceMetric(Model): + """Object representing a metric for any resource . + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar name: Name of metric. + :vartype name: ~azure.mgmt.web.models.ResourceMetricName + :ivar unit: Metric unit. + :vartype unit: str + :ivar time_grain: Metric granularity. E.g PT1H, PT5M, P1D + :vartype time_grain: str + :ivar start_time: Metric start time. + :vartype start_time: datetime + :ivar end_time: Metric end time. + :vartype end_time: datetime + :ivar resource_id: Metric resource Id. + :vartype resource_id: str + :ivar id: Resource Id. + :vartype id: str + :ivar metric_values: Metric values. + :vartype metric_values: list[~azure.mgmt.web.models.ResourceMetricValue] + :ivar properties: Resource metric properties collection. + :vartype properties: list[~azure.mgmt.web.models.ResourceMetricProperty] + """ + + _validation = { + 'name': {'readonly': True}, + 'unit': {'readonly': True}, + 'time_grain': {'readonly': True}, + 'start_time': {'readonly': True}, + 'end_time': {'readonly': True}, + 'resource_id': {'readonly': True}, + 'id': {'readonly': True}, + 'metric_values': {'readonly': True}, + 'properties': {'readonly': True}, + } + + _attribute_map = { + 'name': {'key': 'name', 'type': 'ResourceMetricName'}, + 'unit': {'key': 'unit', 'type': 'str'}, + 'time_grain': {'key': 'timeGrain', 'type': 'str'}, + 'start_time': {'key': 'startTime', 'type': 'iso-8601'}, + 'end_time': {'key': 'endTime', 'type': 'iso-8601'}, + 'resource_id': {'key': 'resourceId', 'type': 'str'}, + 'id': {'key': 'id', 'type': 'str'}, + 'metric_values': {'key': 'metricValues', 'type': '[ResourceMetricValue]'}, + 'properties': {'key': 'properties', 'type': '[ResourceMetricProperty]'}, + } + + def __init__(self, **kwargs) -> None: + super(ResourceMetric, self).__init__(**kwargs) + self.name = None + self.unit = None + self.time_grain = None + self.start_time = None + self.end_time = None + self.resource_id = None + self.id = None + self.metric_values = None + self.properties = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/resource_metric_value.py b/azure-mgmt-web/azure/mgmt/web/models/resource_metric_value.py index fc4db86574cc..0253d46bebfc 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/resource_metric_value.py +++ b/azure-mgmt-web/azure/mgmt/web/models/resource_metric_value.py @@ -54,8 +54,8 @@ class ResourceMetricValue(Model): 'properties': {'key': 'properties', 'type': '[ResourceMetricProperty]'}, } - def __init__(self): - super(ResourceMetricValue, self).__init__() + def __init__(self, **kwargs): + super(ResourceMetricValue, self).__init__(**kwargs) self.timestamp = None self.average = None self.minimum = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/resource_metric_value_py3.py b/azure-mgmt-web/azure/mgmt/web/models/resource_metric_value_py3.py new file mode 100644 index 000000000000..4037a249c04f --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/resource_metric_value_py3.py @@ -0,0 +1,65 @@ +# 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 ResourceMetricValue(Model): + """Value of resource metric. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar timestamp: Value timestamp. + :vartype timestamp: str + :ivar average: Value average. + :vartype average: float + :ivar minimum: Value minimum. + :vartype minimum: float + :ivar maximum: Value maximum. + :vartype maximum: float + :ivar total: Value total. + :vartype total: float + :ivar count: Value count. + :vartype count: float + :ivar properties: Resource metric properties collection. + :vartype properties: list[~azure.mgmt.web.models.ResourceMetricProperty] + """ + + _validation = { + 'timestamp': {'readonly': True}, + 'average': {'readonly': True}, + 'minimum': {'readonly': True}, + 'maximum': {'readonly': True}, + 'total': {'readonly': True}, + 'count': {'readonly': True}, + 'properties': {'readonly': True}, + } + + _attribute_map = { + 'timestamp': {'key': 'timestamp', 'type': 'str'}, + 'average': {'key': 'average', 'type': 'float'}, + 'minimum': {'key': 'minimum', 'type': 'float'}, + 'maximum': {'key': 'maximum', 'type': 'float'}, + 'total': {'key': 'total', 'type': 'float'}, + 'count': {'key': 'count', 'type': 'float'}, + 'properties': {'key': 'properties', 'type': '[ResourceMetricProperty]'}, + } + + def __init__(self, **kwargs) -> None: + super(ResourceMetricValue, self).__init__(**kwargs) + self.timestamp = None + self.average = None + self.minimum = None + self.maximum = None + self.total = None + self.count = None + self.properties = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/resource_name_availability.py b/azure-mgmt-web/azure/mgmt/web/models/resource_name_availability.py index 456eb9416870..00e19a02dfe2 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/resource_name_availability.py +++ b/azure-mgmt-web/azure/mgmt/web/models/resource_name_availability.py @@ -38,8 +38,8 @@ class ResourceNameAvailability(Model): 'message': {'key': 'message', 'type': 'str'}, } - def __init__(self, name_available=None, reason=None, message=None): - super(ResourceNameAvailability, self).__init__() - self.name_available = name_available - self.reason = reason - self.message = message + def __init__(self, **kwargs): + super(ResourceNameAvailability, self).__init__(**kwargs) + self.name_available = kwargs.get('name_available', None) + self.reason = kwargs.get('reason', None) + self.message = kwargs.get('message', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/resource_name_availability_py3.py b/azure-mgmt-web/azure/mgmt/web/models/resource_name_availability_py3.py new file mode 100644 index 000000000000..29684bed5cd3 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/resource_name_availability_py3.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 ResourceNameAvailability(Model): + """Information regarding availbility of a resource name. + + :param name_available: true indicates name is valid and + available. false indicates the name is invalid, unavailable, + or both. + :type name_available: bool + :param reason: Invalid indicates the name provided does not + match Azure App Service naming requirements. AlreadyExists + indicates that the name is already in use and is therefore unavailable. + Possible values include: 'Invalid', 'AlreadyExists' + :type reason: str or ~azure.mgmt.web.models.InAvailabilityReasonType + :param message: If reason == invalid, provide the user with the reason why + the given name is invalid, and provide the resource naming requirements so + that the user can select a valid name. If reason == AlreadyExists, explain + that resource name is already in use, and direct them to select a + different name. + :type message: str + """ + + _attribute_map = { + 'name_available': {'key': 'nameAvailable', 'type': 'bool'}, + 'reason': {'key': 'reason', 'type': 'str'}, + 'message': {'key': 'message', 'type': 'str'}, + } + + def __init__(self, *, name_available: bool=None, reason=None, message: str=None, **kwargs) -> None: + super(ResourceNameAvailability, self).__init__(**kwargs) + self.name_available = name_available + self.reason = reason + self.message = message diff --git a/azure-mgmt-web/azure/mgmt/web/models/resource_name_availability_request.py b/azure-mgmt-web/azure/mgmt/web/models/resource_name_availability_request.py index 2f7ddebe9493..58bd2ae08060 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/resource_name_availability_request.py +++ b/azure-mgmt-web/azure/mgmt/web/models/resource_name_availability_request.py @@ -15,10 +15,12 @@ class ResourceNameAvailabilityRequest(Model): """Resource name availability request content. - :param name: Resource name to verify. + All required parameters must be populated in order to send to Azure. + + :param name: Required. Resource name to verify. :type name: str - :param type: Resource type used for verification. Possible values include: - 'Site', 'Slot', 'HostingEnvironment', 'PublishingUser', + :param type: Required. Resource type used for verification. Possible + values include: 'Site', 'Slot', 'HostingEnvironment', 'PublishingUser', 'Microsoft.Web/sites', 'Microsoft.Web/sites/slots', 'Microsoft.Web/hostingEnvironments', 'Microsoft.Web/publishingUsers' :type type: str or ~azure.mgmt.web.models.CheckNameResourceTypes @@ -37,8 +39,8 @@ class ResourceNameAvailabilityRequest(Model): 'is_fqdn': {'key': 'isFqdn', 'type': 'bool'}, } - def __init__(self, name, type, is_fqdn=None): - super(ResourceNameAvailabilityRequest, self).__init__() - self.name = name - self.type = type - self.is_fqdn = is_fqdn + def __init__(self, **kwargs): + super(ResourceNameAvailabilityRequest, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.type = kwargs.get('type', None) + self.is_fqdn = kwargs.get('is_fqdn', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/resource_name_availability_request_py3.py b/azure-mgmt-web/azure/mgmt/web/models/resource_name_availability_request_py3.py new file mode 100644 index 000000000000..52674f7583c9 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/resource_name_availability_request_py3.py @@ -0,0 +1,46 @@ +# 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 ResourceNameAvailabilityRequest(Model): + """Resource name availability request content. + + All required parameters must be populated in order to send to Azure. + + :param name: Required. Resource name to verify. + :type name: str + :param type: Required. Resource type used for verification. Possible + values include: 'Site', 'Slot', 'HostingEnvironment', 'PublishingUser', + 'Microsoft.Web/sites', 'Microsoft.Web/sites/slots', + 'Microsoft.Web/hostingEnvironments', 'Microsoft.Web/publishingUsers' + :type type: str or ~azure.mgmt.web.models.CheckNameResourceTypes + :param is_fqdn: Is fully qualified domain name. + :type is_fqdn: bool + """ + + _validation = { + 'name': {'required': True}, + 'type': {'required': True}, + } + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'is_fqdn': {'key': 'isFqdn', 'type': 'bool'}, + } + + def __init__(self, *, name: str, type, is_fqdn: bool=None, **kwargs) -> None: + super(ResourceNameAvailabilityRequest, self).__init__(**kwargs) + self.name = name + self.type = type + self.is_fqdn = is_fqdn diff --git a/azure-mgmt-web/azure/mgmt/web/models/resource_py3.py b/azure-mgmt-web/azure/mgmt/web/models/resource_py3.py new file mode 100644 index 000000000000..76c166da271d --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/resource_py3.py @@ -0,0 +1,60 @@ +# 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 Resource(Model): + """Azure resource. This resource is tracked in Azure Resource Manager. + + Variables are only populated by the server, and will be ignored when + sending a request. + + All required parameters must be populated in order to send to Azure. + + :ivar id: Resource Id. + :vartype id: str + :ivar name: Resource Name. + :vartype name: str + :param kind: Kind of resource. + :type kind: str + :param location: Required. Resource Location. + :type location: str + :ivar type: Resource type. + :vartype type: str + :param tags: Resource tags. + :type tags: dict[str, str] + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'location': {'required': True}, + 'type': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'location': {'key': 'location', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, + } + + def __init__(self, *, location: str, kind: str=None, tags=None, **kwargs) -> None: + super(Resource, self).__init__(**kwargs) + self.id = None + self.name = None + self.kind = kind + self.location = location + self.type = None + self.tags = tags diff --git a/azure-mgmt-web/azure/mgmt/web/models/response_meta_data.py b/azure-mgmt-web/azure/mgmt/web/models/response_meta_data.py index 308db7d8a619..00614b9e4ebb 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/response_meta_data.py +++ b/azure-mgmt-web/azure/mgmt/web/models/response_meta_data.py @@ -23,6 +23,6 @@ class ResponseMetaData(Model): 'data_source': {'key': 'dataSource', 'type': 'DataSource'}, } - def __init__(self, data_source=None): - super(ResponseMetaData, self).__init__() - self.data_source = data_source + def __init__(self, **kwargs): + super(ResponseMetaData, self).__init__(**kwargs) + self.data_source = kwargs.get('data_source', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/response_meta_data_py3.py b/azure-mgmt-web/azure/mgmt/web/models/response_meta_data_py3.py new file mode 100644 index 000000000000..2245b81dc0d2 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/response_meta_data_py3.py @@ -0,0 +1,28 @@ +# 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 ResponseMetaData(Model): + """ResponseMetaData. + + :param data_source: Source of the Data + :type data_source: ~azure.mgmt.web.models.DataSource + """ + + _attribute_map = { + 'data_source': {'key': 'dataSource', 'type': 'DataSource'}, + } + + def __init__(self, *, data_source=None, **kwargs) -> None: + super(ResponseMetaData, self).__init__(**kwargs) + self.data_source = data_source 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..6ffd33cc679b 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/restore_request.py +++ b/azure-mgmt-web/azure/mgmt/web/models/restore_request.py @@ -18,6 +18,8 @@ class RestoreRequest(ProxyOnlyResource): Variables are only populated by the server, and will be ignored when sending a request. + All required parameters must be populated in order to send to Azure. + :ivar id: Resource Id. :vartype id: str :ivar name: Resource Name. @@ -26,13 +28,13 @@ class RestoreRequest(ProxyOnlyResource): :type kind: str :ivar type: Resource type. :vartype type: str - :param storage_account_url: SAS URL to the container. + :param storage_account_url: Required. SAS URL to the container. :type storage_account_url: str :param blob_name: Name of a blob which contains the backup. :type blob_name: str - :param overwrite: true if the restore operation can overwrite - target app; otherwise, false. true is needed if - trying to restore over an existing app. + :param overwrite: Required. true if the restore operation can + overwrite target app; otherwise, false. true is + needed if trying to restore over an existing app. :type overwrite: bool :param site_name: Name of an app. :type site_name: str @@ -90,16 +92,16 @@ class RestoreRequest(ProxyOnlyResource): 'hosting_environment': {'key': 'properties.hostingEnvironment', 'type': 'str'}, } - def __init__(self, storage_account_url, overwrite, kind=None, blob_name=None, site_name=None, databases=None, ignore_conflicting_host_names=False, ignore_databases=False, app_service_plan=None, operation_type="Default", adjust_connection_strings=None, hosting_environment=None): - super(RestoreRequest, self).__init__(kind=kind) - self.storage_account_url = storage_account_url - self.blob_name = blob_name - self.overwrite = overwrite - self.site_name = site_name - self.databases = databases - self.ignore_conflicting_host_names = ignore_conflicting_host_names - self.ignore_databases = ignore_databases - self.app_service_plan = app_service_plan - self.operation_type = operation_type - self.adjust_connection_strings = adjust_connection_strings - self.hosting_environment = hosting_environment + def __init__(self, **kwargs): + super(RestoreRequest, self).__init__(**kwargs) + self.storage_account_url = kwargs.get('storage_account_url', None) + self.blob_name = kwargs.get('blob_name', None) + self.overwrite = kwargs.get('overwrite', None) + self.site_name = kwargs.get('site_name', None) + self.databases = kwargs.get('databases', None) + self.ignore_conflicting_host_names = kwargs.get('ignore_conflicting_host_names', False) + self.ignore_databases = kwargs.get('ignore_databases', False) + self.app_service_plan = kwargs.get('app_service_plan', None) + self.operation_type = kwargs.get('operation_type', "Default") + self.adjust_connection_strings = kwargs.get('adjust_connection_strings', None) + self.hosting_environment = kwargs.get('hosting_environment', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/restore_request_py3.py b/azure-mgmt-web/azure/mgmt/web/models/restore_request_py3.py new file mode 100644 index 000000000000..402362b48610 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/restore_request_py3.py @@ -0,0 +1,107 @@ +# 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_py3 import ProxyOnlyResource + + +class RestoreRequest(ProxyOnlyResource): + """Description of a restore request. + + Variables are only populated by the server, and will be ignored when + sending a request. + + All required parameters must be populated in order to send to Azure. + + :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 storage_account_url: Required. SAS URL to the container. + :type storage_account_url: str + :param blob_name: Name of a blob which contains the backup. + :type blob_name: str + :param overwrite: Required. true if the restore operation can + overwrite target app; otherwise, false. true is + needed if trying to restore over an existing app. + :type overwrite: bool + :param site_name: Name of an app. + :type site_name: str + :param databases: Collection of databases which should be restored. This + list has to match the list of databases included in the backup. + :type databases: list[~azure.mgmt.web.models.DatabaseBackupSetting] + :param ignore_conflicting_host_names: Changes a logic when restoring an + app with custom domains. true to remove custom domains + automatically. If false, custom domains are added to + the app's object when it is being restored, but that might fail due to + conflicts during the operation. Default value: False . + :type ignore_conflicting_host_names: bool + :param ignore_databases: Ignore the databases and only restore the site + content. Default value: False . + :type ignore_databases: bool + :param app_service_plan: Specify app service plan that will own restored + site. + :type app_service_plan: str + :param operation_type: Operation type. Possible values include: 'Default', + 'Clone', 'Relocation', 'Snapshot'. Default value: "Default" . + :type operation_type: str or + ~azure.mgmt.web.models.BackupRestoreOperationType + :param adjust_connection_strings: true if + SiteConfig.ConnectionStrings should be set in new app; otherwise, + false. + :type adjust_connection_strings: bool + :param hosting_environment: App Service Environment name, if needed (only + when restoring an app to an App Service Environment). + :type hosting_environment: str + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'storage_account_url': {'required': 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'}, + 'storage_account_url': {'key': 'properties.storageAccountUrl', 'type': 'str'}, + 'blob_name': {'key': 'properties.blobName', 'type': 'str'}, + 'overwrite': {'key': 'properties.overwrite', 'type': 'bool'}, + 'site_name': {'key': 'properties.siteName', 'type': 'str'}, + 'databases': {'key': 'properties.databases', 'type': '[DatabaseBackupSetting]'}, + 'ignore_conflicting_host_names': {'key': 'properties.ignoreConflictingHostNames', 'type': 'bool'}, + 'ignore_databases': {'key': 'properties.ignoreDatabases', 'type': 'bool'}, + 'app_service_plan': {'key': 'properties.appServicePlan', 'type': 'str'}, + 'operation_type': {'key': 'properties.operationType', 'type': 'BackupRestoreOperationType'}, + 'adjust_connection_strings': {'key': 'properties.adjustConnectionStrings', 'type': 'bool'}, + 'hosting_environment': {'key': 'properties.hostingEnvironment', 'type': 'str'}, + } + + def __init__(self, *, storage_account_url: str, overwrite: bool, kind: str=None, blob_name: str=None, site_name: str=None, databases=None, ignore_conflicting_host_names: bool=False, ignore_databases: bool=False, app_service_plan: str=None, operation_type="Default", adjust_connection_strings: bool=None, hosting_environment: str=None, **kwargs) -> None: + super(RestoreRequest, self).__init__(kind=kind, **kwargs) + self.storage_account_url = storage_account_url + self.blob_name = blob_name + self.overwrite = overwrite + self.site_name = site_name + self.databases = databases + self.ignore_conflicting_host_names = ignore_conflicting_host_names + self.ignore_databases = ignore_databases + self.app_service_plan = app_service_plan + self.operation_type = operation_type + self.adjust_connection_strings = adjust_connection_strings + self.hosting_environment = hosting_environment diff --git a/azure-mgmt-web/azure/mgmt/web/models/restore_response.py b/azure-mgmt-web/azure/mgmt/web/models/restore_response.py index 3be8e1f1a0a5..2650a39c521b 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/restore_response.py +++ b/azure-mgmt-web/azure/mgmt/web/models/restore_response.py @@ -46,6 +46,6 @@ class RestoreResponse(ProxyOnlyResource): 'operation_id': {'key': 'properties.operationId', 'type': 'str'}, } - def __init__(self, kind=None): - super(RestoreResponse, self).__init__(kind=kind) + def __init__(self, **kwargs): + super(RestoreResponse, self).__init__(**kwargs) self.operation_id = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/restore_response_py3.py b/azure-mgmt-web/azure/mgmt/web/models/restore_response_py3.py new file mode 100644 index 000000000000..0e9c36e7c2a5 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/restore_response_py3.py @@ -0,0 +1,51 @@ +# 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_py3 import ProxyOnlyResource + + +class RestoreResponse(ProxyOnlyResource): + """Response for an app restore request. + + 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 + :ivar operation_id: When server starts the restore process, it will return + an operation ID identifying that particular restore operation. + :vartype operation_id: str + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'operation_id': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'operation_id': {'key': 'properties.operationId', 'type': 'str'}, + } + + def __init__(self, *, kind: str=None, **kwargs) -> None: + super(RestoreResponse, self).__init__(kind=kind, **kwargs) + self.operation_id = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/service_specification.py b/azure-mgmt-web/azure/mgmt/web/models/service_specification.py index 3dae8a238d72..fe2efb3d6d84 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/service_specification.py +++ b/azure-mgmt-web/azure/mgmt/web/models/service_specification.py @@ -24,6 +24,6 @@ class ServiceSpecification(Model): 'metric_specifications': {'key': 'metricSpecifications', 'type': '[MetricSpecification]'}, } - def __init__(self, metric_specifications=None): - super(ServiceSpecification, self).__init__() - self.metric_specifications = metric_specifications + def __init__(self, **kwargs): + super(ServiceSpecification, self).__init__(**kwargs) + self.metric_specifications = kwargs.get('metric_specifications', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/service_specification_py3.py b/azure-mgmt-web/azure/mgmt/web/models/service_specification_py3.py new file mode 100644 index 000000000000..ea5fcf80b034 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/service_specification_py3.py @@ -0,0 +1,29 @@ +# 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 ServiceSpecification(Model): + """Resource metrics service provided by Microsoft.Insights resource provider. + + :param metric_specifications: + :type metric_specifications: + list[~azure.mgmt.web.models.MetricSpecification] + """ + + _attribute_map = { + 'metric_specifications': {'key': 'metricSpecifications', 'type': '[MetricSpecification]'}, + } + + def __init__(self, *, metric_specifications=None, **kwargs) -> None: + super(ServiceSpecification, self).__init__(**kwargs) + self.metric_specifications = metric_specifications diff --git a/azure-mgmt-web/azure/mgmt/web/models/site.py b/azure-mgmt-web/azure/mgmt/web/models/site.py index 44ddd0d3ff08..177c71de2077 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/site.py +++ b/azure-mgmt-web/azure/mgmt/web/models/site.py @@ -18,13 +18,15 @@ class Site(Resource): Variables are only populated by the server, and will be ignored when sending a request. + All required parameters must be populated in order to send to Azure. + :ivar id: Resource Id. :vartype id: str :ivar name: Resource Name. :vartype name: str :param kind: Kind of resource. :type kind: str - :param location: Resource Location. + :param location: Required. Resource Location. :type location: str :ivar type: Resource type. :vartype type: str @@ -204,38 +206,38 @@ 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): - super(Site, self).__init__(kind=kind, location=location, tags=tags) + def __init__(self, **kwargs): + super(Site, self).__init__(**kwargs) self.state = None self.host_names = None self.repository_site_name = None self.usage_state = None - self.enabled = enabled + self.enabled = kwargs.get('enabled', None) self.enabled_host_names = None self.availability_state = None - self.host_name_ssl_states = host_name_ssl_states - self.server_farm_id = server_farm_id - self.reserved = reserved + self.host_name_ssl_states = kwargs.get('host_name_ssl_states', None) + self.server_farm_id = kwargs.get('server_farm_id', None) + self.reserved = kwargs.get('reserved', False) self.last_modified_time_utc = None - self.site_config = site_config + self.site_config = kwargs.get('site_config', None) self.traffic_manager_host_names = None - self.scm_site_also_stopped = scm_site_also_stopped + self.scm_site_also_stopped = kwargs.get('scm_site_also_stopped', False) self.target_swap_slot = None - self.hosting_environment_profile = hosting_environment_profile - self.client_affinity_enabled = client_affinity_enabled - self.client_cert_enabled = client_cert_enabled - self.host_names_disabled = host_names_disabled + self.hosting_environment_profile = kwargs.get('hosting_environment_profile', None) + self.client_affinity_enabled = kwargs.get('client_affinity_enabled', None) + self.client_cert_enabled = kwargs.get('client_cert_enabled', None) + self.host_names_disabled = kwargs.get('host_names_disabled', None) self.outbound_ip_addresses = None self.possible_outbound_ip_addresses = None - self.container_size = container_size - self.daily_memory_time_quota = daily_memory_time_quota + self.container_size = kwargs.get('container_size', None) + self.daily_memory_time_quota = kwargs.get('daily_memory_time_quota', None) self.suspended_till = None self.max_number_of_workers = None - self.cloning_info = cloning_info - self.snapshot_info = snapshot_info + self.cloning_info = kwargs.get('cloning_info', None) + self.snapshot_info = kwargs.get('snapshot_info', None) self.resource_group = None self.is_default_container = None self.default_host_name = None self.slot_swap_status = None - self.https_only = https_only - self.identity = identity + self.https_only = kwargs.get('https_only', None) + self.identity = kwargs.get('identity', 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..7418c31642f2 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 @@ -203,28 +203,28 @@ 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): - super(SiteAuthSettings, self).__init__(kind=kind) - self.enabled = enabled - self.runtime_version = runtime_version - self.unauthenticated_client_action = unauthenticated_client_action - self.token_store_enabled = token_store_enabled - self.allowed_external_redirect_urls = allowed_external_redirect_urls - self.default_provider = default_provider - self.token_refresh_extension_hours = token_refresh_extension_hours - self.client_id = client_id - self.client_secret = client_secret - self.issuer = issuer - self.allowed_audiences = allowed_audiences - self.additional_login_params = additional_login_params - self.google_client_id = google_client_id - self.google_client_secret = google_client_secret - self.google_oauth_scopes = google_oauth_scopes - self.facebook_app_id = facebook_app_id - self.facebook_app_secret = facebook_app_secret - self.facebook_oauth_scopes = facebook_oauth_scopes - self.twitter_consumer_key = twitter_consumer_key - self.twitter_consumer_secret = twitter_consumer_secret - self.microsoft_account_client_id = microsoft_account_client_id - self.microsoft_account_client_secret = microsoft_account_client_secret - self.microsoft_account_oauth_scopes = microsoft_account_oauth_scopes + def __init__(self, **kwargs): + super(SiteAuthSettings, self).__init__(**kwargs) + self.enabled = kwargs.get('enabled', None) + self.runtime_version = kwargs.get('runtime_version', None) + self.unauthenticated_client_action = kwargs.get('unauthenticated_client_action', None) + self.token_store_enabled = kwargs.get('token_store_enabled', None) + self.allowed_external_redirect_urls = kwargs.get('allowed_external_redirect_urls', None) + self.default_provider = kwargs.get('default_provider', None) + self.token_refresh_extension_hours = kwargs.get('token_refresh_extension_hours', None) + self.client_id = kwargs.get('client_id', None) + self.client_secret = kwargs.get('client_secret', None) + self.issuer = kwargs.get('issuer', None) + self.allowed_audiences = kwargs.get('allowed_audiences', None) + self.additional_login_params = kwargs.get('additional_login_params', None) + self.google_client_id = kwargs.get('google_client_id', None) + self.google_client_secret = kwargs.get('google_client_secret', None) + self.google_oauth_scopes = kwargs.get('google_oauth_scopes', None) + self.facebook_app_id = kwargs.get('facebook_app_id', None) + self.facebook_app_secret = kwargs.get('facebook_app_secret', None) + self.facebook_oauth_scopes = kwargs.get('facebook_oauth_scopes', None) + self.twitter_consumer_key = kwargs.get('twitter_consumer_key', None) + self.twitter_consumer_secret = kwargs.get('twitter_consumer_secret', None) + self.microsoft_account_client_id = kwargs.get('microsoft_account_client_id', None) + self.microsoft_account_client_secret = kwargs.get('microsoft_account_client_secret', None) + self.microsoft_account_oauth_scopes = kwargs.get('microsoft_account_oauth_scopes', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_auth_settings_py3.py b/azure-mgmt-web/azure/mgmt/web/models/site_auth_settings_py3.py new file mode 100644 index 000000000000..9e832491c6d3 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/site_auth_settings_py3.py @@ -0,0 +1,230 @@ +# 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_py3 import ProxyOnlyResource + + +class SiteAuthSettings(ProxyOnlyResource): + """Configuration settings for the Azure App Service Authentication / + Authorization feature. + + 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 enabled: true if the Authentication / Authorization + feature is enabled for the current app; otherwise, false. + :type enabled: bool + :param runtime_version: The RuntimeVersion of the Authentication / + Authorization feature in use for the current app. + The setting in this value can control the behavior of certain features in + the Authentication / Authorization module. + :type runtime_version: str + :param unauthenticated_client_action: The action to take when an + unauthenticated client attempts to access the app. Possible values + include: 'RedirectToLoginPage', 'AllowAnonymous' + :type unauthenticated_client_action: str or + ~azure.mgmt.web.models.UnauthenticatedClientAction + :param token_store_enabled: true to durably store + platform-specific security tokens that are obtained during login flows; + otherwise, false. + The default is false. + :type token_store_enabled: bool + :param allowed_external_redirect_urls: External URLs that can be + redirected to as part of logging in or logging out of the app. Note that + the query string part of the URL is ignored. + This is an advanced setting typically only needed by Windows Store + application backends. + Note that URLs within the current domain are always implicitly allowed. + :type allowed_external_redirect_urls: list[str] + :param default_provider: The default authentication provider to use when + multiple providers are configured. + This setting is only needed if multiple providers are configured and the + unauthenticated client + action is set to "RedirectToLoginPage". Possible values include: + 'AzureActiveDirectory', 'Facebook', 'Google', 'MicrosoftAccount', + 'Twitter' + :type default_provider: str or + ~azure.mgmt.web.models.BuiltInAuthenticationProvider + :param token_refresh_extension_hours: The number of hours after session + token expiration that a session token can be used to + call the token refresh API. The default is 72 hours. + :type token_refresh_extension_hours: float + :param client_id: The Client ID of this relying party application, known + as the client_id. + This setting is required for enabling OpenID Connection authentication + with Azure Active Directory or + other 3rd party OpenID Connect providers. + More information on OpenID Connect: + http://openid.net/specs/openid-connect-core-1_0.html + :type client_id: str + :param client_secret: The Client Secret of this relying party application + (in Azure Active Directory, this is also referred to as the Key). + This setting is optional. If no client secret is configured, the OpenID + Connect implicit auth flow is used to authenticate end users. + Otherwise, the OpenID Connect Authorization Code Flow is used to + authenticate end users. + More information on OpenID Connect: + http://openid.net/specs/openid-connect-core-1_0.html + :type client_secret: str + :param issuer: The OpenID Connect Issuer URI that represents the entity + which issues access tokens for this application. + When using Azure Active Directory, this value is the URI of the directory + tenant, e.g. https://sts.windows.net/{tenant-guid}/. + This URI is a case-sensitive identifier for the token issuer. + More information on OpenID Connect Discovery: + http://openid.net/specs/openid-connect-discovery-1_0.html + :type issuer: str + :param allowed_audiences: Allowed audience values to consider when + validating JWTs issued by + Azure Active Directory. Note that the ClientID value is + always considered an + allowed audience, regardless of this setting. + :type allowed_audiences: list[str] + :param additional_login_params: Login parameters to send to the OpenID + Connect authorization endpoint when + a user logs in. Each parameter must be in the form "key=value". + :type additional_login_params: list[str] + :param google_client_id: The OpenID Connect Client ID for the Google web + application. + This setting is required for enabling Google Sign-In. + Google Sign-In documentation: + https://developers.google.com/identity/sign-in/web/ + :type google_client_id: str + :param google_client_secret: The client secret associated with the Google + web application. + This setting is required for enabling Google Sign-In. + Google Sign-In documentation: + https://developers.google.com/identity/sign-in/web/ + :type google_client_secret: str + :param google_oauth_scopes: The OAuth 2.0 scopes that will be requested as + part of Google Sign-In authentication. + This setting is optional. If not specified, "openid", "profile", and + "email" are used as default scopes. + Google Sign-In documentation: + https://developers.google.com/identity/sign-in/web/ + :type google_oauth_scopes: list[str] + :param facebook_app_id: The App ID of the Facebook app used for login. + This setting is required for enabling Facebook Login. + Facebook Login documentation: + https://developers.facebook.com/docs/facebook-login + :type facebook_app_id: str + :param facebook_app_secret: The App Secret of the Facebook app used for + Facebook Login. + This setting is required for enabling Facebook Login. + Facebook Login documentation: + https://developers.facebook.com/docs/facebook-login + :type facebook_app_secret: str + :param facebook_oauth_scopes: The OAuth 2.0 scopes that will be requested + as part of Facebook Login authentication. + This setting is optional. + Facebook Login documentation: + https://developers.facebook.com/docs/facebook-login + :type facebook_oauth_scopes: list[str] + :param twitter_consumer_key: The OAuth 1.0a consumer key of the Twitter + application used for sign-in. + This setting is required for enabling Twitter Sign-In. + Twitter Sign-In documentation: https://dev.twitter.com/web/sign-in + :type twitter_consumer_key: str + :param twitter_consumer_secret: The OAuth 1.0a consumer secret of the + Twitter application used for sign-in. + This setting is required for enabling Twitter Sign-In. + Twitter Sign-In documentation: https://dev.twitter.com/web/sign-in + :type twitter_consumer_secret: str + :param microsoft_account_client_id: The OAuth 2.0 client ID that was + created for the app used for authentication. + This setting is required for enabling Microsoft Account authentication. + Microsoft Account OAuth documentation: + https://dev.onedrive.com/auth/msa_oauth.htm + :type microsoft_account_client_id: str + :param microsoft_account_client_secret: The OAuth 2.0 client secret that + was created for the app used for authentication. + This setting is required for enabling Microsoft Account authentication. + Microsoft Account OAuth documentation: + https://dev.onedrive.com/auth/msa_oauth.htm + :type microsoft_account_client_secret: str + :param microsoft_account_oauth_scopes: The OAuth 2.0 scopes that will be + requested as part of Microsoft Account authentication. + This setting is optional. If not specified, "wl.basic" is used as the + default scope. + Microsoft Account Scopes and permissions documentation: + https://msdn.microsoft.com/en-us/library/dn631845.aspx + :type microsoft_account_oauth_scopes: list[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'}, + 'enabled': {'key': 'properties.enabled', 'type': 'bool'}, + 'runtime_version': {'key': 'properties.runtimeVersion', 'type': 'str'}, + 'unauthenticated_client_action': {'key': 'properties.unauthenticatedClientAction', 'type': 'UnauthenticatedClientAction'}, + 'token_store_enabled': {'key': 'properties.tokenStoreEnabled', 'type': 'bool'}, + 'allowed_external_redirect_urls': {'key': 'properties.allowedExternalRedirectUrls', 'type': '[str]'}, + 'default_provider': {'key': 'properties.defaultProvider', 'type': 'BuiltInAuthenticationProvider'}, + 'token_refresh_extension_hours': {'key': 'properties.tokenRefreshExtensionHours', 'type': 'float'}, + 'client_id': {'key': 'properties.clientId', 'type': 'str'}, + 'client_secret': {'key': 'properties.clientSecret', 'type': 'str'}, + 'issuer': {'key': 'properties.issuer', 'type': 'str'}, + 'allowed_audiences': {'key': 'properties.allowedAudiences', 'type': '[str]'}, + 'additional_login_params': {'key': 'properties.additionalLoginParams', 'type': '[str]'}, + 'google_client_id': {'key': 'properties.googleClientId', 'type': 'str'}, + 'google_client_secret': {'key': 'properties.googleClientSecret', 'type': 'str'}, + 'google_oauth_scopes': {'key': 'properties.googleOAuthScopes', 'type': '[str]'}, + 'facebook_app_id': {'key': 'properties.facebookAppId', 'type': 'str'}, + 'facebook_app_secret': {'key': 'properties.facebookAppSecret', 'type': 'str'}, + 'facebook_oauth_scopes': {'key': 'properties.facebookOAuthScopes', 'type': '[str]'}, + 'twitter_consumer_key': {'key': 'properties.twitterConsumerKey', 'type': 'str'}, + 'twitter_consumer_secret': {'key': 'properties.twitterConsumerSecret', 'type': 'str'}, + 'microsoft_account_client_id': {'key': 'properties.microsoftAccountClientId', 'type': 'str'}, + 'microsoft_account_client_secret': {'key': 'properties.microsoftAccountClientSecret', 'type': 'str'}, + 'microsoft_account_oauth_scopes': {'key': 'properties.microsoftAccountOAuthScopes', 'type': '[str]'}, + } + + def __init__(self, *, kind: str=None, enabled: bool=None, runtime_version: str=None, unauthenticated_client_action=None, token_store_enabled: bool=None, allowed_external_redirect_urls=None, default_provider=None, token_refresh_extension_hours: float=None, client_id: str=None, client_secret: str=None, issuer: str=None, allowed_audiences=None, additional_login_params=None, google_client_id: str=None, google_client_secret: str=None, google_oauth_scopes=None, facebook_app_id: str=None, facebook_app_secret: str=None, facebook_oauth_scopes=None, twitter_consumer_key: str=None, twitter_consumer_secret: str=None, microsoft_account_client_id: str=None, microsoft_account_client_secret: str=None, microsoft_account_oauth_scopes=None, **kwargs) -> None: + super(SiteAuthSettings, self).__init__(kind=kind, **kwargs) + self.enabled = enabled + self.runtime_version = runtime_version + self.unauthenticated_client_action = unauthenticated_client_action + self.token_store_enabled = token_store_enabled + self.allowed_external_redirect_urls = allowed_external_redirect_urls + self.default_provider = default_provider + self.token_refresh_extension_hours = token_refresh_extension_hours + self.client_id = client_id + self.client_secret = client_secret + self.issuer = issuer + self.allowed_audiences = allowed_audiences + self.additional_login_params = additional_login_params + self.google_client_id = google_client_id + self.google_client_secret = google_client_secret + self.google_oauth_scopes = google_oauth_scopes + self.facebook_app_id = facebook_app_id + self.facebook_app_secret = facebook_app_secret + self.facebook_oauth_scopes = facebook_oauth_scopes + self.twitter_consumer_key = twitter_consumer_key + self.twitter_consumer_secret = twitter_consumer_secret + self.microsoft_account_client_id = microsoft_account_client_id + self.microsoft_account_client_secret = microsoft_account_client_secret + self.microsoft_account_oauth_scopes = microsoft_account_oauth_scopes diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_cloneability.py b/azure-mgmt-web/azure/mgmt/web/models/site_cloneability.py index b58b934354c4..37d68387f3b3 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/site_cloneability.py +++ b/azure-mgmt-web/azure/mgmt/web/models/site_cloneability.py @@ -40,9 +40,9 @@ class SiteCloneability(Model): 'blocking_characteristics': {'key': 'blockingCharacteristics', 'type': '[SiteCloneabilityCriterion]'}, } - def __init__(self, result=None, blocking_features=None, unsupported_features=None, blocking_characteristics=None): - super(SiteCloneability, self).__init__() - self.result = result - self.blocking_features = blocking_features - self.unsupported_features = unsupported_features - self.blocking_characteristics = blocking_characteristics + def __init__(self, **kwargs): + super(SiteCloneability, self).__init__(**kwargs) + self.result = kwargs.get('result', None) + self.blocking_features = kwargs.get('blocking_features', None) + self.unsupported_features = kwargs.get('unsupported_features', None) + self.blocking_characteristics = kwargs.get('blocking_characteristics', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_cloneability_criterion.py b/azure-mgmt-web/azure/mgmt/web/models/site_cloneability_criterion.py index 8e6bf29ccb39..619ec823c8a8 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/site_cloneability_criterion.py +++ b/azure-mgmt-web/azure/mgmt/web/models/site_cloneability_criterion.py @@ -26,7 +26,7 @@ class SiteCloneabilityCriterion(Model): 'description': {'key': 'description', 'type': 'str'}, } - def __init__(self, name=None, description=None): - super(SiteCloneabilityCriterion, self).__init__() - self.name = name - self.description = description + def __init__(self, **kwargs): + super(SiteCloneabilityCriterion, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.description = kwargs.get('description', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_cloneability_criterion_py3.py b/azure-mgmt-web/azure/mgmt/web/models/site_cloneability_criterion_py3.py new file mode 100644 index 000000000000..fcca5c64c56f --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/site_cloneability_criterion_py3.py @@ -0,0 +1,32 @@ +# 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 SiteCloneabilityCriterion(Model): + """An app cloneability criterion. + + :param name: Name of criterion. + :type name: str + :param description: Description of criterion. + :type description: str + """ + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'description': {'key': 'description', 'type': 'str'}, + } + + def __init__(self, *, name: str=None, description: str=None, **kwargs) -> None: + super(SiteCloneabilityCriterion, self).__init__(**kwargs) + self.name = name + self.description = description diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_cloneability_py3.py b/azure-mgmt-web/azure/mgmt/web/models/site_cloneability_py3.py new file mode 100644 index 000000000000..87d084d5e5e4 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/site_cloneability_py3.py @@ -0,0 +1,48 @@ +# 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 SiteCloneability(Model): + """Represents whether or not an app is cloneable. + + :param result: Name of app. Possible values include: 'Cloneable', + 'PartiallyCloneable', 'NotCloneable' + :type result: str or ~azure.mgmt.web.models.CloneAbilityResult + :param blocking_features: List of features enabled on app that prevent + cloning. + :type blocking_features: + list[~azure.mgmt.web.models.SiteCloneabilityCriterion] + :param unsupported_features: List of features enabled on app that are + non-blocking but cannot be cloned. The app can still be cloned + but the features in this list will not be set up on cloned app. + :type unsupported_features: + list[~azure.mgmt.web.models.SiteCloneabilityCriterion] + :param blocking_characteristics: List of blocking application + characteristics. + :type blocking_characteristics: + list[~azure.mgmt.web.models.SiteCloneabilityCriterion] + """ + + _attribute_map = { + 'result': {'key': 'result', 'type': 'CloneAbilityResult'}, + 'blocking_features': {'key': 'blockingFeatures', 'type': '[SiteCloneabilityCriterion]'}, + 'unsupported_features': {'key': 'unsupportedFeatures', 'type': '[SiteCloneabilityCriterion]'}, + 'blocking_characteristics': {'key': 'blockingCharacteristics', 'type': '[SiteCloneabilityCriterion]'}, + } + + def __init__(self, *, result=None, blocking_features=None, unsupported_features=None, blocking_characteristics=None, **kwargs) -> None: + super(SiteCloneability, self).__init__(**kwargs) + self.result = result + self.blocking_features = blocking_features + self.unsupported_features = unsupported_features + self.blocking_characteristics = blocking_characteristics 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..b598addfbdc0 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/site_config.py +++ b/azure-mgmt-web/azure/mgmt/web/models/site_config.py @@ -184,50 +184,50 @@ class SiteConfig(Model): 'min_tls_version': {'key': 'minTlsVersion', '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): - super(SiteConfig, self).__init__() - self.number_of_workers = number_of_workers - self.default_documents = default_documents - self.net_framework_version = net_framework_version - self.php_version = php_version - self.python_version = python_version - self.node_version = node_version - self.linux_fx_version = linux_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 - self.remote_debugging_version = remote_debugging_version - self.http_logging_enabled = http_logging_enabled - self.logs_directory_size_limit = logs_directory_size_limit - self.detailed_error_logging_enabled = detailed_error_logging_enabled - self.publishing_username = publishing_username - self.app_settings = app_settings - self.connection_strings = connection_strings + def __init__(self, **kwargs): + super(SiteConfig, self).__init__(**kwargs) + self.number_of_workers = kwargs.get('number_of_workers', None) + self.default_documents = kwargs.get('default_documents', None) + self.net_framework_version = kwargs.get('net_framework_version', "v4.6") + self.php_version = kwargs.get('php_version', None) + self.python_version = kwargs.get('python_version', None) + self.node_version = kwargs.get('node_version', None) + self.linux_fx_version = kwargs.get('linux_fx_version', None) + self.request_tracing_enabled = kwargs.get('request_tracing_enabled', None) + self.request_tracing_expiration_time = kwargs.get('request_tracing_expiration_time', None) + self.remote_debugging_enabled = kwargs.get('remote_debugging_enabled', None) + self.remote_debugging_version = kwargs.get('remote_debugging_version', None) + self.http_logging_enabled = kwargs.get('http_logging_enabled', None) + self.logs_directory_size_limit = kwargs.get('logs_directory_size_limit', None) + self.detailed_error_logging_enabled = kwargs.get('detailed_error_logging_enabled', None) + self.publishing_username = kwargs.get('publishing_username', None) + self.app_settings = kwargs.get('app_settings', None) + self.connection_strings = kwargs.get('connection_strings', None) self.machine_key = None - self.handler_mappings = handler_mappings - self.document_root = document_root - self.scm_type = scm_type - self.use32_bit_worker_process = use32_bit_worker_process - self.web_sockets_enabled = web_sockets_enabled - self.always_on = always_on - self.java_version = java_version - self.java_container = java_container - self.java_container_version = java_container_version - self.app_command_line = app_command_line - self.managed_pipeline_mode = managed_pipeline_mode - self.virtual_applications = virtual_applications - self.load_balancing = load_balancing - self.experiments = experiments - self.limits = limits - self.auto_heal_enabled = auto_heal_enabled - self.auto_heal_rules = auto_heal_rules - self.tracing_options = tracing_options - self.vnet_name = vnet_name - self.cors = cors - self.push = push - self.api_definition = api_definition - self.auto_swap_slot_name = auto_swap_slot_name - self.local_my_sql_enabled = local_my_sql_enabled - self.ip_security_restrictions = ip_security_restrictions - self.http20_enabled = http20_enabled - self.min_tls_version = min_tls_version + self.handler_mappings = kwargs.get('handler_mappings', None) + self.document_root = kwargs.get('document_root', None) + self.scm_type = kwargs.get('scm_type', None) + self.use32_bit_worker_process = kwargs.get('use32_bit_worker_process', None) + self.web_sockets_enabled = kwargs.get('web_sockets_enabled', None) + self.always_on = kwargs.get('always_on', None) + self.java_version = kwargs.get('java_version', None) + self.java_container = kwargs.get('java_container', None) + self.java_container_version = kwargs.get('java_container_version', None) + self.app_command_line = kwargs.get('app_command_line', None) + self.managed_pipeline_mode = kwargs.get('managed_pipeline_mode', None) + self.virtual_applications = kwargs.get('virtual_applications', None) + self.load_balancing = kwargs.get('load_balancing', None) + self.experiments = kwargs.get('experiments', None) + self.limits = kwargs.get('limits', None) + self.auto_heal_enabled = kwargs.get('auto_heal_enabled', None) + self.auto_heal_rules = kwargs.get('auto_heal_rules', None) + self.tracing_options = kwargs.get('tracing_options', None) + self.vnet_name = kwargs.get('vnet_name', None) + self.cors = kwargs.get('cors', None) + self.push = kwargs.get('push', None) + self.api_definition = kwargs.get('api_definition', None) + self.auto_swap_slot_name = kwargs.get('auto_swap_slot_name', None) + self.local_my_sql_enabled = kwargs.get('local_my_sql_enabled', False) + self.ip_security_restrictions = kwargs.get('ip_security_restrictions', None) + self.http20_enabled = kwargs.get('http20_enabled', True) + self.min_tls_version = kwargs.get('min_tls_version', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_config_py3.py b/azure-mgmt-web/azure/mgmt/web/models/site_config_py3.py new file mode 100644 index 000000000000..fad1c217018c --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/site_config_py3.py @@ -0,0 +1,233 @@ +# 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 SiteConfig(Model): + """Configuration of an App Service app. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :param number_of_workers: Number of workers. + :type number_of_workers: int + :param default_documents: Default documents. + :type default_documents: list[str] + :param net_framework_version: .NET Framework version. Default value: + "v4.6" . + :type net_framework_version: str + :param php_version: Version of PHP. + :type php_version: str + :param python_version: Version of Python. + :type python_version: str + :param node_version: Version of Node.js. + :type node_version: str + :param linux_fx_version: Linux App Framework and version + :type linux_fx_version: str + :param request_tracing_enabled: true if request tracing is + enabled; otherwise, false. + :type request_tracing_enabled: bool + :param request_tracing_expiration_time: Request tracing expiration time. + :type request_tracing_expiration_time: datetime + :param remote_debugging_enabled: true if remote debugging is + enabled; otherwise, false. + :type remote_debugging_enabled: bool + :param remote_debugging_version: Remote debugging version. + :type remote_debugging_version: str + :param http_logging_enabled: true if HTTP logging is enabled; + otherwise, false. + :type http_logging_enabled: bool + :param logs_directory_size_limit: HTTP logs directory size limit. + :type logs_directory_size_limit: int + :param detailed_error_logging_enabled: true if detailed error + logging is enabled; otherwise, false. + :type detailed_error_logging_enabled: bool + :param publishing_username: Publishing user name. + :type publishing_username: str + :param app_settings: Application settings. + :type app_settings: list[~azure.mgmt.web.models.NameValuePair] + :param connection_strings: Connection strings. + :type connection_strings: list[~azure.mgmt.web.models.ConnStringInfo] + :ivar machine_key: Site MachineKey. + :vartype machine_key: ~azure.mgmt.web.models.SiteMachineKey + :param handler_mappings: Handler mappings. + :type handler_mappings: list[~azure.mgmt.web.models.HandlerMapping] + :param document_root: Document root. + :type document_root: str + :param scm_type: SCM type. Possible values include: 'None', 'Dropbox', + 'Tfs', 'LocalGit', 'GitHub', 'CodePlexGit', 'CodePlexHg', 'BitbucketGit', + 'BitbucketHg', 'ExternalGit', 'ExternalHg', 'OneDrive', 'VSO' + :type scm_type: str or ~azure.mgmt.web.models.ScmType + :param use32_bit_worker_process: true to use 32-bit worker + process; otherwise, false. + :type use32_bit_worker_process: bool + :param web_sockets_enabled: true if WebSocket is enabled; + otherwise, false. + :type web_sockets_enabled: bool + :param always_on: true if Always On is enabled; otherwise, + false. + :type always_on: bool + :param java_version: Java version. + :type java_version: str + :param java_container: Java container. + :type java_container: str + :param java_container_version: Java container version. + :type java_container_version: str + :param app_command_line: App command line to launch. + :type app_command_line: str + :param managed_pipeline_mode: Managed pipeline mode. Possible values + include: 'Integrated', 'Classic' + :type managed_pipeline_mode: str or + ~azure.mgmt.web.models.ManagedPipelineMode + :param virtual_applications: Virtual applications. + :type virtual_applications: + list[~azure.mgmt.web.models.VirtualApplication] + :param load_balancing: Site load balancing. Possible values include: + 'WeightedRoundRobin', 'LeastRequests', 'LeastResponseTime', + 'WeightedTotalTraffic', 'RequestHash' + :type load_balancing: str or ~azure.mgmt.web.models.SiteLoadBalancing + :param experiments: This is work around for polymophic types. + :type experiments: ~azure.mgmt.web.models.Experiments + :param limits: Site limits. + :type limits: ~azure.mgmt.web.models.SiteLimits + :param auto_heal_enabled: true if Auto Heal is enabled; + otherwise, false. + :type auto_heal_enabled: bool + :param auto_heal_rules: Auto Heal rules. + :type auto_heal_rules: ~azure.mgmt.web.models.AutoHealRules + :param tracing_options: Tracing options. + :type tracing_options: str + :param vnet_name: Virtual Network name. + :type vnet_name: str + :param cors: Cross-Origin Resource Sharing (CORS) settings. + :type cors: ~azure.mgmt.web.models.CorsSettings + :param push: Push endpoint settings. + :type push: ~azure.mgmt.web.models.PushSettings + :param api_definition: Information about the formal API definition for the + app. + :type api_definition: ~azure.mgmt.web.models.ApiDefinitionInfo + :param auto_swap_slot_name: Auto-swap slot name. + :type auto_swap_slot_name: str + :param local_my_sql_enabled: true to enable local MySQL; + otherwise, false. Default value: False . + :type local_my_sql_enabled: bool + :param ip_security_restrictions: IP security restrictions. + :type ip_security_restrictions: + list[~azure.mgmt.web.models.IpSecurityRestriction] + :param http20_enabled: Http20Enabled: configures a web site to allow + clients to connect over http2.0. Default value: True . + :type http20_enabled: bool + :param min_tls_version: MinTlsVersion: configures the minimum version of + 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 + """ + + _validation = { + 'machine_key': {'readonly': True}, + } + + _attribute_map = { + 'number_of_workers': {'key': 'numberOfWorkers', 'type': 'int'}, + 'default_documents': {'key': 'defaultDocuments', 'type': '[str]'}, + 'net_framework_version': {'key': 'netFrameworkVersion', 'type': 'str'}, + 'php_version': {'key': 'phpVersion', 'type': 'str'}, + 'python_version': {'key': 'pythonVersion', 'type': 'str'}, + 'node_version': {'key': 'nodeVersion', 'type': 'str'}, + 'linux_fx_version': {'key': 'linuxFxVersion', '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'}, + 'remote_debugging_version': {'key': 'remoteDebuggingVersion', 'type': 'str'}, + 'http_logging_enabled': {'key': 'httpLoggingEnabled', 'type': 'bool'}, + 'logs_directory_size_limit': {'key': 'logsDirectorySizeLimit', 'type': 'int'}, + 'detailed_error_logging_enabled': {'key': 'detailedErrorLoggingEnabled', 'type': 'bool'}, + 'publishing_username': {'key': 'publishingUsername', 'type': 'str'}, + 'app_settings': {'key': 'appSettings', 'type': '[NameValuePair]'}, + 'connection_strings': {'key': 'connectionStrings', 'type': '[ConnStringInfo]'}, + 'machine_key': {'key': 'machineKey', 'type': 'SiteMachineKey'}, + 'handler_mappings': {'key': 'handlerMappings', 'type': '[HandlerMapping]'}, + 'document_root': {'key': 'documentRoot', 'type': 'str'}, + 'scm_type': {'key': 'scmType', 'type': 'str'}, + 'use32_bit_worker_process': {'key': 'use32BitWorkerProcess', 'type': 'bool'}, + 'web_sockets_enabled': {'key': 'webSocketsEnabled', 'type': 'bool'}, + 'always_on': {'key': 'alwaysOn', 'type': 'bool'}, + 'java_version': {'key': 'javaVersion', 'type': 'str'}, + 'java_container': {'key': 'javaContainer', 'type': 'str'}, + 'java_container_version': {'key': 'javaContainerVersion', 'type': 'str'}, + 'app_command_line': {'key': 'appCommandLine', 'type': 'str'}, + 'managed_pipeline_mode': {'key': 'managedPipelineMode', 'type': 'ManagedPipelineMode'}, + 'virtual_applications': {'key': 'virtualApplications', 'type': '[VirtualApplication]'}, + 'load_balancing': {'key': 'loadBalancing', 'type': 'SiteLoadBalancing'}, + 'experiments': {'key': 'experiments', 'type': 'Experiments'}, + 'limits': {'key': 'limits', 'type': 'SiteLimits'}, + 'auto_heal_enabled': {'key': 'autoHealEnabled', 'type': 'bool'}, + 'auto_heal_rules': {'key': 'autoHealRules', 'type': 'AutoHealRules'}, + 'tracing_options': {'key': 'tracingOptions', 'type': 'str'}, + 'vnet_name': {'key': 'vnetName', 'type': 'str'}, + 'cors': {'key': 'cors', 'type': 'CorsSettings'}, + 'push': {'key': 'push', 'type': 'PushSettings'}, + 'api_definition': {'key': 'apiDefinition', 'type': 'ApiDefinitionInfo'}, + 'auto_swap_slot_name': {'key': 'autoSwapSlotName', 'type': 'str'}, + 'local_my_sql_enabled': {'key': 'localMySqlEnabled', 'type': 'bool'}, + 'ip_security_restrictions': {'key': 'ipSecurityRestrictions', 'type': '[IpSecurityRestriction]'}, + 'http20_enabled': {'key': 'http20Enabled', 'type': 'bool'}, + 'min_tls_version': {'key': 'minTlsVersion', 'type': 'str'}, + } + + def __init__(self, *, number_of_workers: int=None, default_documents=None, net_framework_version: str="v4.6", php_version: str=None, python_version: str=None, node_version: str=None, linux_fx_version: str=None, request_tracing_enabled: bool=None, request_tracing_expiration_time=None, remote_debugging_enabled: bool=None, remote_debugging_version: str=None, http_logging_enabled: bool=None, logs_directory_size_limit: int=None, detailed_error_logging_enabled: bool=None, publishing_username: str=None, app_settings=None, connection_strings=None, handler_mappings=None, document_root: str=None, scm_type=None, use32_bit_worker_process: bool=None, web_sockets_enabled: bool=None, always_on: bool=None, java_version: str=None, java_container: str=None, java_container_version: str=None, app_command_line: str=None, managed_pipeline_mode=None, virtual_applications=None, load_balancing=None, experiments=None, limits=None, auto_heal_enabled: bool=None, auto_heal_rules=None, tracing_options: str=None, vnet_name: str=None, cors=None, push=None, api_definition=None, auto_swap_slot_name: str=None, local_my_sql_enabled: bool=False, ip_security_restrictions=None, http20_enabled: bool=True, min_tls_version=None, **kwargs) -> None: + super(SiteConfig, self).__init__(**kwargs) + self.number_of_workers = number_of_workers + self.default_documents = default_documents + self.net_framework_version = net_framework_version + self.php_version = php_version + self.python_version = python_version + self.node_version = node_version + self.linux_fx_version = linux_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 + self.remote_debugging_version = remote_debugging_version + self.http_logging_enabled = http_logging_enabled + self.logs_directory_size_limit = logs_directory_size_limit + self.detailed_error_logging_enabled = detailed_error_logging_enabled + self.publishing_username = publishing_username + self.app_settings = app_settings + self.connection_strings = connection_strings + self.machine_key = None + self.handler_mappings = handler_mappings + self.document_root = document_root + self.scm_type = scm_type + self.use32_bit_worker_process = use32_bit_worker_process + self.web_sockets_enabled = web_sockets_enabled + self.always_on = always_on + self.java_version = java_version + self.java_container = java_container + self.java_container_version = java_container_version + self.app_command_line = app_command_line + self.managed_pipeline_mode = managed_pipeline_mode + self.virtual_applications = virtual_applications + self.load_balancing = load_balancing + self.experiments = experiments + self.limits = limits + self.auto_heal_enabled = auto_heal_enabled + self.auto_heal_rules = auto_heal_rules + self.tracing_options = tracing_options + self.vnet_name = vnet_name + self.cors = cors + self.push = push + self.api_definition = api_definition + self.auto_swap_slot_name = auto_swap_slot_name + self.local_my_sql_enabled = local_my_sql_enabled + self.ip_security_restrictions = ip_security_restrictions + self.http20_enabled = http20_enabled + self.min_tls_version = min_tls_version 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..2023ff28665e 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 @@ -199,50 +199,50 @@ class SiteConfigResource(ProxyOnlyResource): 'min_tls_version': {'key': 'properties.minTlsVersion', '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): - super(SiteConfigResource, self).__init__(kind=kind) - self.number_of_workers = number_of_workers - self.default_documents = default_documents - self.net_framework_version = net_framework_version - self.php_version = php_version - self.python_version = python_version - self.node_version = node_version - self.linux_fx_version = linux_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 - self.remote_debugging_version = remote_debugging_version - self.http_logging_enabled = http_logging_enabled - self.logs_directory_size_limit = logs_directory_size_limit - self.detailed_error_logging_enabled = detailed_error_logging_enabled - self.publishing_username = publishing_username - self.app_settings = app_settings - self.connection_strings = connection_strings + def __init__(self, **kwargs): + super(SiteConfigResource, self).__init__(**kwargs) + self.number_of_workers = kwargs.get('number_of_workers', None) + self.default_documents = kwargs.get('default_documents', None) + self.net_framework_version = kwargs.get('net_framework_version', "v4.6") + self.php_version = kwargs.get('php_version', None) + self.python_version = kwargs.get('python_version', None) + self.node_version = kwargs.get('node_version', None) + self.linux_fx_version = kwargs.get('linux_fx_version', None) + self.request_tracing_enabled = kwargs.get('request_tracing_enabled', None) + self.request_tracing_expiration_time = kwargs.get('request_tracing_expiration_time', None) + self.remote_debugging_enabled = kwargs.get('remote_debugging_enabled', None) + self.remote_debugging_version = kwargs.get('remote_debugging_version', None) + self.http_logging_enabled = kwargs.get('http_logging_enabled', None) + self.logs_directory_size_limit = kwargs.get('logs_directory_size_limit', None) + self.detailed_error_logging_enabled = kwargs.get('detailed_error_logging_enabled', None) + self.publishing_username = kwargs.get('publishing_username', None) + self.app_settings = kwargs.get('app_settings', None) + self.connection_strings = kwargs.get('connection_strings', None) self.machine_key = None - self.handler_mappings = handler_mappings - self.document_root = document_root - self.scm_type = scm_type - self.use32_bit_worker_process = use32_bit_worker_process - self.web_sockets_enabled = web_sockets_enabled - self.always_on = always_on - self.java_version = java_version - self.java_container = java_container - self.java_container_version = java_container_version - self.app_command_line = app_command_line - self.managed_pipeline_mode = managed_pipeline_mode - self.virtual_applications = virtual_applications - self.load_balancing = load_balancing - self.experiments = experiments - self.limits = limits - self.auto_heal_enabled = auto_heal_enabled - self.auto_heal_rules = auto_heal_rules - self.tracing_options = tracing_options - self.vnet_name = vnet_name - self.cors = cors - self.push = push - self.api_definition = api_definition - self.auto_swap_slot_name = auto_swap_slot_name - self.local_my_sql_enabled = local_my_sql_enabled - self.ip_security_restrictions = ip_security_restrictions - self.http20_enabled = http20_enabled - self.min_tls_version = min_tls_version + self.handler_mappings = kwargs.get('handler_mappings', None) + self.document_root = kwargs.get('document_root', None) + self.scm_type = kwargs.get('scm_type', None) + self.use32_bit_worker_process = kwargs.get('use32_bit_worker_process', None) + self.web_sockets_enabled = kwargs.get('web_sockets_enabled', None) + self.always_on = kwargs.get('always_on', None) + self.java_version = kwargs.get('java_version', None) + self.java_container = kwargs.get('java_container', None) + self.java_container_version = kwargs.get('java_container_version', None) + self.app_command_line = kwargs.get('app_command_line', None) + self.managed_pipeline_mode = kwargs.get('managed_pipeline_mode', None) + self.virtual_applications = kwargs.get('virtual_applications', None) + self.load_balancing = kwargs.get('load_balancing', None) + self.experiments = kwargs.get('experiments', None) + self.limits = kwargs.get('limits', None) + self.auto_heal_enabled = kwargs.get('auto_heal_enabled', None) + self.auto_heal_rules = kwargs.get('auto_heal_rules', None) + self.tracing_options = kwargs.get('tracing_options', None) + self.vnet_name = kwargs.get('vnet_name', None) + self.cors = kwargs.get('cors', None) + self.push = kwargs.get('push', None) + self.api_definition = kwargs.get('api_definition', None) + self.auto_swap_slot_name = kwargs.get('auto_swap_slot_name', None) + self.local_my_sql_enabled = kwargs.get('local_my_sql_enabled', False) + self.ip_security_restrictions = kwargs.get('ip_security_restrictions', None) + self.http20_enabled = kwargs.get('http20_enabled', True) + self.min_tls_version = kwargs.get('min_tls_version', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_config_resource_py3.py b/azure-mgmt-web/azure/mgmt/web/models/site_config_resource_py3.py new file mode 100644 index 000000000000..97437aea7fcd --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/site_config_resource_py3.py @@ -0,0 +1,248 @@ +# 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_py3 import ProxyOnlyResource + + +class SiteConfigResource(ProxyOnlyResource): + """Web app configuration ARM resource. + + 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 number_of_workers: Number of workers. + :type number_of_workers: int + :param default_documents: Default documents. + :type default_documents: list[str] + :param net_framework_version: .NET Framework version. Default value: + "v4.6" . + :type net_framework_version: str + :param php_version: Version of PHP. + :type php_version: str + :param python_version: Version of Python. + :type python_version: str + :param node_version: Version of Node.js. + :type node_version: str + :param linux_fx_version: Linux App Framework and version + :type linux_fx_version: str + :param request_tracing_enabled: true if request tracing is + enabled; otherwise, false. + :type request_tracing_enabled: bool + :param request_tracing_expiration_time: Request tracing expiration time. + :type request_tracing_expiration_time: datetime + :param remote_debugging_enabled: true if remote debugging is + enabled; otherwise, false. + :type remote_debugging_enabled: bool + :param remote_debugging_version: Remote debugging version. + :type remote_debugging_version: str + :param http_logging_enabled: true if HTTP logging is enabled; + otherwise, false. + :type http_logging_enabled: bool + :param logs_directory_size_limit: HTTP logs directory size limit. + :type logs_directory_size_limit: int + :param detailed_error_logging_enabled: true if detailed error + logging is enabled; otherwise, false. + :type detailed_error_logging_enabled: bool + :param publishing_username: Publishing user name. + :type publishing_username: str + :param app_settings: Application settings. + :type app_settings: list[~azure.mgmt.web.models.NameValuePair] + :param connection_strings: Connection strings. + :type connection_strings: list[~azure.mgmt.web.models.ConnStringInfo] + :ivar machine_key: Site MachineKey. + :vartype machine_key: ~azure.mgmt.web.models.SiteMachineKey + :param handler_mappings: Handler mappings. + :type handler_mappings: list[~azure.mgmt.web.models.HandlerMapping] + :param document_root: Document root. + :type document_root: str + :param scm_type: SCM type. Possible values include: 'None', 'Dropbox', + 'Tfs', 'LocalGit', 'GitHub', 'CodePlexGit', 'CodePlexHg', 'BitbucketGit', + 'BitbucketHg', 'ExternalGit', 'ExternalHg', 'OneDrive', 'VSO' + :type scm_type: str or ~azure.mgmt.web.models.ScmType + :param use32_bit_worker_process: true to use 32-bit worker + process; otherwise, false. + :type use32_bit_worker_process: bool + :param web_sockets_enabled: true if WebSocket is enabled; + otherwise, false. + :type web_sockets_enabled: bool + :param always_on: true if Always On is enabled; otherwise, + false. + :type always_on: bool + :param java_version: Java version. + :type java_version: str + :param java_container: Java container. + :type java_container: str + :param java_container_version: Java container version. + :type java_container_version: str + :param app_command_line: App command line to launch. + :type app_command_line: str + :param managed_pipeline_mode: Managed pipeline mode. Possible values + include: 'Integrated', 'Classic' + :type managed_pipeline_mode: str or + ~azure.mgmt.web.models.ManagedPipelineMode + :param virtual_applications: Virtual applications. + :type virtual_applications: + list[~azure.mgmt.web.models.VirtualApplication] + :param load_balancing: Site load balancing. Possible values include: + 'WeightedRoundRobin', 'LeastRequests', 'LeastResponseTime', + 'WeightedTotalTraffic', 'RequestHash' + :type load_balancing: str or ~azure.mgmt.web.models.SiteLoadBalancing + :param experiments: This is work around for polymophic types. + :type experiments: ~azure.mgmt.web.models.Experiments + :param limits: Site limits. + :type limits: ~azure.mgmt.web.models.SiteLimits + :param auto_heal_enabled: true if Auto Heal is enabled; + otherwise, false. + :type auto_heal_enabled: bool + :param auto_heal_rules: Auto Heal rules. + :type auto_heal_rules: ~azure.mgmt.web.models.AutoHealRules + :param tracing_options: Tracing options. + :type tracing_options: str + :param vnet_name: Virtual Network name. + :type vnet_name: str + :param cors: Cross-Origin Resource Sharing (CORS) settings. + :type cors: ~azure.mgmt.web.models.CorsSettings + :param push: Push endpoint settings. + :type push: ~azure.mgmt.web.models.PushSettings + :param api_definition: Information about the formal API definition for the + app. + :type api_definition: ~azure.mgmt.web.models.ApiDefinitionInfo + :param auto_swap_slot_name: Auto-swap slot name. + :type auto_swap_slot_name: str + :param local_my_sql_enabled: true to enable local MySQL; + otherwise, false. Default value: False . + :type local_my_sql_enabled: bool + :param ip_security_restrictions: IP security restrictions. + :type ip_security_restrictions: + list[~azure.mgmt.web.models.IpSecurityRestriction] + :param http20_enabled: Http20Enabled: configures a web site to allow + clients to connect over http2.0. Default value: True . + :type http20_enabled: bool + :param min_tls_version: MinTlsVersion: configures the minimum version of + 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 + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'machine_key': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'number_of_workers': {'key': 'properties.numberOfWorkers', 'type': 'int'}, + 'default_documents': {'key': 'properties.defaultDocuments', 'type': '[str]'}, + 'net_framework_version': {'key': 'properties.netFrameworkVersion', 'type': 'str'}, + 'php_version': {'key': 'properties.phpVersion', 'type': 'str'}, + 'python_version': {'key': 'properties.pythonVersion', 'type': 'str'}, + 'node_version': {'key': 'properties.nodeVersion', 'type': 'str'}, + 'linux_fx_version': {'key': 'properties.linuxFxVersion', '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'}, + 'remote_debugging_version': {'key': 'properties.remoteDebuggingVersion', 'type': 'str'}, + 'http_logging_enabled': {'key': 'properties.httpLoggingEnabled', 'type': 'bool'}, + 'logs_directory_size_limit': {'key': 'properties.logsDirectorySizeLimit', 'type': 'int'}, + 'detailed_error_logging_enabled': {'key': 'properties.detailedErrorLoggingEnabled', 'type': 'bool'}, + 'publishing_username': {'key': 'properties.publishingUsername', 'type': 'str'}, + 'app_settings': {'key': 'properties.appSettings', 'type': '[NameValuePair]'}, + 'connection_strings': {'key': 'properties.connectionStrings', 'type': '[ConnStringInfo]'}, + 'machine_key': {'key': 'properties.machineKey', 'type': 'SiteMachineKey'}, + 'handler_mappings': {'key': 'properties.handlerMappings', 'type': '[HandlerMapping]'}, + 'document_root': {'key': 'properties.documentRoot', 'type': 'str'}, + 'scm_type': {'key': 'properties.scmType', 'type': 'str'}, + 'use32_bit_worker_process': {'key': 'properties.use32BitWorkerProcess', 'type': 'bool'}, + 'web_sockets_enabled': {'key': 'properties.webSocketsEnabled', 'type': 'bool'}, + 'always_on': {'key': 'properties.alwaysOn', 'type': 'bool'}, + 'java_version': {'key': 'properties.javaVersion', 'type': 'str'}, + 'java_container': {'key': 'properties.javaContainer', 'type': 'str'}, + 'java_container_version': {'key': 'properties.javaContainerVersion', 'type': 'str'}, + 'app_command_line': {'key': 'properties.appCommandLine', 'type': 'str'}, + 'managed_pipeline_mode': {'key': 'properties.managedPipelineMode', 'type': 'ManagedPipelineMode'}, + 'virtual_applications': {'key': 'properties.virtualApplications', 'type': '[VirtualApplication]'}, + 'load_balancing': {'key': 'properties.loadBalancing', 'type': 'SiteLoadBalancing'}, + 'experiments': {'key': 'properties.experiments', 'type': 'Experiments'}, + 'limits': {'key': 'properties.limits', 'type': 'SiteLimits'}, + 'auto_heal_enabled': {'key': 'properties.autoHealEnabled', 'type': 'bool'}, + 'auto_heal_rules': {'key': 'properties.autoHealRules', 'type': 'AutoHealRules'}, + 'tracing_options': {'key': 'properties.tracingOptions', 'type': 'str'}, + 'vnet_name': {'key': 'properties.vnetName', 'type': 'str'}, + 'cors': {'key': 'properties.cors', 'type': 'CorsSettings'}, + 'push': {'key': 'properties.push', 'type': 'PushSettings'}, + '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'}, + 'ip_security_restrictions': {'key': 'properties.ipSecurityRestrictions', 'type': '[IpSecurityRestriction]'}, + 'http20_enabled': {'key': 'properties.http20Enabled', 'type': 'bool'}, + 'min_tls_version': {'key': 'properties.minTlsVersion', 'type': 'str'}, + } + + def __init__(self, *, kind: str=None, number_of_workers: int=None, default_documents=None, net_framework_version: str="v4.6", php_version: str=None, python_version: str=None, node_version: str=None, linux_fx_version: str=None, request_tracing_enabled: bool=None, request_tracing_expiration_time=None, remote_debugging_enabled: bool=None, remote_debugging_version: str=None, http_logging_enabled: bool=None, logs_directory_size_limit: int=None, detailed_error_logging_enabled: bool=None, publishing_username: str=None, app_settings=None, connection_strings=None, handler_mappings=None, document_root: str=None, scm_type=None, use32_bit_worker_process: bool=None, web_sockets_enabled: bool=None, always_on: bool=None, java_version: str=None, java_container: str=None, java_container_version: str=None, app_command_line: str=None, managed_pipeline_mode=None, virtual_applications=None, load_balancing=None, experiments=None, limits=None, auto_heal_enabled: bool=None, auto_heal_rules=None, tracing_options: str=None, vnet_name: str=None, cors=None, push=None, api_definition=None, auto_swap_slot_name: str=None, local_my_sql_enabled: bool=False, ip_security_restrictions=None, http20_enabled: bool=True, min_tls_version=None, **kwargs) -> None: + super(SiteConfigResource, self).__init__(kind=kind, **kwargs) + self.number_of_workers = number_of_workers + self.default_documents = default_documents + self.net_framework_version = net_framework_version + self.php_version = php_version + self.python_version = python_version + self.node_version = node_version + self.linux_fx_version = linux_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 + self.remote_debugging_version = remote_debugging_version + self.http_logging_enabled = http_logging_enabled + self.logs_directory_size_limit = logs_directory_size_limit + self.detailed_error_logging_enabled = detailed_error_logging_enabled + self.publishing_username = publishing_username + self.app_settings = app_settings + self.connection_strings = connection_strings + self.machine_key = None + self.handler_mappings = handler_mappings + self.document_root = document_root + self.scm_type = scm_type + self.use32_bit_worker_process = use32_bit_worker_process + self.web_sockets_enabled = web_sockets_enabled + self.always_on = always_on + self.java_version = java_version + self.java_container = java_container + self.java_container_version = java_container_version + self.app_command_line = app_command_line + self.managed_pipeline_mode = managed_pipeline_mode + self.virtual_applications = virtual_applications + self.load_balancing = load_balancing + self.experiments = experiments + self.limits = limits + self.auto_heal_enabled = auto_heal_enabled + self.auto_heal_rules = auto_heal_rules + self.tracing_options = tracing_options + self.vnet_name = vnet_name + self.cors = cors + self.push = push + self.api_definition = api_definition + self.auto_swap_slot_name = auto_swap_slot_name + self.local_my_sql_enabled = local_my_sql_enabled + self.ip_security_restrictions = ip_security_restrictions + self.http20_enabled = http20_enabled + self.min_tls_version = min_tls_version 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..3e73e8b95d20 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 @@ -49,7 +49,7 @@ class SiteConfigurationSnapshotInfo(ProxyOnlyResource): 'site_configuration_snapshot_info_id': {'key': 'properties.id', 'type': 'int'}, } - def __init__(self, kind=None): - super(SiteConfigurationSnapshotInfo, self).__init__(kind=kind) + def __init__(self, **kwargs): + super(SiteConfigurationSnapshotInfo, self).__init__(**kwargs) self.time = None self.site_configuration_snapshot_info_id = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_configuration_snapshot_info_py3.py b/azure-mgmt-web/azure/mgmt/web/models/site_configuration_snapshot_info_py3.py new file mode 100644 index 000000000000..1f6ecef24754 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/site_configuration_snapshot_info_py3.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 .proxy_only_resource_py3 import ProxyOnlyResource + + +class SiteConfigurationSnapshotInfo(ProxyOnlyResource): + """A snapshot of a web app configuration. + + 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 + :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 + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'time': {'readonly': True}, + 'site_configuration_snapshot_info_id': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + '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'}, + } + + def __init__(self, *, kind: str=None, **kwargs) -> None: + super(SiteConfigurationSnapshotInfo, self).__init__(kind=kind, **kwargs) + self.time = None + self.site_configuration_snapshot_info_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..d00ab6c3dbfe 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 @@ -104,25 +104,25 @@ class SiteExtensionInfo(ProxyOnlyResource): '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): - super(SiteExtensionInfo, self).__init__(kind=kind) - self.site_extension_info_id = site_extension_info_id - self.title = title - self.site_extension_info_type = site_extension_info_type - self.summary = summary - self.description = description - self.version = version - self.extension_url = extension_url - self.project_url = project_url - self.icon_url = icon_url - self.license_url = license_url - self.feed_url = feed_url - self.authors = authors - self.installation_args = installation_args - self.published_date_time = published_date_time - self.download_count = download_count - self.local_is_latest_version = local_is_latest_version - self.local_path = local_path - self.installed_date_time = installed_date_time - self.provisioning_state = provisioning_state - self.comment = comment + def __init__(self, **kwargs): + super(SiteExtensionInfo, self).__init__(**kwargs) + self.site_extension_info_id = kwargs.get('site_extension_info_id', None) + self.title = kwargs.get('title', None) + self.site_extension_info_type = kwargs.get('site_extension_info_type', None) + self.summary = kwargs.get('summary', None) + self.description = kwargs.get('description', None) + self.version = kwargs.get('version', None) + self.extension_url = kwargs.get('extension_url', None) + self.project_url = kwargs.get('project_url', None) + self.icon_url = kwargs.get('icon_url', None) + self.license_url = kwargs.get('license_url', None) + self.feed_url = kwargs.get('feed_url', None) + self.authors = kwargs.get('authors', None) + self.installation_args = kwargs.get('installation_args', None) + self.published_date_time = kwargs.get('published_date_time', None) + self.download_count = kwargs.get('download_count', None) + self.local_is_latest_version = kwargs.get('local_is_latest_version', None) + self.local_path = kwargs.get('local_path', None) + self.installed_date_time = kwargs.get('installed_date_time', None) + self.provisioning_state = kwargs.get('provisioning_state', None) + self.comment = kwargs.get('comment', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_extension_info_py3.py b/azure-mgmt-web/azure/mgmt/web/models/site_extension_info_py3.py new file mode 100644 index 000000000000..e8e9736cfd05 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/site_extension_info_py3.py @@ -0,0 +1,128 @@ +# 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_py3 import ProxyOnlyResource + + +class SiteExtensionInfo(ProxyOnlyResource): + """Site Extension Information. + + 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 site_extension_info_id: Site extension ID. + :type site_extension_info_id: str + :param title: Site extension 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 summary: Summary description. + :type summary: str + :param description: Detailed description. + :type description: str + :param version: Version information. + :type version: str + :param extension_url: Extension URL. + :type extension_url: str + :param project_url: Project URL. + :type project_url: str + :param icon_url: Icon URL. + :type icon_url: str + :param license_url: License URL. + :type license_url: str + :param feed_url: Feed URL. + :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 published_date_time: Published timestamp. + :type published_date_time: datetime + :param download_count: Count of downloads. + :type download_count: int + :param local_is_latest_version: true if the local version is + the latest version; false otherwise. + :type local_is_latest_version: bool + :param local_path: Local path. + :type local_path: str + :param installed_date_time: Installed timestamp. + :type installed_date_time: datetime + :param provisioning_state: Provisioning state. + :type provisioning_state: str + :param comment: Site Extension comment. + :type comment: 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'}, + 'site_extension_info_id': {'key': 'properties.id', 'type': 'str'}, + 'title': {'key': 'properties.title', 'type': 'str'}, + 'site_extension_info_type': {'key': 'properties.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'}, + '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'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'comment': {'key': 'properties.comment', 'type': 'str'}, + } + + def __init__(self, *, kind: str=None, site_extension_info_id: str=None, title: str=None, site_extension_info_type=None, summary: str=None, description: str=None, version: str=None, extension_url: str=None, project_url: str=None, icon_url: str=None, license_url: str=None, feed_url: str=None, authors=None, installation_args: str=None, published_date_time=None, download_count: int=None, local_is_latest_version: bool=None, local_path: str=None, installed_date_time=None, provisioning_state: str=None, comment: str=None, **kwargs) -> None: + super(SiteExtensionInfo, self).__init__(kind=kind, **kwargs) + self.site_extension_info_id = site_extension_info_id + self.title = title + self.site_extension_info_type = site_extension_info_type + self.summary = summary + self.description = description + self.version = version + self.extension_url = extension_url + self.project_url = project_url + self.icon_url = icon_url + self.license_url = license_url + self.feed_url = feed_url + self.authors = authors + self.installation_args = installation_args + self.published_date_time = published_date_time + self.download_count = download_count + self.local_is_latest_version = local_is_latest_version + self.local_path = local_path + self.installed_date_time = installed_date_time + self.provisioning_state = provisioning_state + self.comment = comment 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..fa25964c4357 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/site_instance.py +++ b/azure-mgmt-web/azure/mgmt/web/models/site_instance.py @@ -45,6 +45,6 @@ class SiteInstance(ProxyOnlyResource): 'site_instance_name': {'key': 'properties.name', 'type': 'str'}, } - def __init__(self, kind=None): - super(SiteInstance, self).__init__(kind=kind) + def __init__(self, **kwargs): + super(SiteInstance, self).__init__(**kwargs) self.site_instance_name = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_instance_py3.py b/azure-mgmt-web/azure/mgmt/web/models/site_instance_py3.py new file mode 100644 index 000000000000..49bedfee2116 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/site_instance_py3.py @@ -0,0 +1,50 @@ +# 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_py3 import ProxyOnlyResource + + +class SiteInstance(ProxyOnlyResource): + """Instance of an 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 + :ivar site_instance_name: Name of instance. + :vartype site_instance_name: str + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'site_instance_name': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'site_instance_name': {'key': 'properties.name', 'type': 'str'}, + } + + def __init__(self, *, kind: str=None, **kwargs) -> None: + super(SiteInstance, self).__init__(kind=kind, **kwargs) + self.site_instance_name = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_limits.py b/azure-mgmt-web/azure/mgmt/web/models/site_limits.py index f1e9cca487a1..d56d77d48e01 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/site_limits.py +++ b/azure-mgmt-web/azure/mgmt/web/models/site_limits.py @@ -29,8 +29,8 @@ class SiteLimits(Model): 'max_disk_size_in_mb': {'key': 'maxDiskSizeInMb', 'type': 'long'}, } - def __init__(self, max_percentage_cpu=None, max_memory_in_mb=None, max_disk_size_in_mb=None): - super(SiteLimits, self).__init__() - self.max_percentage_cpu = max_percentage_cpu - self.max_memory_in_mb = max_memory_in_mb - self.max_disk_size_in_mb = max_disk_size_in_mb + def __init__(self, **kwargs): + super(SiteLimits, self).__init__(**kwargs) + self.max_percentage_cpu = kwargs.get('max_percentage_cpu', None) + self.max_memory_in_mb = kwargs.get('max_memory_in_mb', None) + self.max_disk_size_in_mb = kwargs.get('max_disk_size_in_mb', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_limits_py3.py b/azure-mgmt-web/azure/mgmt/web/models/site_limits_py3.py new file mode 100644 index 000000000000..2f58a349bca9 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/site_limits_py3.py @@ -0,0 +1,36 @@ +# 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 SiteLimits(Model): + """Metric limits set on an app. + + :param max_percentage_cpu: Maximum allowed CPU usage percentage. + :type max_percentage_cpu: float + :param max_memory_in_mb: Maximum allowed memory usage in MB. + :type max_memory_in_mb: long + :param max_disk_size_in_mb: Maximum allowed disk size usage in MB. + :type max_disk_size_in_mb: long + """ + + _attribute_map = { + 'max_percentage_cpu': {'key': 'maxPercentageCpu', 'type': 'float'}, + 'max_memory_in_mb': {'key': 'maxMemoryInMb', 'type': 'long'}, + 'max_disk_size_in_mb': {'key': 'maxDiskSizeInMb', 'type': 'long'}, + } + + def __init__(self, *, max_percentage_cpu: float=None, max_memory_in_mb: int=None, max_disk_size_in_mb: int=None, **kwargs) -> None: + super(SiteLimits, self).__init__(**kwargs) + self.max_percentage_cpu = max_percentage_cpu + self.max_memory_in_mb = max_memory_in_mb + self.max_disk_size_in_mb = max_disk_size_in_mb diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_logs_config.py b/azure-mgmt-web/azure/mgmt/web/models/site_logs_config.py index 8a5be995652d..c637d918bb78 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/site_logs_config.py +++ b/azure-mgmt-web/azure/mgmt/web/models/site_logs_config.py @@ -53,9 +53,9 @@ class SiteLogsConfig(ProxyOnlyResource): 'detailed_error_messages': {'key': 'properties.detailedErrorMessages', 'type': 'EnabledConfig'}, } - def __init__(self, kind=None, application_logs=None, http_logs=None, failed_requests_tracing=None, detailed_error_messages=None): - super(SiteLogsConfig, self).__init__(kind=kind) - self.application_logs = application_logs - self.http_logs = http_logs - self.failed_requests_tracing = failed_requests_tracing - self.detailed_error_messages = detailed_error_messages + def __init__(self, **kwargs): + super(SiteLogsConfig, self).__init__(**kwargs) + self.application_logs = kwargs.get('application_logs', None) + self.http_logs = kwargs.get('http_logs', None) + self.failed_requests_tracing = kwargs.get('failed_requests_tracing', None) + self.detailed_error_messages = kwargs.get('detailed_error_messages', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_logs_config_py3.py b/azure-mgmt-web/azure/mgmt/web/models/site_logs_config_py3.py new file mode 100644 index 000000000000..77bd46db1b1f --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/site_logs_config_py3.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_py3 import ProxyOnlyResource + + +class SiteLogsConfig(ProxyOnlyResource): + """Configuration of App Service site logs. + + 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 application_logs: Application logs configuration. + :type application_logs: ~azure.mgmt.web.models.ApplicationLogsConfig + :param http_logs: HTTP logs configuration. + :type http_logs: ~azure.mgmt.web.models.HttpLogsConfig + :param failed_requests_tracing: Failed requests tracing configuration. + :type failed_requests_tracing: ~azure.mgmt.web.models.EnabledConfig + :param detailed_error_messages: Detailed error messages configuration. + :type detailed_error_messages: ~azure.mgmt.web.models.EnabledConfig + """ + + _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'}, + 'application_logs': {'key': 'properties.applicationLogs', 'type': 'ApplicationLogsConfig'}, + 'http_logs': {'key': 'properties.httpLogs', 'type': 'HttpLogsConfig'}, + 'failed_requests_tracing': {'key': 'properties.failedRequestsTracing', 'type': 'EnabledConfig'}, + 'detailed_error_messages': {'key': 'properties.detailedErrorMessages', 'type': 'EnabledConfig'}, + } + + def __init__(self, *, kind: str=None, application_logs=None, http_logs=None, failed_requests_tracing=None, detailed_error_messages=None, **kwargs) -> None: + super(SiteLogsConfig, self).__init__(kind=kind, **kwargs) + self.application_logs = application_logs + self.http_logs = http_logs + self.failed_requests_tracing = failed_requests_tracing + self.detailed_error_messages = detailed_error_messages diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_machine_key.py b/azure-mgmt-web/azure/mgmt/web/models/site_machine_key.py index 4da2087e595d..46c20e72b102 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/site_machine_key.py +++ b/azure-mgmt-web/azure/mgmt/web/models/site_machine_key.py @@ -32,9 +32,9 @@ class SiteMachineKey(Model): 'decryption_key': {'key': 'decryptionKey', 'type': 'str'}, } - def __init__(self, validation=None, validation_key=None, decryption=None, decryption_key=None): - super(SiteMachineKey, self).__init__() - self.validation = validation - self.validation_key = validation_key - self.decryption = decryption - self.decryption_key = decryption_key + def __init__(self, **kwargs): + super(SiteMachineKey, self).__init__(**kwargs) + self.validation = kwargs.get('validation', None) + self.validation_key = kwargs.get('validation_key', None) + self.decryption = kwargs.get('decryption', None) + self.decryption_key = kwargs.get('decryption_key', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_machine_key_py3.py b/azure-mgmt-web/azure/mgmt/web/models/site_machine_key_py3.py new file mode 100644 index 000000000000..55b1f1f0798f --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/site_machine_key_py3.py @@ -0,0 +1,40 @@ +# 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 SiteMachineKey(Model): + """MachineKey of an app. + + :param validation: MachineKey validation. + :type validation: str + :param validation_key: Validation key. + :type validation_key: str + :param decryption: Algorithm used for decryption. + :type decryption: str + :param decryption_key: Decryption key. + :type decryption_key: str + """ + + _attribute_map = { + 'validation': {'key': 'validation', 'type': 'str'}, + 'validation_key': {'key': 'validationKey', 'type': 'str'}, + 'decryption': {'key': 'decryption', 'type': 'str'}, + 'decryption_key': {'key': 'decryptionKey', 'type': 'str'}, + } + + def __init__(self, *, validation: str=None, validation_key: str=None, decryption: str=None, decryption_key: str=None, **kwargs) -> None: + super(SiteMachineKey, self).__init__(**kwargs) + self.validation = validation + self.validation_key = validation_key + self.decryption = decryption + self.decryption_key = decryption_key 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..029f78ffa8dc 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 @@ -194,37 +194,37 @@ 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): - super(SitePatchResource, self).__init__(kind=kind) + def __init__(self, **kwargs): + super(SitePatchResource, self).__init__(**kwargs) self.state = None self.host_names = None self.repository_site_name = None self.usage_state = None - self.enabled = enabled + self.enabled = kwargs.get('enabled', None) self.enabled_host_names = None self.availability_state = None - self.host_name_ssl_states = host_name_ssl_states - self.server_farm_id = server_farm_id - self.reserved = reserved + self.host_name_ssl_states = kwargs.get('host_name_ssl_states', None) + self.server_farm_id = kwargs.get('server_farm_id', None) + self.reserved = kwargs.get('reserved', False) self.last_modified_time_utc = None - self.site_config = site_config + self.site_config = kwargs.get('site_config', None) self.traffic_manager_host_names = None - self.scm_site_also_stopped = scm_site_also_stopped + self.scm_site_also_stopped = kwargs.get('scm_site_also_stopped', False) self.target_swap_slot = None - self.hosting_environment_profile = hosting_environment_profile - self.client_affinity_enabled = client_affinity_enabled - self.client_cert_enabled = client_cert_enabled - self.host_names_disabled = host_names_disabled + self.hosting_environment_profile = kwargs.get('hosting_environment_profile', None) + self.client_affinity_enabled = kwargs.get('client_affinity_enabled', None) + self.client_cert_enabled = kwargs.get('client_cert_enabled', None) + self.host_names_disabled = kwargs.get('host_names_disabled', None) self.outbound_ip_addresses = None self.possible_outbound_ip_addresses = None - self.container_size = container_size - self.daily_memory_time_quota = daily_memory_time_quota + self.container_size = kwargs.get('container_size', None) + self.daily_memory_time_quota = kwargs.get('daily_memory_time_quota', None) self.suspended_till = None self.max_number_of_workers = None - self.cloning_info = cloning_info - self.snapshot_info = snapshot_info + self.cloning_info = kwargs.get('cloning_info', None) + self.snapshot_info = kwargs.get('snapshot_info', None) self.resource_group = None self.is_default_container = None self.default_host_name = None self.slot_swap_status = None - self.https_only = https_only + self.https_only = kwargs.get('https_only', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_patch_resource_py3.py b/azure-mgmt-web/azure/mgmt/web/models/site_patch_resource_py3.py new file mode 100644 index 000000000000..9f66719d0271 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/site_patch_resource_py3.py @@ -0,0 +1,230 @@ +# 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_py3 import ProxyOnlyResource + + +class SitePatchResource(ProxyOnlyResource): + """ARM resource for a site. + + 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 + :ivar state: Current state of the app. + :vartype state: str + :ivar host_names: Hostnames associated with the app. + :vartype host_names: list[str] + :ivar repository_site_name: Name of the repository site. + :vartype repository_site_name: str + :ivar usage_state: State indicating whether the app has exceeded its quota + usage. Read-only. Possible values include: 'Normal', 'Exceeded' + :vartype usage_state: str or ~azure.mgmt.web.models.UsageState + :param enabled: true if the app is enabled; otherwise, + false. Setting this value to false disables the app (takes + the app offline). + :type enabled: bool + :ivar enabled_host_names: Enabled hostnames for the app.Hostnames need to + be assigned (see HostNames) AND enabled. Otherwise, + the app is not served on those hostnames. + :vartype enabled_host_names: list[str] + :ivar availability_state: Management information availability state for + the app. Possible values include: 'Normal', 'Limited', + 'DisasterRecoveryMode' + :vartype availability_state: str or + ~azure.mgmt.web.models.SiteAvailabilityState + :param host_name_ssl_states: Hostname SSL states are used to manage the + SSL bindings for app's hostnames. + :type host_name_ssl_states: list[~azure.mgmt.web.models.HostNameSslState] + :param server_farm_id: Resource ID of the associated App Service plan, + formatted as: + "/subscriptions/{subscriptionID}/resourceGroups/{groupName}/providers/Microsoft.Web/serverfarms/{appServicePlanName}". + :type server_farm_id: str + :param reserved: true if reserved; otherwise, + false. Default value: False . + :type reserved: bool + :ivar last_modified_time_utc: Last time the app was modified, in UTC. + Read-only. + :vartype last_modified_time_utc: datetime + :param site_config: Configuration of the app. + :type site_config: ~azure.mgmt.web.models.SiteConfig + :ivar traffic_manager_host_names: Azure Traffic Manager hostnames + associated with the app. Read-only. + :vartype traffic_manager_host_names: list[str] + :param scm_site_also_stopped: true to stop SCM (KUDU) site + when the app is stopped; otherwise, false. The default is + false. Default value: False . + :type scm_site_also_stopped: bool + :ivar target_swap_slot: Specifies which deployment slot this app will swap + into. Read-only. + :vartype target_swap_slot: str + :param hosting_environment_profile: App Service Environment to use for the + app. + :type hosting_environment_profile: + ~azure.mgmt.web.models.HostingEnvironmentProfile + :param client_affinity_enabled: true to enable client + affinity; false to stop sending session affinity cookies, + which route client requests in the same session to the same instance. + Default is true. + :type client_affinity_enabled: bool + :param client_cert_enabled: true to enable client certificate + authentication (TLS mutual authentication); otherwise, false. + Default is false. + :type client_cert_enabled: bool + :param host_names_disabled: true to disable the public + hostnames of the app; otherwise, false. + If true, the app is only accessible via API management + process. + :type host_names_disabled: bool + :ivar outbound_ip_addresses: List of IP addresses that the app uses for + outbound connections (e.g. database access). Includes VIPs from tenants + that site can be hosted with current settings. Read-only. + :vartype outbound_ip_addresses: str + :ivar possible_outbound_ip_addresses: List of IP addresses that the app + uses for outbound connections (e.g. database access). Includes VIPs from + all tenants. Read-only. + :vartype possible_outbound_ip_addresses: str + :param container_size: Size of the function container. + :type container_size: int + :param daily_memory_time_quota: Maximum allowed daily memory-time quota + (applicable on dynamic apps only). + :type daily_memory_time_quota: int + :ivar suspended_till: App suspended till in case memory-time quota is + exceeded. + :vartype suspended_till: datetime + :ivar max_number_of_workers: Maximum number of workers. + This only applies to Functions container. + :vartype max_number_of_workers: int + :param cloning_info: If specified during app creation, the app is cloned + from a source app. + :type cloning_info: ~azure.mgmt.web.models.CloningInfo + :param snapshot_info: If specified during app creation, the app is created + from a previous snapshot. + :type snapshot_info: ~azure.mgmt.web.models.SnapshotRecoveryRequest + :ivar resource_group: Name of the resource group the app belongs to. + Read-only. + :vartype resource_group: str + :ivar is_default_container: true if the app is a default + container; otherwise, false. + :vartype is_default_container: bool + :ivar default_host_name: Default hostname of the app. Read-only. + :vartype default_host_name: str + :ivar slot_swap_status: Status of the last deployment slot swap operation. + :vartype slot_swap_status: ~azure.mgmt.web.models.SlotSwapStatus + :param https_only: HttpsOnly: configures a web site to accept only https + requests. Issues redirect for + http requests + :type https_only: bool + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'state': {'readonly': True}, + 'host_names': {'readonly': True}, + 'repository_site_name': {'readonly': True}, + 'usage_state': {'readonly': True}, + 'enabled_host_names': {'readonly': True}, + 'availability_state': {'readonly': True}, + 'last_modified_time_utc': {'readonly': True}, + 'traffic_manager_host_names': {'readonly': True}, + 'target_swap_slot': {'readonly': True}, + 'outbound_ip_addresses': {'readonly': True}, + 'possible_outbound_ip_addresses': {'readonly': True}, + 'suspended_till': {'readonly': True}, + 'max_number_of_workers': {'readonly': True}, + 'resource_group': {'readonly': True}, + 'is_default_container': {'readonly': True}, + 'default_host_name': {'readonly': True}, + 'slot_swap_status': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'state': {'key': 'properties.state', 'type': 'str'}, + 'host_names': {'key': 'properties.hostNames', 'type': '[str]'}, + 'repository_site_name': {'key': 'properties.repositorySiteName', 'type': 'str'}, + 'usage_state': {'key': 'properties.usageState', 'type': 'UsageState'}, + 'enabled': {'key': 'properties.enabled', 'type': 'bool'}, + 'enabled_host_names': {'key': 'properties.enabledHostNames', 'type': '[str]'}, + 'availability_state': {'key': 'properties.availabilityState', 'type': 'SiteAvailabilityState'}, + 'host_name_ssl_states': {'key': 'properties.hostNameSslStates', 'type': '[HostNameSslState]'}, + 'server_farm_id': {'key': 'properties.serverFarmId', 'type': 'str'}, + 'reserved': {'key': 'properties.reserved', '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]'}, + 'scm_site_also_stopped': {'key': 'properties.scmSiteAlsoStopped', 'type': 'bool'}, + 'target_swap_slot': {'key': 'properties.targetSwapSlot', 'type': 'str'}, + 'hosting_environment_profile': {'key': 'properties.hostingEnvironmentProfile', 'type': 'HostingEnvironmentProfile'}, + 'client_affinity_enabled': {'key': 'properties.clientAffinityEnabled', 'type': 'bool'}, + 'client_cert_enabled': {'key': 'properties.clientCertEnabled', 'type': 'bool'}, + 'host_names_disabled': {'key': 'properties.hostNamesDisabled', 'type': 'bool'}, + 'outbound_ip_addresses': {'key': 'properties.outboundIpAddresses', 'type': 'str'}, + 'possible_outbound_ip_addresses': {'key': 'properties.possibleOutboundIpAddresses', 'type': 'str'}, + 'container_size': {'key': 'properties.containerSize', 'type': 'int'}, + 'daily_memory_time_quota': {'key': 'properties.dailyMemoryTimeQuota', 'type': 'int'}, + 'suspended_till': {'key': 'properties.suspendedTill', 'type': 'iso-8601'}, + 'max_number_of_workers': {'key': 'properties.maxNumberOfWorkers', 'type': 'int'}, + 'cloning_info': {'key': 'properties.cloningInfo', 'type': 'CloningInfo'}, + 'snapshot_info': {'key': 'properties.snapshotInfo', 'type': 'SnapshotRecoveryRequest'}, + 'resource_group': {'key': 'properties.resourceGroup', 'type': 'str'}, + 'is_default_container': {'key': 'properties.isDefaultContainer', 'type': 'bool'}, + 'default_host_name': {'key': 'properties.defaultHostName', 'type': 'str'}, + 'slot_swap_status': {'key': 'properties.slotSwapStatus', 'type': 'SlotSwapStatus'}, + 'https_only': {'key': 'properties.httpsOnly', 'type': 'bool'}, + } + + def __init__(self, *, kind: str=None, enabled: bool=None, host_name_ssl_states=None, server_farm_id: str=None, reserved: bool=False, site_config=None, scm_site_also_stopped: bool=False, hosting_environment_profile=None, client_affinity_enabled: bool=None, client_cert_enabled: bool=None, host_names_disabled: bool=None, container_size: int=None, daily_memory_time_quota: int=None, cloning_info=None, snapshot_info=None, https_only: bool=None, **kwargs) -> None: + super(SitePatchResource, self).__init__(kind=kind, **kwargs) + self.state = None + self.host_names = None + self.repository_site_name = None + self.usage_state = None + self.enabled = enabled + self.enabled_host_names = None + self.availability_state = None + self.host_name_ssl_states = host_name_ssl_states + self.server_farm_id = server_farm_id + self.reserved = reserved + self.last_modified_time_utc = None + self.site_config = site_config + self.traffic_manager_host_names = None + self.scm_site_also_stopped = scm_site_also_stopped + self.target_swap_slot = None + self.hosting_environment_profile = hosting_environment_profile + self.client_affinity_enabled = client_affinity_enabled + self.client_cert_enabled = client_cert_enabled + self.host_names_disabled = host_names_disabled + self.outbound_ip_addresses = None + self.possible_outbound_ip_addresses = None + self.container_size = container_size + self.daily_memory_time_quota = daily_memory_time_quota + self.suspended_till = None + self.max_number_of_workers = None + self.cloning_info = cloning_info + self.snapshot_info = snapshot_info + self.resource_group = None + self.is_default_container = None + self.default_host_name = None + self.slot_swap_status = None + self.https_only = https_only diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_php_error_log_flag.py b/azure-mgmt-web/azure/mgmt/web/models/site_php_error_log_flag.py index b957e542f038..717ea82d2c8a 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/site_php_error_log_flag.py +++ b/azure-mgmt-web/azure/mgmt/web/models/site_php_error_log_flag.py @@ -53,9 +53,9 @@ class SitePhpErrorLogFlag(ProxyOnlyResource): 'master_log_errors_max_length': {'key': 'properties.masterLogErrorsMaxLength', 'type': 'str'}, } - def __init__(self, kind=None, local_log_errors=None, master_log_errors=None, local_log_errors_max_length=None, master_log_errors_max_length=None): - super(SitePhpErrorLogFlag, self).__init__(kind=kind) - self.local_log_errors = local_log_errors - self.master_log_errors = master_log_errors - self.local_log_errors_max_length = local_log_errors_max_length - self.master_log_errors_max_length = master_log_errors_max_length + def __init__(self, **kwargs): + super(SitePhpErrorLogFlag, self).__init__(**kwargs) + self.local_log_errors = kwargs.get('local_log_errors', None) + self.master_log_errors = kwargs.get('master_log_errors', None) + self.local_log_errors_max_length = kwargs.get('local_log_errors_max_length', None) + self.master_log_errors_max_length = kwargs.get('master_log_errors_max_length', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_php_error_log_flag_py3.py b/azure-mgmt-web/azure/mgmt/web/models/site_php_error_log_flag_py3.py new file mode 100644 index 000000000000..d13f3def0fe5 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/site_php_error_log_flag_py3.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_py3 import ProxyOnlyResource + + +class SitePhpErrorLogFlag(ProxyOnlyResource): + """Used for getting PHP error logging flag. + + 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 local_log_errors: Local log_errors setting. + :type local_log_errors: str + :param master_log_errors: Master log_errors setting. + :type master_log_errors: str + :param local_log_errors_max_length: Local log_errors_max_len setting. + :type local_log_errors_max_length: str + :param master_log_errors_max_length: Master log_errors_max_len setting. + :type master_log_errors_max_length: 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'}, + 'local_log_errors': {'key': 'properties.localLogErrors', 'type': 'str'}, + 'master_log_errors': {'key': 'properties.masterLogErrors', 'type': 'str'}, + 'local_log_errors_max_length': {'key': 'properties.localLogErrorsMaxLength', 'type': 'str'}, + 'master_log_errors_max_length': {'key': 'properties.masterLogErrorsMaxLength', 'type': 'str'}, + } + + def __init__(self, *, kind: str=None, local_log_errors: str=None, master_log_errors: str=None, local_log_errors_max_length: str=None, master_log_errors_max_length: str=None, **kwargs) -> None: + super(SitePhpErrorLogFlag, self).__init__(kind=kind, **kwargs) + self.local_log_errors = local_log_errors + self.master_log_errors = master_log_errors + self.local_log_errors_max_length = local_log_errors_max_length + self.master_log_errors_max_length = master_log_errors_max_length diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_py3.py b/azure-mgmt-web/azure/mgmt/web/models/site_py3.py new file mode 100644 index 000000000000..64901a32b37a --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/site_py3.py @@ -0,0 +1,243 @@ +# 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 .resource_py3 import Resource + + +class Site(Resource): + """A web app, a mobile app backend, or an API app. + + Variables are only populated by the server, and will be ignored when + sending a request. + + All required parameters must be populated in order to send to Azure. + + :ivar id: Resource Id. + :vartype id: str + :ivar name: Resource Name. + :vartype name: str + :param kind: Kind of resource. + :type kind: str + :param location: Required. Resource Location. + :type location: str + :ivar type: Resource type. + :vartype type: str + :param tags: Resource tags. + :type tags: dict[str, str] + :ivar state: Current state of the app. + :vartype state: str + :ivar host_names: Hostnames associated with the app. + :vartype host_names: list[str] + :ivar repository_site_name: Name of the repository site. + :vartype repository_site_name: str + :ivar usage_state: State indicating whether the app has exceeded its quota + usage. Read-only. Possible values include: 'Normal', 'Exceeded' + :vartype usage_state: str or ~azure.mgmt.web.models.UsageState + :param enabled: true if the app is enabled; otherwise, + false. Setting this value to false disables the app (takes + the app offline). + :type enabled: bool + :ivar enabled_host_names: Enabled hostnames for the app.Hostnames need to + be assigned (see HostNames) AND enabled. Otherwise, + the app is not served on those hostnames. + :vartype enabled_host_names: list[str] + :ivar availability_state: Management information availability state for + the app. Possible values include: 'Normal', 'Limited', + 'DisasterRecoveryMode' + :vartype availability_state: str or + ~azure.mgmt.web.models.SiteAvailabilityState + :param host_name_ssl_states: Hostname SSL states are used to manage the + SSL bindings for app's hostnames. + :type host_name_ssl_states: list[~azure.mgmt.web.models.HostNameSslState] + :param server_farm_id: Resource ID of the associated App Service plan, + formatted as: + "/subscriptions/{subscriptionID}/resourceGroups/{groupName}/providers/Microsoft.Web/serverfarms/{appServicePlanName}". + :type server_farm_id: str + :param reserved: true if reserved; otherwise, + false. Default value: False . + :type reserved: bool + :ivar last_modified_time_utc: Last time the app was modified, in UTC. + Read-only. + :vartype last_modified_time_utc: datetime + :param site_config: Configuration of the app. + :type site_config: ~azure.mgmt.web.models.SiteConfig + :ivar traffic_manager_host_names: Azure Traffic Manager hostnames + associated with the app. Read-only. + :vartype traffic_manager_host_names: list[str] + :param scm_site_also_stopped: true to stop SCM (KUDU) site + when the app is stopped; otherwise, false. The default is + false. Default value: False . + :type scm_site_also_stopped: bool + :ivar target_swap_slot: Specifies which deployment slot this app will swap + into. Read-only. + :vartype target_swap_slot: str + :param hosting_environment_profile: App Service Environment to use for the + app. + :type hosting_environment_profile: + ~azure.mgmt.web.models.HostingEnvironmentProfile + :param client_affinity_enabled: true to enable client + affinity; false to stop sending session affinity cookies, + which route client requests in the same session to the same instance. + Default is true. + :type client_affinity_enabled: bool + :param client_cert_enabled: true to enable client certificate + authentication (TLS mutual authentication); otherwise, false. + Default is false. + :type client_cert_enabled: bool + :param host_names_disabled: true to disable the public + hostnames of the app; otherwise, false. + If true, the app is only accessible via API management + process. + :type host_names_disabled: bool + :ivar outbound_ip_addresses: List of IP addresses that the app uses for + outbound connections (e.g. database access). Includes VIPs from tenants + that site can be hosted with current settings. Read-only. + :vartype outbound_ip_addresses: str + :ivar possible_outbound_ip_addresses: List of IP addresses that the app + uses for outbound connections (e.g. database access). Includes VIPs from + all tenants. Read-only. + :vartype possible_outbound_ip_addresses: str + :param container_size: Size of the function container. + :type container_size: int + :param daily_memory_time_quota: Maximum allowed daily memory-time quota + (applicable on dynamic apps only). + :type daily_memory_time_quota: int + :ivar suspended_till: App suspended till in case memory-time quota is + exceeded. + :vartype suspended_till: datetime + :ivar max_number_of_workers: Maximum number of workers. + This only applies to Functions container. + :vartype max_number_of_workers: int + :param cloning_info: If specified during app creation, the app is cloned + from a source app. + :type cloning_info: ~azure.mgmt.web.models.CloningInfo + :param snapshot_info: If specified during app creation, the app is created + from a previous snapshot. + :type snapshot_info: ~azure.mgmt.web.models.SnapshotRecoveryRequest + :ivar resource_group: Name of the resource group the app belongs to. + Read-only. + :vartype resource_group: str + :ivar is_default_container: true if the app is a default + container; otherwise, false. + :vartype is_default_container: bool + :ivar default_host_name: Default hostname of the app. Read-only. + :vartype default_host_name: str + :ivar slot_swap_status: Status of the last deployment slot swap operation. + :vartype slot_swap_status: ~azure.mgmt.web.models.SlotSwapStatus + :param https_only: HttpsOnly: configures a web site to accept only https + requests. Issues redirect for + http requests + :type https_only: bool + :param identity: + :type identity: ~azure.mgmt.web.models.ManagedServiceIdentity + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'location': {'required': True}, + 'type': {'readonly': True}, + 'state': {'readonly': True}, + 'host_names': {'readonly': True}, + 'repository_site_name': {'readonly': True}, + 'usage_state': {'readonly': True}, + 'enabled_host_names': {'readonly': True}, + 'availability_state': {'readonly': True}, + 'last_modified_time_utc': {'readonly': True}, + 'traffic_manager_host_names': {'readonly': True}, + 'target_swap_slot': {'readonly': True}, + 'outbound_ip_addresses': {'readonly': True}, + 'possible_outbound_ip_addresses': {'readonly': True}, + 'suspended_till': {'readonly': True}, + 'max_number_of_workers': {'readonly': True}, + 'resource_group': {'readonly': True}, + 'is_default_container': {'readonly': True}, + 'default_host_name': {'readonly': True}, + 'slot_swap_status': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'location': {'key': 'location', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, + 'state': {'key': 'properties.state', 'type': 'str'}, + 'host_names': {'key': 'properties.hostNames', 'type': '[str]'}, + 'repository_site_name': {'key': 'properties.repositorySiteName', 'type': 'str'}, + 'usage_state': {'key': 'properties.usageState', 'type': 'UsageState'}, + 'enabled': {'key': 'properties.enabled', 'type': 'bool'}, + 'enabled_host_names': {'key': 'properties.enabledHostNames', 'type': '[str]'}, + 'availability_state': {'key': 'properties.availabilityState', 'type': 'SiteAvailabilityState'}, + 'host_name_ssl_states': {'key': 'properties.hostNameSslStates', 'type': '[HostNameSslState]'}, + 'server_farm_id': {'key': 'properties.serverFarmId', 'type': 'str'}, + 'reserved': {'key': 'properties.reserved', '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]'}, + 'scm_site_also_stopped': {'key': 'properties.scmSiteAlsoStopped', 'type': 'bool'}, + 'target_swap_slot': {'key': 'properties.targetSwapSlot', 'type': 'str'}, + 'hosting_environment_profile': {'key': 'properties.hostingEnvironmentProfile', 'type': 'HostingEnvironmentProfile'}, + 'client_affinity_enabled': {'key': 'properties.clientAffinityEnabled', 'type': 'bool'}, + 'client_cert_enabled': {'key': 'properties.clientCertEnabled', 'type': 'bool'}, + 'host_names_disabled': {'key': 'properties.hostNamesDisabled', 'type': 'bool'}, + 'outbound_ip_addresses': {'key': 'properties.outboundIpAddresses', 'type': 'str'}, + 'possible_outbound_ip_addresses': {'key': 'properties.possibleOutboundIpAddresses', 'type': 'str'}, + 'container_size': {'key': 'properties.containerSize', 'type': 'int'}, + 'daily_memory_time_quota': {'key': 'properties.dailyMemoryTimeQuota', 'type': 'int'}, + 'suspended_till': {'key': 'properties.suspendedTill', 'type': 'iso-8601'}, + 'max_number_of_workers': {'key': 'properties.maxNumberOfWorkers', 'type': 'int'}, + 'cloning_info': {'key': 'properties.cloningInfo', 'type': 'CloningInfo'}, + 'snapshot_info': {'key': 'properties.snapshotInfo', 'type': 'SnapshotRecoveryRequest'}, + 'resource_group': {'key': 'properties.resourceGroup', 'type': 'str'}, + 'is_default_container': {'key': 'properties.isDefaultContainer', 'type': 'bool'}, + 'default_host_name': {'key': 'properties.defaultHostName', 'type': 'str'}, + 'slot_swap_status': {'key': 'properties.slotSwapStatus', 'type': 'SlotSwapStatus'}, + 'https_only': {'key': 'properties.httpsOnly', 'type': 'bool'}, + 'identity': {'key': 'identity', 'type': 'ManagedServiceIdentity'}, + } + + def __init__(self, *, location: str, kind: str=None, tags=None, enabled: bool=None, host_name_ssl_states=None, server_farm_id: str=None, reserved: bool=False, site_config=None, scm_site_also_stopped: bool=False, hosting_environment_profile=None, client_affinity_enabled: bool=None, client_cert_enabled: bool=None, host_names_disabled: bool=None, container_size: int=None, daily_memory_time_quota: int=None, cloning_info=None, snapshot_info=None, https_only: bool=None, identity=None, **kwargs) -> None: + super(Site, self).__init__(kind=kind, location=location, tags=tags, **kwargs) + self.state = None + self.host_names = None + self.repository_site_name = None + self.usage_state = None + self.enabled = enabled + self.enabled_host_names = None + self.availability_state = None + self.host_name_ssl_states = host_name_ssl_states + self.server_farm_id = server_farm_id + self.reserved = reserved + self.last_modified_time_utc = None + self.site_config = site_config + self.traffic_manager_host_names = None + self.scm_site_also_stopped = scm_site_also_stopped + self.target_swap_slot = None + self.hosting_environment_profile = hosting_environment_profile + self.client_affinity_enabled = client_affinity_enabled + self.client_cert_enabled = client_cert_enabled + self.host_names_disabled = host_names_disabled + self.outbound_ip_addresses = None + self.possible_outbound_ip_addresses = None + self.container_size = container_size + self.daily_memory_time_quota = daily_memory_time_quota + self.suspended_till = None + self.max_number_of_workers = None + self.cloning_info = cloning_info + self.snapshot_info = snapshot_info + self.resource_group = None + self.is_default_container = None + self.default_host_name = None + self.slot_swap_status = None + self.https_only = https_only + self.identity = identity diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_seal.py b/azure-mgmt-web/azure/mgmt/web/models/site_seal.py index 8512e5255443..c06f92634aaa 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/site_seal.py +++ b/azure-mgmt-web/azure/mgmt/web/models/site_seal.py @@ -15,7 +15,9 @@ class SiteSeal(Model): """Site seal. - :param html: HTML snippet + All required parameters must be populated in order to send to Azure. + + :param html: Required. HTML snippet :type html: str """ @@ -27,6 +29,6 @@ class SiteSeal(Model): 'html': {'key': 'html', 'type': 'str'}, } - def __init__(self, html): - super(SiteSeal, self).__init__() - self.html = html + def __init__(self, **kwargs): + super(SiteSeal, self).__init__(**kwargs) + self.html = kwargs.get('html', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_seal_py3.py b/azure-mgmt-web/azure/mgmt/web/models/site_seal_py3.py new file mode 100644 index 000000000000..141f0f214753 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/site_seal_py3.py @@ -0,0 +1,34 @@ +# 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 SiteSeal(Model): + """Site seal. + + All required parameters must be populated in order to send to Azure. + + :param html: Required. HTML snippet + :type html: str + """ + + _validation = { + 'html': {'required': True}, + } + + _attribute_map = { + 'html': {'key': 'html', 'type': 'str'}, + } + + def __init__(self, *, html: str, **kwargs) -> None: + super(SiteSeal, self).__init__(**kwargs) + self.html = html diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_seal_request.py b/azure-mgmt-web/azure/mgmt/web/models/site_seal_request.py index d2bbd785edeb..039baebd82e9 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/site_seal_request.py +++ b/azure-mgmt-web/azure/mgmt/web/models/site_seal_request.py @@ -27,7 +27,7 @@ class SiteSealRequest(Model): 'locale': {'key': 'locale', 'type': 'str'}, } - def __init__(self, light_theme=None, locale=None): - super(SiteSealRequest, self).__init__() - self.light_theme = light_theme - self.locale = locale + def __init__(self, **kwargs): + super(SiteSealRequest, self).__init__(**kwargs) + self.light_theme = kwargs.get('light_theme', None) + self.locale = kwargs.get('locale', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_seal_request_py3.py b/azure-mgmt-web/azure/mgmt/web/models/site_seal_request_py3.py new file mode 100644 index 000000000000..033e32201928 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/site_seal_request_py3.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 SiteSealRequest(Model): + """Site seal request. + + :param light_theme: If true use the light color theme for + site seal; otherwise, use the default color theme. + :type light_theme: bool + :param locale: Locale of site seal. + :type locale: str + """ + + _attribute_map = { + 'light_theme': {'key': 'lightTheme', 'type': 'bool'}, + 'locale': {'key': 'locale', 'type': 'str'}, + } + + def __init__(self, *, light_theme: bool=None, locale: str=None, **kwargs) -> None: + super(SiteSealRequest, self).__init__(**kwargs) + self.light_theme = light_theme + self.locale = locale diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_source_control.py b/azure-mgmt-web/azure/mgmt/web/models/site_source_control.py index 5d296b1d9ccc..97e16982b305 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/site_source_control.py +++ b/azure-mgmt-web/azure/mgmt/web/models/site_source_control.py @@ -60,10 +60,10 @@ class SiteSourceControl(ProxyOnlyResource): 'is_mercurial': {'key': 'properties.isMercurial', 'type': 'bool'}, } - def __init__(self, kind=None, repo_url=None, branch=None, is_manual_integration=None, deployment_rollback_enabled=None, is_mercurial=None): - super(SiteSourceControl, self).__init__(kind=kind) - self.repo_url = repo_url - self.branch = branch - self.is_manual_integration = is_manual_integration - self.deployment_rollback_enabled = deployment_rollback_enabled - self.is_mercurial = is_mercurial + def __init__(self, **kwargs): + super(SiteSourceControl, self).__init__(**kwargs) + self.repo_url = kwargs.get('repo_url', None) + self.branch = kwargs.get('branch', None) + self.is_manual_integration = kwargs.get('is_manual_integration', None) + self.deployment_rollback_enabled = kwargs.get('deployment_rollback_enabled', None) + self.is_mercurial = kwargs.get('is_mercurial', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_source_control_py3.py b/azure-mgmt-web/azure/mgmt/web/models/site_source_control_py3.py new file mode 100644 index 000000000000..7397edd38638 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/site_source_control_py3.py @@ -0,0 +1,69 @@ +# 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_py3 import ProxyOnlyResource + + +class SiteSourceControl(ProxyOnlyResource): + """Source control configuration for an 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 repo_url: Repository or source control URL. + :type repo_url: str + :param branch: Name of branch to use for deployment. + :type branch: str + :param is_manual_integration: true to limit to manual + integration; false to enable continuous integration (which + configures webhooks into online repos like GitHub). + :type is_manual_integration: bool + :param deployment_rollback_enabled: true to enable deployment + rollback; otherwise, false. + :type deployment_rollback_enabled: bool + :param is_mercurial: true for a Mercurial repository; + false for a Git repository. + :type is_mercurial: bool + """ + + _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'}, + 'repo_url': {'key': 'properties.repoUrl', 'type': 'str'}, + 'branch': {'key': 'properties.branch', 'type': 'str'}, + 'is_manual_integration': {'key': 'properties.isManualIntegration', 'type': 'bool'}, + 'deployment_rollback_enabled': {'key': 'properties.deploymentRollbackEnabled', 'type': 'bool'}, + 'is_mercurial': {'key': 'properties.isMercurial', 'type': 'bool'}, + } + + def __init__(self, *, kind: str=None, repo_url: str=None, branch: str=None, is_manual_integration: bool=None, deployment_rollback_enabled: bool=None, is_mercurial: bool=None, **kwargs) -> None: + super(SiteSourceControl, self).__init__(kind=kind, **kwargs) + self.repo_url = repo_url + self.branch = branch + self.is_manual_integration = is_manual_integration + self.deployment_rollback_enabled = deployment_rollback_enabled + self.is_mercurial = is_mercurial diff --git a/azure-mgmt-web/azure/mgmt/web/models/sku_capacity.py b/azure-mgmt-web/azure/mgmt/web/models/sku_capacity.py index 6e3ca3b8378c..1badcfdc803c 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/sku_capacity.py +++ b/azure-mgmt-web/azure/mgmt/web/models/sku_capacity.py @@ -32,9 +32,9 @@ class SkuCapacity(Model): 'scale_type': {'key': 'scaleType', 'type': 'str'}, } - def __init__(self, minimum=None, maximum=None, default=None, scale_type=None): - super(SkuCapacity, self).__init__() - self.minimum = minimum - self.maximum = maximum - self.default = default - self.scale_type = scale_type + def __init__(self, **kwargs): + super(SkuCapacity, self).__init__(**kwargs) + self.minimum = kwargs.get('minimum', None) + self.maximum = kwargs.get('maximum', None) + self.default = kwargs.get('default', None) + self.scale_type = kwargs.get('scale_type', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/sku_capacity_py3.py b/azure-mgmt-web/azure/mgmt/web/models/sku_capacity_py3.py new file mode 100644 index 000000000000..527a1414a2d5 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/sku_capacity_py3.py @@ -0,0 +1,40 @@ +# 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 SkuCapacity(Model): + """Description of the App Service plan scale options. + + :param minimum: Minimum number of workers for this App Service plan SKU. + :type minimum: int + :param maximum: Maximum number of workers for this App Service plan SKU. + :type maximum: int + :param default: Default number of workers for this App Service plan SKU. + :type default: int + :param scale_type: Available scale configurations for an App Service plan. + :type scale_type: str + """ + + _attribute_map = { + 'minimum': {'key': 'minimum', 'type': 'int'}, + 'maximum': {'key': 'maximum', 'type': 'int'}, + 'default': {'key': 'default', 'type': 'int'}, + 'scale_type': {'key': 'scaleType', 'type': 'str'}, + } + + def __init__(self, *, minimum: int=None, maximum: int=None, default: int=None, scale_type: str=None, **kwargs) -> None: + super(SkuCapacity, self).__init__(**kwargs) + self.minimum = minimum + self.maximum = maximum + self.default = default + self.scale_type = scale_type diff --git a/azure-mgmt-web/azure/mgmt/web/models/sku_description.py b/azure-mgmt-web/azure/mgmt/web/models/sku_description.py index 4e5ac3fc4498..3e086dfb73d9 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/sku_description.py +++ b/azure-mgmt-web/azure/mgmt/web/models/sku_description.py @@ -45,13 +45,13 @@ class SkuDescription(Model): 'capabilities': {'key': 'capabilities', 'type': '[Capability]'}, } - def __init__(self, name=None, tier=None, size=None, family=None, capacity=None, sku_capacity=None, locations=None, capabilities=None): - super(SkuDescription, self).__init__() - self.name = name - self.tier = tier - self.size = size - self.family = family - self.capacity = capacity - self.sku_capacity = sku_capacity - self.locations = locations - self.capabilities = capabilities + def __init__(self, **kwargs): + super(SkuDescription, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.tier = kwargs.get('tier', None) + self.size = kwargs.get('size', None) + self.family = kwargs.get('family', None) + self.capacity = kwargs.get('capacity', None) + self.sku_capacity = kwargs.get('sku_capacity', None) + self.locations = kwargs.get('locations', None) + self.capabilities = kwargs.get('capabilities', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/sku_description_py3.py b/azure-mgmt-web/azure/mgmt/web/models/sku_description_py3.py new file mode 100644 index 000000000000..1c23aeb7e2c5 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/sku_description_py3.py @@ -0,0 +1,57 @@ +# 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 SkuDescription(Model): + """Description of a SKU for a scalable resource. + + :param name: Name of the resource SKU. + :type name: str + :param tier: Service tier of the resource SKU. + :type tier: str + :param size: Size specifier of the resource SKU. + :type size: str + :param family: Family code of the resource SKU. + :type family: str + :param capacity: Current number of instances assigned to the resource. + :type capacity: int + :param sku_capacity: Min, max, and default scale values of the SKU. + :type sku_capacity: ~azure.mgmt.web.models.SkuCapacity + :param locations: Locations of the SKU. + :type locations: list[str] + :param capabilities: Capabilities of the SKU, e.g., is traffic manager + enabled? + :type capabilities: list[~azure.mgmt.web.models.Capability] + """ + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'tier': {'key': 'tier', 'type': 'str'}, + 'size': {'key': 'size', 'type': 'str'}, + 'family': {'key': 'family', 'type': 'str'}, + 'capacity': {'key': 'capacity', 'type': 'int'}, + 'sku_capacity': {'key': 'skuCapacity', 'type': 'SkuCapacity'}, + 'locations': {'key': 'locations', 'type': '[str]'}, + 'capabilities': {'key': 'capabilities', 'type': '[Capability]'}, + } + + def __init__(self, *, name: str=None, tier: str=None, size: str=None, family: str=None, capacity: int=None, sku_capacity=None, locations=None, capabilities=None, **kwargs) -> None: + super(SkuDescription, self).__init__(**kwargs) + self.name = name + self.tier = tier + self.size = size + self.family = family + self.capacity = capacity + self.sku_capacity = sku_capacity + self.locations = locations + self.capabilities = capabilities diff --git a/azure-mgmt-web/azure/mgmt/web/models/sku_info.py b/azure-mgmt-web/azure/mgmt/web/models/sku_info.py index 04431f22a4a1..b4935ef3a0e8 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/sku_info.py +++ b/azure-mgmt-web/azure/mgmt/web/models/sku_info.py @@ -29,8 +29,8 @@ class SkuInfo(Model): 'capacity': {'key': 'capacity', 'type': 'SkuCapacity'}, } - def __init__(self, resource_type=None, sku=None, capacity=None): - super(SkuInfo, self).__init__() - self.resource_type = resource_type - self.sku = sku - self.capacity = capacity + def __init__(self, **kwargs): + super(SkuInfo, self).__init__(**kwargs) + self.resource_type = kwargs.get('resource_type', None) + self.sku = kwargs.get('sku', None) + self.capacity = kwargs.get('capacity', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/sku_info_py3.py b/azure-mgmt-web/azure/mgmt/web/models/sku_info_py3.py new file mode 100644 index 000000000000..58c940e0c367 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/sku_info_py3.py @@ -0,0 +1,36 @@ +# 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 SkuInfo(Model): + """SKU discovery information. + + :param resource_type: Resource type that this SKU applies to. + :type resource_type: str + :param sku: Name and tier of the SKU. + :type sku: ~azure.mgmt.web.models.SkuDescription + :param capacity: Min, max, and default scale values of the SKU. + :type capacity: ~azure.mgmt.web.models.SkuCapacity + """ + + _attribute_map = { + 'resource_type': {'key': 'resourceType', 'type': 'str'}, + 'sku': {'key': 'sku', 'type': 'SkuDescription'}, + 'capacity': {'key': 'capacity', 'type': 'SkuCapacity'}, + } + + def __init__(self, *, resource_type: str=None, sku=None, capacity=None, **kwargs) -> None: + super(SkuInfo, self).__init__(**kwargs) + self.resource_type = resource_type + self.sku = sku + self.capacity = capacity diff --git a/azure-mgmt-web/azure/mgmt/web/models/sku_infos.py b/azure-mgmt-web/azure/mgmt/web/models/sku_infos.py index f5f9fbadd447..3c1c17aa7392 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/sku_infos.py +++ b/azure-mgmt-web/azure/mgmt/web/models/sku_infos.py @@ -26,7 +26,7 @@ class SkuInfos(Model): 'skus': {'key': 'skus', 'type': '[GlobalCsmSkuDescription]'}, } - def __init__(self, resource_type=None, skus=None): - super(SkuInfos, self).__init__() - self.resource_type = resource_type - self.skus = skus + def __init__(self, **kwargs): + super(SkuInfos, self).__init__(**kwargs) + self.resource_type = kwargs.get('resource_type', None) + self.skus = kwargs.get('skus', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/sku_infos_py3.py b/azure-mgmt-web/azure/mgmt/web/models/sku_infos_py3.py new file mode 100644 index 000000000000..e51bc7df9809 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/sku_infos_py3.py @@ -0,0 +1,32 @@ +# 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 SkuInfos(Model): + """Collection of SKU information. + + :param resource_type: Resource type that this SKU applies to. + :type resource_type: str + :param skus: List of SKUs the subscription is able to use. + :type skus: list[~azure.mgmt.web.models.GlobalCsmSkuDescription] + """ + + _attribute_map = { + 'resource_type': {'key': 'resourceType', 'type': 'str'}, + 'skus': {'key': 'skus', 'type': '[GlobalCsmSkuDescription]'}, + } + + def __init__(self, *, resource_type: str=None, skus=None, **kwargs) -> None: + super(SkuInfos, self).__init__(**kwargs) + self.resource_type = resource_type + self.skus = skus diff --git a/azure-mgmt-web/azure/mgmt/web/models/slot_config_names_resource.py b/azure-mgmt-web/azure/mgmt/web/models/slot_config_names_resource.py index 1bb9f07e671b..6c21dc922423 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/slot_config_names_resource.py +++ b/azure-mgmt-web/azure/mgmt/web/models/slot_config_names_resource.py @@ -47,7 +47,7 @@ class SlotConfigNamesResource(ProxyOnlyResource): 'app_setting_names': {'key': 'properties.appSettingNames', 'type': '[str]'}, } - def __init__(self, kind=None, connection_string_names=None, app_setting_names=None): - super(SlotConfigNamesResource, self).__init__(kind=kind) - self.connection_string_names = connection_string_names - self.app_setting_names = app_setting_names + def __init__(self, **kwargs): + super(SlotConfigNamesResource, self).__init__(**kwargs) + self.connection_string_names = kwargs.get('connection_string_names', None) + self.app_setting_names = kwargs.get('app_setting_names', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/slot_config_names_resource_py3.py b/azure-mgmt-web/azure/mgmt/web/models/slot_config_names_resource_py3.py new file mode 100644 index 000000000000..adfc50723e23 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/slot_config_names_resource_py3.py @@ -0,0 +1,53 @@ +# 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_py3 import ProxyOnlyResource + + +class SlotConfigNamesResource(ProxyOnlyResource): + """Slot Config names azure resource. + + 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 connection_string_names: List of connection string names. + :type connection_string_names: list[str] + :param app_setting_names: List of application settings names. + :type app_setting_names: list[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'}, + 'connection_string_names': {'key': 'properties.connectionStringNames', 'type': '[str]'}, + 'app_setting_names': {'key': 'properties.appSettingNames', 'type': '[str]'}, + } + + def __init__(self, *, kind: str=None, connection_string_names=None, app_setting_names=None, **kwargs) -> None: + super(SlotConfigNamesResource, self).__init__(kind=kind, **kwargs) + self.connection_string_names = connection_string_names + self.app_setting_names = app_setting_names 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..cc203a46d259 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/slot_difference.py +++ b/azure-mgmt-web/azure/mgmt/web/models/slot_difference.py @@ -72,8 +72,8 @@ class SlotDifference(ProxyOnlyResource): 'description': {'key': 'properties.description', 'type': 'str'}, } - def __init__(self, kind=None): - super(SlotDifference, self).__init__(kind=kind) + def __init__(self, **kwargs): + super(SlotDifference, self).__init__(**kwargs) self.slot_difference_type = None self.setting_type = None self.diff_rule = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/slot_difference_py3.py b/azure-mgmt-web/azure/mgmt/web/models/slot_difference_py3.py new file mode 100644 index 000000000000..943d958637f1 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/slot_difference_py3.py @@ -0,0 +1,83 @@ +# 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_py3 import ProxyOnlyResource + + +class SlotDifference(ProxyOnlyResource): + """A setting difference between two deployment slots of an 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 + :ivar slot_difference_type: Type of the difference: Information, Warning + or Error. + :vartype slot_difference_type: str + :ivar setting_type: The type of the setting: General, AppSetting or + ConnectionString. + :vartype setting_type: str + :ivar diff_rule: Rule that describes how to process the setting difference + during a slot swap. + :vartype diff_rule: str + :ivar setting_name: Name of the setting. + :vartype setting_name: str + :ivar value_in_current_slot: Value of the setting in the current slot. + :vartype value_in_current_slot: str + :ivar value_in_target_slot: Value of the setting in the target slot. + :vartype value_in_target_slot: str + :ivar description: Description of the setting difference. + :vartype description: str + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'slot_difference_type': {'readonly': True}, + 'setting_type': {'readonly': True}, + 'diff_rule': {'readonly': True}, + 'setting_name': {'readonly': True}, + 'value_in_current_slot': {'readonly': True}, + 'value_in_target_slot': {'readonly': True}, + 'description': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'slot_difference_type': {'key': 'properties.type', 'type': 'str'}, + 'setting_type': {'key': 'properties.settingType', 'type': 'str'}, + 'diff_rule': {'key': 'properties.diffRule', 'type': 'str'}, + 'setting_name': {'key': 'properties.settingName', 'type': 'str'}, + 'value_in_current_slot': {'key': 'properties.valueInCurrentSlot', 'type': 'str'}, + 'value_in_target_slot': {'key': 'properties.valueInTargetSlot', 'type': 'str'}, + 'description': {'key': 'properties.description', 'type': 'str'}, + } + + def __init__(self, *, kind: str=None, **kwargs) -> None: + super(SlotDifference, self).__init__(kind=kind, **kwargs) + self.slot_difference_type = None + self.setting_type = None + self.diff_rule = None + self.setting_name = None + self.value_in_current_slot = None + self.value_in_target_slot = None + self.description = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/slot_swap_status.py b/azure-mgmt-web/azure/mgmt/web/models/slot_swap_status.py index fa0589c5c1d3..73c238d3fd5b 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/slot_swap_status.py +++ b/azure-mgmt-web/azure/mgmt/web/models/slot_swap_status.py @@ -39,8 +39,8 @@ class SlotSwapStatus(Model): 'destination_slot_name': {'key': 'destinationSlotName', 'type': 'str'}, } - def __init__(self): - super(SlotSwapStatus, self).__init__() + def __init__(self, **kwargs): + super(SlotSwapStatus, self).__init__(**kwargs) self.timestamp_utc = None self.source_slot_name = None self.destination_slot_name = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/slot_swap_status_py3.py b/azure-mgmt-web/azure/mgmt/web/models/slot_swap_status_py3.py new file mode 100644 index 000000000000..9d555a5fe6f2 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/slot_swap_status_py3.py @@ -0,0 +1,46 @@ +# 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 SlotSwapStatus(Model): + """The status of the last successfull slot swap operation. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar timestamp_utc: The time the last successful slot swap completed. + :vartype timestamp_utc: datetime + :ivar source_slot_name: The source slot of the last swap operation. + :vartype source_slot_name: str + :ivar destination_slot_name: The destination slot of the last swap + operation. + :vartype destination_slot_name: str + """ + + _validation = { + 'timestamp_utc': {'readonly': True}, + 'source_slot_name': {'readonly': True}, + 'destination_slot_name': {'readonly': True}, + } + + _attribute_map = { + 'timestamp_utc': {'key': 'timestampUtc', 'type': 'iso-8601'}, + 'source_slot_name': {'key': 'sourceSlotName', 'type': 'str'}, + 'destination_slot_name': {'key': 'destinationSlotName', 'type': 'str'}, + } + + def __init__(self, **kwargs) -> None: + super(SlotSwapStatus, self).__init__(**kwargs) + self.timestamp_utc = None + self.source_slot_name = None + self.destination_slot_name = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/slow_requests_based_trigger.py b/azure-mgmt-web/azure/mgmt/web/models/slow_requests_based_trigger.py index 3995123a0e1d..b2e7cb1168f3 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/slow_requests_based_trigger.py +++ b/azure-mgmt-web/azure/mgmt/web/models/slow_requests_based_trigger.py @@ -29,8 +29,8 @@ class SlowRequestsBasedTrigger(Model): 'time_interval': {'key': 'timeInterval', 'type': 'str'}, } - def __init__(self, time_taken=None, count=None, time_interval=None): - super(SlowRequestsBasedTrigger, self).__init__() - self.time_taken = time_taken - self.count = count - self.time_interval = time_interval + def __init__(self, **kwargs): + super(SlowRequestsBasedTrigger, self).__init__(**kwargs) + self.time_taken = kwargs.get('time_taken', None) + self.count = kwargs.get('count', None) + self.time_interval = kwargs.get('time_interval', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/slow_requests_based_trigger_py3.py b/azure-mgmt-web/azure/mgmt/web/models/slow_requests_based_trigger_py3.py new file mode 100644 index 000000000000..5288e5b100d6 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/slow_requests_based_trigger_py3.py @@ -0,0 +1,36 @@ +# 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 SlowRequestsBasedTrigger(Model): + """Trigger based on request execution time. + + :param time_taken: Time taken. + :type time_taken: str + :param count: Request Count. + :type count: int + :param time_interval: Time interval. + :type time_interval: str + """ + + _attribute_map = { + 'time_taken': {'key': 'timeTaken', 'type': 'str'}, + 'count': {'key': 'count', 'type': 'int'}, + 'time_interval': {'key': 'timeInterval', 'type': 'str'}, + } + + def __init__(self, *, time_taken: str=None, count: int=None, time_interval: str=None, **kwargs) -> None: + super(SlowRequestsBasedTrigger, self).__init__(**kwargs) + self.time_taken = time_taken + self.count = count + self.time_interval = time_interval diff --git a/azure-mgmt-web/azure/mgmt/web/models/snapshot.py b/azure-mgmt-web/azure/mgmt/web/models/snapshot.py index 066eae59ceb1..fb9d95fd5ff7 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/snapshot.py +++ b/azure-mgmt-web/azure/mgmt/web/models/snapshot.py @@ -45,6 +45,6 @@ class Snapshot(ProxyOnlyResource): 'time': {'key': 'properties.time', 'type': 'str'}, } - def __init__(self, kind=None): - super(Snapshot, self).__init__(kind=kind) + def __init__(self, **kwargs): + super(Snapshot, self).__init__(**kwargs) self.time = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/snapshot_py3.py b/azure-mgmt-web/azure/mgmt/web/models/snapshot_py3.py new file mode 100644 index 000000000000..d1837cfef8bd --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/snapshot_py3.py @@ -0,0 +1,50 @@ +# 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_py3 import ProxyOnlyResource + + +class Snapshot(ProxyOnlyResource): + """A snapshot of an 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 + :ivar time: The time the snapshot was taken. + :vartype time: str + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'time': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'time': {'key': 'properties.time', 'type': 'str'}, + } + + def __init__(self, *, kind: str=None, **kwargs) -> None: + super(Snapshot, self).__init__(kind=kind, **kwargs) + self.time = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/snapshot_recovery_request.py b/azure-mgmt-web/azure/mgmt/web/models/snapshot_recovery_request.py index 594a87aa73ac..73f8ff371733 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/snapshot_recovery_request.py +++ b/azure-mgmt-web/azure/mgmt/web/models/snapshot_recovery_request.py @@ -18,6 +18,8 @@ class SnapshotRecoveryRequest(ProxyOnlyResource): Variables are only populated by the server, and will be ignored when sending a request. + All required parameters must be populated in order to send to Azure. + :ivar id: Resource Id. :vartype id: str :ivar name: Resource Name. @@ -32,8 +34,8 @@ class SnapshotRecoveryRequest(ProxyOnlyResource): :param recovery_target: Specifies the web app that snapshot contents will be written to. :type recovery_target: ~azure.mgmt.web.models.SnapshotRecoveryTarget - :param overwrite: If true the recovery operation can - overwrite source app; otherwise, false. + :param overwrite: Required. If true the recovery operation + can overwrite source app; otherwise, false. :type overwrite: bool :param recover_configuration: If true, site configuration, in addition to content, will be reverted. @@ -63,10 +65,10 @@ class SnapshotRecoveryRequest(ProxyOnlyResource): 'ignore_conflicting_host_names': {'key': 'properties.ignoreConflictingHostNames', 'type': 'bool'}, } - def __init__(self, overwrite, kind=None, snapshot_time=None, recovery_target=None, recover_configuration=None, ignore_conflicting_host_names=None): - super(SnapshotRecoveryRequest, self).__init__(kind=kind) - self.snapshot_time = snapshot_time - self.recovery_target = recovery_target - self.overwrite = overwrite - self.recover_configuration = recover_configuration - self.ignore_conflicting_host_names = ignore_conflicting_host_names + def __init__(self, **kwargs): + super(SnapshotRecoveryRequest, self).__init__(**kwargs) + self.snapshot_time = kwargs.get('snapshot_time', None) + self.recovery_target = kwargs.get('recovery_target', None) + self.overwrite = kwargs.get('overwrite', None) + self.recover_configuration = kwargs.get('recover_configuration', None) + self.ignore_conflicting_host_names = kwargs.get('ignore_conflicting_host_names', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/snapshot_recovery_request_py3.py b/azure-mgmt-web/azure/mgmt/web/models/snapshot_recovery_request_py3.py new file mode 100644 index 000000000000..ef077653b9b7 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/snapshot_recovery_request_py3.py @@ -0,0 +1,74 @@ +# 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_py3 import ProxyOnlyResource + + +class SnapshotRecoveryRequest(ProxyOnlyResource): + """Details about app recovery operation. + + Variables are only populated by the server, and will be ignored when + sending a request. + + All required parameters must be populated in order to send to Azure. + + :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 recovery should be + attempted, formatted as a DateTime string. + :type snapshot_time: str + :param recovery_target: Specifies the web app that snapshot contents will + be written to. + :type recovery_target: ~azure.mgmt.web.models.SnapshotRecoveryTarget + :param overwrite: Required. If true the recovery 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_target': {'key': 'properties.recoveryTarget', 'type': 'SnapshotRecoveryTarget'}, + '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: bool, kind: str=None, snapshot_time: str=None, recovery_target=None, recover_configuration: bool=None, ignore_conflicting_host_names: bool=None, **kwargs) -> None: + super(SnapshotRecoveryRequest, self).__init__(kind=kind, **kwargs) + self.snapshot_time = snapshot_time + self.recovery_target = recovery_target + 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/snapshot_recovery_target.py b/azure-mgmt-web/azure/mgmt/web/models/snapshot_recovery_target.py index 86e831e9a8b7..38f3c267bc68 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/snapshot_recovery_target.py +++ b/azure-mgmt-web/azure/mgmt/web/models/snapshot_recovery_target.py @@ -31,7 +31,7 @@ class SnapshotRecoveryTarget(Model): 'id': {'key': 'id', 'type': 'str'}, } - def __init__(self, location=None, id=None): - super(SnapshotRecoveryTarget, self).__init__() - self.location = location - self.id = id + def __init__(self, **kwargs): + super(SnapshotRecoveryTarget, self).__init__(**kwargs) + self.location = kwargs.get('location', None) + self.id = kwargs.get('id', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/snapshot_recovery_target_py3.py b/azure-mgmt-web/azure/mgmt/web/models/snapshot_recovery_target_py3.py new file mode 100644 index 000000000000..07035487add4 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/snapshot_recovery_target_py3.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 SnapshotRecoveryTarget(Model): + """Specifies the web app that snapshot contents will be written to. + + :param location: Geographical location of the target web app, e.g. + SouthEastAsia, SouthCentralUS + :type location: str + :param id: ARM resource ID of the target 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: str=None, id: str=None, **kwargs) -> None: + super(SnapshotRecoveryTarget, self).__init__(**kwargs) + self.location = location + self.id = id diff --git a/azure-mgmt-web/azure/mgmt/web/models/solution.py b/azure-mgmt-web/azure/mgmt/web/models/solution.py index 931fdc999138..cca3a08776a4 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/solution.py +++ b/azure-mgmt-web/azure/mgmt/web/models/solution.py @@ -42,12 +42,12 @@ class Solution(Model): 'metadata': {'key': 'metadata', 'type': '[[NameValuePair]]'}, } - def __init__(self, id=None, display_name=None, order=None, description=None, type=None, data=None, metadata=None): - super(Solution, self).__init__() - self.id = id - self.display_name = display_name - self.order = order - self.description = description - self.type = type - self.data = data - self.metadata = metadata + def __init__(self, **kwargs): + super(Solution, self).__init__(**kwargs) + self.id = kwargs.get('id', None) + self.display_name = kwargs.get('display_name', None) + self.order = kwargs.get('order', None) + self.description = kwargs.get('description', None) + self.type = kwargs.get('type', None) + self.data = kwargs.get('data', None) + self.metadata = kwargs.get('metadata', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/solution_py3.py b/azure-mgmt-web/azure/mgmt/web/models/solution_py3.py new file mode 100644 index 000000000000..ebc38ca34a18 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/solution_py3.py @@ -0,0 +1,53 @@ +# 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 Solution(Model): + """Class Representing Solution for problems detected. + + :param id: Solution Id. + :type id: float + :param display_name: Display Name of the solution + :type display_name: str + :param order: Order of the solution. + :type order: float + :param description: Description of the solution + :type description: str + :param type: Type of Solution. Possible values include: 'QuickSolution', + 'DeepInvestigation', 'BestPractices' + :type type: str or ~azure.mgmt.web.models.SolutionType + :param data: Solution Data. + :type data: list[list[~azure.mgmt.web.models.NameValuePair]] + :param metadata: Solution Metadata. + :type metadata: list[list[~azure.mgmt.web.models.NameValuePair]] + """ + + _attribute_map = { + 'id': {'key': 'id', 'type': 'float'}, + 'display_name': {'key': 'displayName', 'type': 'str'}, + 'order': {'key': 'order', 'type': 'float'}, + 'description': {'key': 'description', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'SolutionType'}, + 'data': {'key': 'data', 'type': '[[NameValuePair]]'}, + 'metadata': {'key': 'metadata', 'type': '[[NameValuePair]]'}, + } + + def __init__(self, *, id: float=None, display_name: str=None, order: float=None, description: str=None, type=None, data=None, metadata=None, **kwargs) -> None: + super(Solution, self).__init__(**kwargs) + self.id = id + self.display_name = display_name + self.order = order + self.description = description + self.type = type + self.data = data + self.metadata = metadata 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..6f018d16e3f0 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/source_control.py +++ b/azure-mgmt-web/azure/mgmt/web/models/source_control.py @@ -56,10 +56,10 @@ class SourceControl(ProxyOnlyResource): '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): - 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 - self.expiration_time = expiration_time + def __init__(self, **kwargs): + super(SourceControl, self).__init__(**kwargs) + self.source_control_name = kwargs.get('source_control_name', None) + self.token = kwargs.get('token', None) + self.token_secret = kwargs.get('token_secret', None) + self.refresh_token = kwargs.get('refresh_token', None) + self.expiration_time = kwargs.get('expiration_time', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/source_control_py3.py b/azure-mgmt-web/azure/mgmt/web/models/source_control_py3.py new file mode 100644 index 000000000000..4b160caa147a --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/source_control_py3.py @@ -0,0 +1,65 @@ +# 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_py3 import ProxyOnlyResource + + +class SourceControl(ProxyOnlyResource): + """The source control OAuth token. + + 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 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. + :type token_secret: str + :param refresh_token: OAuth refresh token. + :type refresh_token: str + :param expiration_time: OAuth token expiration. + :type expiration_time: datetime + """ + + _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'}, + '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: str=None, source_control_name: str=None, token: str=None, token_secret: str=None, refresh_token: str=None, expiration_time=None, **kwargs) -> None: + super(SourceControl, self).__init__(kind=kind, **kwargs) + self.source_control_name = source_control_name + self.token = token + self.token_secret = token_secret + self.refresh_token = refresh_token + self.expiration_time = expiration_time diff --git a/azure-mgmt-web/azure/mgmt/web/models/stack_major_version.py b/azure-mgmt-web/azure/mgmt/web/models/stack_major_version.py index 6ed47577e8ec..d5faa48be425 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/stack_major_version.py +++ b/azure-mgmt-web/azure/mgmt/web/models/stack_major_version.py @@ -33,9 +33,9 @@ class StackMajorVersion(Model): 'minor_versions': {'key': 'minorVersions', 'type': '[StackMinorVersion]'}, } - def __init__(self, display_version=None, runtime_version=None, is_default=None, minor_versions=None): - super(StackMajorVersion, self).__init__() - self.display_version = display_version - self.runtime_version = runtime_version - self.is_default = is_default - self.minor_versions = minor_versions + def __init__(self, **kwargs): + super(StackMajorVersion, self).__init__(**kwargs) + self.display_version = kwargs.get('display_version', None) + self.runtime_version = kwargs.get('runtime_version', None) + self.is_default = kwargs.get('is_default', None) + self.minor_versions = kwargs.get('minor_versions', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/stack_major_version_py3.py b/azure-mgmt-web/azure/mgmt/web/models/stack_major_version_py3.py new file mode 100644 index 000000000000..d53e57163b0d --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/stack_major_version_py3.py @@ -0,0 +1,41 @@ +# 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 StackMajorVersion(Model): + """Application stack major version. + + :param display_version: Application stack major version (display only). + :type display_version: str + :param runtime_version: Application stack major version (runtime only). + :type runtime_version: str + :param is_default: true if this is the default major version; + otherwise, false. + :type is_default: bool + :param minor_versions: Minor versions associated with the major version. + :type minor_versions: list[~azure.mgmt.web.models.StackMinorVersion] + """ + + _attribute_map = { + 'display_version': {'key': 'displayVersion', 'type': 'str'}, + 'runtime_version': {'key': 'runtimeVersion', 'type': 'str'}, + 'is_default': {'key': 'isDefault', 'type': 'bool'}, + 'minor_versions': {'key': 'minorVersions', 'type': '[StackMinorVersion]'}, + } + + def __init__(self, *, display_version: str=None, runtime_version: str=None, is_default: bool=None, minor_versions=None, **kwargs) -> None: + super(StackMajorVersion, self).__init__(**kwargs) + self.display_version = display_version + self.runtime_version = runtime_version + self.is_default = is_default + self.minor_versions = minor_versions diff --git a/azure-mgmt-web/azure/mgmt/web/models/stack_minor_version.py b/azure-mgmt-web/azure/mgmt/web/models/stack_minor_version.py index 543fd44a5f23..f732bbb506a0 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/stack_minor_version.py +++ b/azure-mgmt-web/azure/mgmt/web/models/stack_minor_version.py @@ -30,8 +30,8 @@ class StackMinorVersion(Model): 'is_default': {'key': 'isDefault', 'type': 'bool'}, } - def __init__(self, display_version=None, runtime_version=None, is_default=None): - super(StackMinorVersion, self).__init__() - self.display_version = display_version - self.runtime_version = runtime_version - self.is_default = is_default + def __init__(self, **kwargs): + super(StackMinorVersion, self).__init__(**kwargs) + self.display_version = kwargs.get('display_version', None) + self.runtime_version = kwargs.get('runtime_version', None) + self.is_default = kwargs.get('is_default', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/stack_minor_version_py3.py b/azure-mgmt-web/azure/mgmt/web/models/stack_minor_version_py3.py new file mode 100644 index 000000000000..3d1d4741da2c --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/stack_minor_version_py3.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 StackMinorVersion(Model): + """Application stack minor version. + + :param display_version: Application stack minor version (display only). + :type display_version: str + :param runtime_version: Application stack minor version (runtime only). + :type runtime_version: str + :param is_default: true if this is the default minor version; + otherwise, false. + :type is_default: bool + """ + + _attribute_map = { + 'display_version': {'key': 'displayVersion', 'type': 'str'}, + 'runtime_version': {'key': 'runtimeVersion', 'type': 'str'}, + 'is_default': {'key': 'isDefault', 'type': 'bool'}, + } + + def __init__(self, *, display_version: str=None, runtime_version: str=None, is_default: bool=None, **kwargs) -> None: + super(StackMinorVersion, self).__init__(**kwargs) + self.display_version = display_version + self.runtime_version = runtime_version + self.is_default = is_default 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..bb62863d4176 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/stamp_capacity.py +++ b/azure-mgmt-web/azure/mgmt/web/models/stamp_capacity.py @@ -60,15 +60,15 @@ class StampCapacity(Model): 'site_mode': {'key': 'siteMode', 'type': 'str'}, } - 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): - super(StampCapacity, self).__init__() - self.name = name - self.available_capacity = available_capacity - self.total_capacity = total_capacity - self.unit = unit - self.compute_mode = compute_mode - self.worker_size = worker_size - self.worker_size_id = worker_size_id - 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 + def __init__(self, **kwargs): + super(StampCapacity, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.available_capacity = kwargs.get('available_capacity', None) + self.total_capacity = kwargs.get('total_capacity', None) + self.unit = kwargs.get('unit', None) + self.compute_mode = kwargs.get('compute_mode', None) + self.worker_size = kwargs.get('worker_size', None) + self.worker_size_id = kwargs.get('worker_size_id', None) + self.exclude_from_capacity_allocation = kwargs.get('exclude_from_capacity_allocation', None) + self.is_applicable_for_all_compute_modes = kwargs.get('is_applicable_for_all_compute_modes', None) + self.site_mode = kwargs.get('site_mode', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/stamp_capacity_py3.py b/azure-mgmt-web/azure/mgmt/web/models/stamp_capacity_py3.py new file mode 100644 index 000000000000..f9135aa4057c --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/stamp_capacity_py3.py @@ -0,0 +1,74 @@ +# 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 StampCapacity(Model): + """Stamp capacity information. + + :param name: Name of the stamp. + :type name: str + :param available_capacity: Available capacity (# of machines, bytes of + storage etc...). + :type available_capacity: long + :param total_capacity: Total capacity (# of machines, bytes of storage + etc...). + :type total_capacity: long + :param unit: Name of the unit. + :type unit: str + :param compute_mode: Shared/dedicated workers. Possible values include: + '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' + :type worker_size: str or ~azure.mgmt.web.models.WorkerSizeOptions + :param worker_size_id: Size ID of machines: + 0 - Small + 1 - Medium + 2 - Large + :type worker_size_id: int + :param exclude_from_capacity_allocation: If true, it includes + basic apps. + Basic apps are not used for capacity allocation. + :type exclude_from_capacity_allocation: bool + :param is_applicable_for_all_compute_modes: true if capacity + is applicable for all apps; otherwise, false. + :type is_applicable_for_all_compute_modes: bool + :param site_mode: Shared or Dedicated. + :type site_mode: str + """ + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'available_capacity': {'key': 'availableCapacity', 'type': 'long'}, + 'total_capacity': {'key': 'totalCapacity', 'type': 'long'}, + 'unit': {'key': 'unit', 'type': 'str'}, + 'compute_mode': {'key': 'computeMode', 'type': 'ComputeModeOptions'}, + 'worker_size': {'key': 'workerSize', 'type': 'WorkerSizeOptions'}, + 'worker_size_id': {'key': 'workerSizeId', 'type': 'int'}, + 'exclude_from_capacity_allocation': {'key': 'excludeFromCapacityAllocation', 'type': 'bool'}, + 'is_applicable_for_all_compute_modes': {'key': 'isApplicableForAllComputeModes', 'type': 'bool'}, + 'site_mode': {'key': 'siteMode', 'type': 'str'}, + } + + def __init__(self, *, name: str=None, available_capacity: int=None, total_capacity: int=None, unit: str=None, compute_mode=None, worker_size=None, worker_size_id: int=None, exclude_from_capacity_allocation: bool=None, is_applicable_for_all_compute_modes: bool=None, site_mode: str=None, **kwargs) -> None: + super(StampCapacity, self).__init__(**kwargs) + self.name = name + self.available_capacity = available_capacity + self.total_capacity = total_capacity + self.unit = unit + self.compute_mode = compute_mode + self.worker_size = worker_size + self.worker_size_id = worker_size_id + 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 diff --git a/azure-mgmt-web/azure/mgmt/web/models/status_codes_based_trigger.py b/azure-mgmt-web/azure/mgmt/web/models/status_codes_based_trigger.py index 32389ee7253d..d1776ce91bc0 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/status_codes_based_trigger.py +++ b/azure-mgmt-web/azure/mgmt/web/models/status_codes_based_trigger.py @@ -35,10 +35,10 @@ class StatusCodesBasedTrigger(Model): 'time_interval': {'key': 'timeInterval', 'type': 'str'}, } - def __init__(self, status=None, sub_status=None, win32_status=None, count=None, time_interval=None): - super(StatusCodesBasedTrigger, self).__init__() - self.status = status - self.sub_status = sub_status - self.win32_status = win32_status - self.count = count - self.time_interval = time_interval + def __init__(self, **kwargs): + super(StatusCodesBasedTrigger, self).__init__(**kwargs) + self.status = kwargs.get('status', None) + self.sub_status = kwargs.get('sub_status', None) + self.win32_status = kwargs.get('win32_status', None) + self.count = kwargs.get('count', None) + self.time_interval = kwargs.get('time_interval', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/status_codes_based_trigger_py3.py b/azure-mgmt-web/azure/mgmt/web/models/status_codes_based_trigger_py3.py new file mode 100644 index 000000000000..939a950c1d37 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/status_codes_based_trigger_py3.py @@ -0,0 +1,44 @@ +# 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 StatusCodesBasedTrigger(Model): + """Trigger based on status code. + + :param status: HTTP status code. + :type status: int + :param sub_status: Request Sub Status. + :type sub_status: int + :param win32_status: Win32 error code. + :type win32_status: int + :param count: Request Count. + :type count: int + :param time_interval: Time interval. + :type time_interval: str + """ + + _attribute_map = { + 'status': {'key': 'status', 'type': 'int'}, + 'sub_status': {'key': 'subStatus', 'type': 'int'}, + 'win32_status': {'key': 'win32Status', 'type': 'int'}, + 'count': {'key': 'count', 'type': 'int'}, + 'time_interval': {'key': 'timeInterval', 'type': 'str'}, + } + + def __init__(self, *, status: int=None, sub_status: int=None, win32_status: int=None, count: int=None, time_interval: str=None, **kwargs) -> None: + super(StatusCodesBasedTrigger, self).__init__(**kwargs) + self.status = status + self.sub_status = sub_status + self.win32_status = win32_status + self.count = count + self.time_interval = time_interval diff --git a/azure-mgmt-web/azure/mgmt/web/models/storage_migration_options.py b/azure-mgmt-web/azure/mgmt/web/models/storage_migration_options.py index e92a9f06c9b2..faaeabd58089 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/storage_migration_options.py +++ b/azure-mgmt-web/azure/mgmt/web/models/storage_migration_options.py @@ -18,6 +18,8 @@ class StorageMigrationOptions(ProxyOnlyResource): Variables are only populated by the server, and will be ignored when sending a request. + All required parameters must be populated in order to send to Azure. + :ivar id: Resource Id. :vartype id: str :ivar name: Resource Name. @@ -26,9 +28,10 @@ class StorageMigrationOptions(ProxyOnlyResource): :type kind: str :ivar type: Resource type. :vartype type: str - :param azurefiles_connection_string: AzureFiles connection string. + :param azurefiles_connection_string: Required. AzureFiles connection + string. :type azurefiles_connection_string: str - :param azurefiles_share: AzureFiles share. + :param azurefiles_share: Required. AzureFiles share. :type azurefiles_share: str :param switch_site_after_migration: trueif the app should be switched over; otherwise, false. Default value: False . @@ -58,9 +61,9 @@ class StorageMigrationOptions(ProxyOnlyResource): 'block_write_access_to_site': {'key': 'properties.blockWriteAccessToSite', 'type': 'bool'}, } - def __init__(self, azurefiles_connection_string, azurefiles_share, kind=None, switch_site_after_migration=False, block_write_access_to_site=False): - super(StorageMigrationOptions, self).__init__(kind=kind) - self.azurefiles_connection_string = azurefiles_connection_string - self.azurefiles_share = azurefiles_share - self.switch_site_after_migration = switch_site_after_migration - self.block_write_access_to_site = block_write_access_to_site + def __init__(self, **kwargs): + super(StorageMigrationOptions, self).__init__(**kwargs) + self.azurefiles_connection_string = kwargs.get('azurefiles_connection_string', None) + self.azurefiles_share = kwargs.get('azurefiles_share', None) + self.switch_site_after_migration = kwargs.get('switch_site_after_migration', False) + self.block_write_access_to_site = kwargs.get('block_write_access_to_site', False) diff --git a/azure-mgmt-web/azure/mgmt/web/models/storage_migration_options_py3.py b/azure-mgmt-web/azure/mgmt/web/models/storage_migration_options_py3.py new file mode 100644 index 000000000000..0d86033f921b --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/storage_migration_options_py3.py @@ -0,0 +1,69 @@ +# 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_py3 import ProxyOnlyResource + + +class StorageMigrationOptions(ProxyOnlyResource): + """Options for app content migration. + + Variables are only populated by the server, and will be ignored when + sending a request. + + All required parameters must be populated in order to send to Azure. + + :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 azurefiles_connection_string: Required. AzureFiles connection + string. + :type azurefiles_connection_string: str + :param azurefiles_share: Required. AzureFiles share. + :type azurefiles_share: str + :param switch_site_after_migration: trueif the app should be + switched over; otherwise, false. Default value: False . + :type switch_site_after_migration: bool + :param block_write_access_to_site: true if the app should be + read only during copy operation; otherwise, false. Default + value: False . + :type block_write_access_to_site: bool + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'azurefiles_connection_string': {'required': True}, + 'azurefiles_share': {'required': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'azurefiles_connection_string': {'key': 'properties.azurefilesConnectionString', 'type': 'str'}, + 'azurefiles_share': {'key': 'properties.azurefilesShare', 'type': 'str'}, + 'switch_site_after_migration': {'key': 'properties.switchSiteAfterMigration', 'type': 'bool'}, + 'block_write_access_to_site': {'key': 'properties.blockWriteAccessToSite', 'type': 'bool'}, + } + + def __init__(self, *, azurefiles_connection_string: str, azurefiles_share: str, kind: str=None, switch_site_after_migration: bool=False, block_write_access_to_site: bool=False, **kwargs) -> None: + super(StorageMigrationOptions, self).__init__(kind=kind, **kwargs) + self.azurefiles_connection_string = azurefiles_connection_string + self.azurefiles_share = azurefiles_share + self.switch_site_after_migration = switch_site_after_migration + self.block_write_access_to_site = block_write_access_to_site diff --git a/azure-mgmt-web/azure/mgmt/web/models/storage_migration_response.py b/azure-mgmt-web/azure/mgmt/web/models/storage_migration_response.py index eda75c3f5171..f528db53bae5 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/storage_migration_response.py +++ b/azure-mgmt-web/azure/mgmt/web/models/storage_migration_response.py @@ -46,6 +46,6 @@ class StorageMigrationResponse(ProxyOnlyResource): 'operation_id': {'key': 'properties.operationId', 'type': 'str'}, } - def __init__(self, kind=None): - super(StorageMigrationResponse, self).__init__(kind=kind) + def __init__(self, **kwargs): + super(StorageMigrationResponse, self).__init__(**kwargs) self.operation_id = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/storage_migration_response_py3.py b/azure-mgmt-web/azure/mgmt/web/models/storage_migration_response_py3.py new file mode 100644 index 000000000000..96dabf439e79 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/storage_migration_response_py3.py @@ -0,0 +1,51 @@ +# 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_py3 import ProxyOnlyResource + + +class StorageMigrationResponse(ProxyOnlyResource): + """Response for a migration of app content request. + + 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 + :ivar operation_id: When server starts the migration process, it will + return an operation ID identifying that particular migration operation. + :vartype operation_id: str + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'operation_id': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'operation_id': {'key': 'properties.operationId', 'type': 'str'}, + } + + def __init__(self, *, kind: str=None, **kwargs) -> None: + super(StorageMigrationResponse, self).__init__(kind=kind, **kwargs) + self.operation_id = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/string_dictionary.py b/azure-mgmt-web/azure/mgmt/web/models/string_dictionary.py index 875d8325abaf..de492106f79c 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/string_dictionary.py +++ b/azure-mgmt-web/azure/mgmt/web/models/string_dictionary.py @@ -44,6 +44,6 @@ class StringDictionary(ProxyOnlyResource): 'properties': {'key': 'properties', 'type': '{str}'}, } - def __init__(self, kind=None, properties=None): - super(StringDictionary, self).__init__(kind=kind) - self.properties = properties + def __init__(self, **kwargs): + super(StringDictionary, self).__init__(**kwargs) + self.properties = kwargs.get('properties', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/string_dictionary_py3.py b/azure-mgmt-web/azure/mgmt/web/models/string_dictionary_py3.py new file mode 100644 index 000000000000..7a2e90bd44ff --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/string_dictionary_py3.py @@ -0,0 +1,49 @@ +# 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_py3 import ProxyOnlyResource + + +class StringDictionary(ProxyOnlyResource): + """String dictionary resource. + + 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 properties: Settings. + :type properties: dict[str, 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'}, + 'properties': {'key': 'properties', 'type': '{str}'}, + } + + def __init__(self, *, kind: str=None, properties=None, **kwargs) -> None: + super(StringDictionary, self).__init__(kind=kind, **kwargs) + self.properties = properties diff --git a/azure-mgmt-web/azure/mgmt/web/models/tld_legal_agreement.py b/azure-mgmt-web/azure/mgmt/web/models/tld_legal_agreement.py index c7ac735feb00..ebe9ca9add5c 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/tld_legal_agreement.py +++ b/azure-mgmt-web/azure/mgmt/web/models/tld_legal_agreement.py @@ -15,11 +15,13 @@ class TldLegalAgreement(Model): """Legal agreement for a top level domain. - :param agreement_key: Unique identifier for the agreement. + All required parameters must be populated in order to send to Azure. + + :param agreement_key: Required. Unique identifier for the agreement. :type agreement_key: str - :param title: Agreement title. + :param title: Required. Agreement title. :type title: str - :param content: Agreement details. + :param content: Required. Agreement details. :type content: str :param url: URL where a copy of the agreement details is hosted. :type url: str @@ -38,9 +40,9 @@ class TldLegalAgreement(Model): 'url': {'key': 'url', 'type': 'str'}, } - def __init__(self, agreement_key, title, content, url=None): - super(TldLegalAgreement, self).__init__() - self.agreement_key = agreement_key - self.title = title - self.content = content - self.url = url + def __init__(self, **kwargs): + super(TldLegalAgreement, self).__init__(**kwargs) + self.agreement_key = kwargs.get('agreement_key', None) + self.title = kwargs.get('title', None) + self.content = kwargs.get('content', None) + self.url = kwargs.get('url', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/tld_legal_agreement_py3.py b/azure-mgmt-web/azure/mgmt/web/models/tld_legal_agreement_py3.py new file mode 100644 index 000000000000..a32633d0e8d6 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/tld_legal_agreement_py3.py @@ -0,0 +1,48 @@ +# 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 TldLegalAgreement(Model): + """Legal agreement for a top level domain. + + All required parameters must be populated in order to send to Azure. + + :param agreement_key: Required. Unique identifier for the agreement. + :type agreement_key: str + :param title: Required. Agreement title. + :type title: str + :param content: Required. Agreement details. + :type content: str + :param url: URL where a copy of the agreement details is hosted. + :type url: str + """ + + _validation = { + 'agreement_key': {'required': True}, + 'title': {'required': True}, + 'content': {'required': True}, + } + + _attribute_map = { + 'agreement_key': {'key': 'agreementKey', 'type': 'str'}, + 'title': {'key': 'title', 'type': 'str'}, + 'content': {'key': 'content', 'type': 'str'}, + 'url': {'key': 'url', 'type': 'str'}, + } + + def __init__(self, *, agreement_key: str, title: str, content: str, url: str=None, **kwargs) -> None: + super(TldLegalAgreement, self).__init__(**kwargs) + self.agreement_key = agreement_key + self.title = title + self.content = content + self.url = url 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..cdd7cbd07acd 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 @@ -49,7 +49,7 @@ class TopLevelDomain(ProxyOnlyResource): 'privacy': {'key': 'properties.privacy', 'type': 'bool'}, } - def __init__(self, kind=None, privacy=None): - super(TopLevelDomain, self).__init__(kind=kind) + def __init__(self, **kwargs): + super(TopLevelDomain, self).__init__(**kwargs) self.domain_name = None - self.privacy = privacy + self.privacy = kwargs.get('privacy', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/top_level_domain_agreement_option.py b/azure-mgmt-web/azure/mgmt/web/models/top_level_domain_agreement_option.py index c22b5dfd1948..94be4b55cfd3 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/top_level_domain_agreement_option.py +++ b/azure-mgmt-web/azure/mgmt/web/models/top_level_domain_agreement_option.py @@ -30,7 +30,7 @@ class TopLevelDomainAgreementOption(Model): 'for_transfer': {'key': 'forTransfer', 'type': 'bool'}, } - def __init__(self, include_privacy=None, for_transfer=None): - super(TopLevelDomainAgreementOption, self).__init__() - self.include_privacy = include_privacy - self.for_transfer = for_transfer + def __init__(self, **kwargs): + super(TopLevelDomainAgreementOption, self).__init__(**kwargs) + self.include_privacy = kwargs.get('include_privacy', None) + self.for_transfer = kwargs.get('for_transfer', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/top_level_domain_agreement_option_py3.py b/azure-mgmt-web/azure/mgmt/web/models/top_level_domain_agreement_option_py3.py new file mode 100644 index 000000000000..88bde7894d0f --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/top_level_domain_agreement_option_py3.py @@ -0,0 +1,36 @@ +# 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 TopLevelDomainAgreementOption(Model): + """Options for retrieving the list of top level domain legal agreements. + + :param include_privacy: If true, then the list of agreements + will include agreements for domain privacy as well; otherwise, + false. + :type include_privacy: bool + :param for_transfer: If true, then the list of agreements + will include agreements for domain transfer as well; otherwise, + false. + :type for_transfer: bool + """ + + _attribute_map = { + 'include_privacy': {'key': 'includePrivacy', 'type': 'bool'}, + 'for_transfer': {'key': 'forTransfer', 'type': 'bool'}, + } + + def __init__(self, *, include_privacy: bool=None, for_transfer: bool=None, **kwargs) -> None: + super(TopLevelDomainAgreementOption, self).__init__(**kwargs) + self.include_privacy = include_privacy + self.for_transfer = for_transfer diff --git a/azure-mgmt-web/azure/mgmt/web/models/top_level_domain_py3.py b/azure-mgmt-web/azure/mgmt/web/models/top_level_domain_py3.py new file mode 100644 index 000000000000..4d76becde767 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/top_level_domain_py3.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 .proxy_only_resource_py3 import ProxyOnlyResource + + +class TopLevelDomain(ProxyOnlyResource): + """A top level domain object. + + 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 + :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 + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'domain_name': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + '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: str=None, privacy: bool=None, **kwargs) -> None: + super(TopLevelDomain, self).__init__(kind=kind, **kwargs) + 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..4bd86dd9efe2 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 @@ -45,6 +45,6 @@ class TriggeredJobHistory(ProxyOnlyResource): 'triggered_job_runs': {'key': 'properties.triggeredJobRuns', 'type': '[TriggeredJobRun]'}, } - def __init__(self, kind=None, triggered_job_runs=None): - super(TriggeredJobHistory, self).__init__(kind=kind) - self.triggered_job_runs = triggered_job_runs + def __init__(self, **kwargs): + super(TriggeredJobHistory, self).__init__(**kwargs) + self.triggered_job_runs = kwargs.get('triggered_job_runs', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/triggered_job_history_py3.py b/azure-mgmt-web/azure/mgmt/web/models/triggered_job_history_py3.py new file mode 100644 index 000000000000..404156b42f0d --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/triggered_job_history_py3.py @@ -0,0 +1,50 @@ +# 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_py3 import ProxyOnlyResource + + +class TriggeredJobHistory(ProxyOnlyResource): + """Triggered Web Job History. List of Triggered Web Job Run Information + elements. + + 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 triggered_job_runs: List of triggered web job runs. + :type triggered_job_runs: list[~azure.mgmt.web.models.TriggeredJobRun] + """ + + _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'}, + 'triggered_job_runs': {'key': 'properties.triggeredJobRuns', 'type': '[TriggeredJobRun]'}, + } + + def __init__(self, *, kind: str=None, triggered_job_runs=None, **kwargs) -> None: + super(TriggeredJobHistory, self).__init__(kind=kind, **kwargs) + self.triggered_job_runs = triggered_job_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..e0d3653c3690 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 @@ -76,16 +76,16 @@ class TriggeredJobRun(ProxyOnlyResource): '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): - super(TriggeredJobRun, self).__init__(kind=kind) - self.triggered_job_run_id = triggered_job_run_id + def __init__(self, **kwargs): + super(TriggeredJobRun, self).__init__(**kwargs) + self.triggered_job_run_id = kwargs.get('triggered_job_run_id', None) self.triggered_job_run_name = None - self.status = status - self.start_time = start_time - self.end_time = end_time - self.duration = duration - self.output_url = output_url - self.error_url = error_url - self.url = url - self.job_name = job_name - self.trigger = trigger + self.status = kwargs.get('status', None) + self.start_time = kwargs.get('start_time', None) + self.end_time = kwargs.get('end_time', None) + self.duration = kwargs.get('duration', None) + self.output_url = kwargs.get('output_url', None) + self.error_url = kwargs.get('error_url', None) + self.url = kwargs.get('url', None) + self.job_name = kwargs.get('job_name', None) + self.trigger = kwargs.get('trigger', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/triggered_job_run_py3.py b/azure-mgmt-web/azure/mgmt/web/models/triggered_job_run_py3.py new file mode 100644 index 000000000000..631559f3102f --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/triggered_job_run_py3.py @@ -0,0 +1,91 @@ +# 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_py3 import ProxyOnlyResource + + +class TriggeredJobRun(ProxyOnlyResource): + """Triggered Web Job Run Information. + + 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 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 status: Job status. Possible values include: 'Success', 'Failed', + 'Error' + :type status: str or ~azure.mgmt.web.models.TriggeredWebJobStatus + :param start_time: Start time. + :type start_time: datetime + :param end_time: End time. + :type end_time: datetime + :param duration: Job duration. + :type duration: str + :param output_url: Output URL. + :type output_url: str + :param error_url: Error URL. + :type error_url: str + :param url: Job URL. + :type url: str + :param job_name: Job name. + :type job_name: str + :param trigger: Job trigger. + :type trigger: str + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'triggered_job_run_name': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + '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'}, + 'status': {'key': 'properties.status', 'type': 'TriggeredWebJobStatus'}, + 'start_time': {'key': 'properties.startTime', 'type': 'iso-8601'}, + 'end_time': {'key': 'properties.endTime', 'type': 'iso-8601'}, + 'duration': {'key': 'properties.duration', 'type': 'str'}, + 'output_url': {'key': 'properties.outputUrl', 'type': 'str'}, + 'error_url': {'key': 'properties.errorUrl', 'type': 'str'}, + 'url': {'key': 'properties.url', 'type': 'str'}, + 'job_name': {'key': 'properties.jobName', 'type': 'str'}, + 'trigger': {'key': 'properties.trigger', 'type': 'str'}, + } + + def __init__(self, *, kind: str=None, triggered_job_run_id: str=None, status=None, start_time=None, end_time=None, duration: str=None, output_url: str=None, error_url: str=None, url: str=None, job_name: str=None, trigger: str=None, **kwargs) -> None: + super(TriggeredJobRun, self).__init__(kind=kind, **kwargs) + self.triggered_job_run_id = triggered_job_run_id + self.triggered_job_run_name = None + self.status = status + self.start_time = start_time + self.end_time = end_time + self.duration = duration + self.output_url = output_url + self.error_url = error_url + self.url = url + self.job_name = job_name + self.trigger = trigger 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..f3a58d01e26c 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 @@ -77,16 +77,16 @@ class TriggeredWebJob(ProxyOnlyResource): '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): - super(TriggeredWebJob, self).__init__(kind=kind) - self.latest_run = latest_run - self.history_url = history_url - self.scheduler_logs_url = scheduler_logs_url + def __init__(self, **kwargs): + super(TriggeredWebJob, self).__init__(**kwargs) + self.latest_run = kwargs.get('latest_run', None) + self.history_url = kwargs.get('history_url', None) + self.scheduler_logs_url = kwargs.get('scheduler_logs_url', None) 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.error = error - self.using_sdk = using_sdk - self.settings = settings + self.run_command = kwargs.get('run_command', None) + self.url = kwargs.get('url', None) + self.extra_info_url = kwargs.get('extra_info_url', None) + self.job_type = kwargs.get('job_type', None) + self.error = kwargs.get('error', None) + self.using_sdk = kwargs.get('using_sdk', None) + self.settings = kwargs.get('settings', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/triggered_web_job_py3.py b/azure-mgmt-web/azure/mgmt/web/models/triggered_web_job_py3.py new file mode 100644 index 000000000000..c3fc83e4a1df --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/triggered_web_job_py3.py @@ -0,0 +1,92 @@ +# 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_py3 import ProxyOnlyResource + + +class TriggeredWebJob(ProxyOnlyResource): + """Triggered Web Job Information. + + 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 latest_run: Latest job run information. + :type latest_run: ~azure.mgmt.web.models.TriggeredJobRun + :param history_url: History URL. + :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', + 'Triggered' + :type job_type: str or ~azure.mgmt.web.models.WebJobType + :param error: Error information. + :type error: str + :param using_sdk: Using SDK? + :type using_sdk: bool + :param settings: Job settings. + :type settings: dict[str, object] + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'triggered_web_job_name': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + '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'}, + 'url': {'key': 'properties.url', 'type': 'str'}, + 'extra_info_url': {'key': 'properties.extraInfoUrl', 'type': 'str'}, + 'job_type': {'key': 'properties.jobType', 'type': 'WebJobType'}, + 'error': {'key': 'properties.error', 'type': 'str'}, + 'using_sdk': {'key': 'properties.usingSdk', 'type': 'bool'}, + 'settings': {'key': 'properties.settings', 'type': '{object}'}, + } + + def __init__(self, *, kind: str=None, latest_run=None, history_url: str=None, scheduler_logs_url: str=None, run_command: str=None, url: str=None, extra_info_url: str=None, job_type=None, error: str=None, using_sdk: bool=None, settings=None, **kwargs) -> None: + super(TriggeredWebJob, self).__init__(kind=kind, **kwargs) + 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.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..8cc6e379603e 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/usage.py +++ b/azure-mgmt-web/azure/mgmt/web/models/usage.py @@ -78,8 +78,8 @@ class Usage(ProxyOnlyResource): 'site_mode': {'key': 'properties.siteMode', 'type': 'str'}, } - def __init__(self, kind=None): - super(Usage, self).__init__(kind=kind) + def __init__(self, **kwargs): + super(Usage, self).__init__(**kwargs) self.display_name = None self.usage_name = None self.resource_name = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/usage_py3.py b/azure-mgmt-web/azure/mgmt/web/models/usage_py3.py new file mode 100644 index 000000000000..90497208ad04 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/usage_py3.py @@ -0,0 +1,91 @@ +# 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_py3 import ProxyOnlyResource + + +class Usage(ProxyOnlyResource): + """Usage of the quota resource. + + 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 + :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. + :vartype unit: str + :ivar current_value: The current value of the resource counter. + :vartype current_value: long + :ivar limit: The resource limit. + :vartype limit: long + :ivar next_reset_time: Next reset time for the resource counter. + :vartype next_reset_time: datetime + :ivar compute_mode: Compute mode used for this usage. Possible values + include: 'Shared', 'Dedicated', 'Dynamic' + :vartype compute_mode: str or ~azure.mgmt.web.models.ComputeModeOptions + :ivar site_mode: Site mode used for this usage. + :vartype site_mode: str + """ + + _validation = { + 'id': {'readonly': True}, + '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}, + 'limit': {'readonly': True}, + 'next_reset_time': {'readonly': True}, + 'compute_mode': {'readonly': True}, + 'site_mode': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + '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'}, + 'limit': {'key': 'properties.limit', 'type': 'long'}, + 'next_reset_time': {'key': 'properties.nextResetTime', 'type': 'iso-8601'}, + 'compute_mode': {'key': 'properties.computeMode', 'type': 'ComputeModeOptions'}, + 'site_mode': {'key': 'properties.siteMode', 'type': 'str'}, + } + + def __init__(self, *, kind: str=None, **kwargs) -> None: + super(Usage, self).__init__(kind=kind, **kwargs) + self.display_name = None + self.usage_name = None + self.resource_name = None + self.unit = None + self.current_value = None + self.limit = None + self.next_reset_time = None + self.compute_mode = None + self.site_mode = 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..d34af225db0b 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/user.py +++ b/azure-mgmt-web/azure/mgmt/web/models/user.py @@ -18,6 +18,8 @@ class User(ProxyOnlyResource): Variables are only populated by the server, and will be ignored when sending a request. + All required parameters must be populated in order to send to Azure. + :ivar id: Resource Id. :vartype id: str :ivar name: Resource Name. @@ -28,7 +30,7 @@ class User(ProxyOnlyResource): :vartype type: str :param user_name: Username :type user_name: str - :param publishing_user_name: Username used for publishing. + :param publishing_user_name: Required. Username used for publishing. :type publishing_user_name: str :param publishing_password: Password used for publishing. :type publishing_password: str @@ -58,10 +60,10 @@ class User(ProxyOnlyResource): 'publishing_password_hash_salt': {'key': 'properties.publishingPasswordHashSalt', '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): - 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 + def __init__(self, **kwargs): + super(User, self).__init__(**kwargs) + self.user_name = kwargs.get('user_name', None) + self.publishing_user_name = kwargs.get('publishing_user_name', None) + self.publishing_password = kwargs.get('publishing_password', None) + self.publishing_password_hash = kwargs.get('publishing_password_hash', None) + self.publishing_password_hash_salt = kwargs.get('publishing_password_hash_salt', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/user_py3.py b/azure-mgmt-web/azure/mgmt/web/models/user_py3.py new file mode 100644 index 000000000000..78fc453a89e0 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/user_py3.py @@ -0,0 +1,69 @@ +# 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_py3 import ProxyOnlyResource + + +class User(ProxyOnlyResource): + """User crendentials used for publishing activity. + + Variables are only populated by the server, and will be ignored when + sending a request. + + All required parameters must be populated in order to send to Azure. + + :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 user_name: Username + :type user_name: str + :param publishing_user_name: Required. Username used for publishing. + :type publishing_user_name: str + :param publishing_password: Password used for publishing. + :type publishing_password: str + :param publishing_password_hash: Password hash used for publishing. + :type publishing_password_hash: str + :param publishing_password_hash_salt: Password hash salt used for + publishing. + :type publishing_password_hash_salt: str + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'publishing_user_name': {'required': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + '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'}, + } + + def __init__(self, *, publishing_user_name: str, kind: str=None, user_name: str=None, publishing_password: str=None, publishing_password_hash: str=None, publishing_password_hash_salt: str=None, **kwargs) -> None: + super(User, self).__init__(kind=kind, **kwargs) + 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 diff --git a/azure-mgmt-web/azure/mgmt/web/models/validate_request.py b/azure-mgmt-web/azure/mgmt/web/models/validate_request.py index d34b163fd640..472cbbc7612b 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/validate_request.py +++ b/azure-mgmt-web/azure/mgmt/web/models/validate_request.py @@ -15,12 +15,14 @@ class ValidateRequest(Model): """Resource validation request content. - :param name: Resource name to verify. + All required parameters must be populated in order to send to Azure. + + :param name: Required. Resource name to verify. :type name: str - :param type: Resource type used for verification. Possible values include: - 'ServerFarm', 'Site' + :param type: Required. Resource type used for verification. Possible + values include: 'ServerFarm', 'Site' :type type: str or ~azure.mgmt.web.models.ValidateResourceTypes - :param location: Expected location of the resource. + :param location: Required. Expected location of the resource. :type location: str :param server_farm_id: ARM resource ID of an App Service plan that would host the app. @@ -59,14 +61,14 @@ class ValidateRequest(Model): 'hosting_environment': {'key': 'properties.hostingEnvironment', 'type': 'str'}, } - def __init__(self, name, type, location, server_farm_id=None, sku_name=None, need_linux_workers=None, is_spot=None, capacity=None, hosting_environment=None): - super(ValidateRequest, self).__init__() - self.name = name - self.type = type - self.location = location - self.server_farm_id = server_farm_id - self.sku_name = sku_name - self.need_linux_workers = need_linux_workers - self.is_spot = is_spot - self.capacity = capacity - self.hosting_environment = hosting_environment + def __init__(self, **kwargs): + super(ValidateRequest, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.type = kwargs.get('type', None) + self.location = kwargs.get('location', None) + self.server_farm_id = kwargs.get('server_farm_id', None) + self.sku_name = kwargs.get('sku_name', None) + self.need_linux_workers = kwargs.get('need_linux_workers', None) + self.is_spot = kwargs.get('is_spot', None) + self.capacity = kwargs.get('capacity', None) + self.hosting_environment = kwargs.get('hosting_environment', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/validate_request_py3.py b/azure-mgmt-web/azure/mgmt/web/models/validate_request_py3.py new file mode 100644 index 000000000000..711a94575335 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/validate_request_py3.py @@ -0,0 +1,74 @@ +# 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 ValidateRequest(Model): + """Resource validation request content. + + All required parameters must be populated in order to send to Azure. + + :param name: Required. Resource name to verify. + :type name: str + :param type: Required. Resource type used for verification. Possible + values include: 'ServerFarm', 'Site' + :type type: str or ~azure.mgmt.web.models.ValidateResourceTypes + :param location: Required. Expected location of the resource. + :type location: str + :param server_farm_id: ARM resource ID of an App Service plan that would + host the app. + :type server_farm_id: str + :param sku_name: Name of the target SKU for the App Service plan. + :type sku_name: str + :param need_linux_workers: true if App Service plan is for + Linux workers; otherwise, false. + :type need_linux_workers: bool + :param is_spot: true if App Service plan is for Spot + instances; otherwise, false. + :type is_spot: bool + :param capacity: Target capacity of the App Service plan (number of VM's). + :type capacity: int + :param hosting_environment: Name of App Service Environment where app or + App Service plan should be created. + :type hosting_environment: str + """ + + _validation = { + 'name': {'required': True}, + 'type': {'required': True}, + 'location': {'required': True}, + 'capacity': {'minimum': 1}, + } + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'location': {'key': 'location', 'type': 'str'}, + 'server_farm_id': {'key': 'properties.serverFarmId', 'type': 'str'}, + 'sku_name': {'key': 'properties.skuName', 'type': 'str'}, + 'need_linux_workers': {'key': 'properties.needLinuxWorkers', 'type': 'bool'}, + 'is_spot': {'key': 'properties.isSpot', 'type': 'bool'}, + 'capacity': {'key': 'properties.capacity', 'type': 'int'}, + 'hosting_environment': {'key': 'properties.hostingEnvironment', 'type': 'str'}, + } + + def __init__(self, *, name: str, type, location: str, server_farm_id: str=None, sku_name: str=None, need_linux_workers: bool=None, is_spot: bool=None, capacity: int=None, hosting_environment: str=None, **kwargs) -> None: + super(ValidateRequest, self).__init__(**kwargs) + self.name = name + self.type = type + self.location = location + self.server_farm_id = server_farm_id + self.sku_name = sku_name + self.need_linux_workers = need_linux_workers + self.is_spot = is_spot + self.capacity = capacity + self.hosting_environment = hosting_environment diff --git a/azure-mgmt-web/azure/mgmt/web/models/validate_response.py b/azure-mgmt-web/azure/mgmt/web/models/validate_response.py index 72e3aebdcb3b..473d45b816ca 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/validate_response.py +++ b/azure-mgmt-web/azure/mgmt/web/models/validate_response.py @@ -26,7 +26,7 @@ class ValidateResponse(Model): 'error': {'key': 'error', 'type': 'ValidateResponseError'}, } - def __init__(self, status=None, error=None): - super(ValidateResponse, self).__init__() - self.status = status - self.error = error + def __init__(self, **kwargs): + super(ValidateResponse, self).__init__(**kwargs) + self.status = kwargs.get('status', None) + self.error = kwargs.get('error', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/validate_response_error.py b/azure-mgmt-web/azure/mgmt/web/models/validate_response_error.py index 6186f924e892..3d265a67be07 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/validate_response_error.py +++ b/azure-mgmt-web/azure/mgmt/web/models/validate_response_error.py @@ -26,7 +26,7 @@ class ValidateResponseError(Model): 'message': {'key': 'message', 'type': 'str'}, } - def __init__(self, code=None, message=None): - super(ValidateResponseError, self).__init__() - self.code = code - self.message = message + def __init__(self, **kwargs): + super(ValidateResponseError, self).__init__(**kwargs) + self.code = kwargs.get('code', None) + self.message = kwargs.get('message', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/validate_response_error_py3.py b/azure-mgmt-web/azure/mgmt/web/models/validate_response_error_py3.py new file mode 100644 index 000000000000..8c52675c3356 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/validate_response_error_py3.py @@ -0,0 +1,32 @@ +# 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 ValidateResponseError(Model): + """Error details for when validation fails. + + :param code: Validation error code. + :type code: str + :param message: Validation error message. + :type message: str + """ + + _attribute_map = { + 'code': {'key': 'code', 'type': 'str'}, + 'message': {'key': 'message', 'type': 'str'}, + } + + def __init__(self, *, code: str=None, message: str=None, **kwargs) -> None: + super(ValidateResponseError, self).__init__(**kwargs) + self.code = code + self.message = message diff --git a/azure-mgmt-web/azure/mgmt/web/models/validate_response_py3.py b/azure-mgmt-web/azure/mgmt/web/models/validate_response_py3.py new file mode 100644 index 000000000000..7c21b066f7cc --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/validate_response_py3.py @@ -0,0 +1,32 @@ +# 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 ValidateResponse(Model): + """Describes the result of resource validation. + + :param status: Result of validation. + :type status: str + :param error: Error details for the case when validation fails. + :type error: ~azure.mgmt.web.models.ValidateResponseError + """ + + _attribute_map = { + 'status': {'key': 'status', 'type': 'str'}, + 'error': {'key': 'error', 'type': 'ValidateResponseError'}, + } + + def __init__(self, *, status: str=None, error=None, **kwargs) -> None: + super(ValidateResponse, self).__init__(**kwargs) + self.status = status + self.error = error diff --git a/azure-mgmt-web/azure/mgmt/web/models/virtual_application.py b/azure-mgmt-web/azure/mgmt/web/models/virtual_application.py index 6394e8f4a0dd..7b5538859ff9 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/virtual_application.py +++ b/azure-mgmt-web/azure/mgmt/web/models/virtual_application.py @@ -33,9 +33,9 @@ class VirtualApplication(Model): 'virtual_directories': {'key': 'virtualDirectories', 'type': '[VirtualDirectory]'}, } - def __init__(self, virtual_path=None, physical_path=None, preload_enabled=None, virtual_directories=None): - super(VirtualApplication, self).__init__() - self.virtual_path = virtual_path - self.physical_path = physical_path - self.preload_enabled = preload_enabled - self.virtual_directories = virtual_directories + def __init__(self, **kwargs): + super(VirtualApplication, self).__init__(**kwargs) + self.virtual_path = kwargs.get('virtual_path', None) + self.physical_path = kwargs.get('physical_path', None) + self.preload_enabled = kwargs.get('preload_enabled', None) + self.virtual_directories = kwargs.get('virtual_directories', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/virtual_application_py3.py b/azure-mgmt-web/azure/mgmt/web/models/virtual_application_py3.py new file mode 100644 index 000000000000..9fb6d7595fb6 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/virtual_application_py3.py @@ -0,0 +1,41 @@ +# 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 VirtualApplication(Model): + """Virtual application in an app. + + :param virtual_path: Virtual path. + :type virtual_path: str + :param physical_path: Physical path. + :type physical_path: str + :param preload_enabled: true if preloading is enabled; + otherwise, false. + :type preload_enabled: bool + :param virtual_directories: Virtual directories for virtual application. + :type virtual_directories: list[~azure.mgmt.web.models.VirtualDirectory] + """ + + _attribute_map = { + 'virtual_path': {'key': 'virtualPath', 'type': 'str'}, + 'physical_path': {'key': 'physicalPath', 'type': 'str'}, + 'preload_enabled': {'key': 'preloadEnabled', 'type': 'bool'}, + 'virtual_directories': {'key': 'virtualDirectories', 'type': '[VirtualDirectory]'}, + } + + def __init__(self, *, virtual_path: str=None, physical_path: str=None, preload_enabled: bool=None, virtual_directories=None, **kwargs) -> None: + super(VirtualApplication, self).__init__(**kwargs) + self.virtual_path = virtual_path + self.physical_path = physical_path + self.preload_enabled = preload_enabled + self.virtual_directories = virtual_directories diff --git a/azure-mgmt-web/azure/mgmt/web/models/virtual_directory.py b/azure-mgmt-web/azure/mgmt/web/models/virtual_directory.py index 8742aa28ba2d..e29d6e124afe 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/virtual_directory.py +++ b/azure-mgmt-web/azure/mgmt/web/models/virtual_directory.py @@ -26,7 +26,7 @@ class VirtualDirectory(Model): 'physical_path': {'key': 'physicalPath', 'type': 'str'}, } - def __init__(self, virtual_path=None, physical_path=None): - super(VirtualDirectory, self).__init__() - self.virtual_path = virtual_path - self.physical_path = physical_path + def __init__(self, **kwargs): + super(VirtualDirectory, self).__init__(**kwargs) + self.virtual_path = kwargs.get('virtual_path', None) + self.physical_path = kwargs.get('physical_path', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/virtual_directory_py3.py b/azure-mgmt-web/azure/mgmt/web/models/virtual_directory_py3.py new file mode 100644 index 000000000000..d24e93b8e0e4 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/virtual_directory_py3.py @@ -0,0 +1,32 @@ +# 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 VirtualDirectory(Model): + """Directory for virtual application. + + :param virtual_path: Path to virtual application. + :type virtual_path: str + :param physical_path: Physical path. + :type physical_path: str + """ + + _attribute_map = { + 'virtual_path': {'key': 'virtualPath', 'type': 'str'}, + 'physical_path': {'key': 'physicalPath', 'type': 'str'}, + } + + def __init__(self, *, virtual_path: str=None, physical_path: str=None, **kwargs) -> None: + super(VirtualDirectory, self).__init__(**kwargs) + self.virtual_path = virtual_path + self.physical_path = physical_path diff --git a/azure-mgmt-web/azure/mgmt/web/models/virtual_ip_mapping.py b/azure-mgmt-web/azure/mgmt/web/models/virtual_ip_mapping.py index 6a8674d29b36..60c9a80fd16a 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/virtual_ip_mapping.py +++ b/azure-mgmt-web/azure/mgmt/web/models/virtual_ip_mapping.py @@ -32,9 +32,9 @@ class VirtualIPMapping(Model): 'in_use': {'key': 'inUse', 'type': 'bool'}, } - def __init__(self, virtual_ip=None, internal_http_port=None, internal_https_port=None, in_use=None): - super(VirtualIPMapping, self).__init__() - self.virtual_ip = virtual_ip - self.internal_http_port = internal_http_port - self.internal_https_port = internal_https_port - self.in_use = in_use + def __init__(self, **kwargs): + super(VirtualIPMapping, self).__init__(**kwargs) + self.virtual_ip = kwargs.get('virtual_ip', None) + self.internal_http_port = kwargs.get('internal_http_port', None) + self.internal_https_port = kwargs.get('internal_https_port', None) + self.in_use = kwargs.get('in_use', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/virtual_ip_mapping_py3.py b/azure-mgmt-web/azure/mgmt/web/models/virtual_ip_mapping_py3.py new file mode 100644 index 000000000000..5f77859f5068 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/virtual_ip_mapping_py3.py @@ -0,0 +1,40 @@ +# 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 VirtualIPMapping(Model): + """Virtual IP mapping. + + :param virtual_ip: Virtual IP address. + :type virtual_ip: str + :param internal_http_port: Internal HTTP port. + :type internal_http_port: int + :param internal_https_port: Internal HTTPS port. + :type internal_https_port: int + :param in_use: Is virtual IP mapping in use. + :type in_use: bool + """ + + _attribute_map = { + 'virtual_ip': {'key': 'virtualIP', 'type': 'str'}, + 'internal_http_port': {'key': 'internalHttpPort', 'type': 'int'}, + 'internal_https_port': {'key': 'internalHttpsPort', 'type': 'int'}, + 'in_use': {'key': 'inUse', 'type': 'bool'}, + } + + def __init__(self, *, virtual_ip: str=None, internal_http_port: int=None, internal_https_port: int=None, in_use: bool=None, **kwargs) -> None: + super(VirtualIPMapping, self).__init__(**kwargs) + self.virtual_ip = virtual_ip + self.internal_http_port = internal_http_port + self.internal_https_port = internal_https_port + self.in_use = in_use diff --git a/azure-mgmt-web/azure/mgmt/web/models/virtual_network_profile.py b/azure-mgmt-web/azure/mgmt/web/models/virtual_network_profile.py index f4d62a216f3c..decb7f8737c8 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/virtual_network_profile.py +++ b/azure-mgmt-web/azure/mgmt/web/models/virtual_network_profile.py @@ -40,9 +40,9 @@ class VirtualNetworkProfile(Model): 'subnet': {'key': 'subnet', 'type': 'str'}, } - def __init__(self, id=None, subnet=None): - super(VirtualNetworkProfile, self).__init__() - self.id = id + def __init__(self, **kwargs): + super(VirtualNetworkProfile, self).__init__(**kwargs) + self.id = kwargs.get('id', None) self.name = None self.type = None - self.subnet = subnet + self.subnet = kwargs.get('subnet', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/virtual_network_profile_py3.py b/azure-mgmt-web/azure/mgmt/web/models/virtual_network_profile_py3.py new file mode 100644 index 000000000000..a45c1060294e --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/virtual_network_profile_py3.py @@ -0,0 +1,48 @@ +# 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 VirtualNetworkProfile(Model): + """Specification for using a Virtual Network. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :param id: Resource id of the Virtual Network. + :type id: str + :ivar name: Name of the Virtual Network (read-only). + :vartype name: str + :ivar type: Resource type of the Virtual Network (read-only). + :vartype type: str + :param subnet: Subnet within the Virtual Network. + :type subnet: str + """ + + _validation = { + 'name': {'readonly': True}, + 'type': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'subnet': {'key': 'subnet', 'type': 'str'}, + } + + def __init__(self, *, id: str=None, subnet: str=None, **kwargs) -> None: + super(VirtualNetworkProfile, self).__init__(**kwargs) + self.id = id + self.name = None + self.type = None + self.subnet = subnet diff --git a/azure-mgmt-web/azure/mgmt/web/models/vnet_gateway.py b/azure-mgmt-web/azure/mgmt/web/models/vnet_gateway.py index 2f48fa8b30cf..104f9bab1405 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/vnet_gateway.py +++ b/azure-mgmt-web/azure/mgmt/web/models/vnet_gateway.py @@ -19,6 +19,8 @@ class VnetGateway(ProxyOnlyResource): Variables are only populated by the server, and will be ignored when sending a request. + All required parameters must be populated in order to send to Azure. + :ivar id: Resource Id. :vartype id: str :ivar name: Resource Name. @@ -29,7 +31,8 @@ class VnetGateway(ProxyOnlyResource): :vartype type: str :param vnet_name: The Virtual Network name. :type vnet_name: str - :param vpn_package_uri: The URI where the VPN package can be downloaded. + :param vpn_package_uri: Required. The URI where the VPN package can be + downloaded. :type vpn_package_uri: str """ @@ -49,7 +52,7 @@ class VnetGateway(ProxyOnlyResource): 'vpn_package_uri': {'key': 'properties.vpnPackageUri', 'type': 'str'}, } - def __init__(self, vpn_package_uri, kind=None, vnet_name=None): - super(VnetGateway, self).__init__(kind=kind) - self.vnet_name = vnet_name - self.vpn_package_uri = vpn_package_uri + def __init__(self, **kwargs): + super(VnetGateway, self).__init__(**kwargs) + self.vnet_name = kwargs.get('vnet_name', None) + self.vpn_package_uri = kwargs.get('vpn_package_uri', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/vnet_gateway_py3.py b/azure-mgmt-web/azure/mgmt/web/models/vnet_gateway_py3.py new file mode 100644 index 000000000000..60a9ab744fa9 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/vnet_gateway_py3.py @@ -0,0 +1,58 @@ +# 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_py3 import ProxyOnlyResource + + +class VnetGateway(ProxyOnlyResource): + """The Virtual Network gateway contract. This is used to give the Virtual + Network gateway access to the VPN package. + + Variables are only populated by the server, and will be ignored when + sending a request. + + All required parameters must be populated in order to send to Azure. + + :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 vnet_name: The Virtual Network name. + :type vnet_name: str + :param vpn_package_uri: Required. The URI where the VPN package can be + downloaded. + :type vpn_package_uri: str + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'vpn_package_uri': {'required': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'vnet_name': {'key': 'properties.vnetName', 'type': 'str'}, + 'vpn_package_uri': {'key': 'properties.vpnPackageUri', 'type': 'str'}, + } + + def __init__(self, *, vpn_package_uri: str, kind: str=None, vnet_name: str=None, **kwargs) -> None: + super(VnetGateway, self).__init__(kind=kind, **kwargs) + self.vnet_name = vnet_name + self.vpn_package_uri = vpn_package_uri diff --git a/azure-mgmt-web/azure/mgmt/web/models/vnet_info.py b/azure-mgmt-web/azure/mgmt/web/models/vnet_info.py index 14915ba9a7fd..2a6527234b04 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/vnet_info.py +++ b/azure-mgmt-web/azure/mgmt/web/models/vnet_info.py @@ -66,11 +66,11 @@ class VnetInfo(ProxyOnlyResource): 'dns_servers': {'key': 'properties.dnsServers', 'type': 'str'}, } - def __init__(self, kind=None, vnet_resource_id=None, cert_blob=None, dns_servers=None): - super(VnetInfo, self).__init__(kind=kind) - self.vnet_resource_id = vnet_resource_id + def __init__(self, **kwargs): + super(VnetInfo, self).__init__(**kwargs) + self.vnet_resource_id = kwargs.get('vnet_resource_id', None) self.cert_thumbprint = None - self.cert_blob = cert_blob + self.cert_blob = kwargs.get('cert_blob', None) self.routes = None self.resync_required = None - self.dns_servers = dns_servers + self.dns_servers = kwargs.get('dns_servers', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/vnet_info_py3.py b/azure-mgmt-web/azure/mgmt/web/models/vnet_info_py3.py new file mode 100644 index 000000000000..2aad16e2d9dc --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/vnet_info_py3.py @@ -0,0 +1,76 @@ +# 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_py3 import ProxyOnlyResource + + +class VnetInfo(ProxyOnlyResource): + """Virtual Network information contract. + + 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 vnet_resource_id: The Virtual Network's resource ID. + :type vnet_resource_id: str + :ivar cert_thumbprint: The client certificate thumbprint. + :vartype cert_thumbprint: str + :param cert_blob: A certificate file (.cer) blob containing the public key + of the private key used to authenticate a + Point-To-Site VPN connection. + :type cert_blob: bytearray + :ivar routes: The routes that this Virtual Network connection uses. + :vartype routes: list[~azure.mgmt.web.models.VnetRoute] + :ivar resync_required: true if a resync is required; + otherwise, false. + :vartype resync_required: bool + :param dns_servers: DNS servers to be used by this Virtual Network. This + should be a comma-separated list of IP addresses. + :type dns_servers: str + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'cert_thumbprint': {'readonly': True}, + 'routes': {'readonly': True}, + 'resync_required': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'vnet_resource_id': {'key': 'properties.vnetResourceId', 'type': 'str'}, + 'cert_thumbprint': {'key': 'properties.certThumbprint', 'type': 'str'}, + 'cert_blob': {'key': 'properties.certBlob', 'type': 'bytearray'}, + 'routes': {'key': 'properties.routes', 'type': '[VnetRoute]'}, + 'resync_required': {'key': 'properties.resyncRequired', 'type': 'bool'}, + 'dns_servers': {'key': 'properties.dnsServers', 'type': 'str'}, + } + + def __init__(self, *, kind: str=None, vnet_resource_id: str=None, cert_blob: bytearray=None, dns_servers: str=None, **kwargs) -> None: + super(VnetInfo, self).__init__(kind=kind, **kwargs) + self.vnet_resource_id = vnet_resource_id + self.cert_thumbprint = None + self.cert_blob = cert_blob + self.routes = None + self.resync_required = None + self.dns_servers = dns_servers diff --git a/azure-mgmt-web/azure/mgmt/web/models/vnet_parameters.py b/azure-mgmt-web/azure/mgmt/web/models/vnet_parameters.py index 1226c3ef1b27..493b96c7daa1 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/vnet_parameters.py +++ b/azure-mgmt-web/azure/mgmt/web/models/vnet_parameters.py @@ -50,8 +50,8 @@ class VnetParameters(ProxyOnlyResource): 'vnet_subnet_name': {'key': 'properties.vnetSubnetName', 'type': 'str'}, } - def __init__(self, kind=None, vnet_resource_group=None, vnet_name=None, vnet_subnet_name=None): - super(VnetParameters, self).__init__(kind=kind) - self.vnet_resource_group = vnet_resource_group - self.vnet_name = vnet_name - self.vnet_subnet_name = vnet_subnet_name + def __init__(self, **kwargs): + super(VnetParameters, self).__init__(**kwargs) + self.vnet_resource_group = kwargs.get('vnet_resource_group', None) + self.vnet_name = kwargs.get('vnet_name', None) + self.vnet_subnet_name = kwargs.get('vnet_subnet_name', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/vnet_parameters_py3.py b/azure-mgmt-web/azure/mgmt/web/models/vnet_parameters_py3.py new file mode 100644 index 000000000000..342af4a4e5a5 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/vnet_parameters_py3.py @@ -0,0 +1,57 @@ +# 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_py3 import ProxyOnlyResource + + +class VnetParameters(ProxyOnlyResource): + """The required set of inputs to validate a VNET. + + 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 vnet_resource_group: The Resource Group of the VNET to be validated + :type vnet_resource_group: str + :param vnet_name: The name of the VNET to be validated + :type vnet_name: str + :param vnet_subnet_name: The subnet name to be validated + :type vnet_subnet_name: 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'}, + 'vnet_resource_group': {'key': 'properties.vnetResourceGroup', 'type': 'str'}, + 'vnet_name': {'key': 'properties.vnetName', 'type': 'str'}, + 'vnet_subnet_name': {'key': 'properties.vnetSubnetName', 'type': 'str'}, + } + + def __init__(self, *, kind: str=None, vnet_resource_group: str=None, vnet_name: str=None, vnet_subnet_name: str=None, **kwargs) -> None: + super(VnetParameters, self).__init__(kind=kind, **kwargs) + self.vnet_resource_group = vnet_resource_group + self.vnet_name = vnet_name + self.vnet_subnet_name = vnet_subnet_name 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..43a33b9d117e 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/vnet_route.py +++ b/azure-mgmt-web/azure/mgmt/web/models/vnet_route.py @@ -64,9 +64,9 @@ class VnetRoute(ProxyOnlyResource): '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): - 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 + def __init__(self, **kwargs): + super(VnetRoute, self).__init__(**kwargs) + self.vnet_route_name = kwargs.get('vnet_route_name', None) + self.start_address = kwargs.get('start_address', None) + self.end_address = kwargs.get('end_address', None) + self.route_type = kwargs.get('route_type', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/vnet_route_py3.py b/azure-mgmt-web/azure/mgmt/web/models/vnet_route_py3.py new file mode 100644 index 000000000000..9412206ce11b --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/vnet_route_py3.py @@ -0,0 +1,72 @@ +# 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_py3 import ProxyOnlyResource + + +class VnetRoute(ProxyOnlyResource): + """Virtual Network route contract used to pass routing information for a + Virtual Network. + + 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 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. + :type start_address: str + :param end_address: The ending address for this route. If the start + address is specified in CIDR notation, this must be omitted. + :type end_address: str + :param route_type: The type of route this is: + DEFAULT - By default, every app has routes to the local address ranges + specified by RFC1918 + INHERITED - Routes inherited from the real Virtual Network routes + STATIC - Static route set on the app only + These values will be used for syncing an app's routes with those from a + Virtual Network. Possible values include: 'DEFAULT', 'INHERITED', 'STATIC' + :type route_type: str or ~azure.mgmt.web.models.RouteType + """ + + _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'}, + '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: str=None, vnet_route_name: str=None, start_address: str=None, end_address: str=None, route_type=None, **kwargs) -> None: + super(VnetRoute, self).__init__(kind=kind, **kwargs) + 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/vnet_validation_failure_details.py b/azure-mgmt-web/azure/mgmt/web/models/vnet_validation_failure_details.py index 4ac9adf0d201..f980264509d3 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/vnet_validation_failure_details.py +++ b/azure-mgmt-web/azure/mgmt/web/models/vnet_validation_failure_details.py @@ -47,7 +47,7 @@ class VnetValidationFailureDetails(ProxyOnlyResource): 'failed_tests': {'key': 'properties.failedTests', 'type': '[VnetValidationTestFailure]'}, } - def __init__(self, kind=None, failed=None, failed_tests=None): - super(VnetValidationFailureDetails, self).__init__(kind=kind) - self.failed = failed - self.failed_tests = failed_tests + def __init__(self, **kwargs): + super(VnetValidationFailureDetails, self).__init__(**kwargs) + self.failed = kwargs.get('failed', None) + self.failed_tests = kwargs.get('failed_tests', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/vnet_validation_failure_details_py3.py b/azure-mgmt-web/azure/mgmt/web/models/vnet_validation_failure_details_py3.py new file mode 100644 index 000000000000..6d0fcd6b6ae8 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/vnet_validation_failure_details_py3.py @@ -0,0 +1,53 @@ +# 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_py3 import ProxyOnlyResource + + +class VnetValidationFailureDetails(ProxyOnlyResource): + """A class that describes the reason for a validation failure. + + 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 failed: A flag describing whether or not validation failed. + :type failed: bool + :param failed_tests: A list of tests that failed in the validation. + :type failed_tests: list[~azure.mgmt.web.models.VnetValidationTestFailure] + """ + + _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'}, + 'failed': {'key': 'properties.failed', 'type': 'bool'}, + 'failed_tests': {'key': 'properties.failedTests', 'type': '[VnetValidationTestFailure]'}, + } + + def __init__(self, *, kind: str=None, failed: bool=None, failed_tests=None, **kwargs) -> None: + super(VnetValidationFailureDetails, self).__init__(kind=kind, **kwargs) + self.failed = failed + self.failed_tests = failed_tests diff --git a/azure-mgmt-web/azure/mgmt/web/models/vnet_validation_test_failure.py b/azure-mgmt-web/azure/mgmt/web/models/vnet_validation_test_failure.py index c0d453c1b53a..25326a68951a 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/vnet_validation_test_failure.py +++ b/azure-mgmt-web/azure/mgmt/web/models/vnet_validation_test_failure.py @@ -48,7 +48,7 @@ class VnetValidationTestFailure(ProxyOnlyResource): 'details': {'key': 'properties.details', 'type': 'str'}, } - def __init__(self, kind=None, test_name=None, details=None): - super(VnetValidationTestFailure, self).__init__(kind=kind) - self.test_name = test_name - self.details = details + def __init__(self, **kwargs): + super(VnetValidationTestFailure, self).__init__(**kwargs) + self.test_name = kwargs.get('test_name', None) + self.details = kwargs.get('details', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/vnet_validation_test_failure_py3.py b/azure-mgmt-web/azure/mgmt/web/models/vnet_validation_test_failure_py3.py new file mode 100644 index 000000000000..e8d1d9854a18 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/vnet_validation_test_failure_py3.py @@ -0,0 +1,54 @@ +# 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_py3 import ProxyOnlyResource + + +class VnetValidationTestFailure(ProxyOnlyResource): + """A class that describes a test that failed during NSG and UDR validation. + + 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 test_name: The name of the test that failed. + :type test_name: str + :param details: The details of what caused the failure, e.g. the blocking + rule name, etc. + :type details: 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'}, + 'test_name': {'key': 'properties.testName', 'type': 'str'}, + 'details': {'key': 'properties.details', 'type': 'str'}, + } + + def __init__(self, *, kind: str=None, test_name: str=None, details: str=None, **kwargs) -> None: + super(VnetValidationTestFailure, self).__init__(kind=kind, **kwargs) + self.test_name = test_name + self.details = details diff --git a/azure-mgmt-web/azure/mgmt/web/models/web_app_collection.py b/azure-mgmt-web/azure/mgmt/web/models/web_app_collection.py index 3c53315ca4e7..a74350b0d7a4 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/web_app_collection.py +++ b/azure-mgmt-web/azure/mgmt/web/models/web_app_collection.py @@ -18,7 +18,9 @@ class WebAppCollection(Model): Variables are only populated by the server, and will be ignored when sending a request. - :param value: Collection of resources. + All required parameters must be populated in order to send to Azure. + + :param value: Required. Collection of resources. :type value: list[~azure.mgmt.web.models.Site] :ivar next_link: Link to next page of resources. :vartype next_link: str @@ -34,7 +36,7 @@ class WebAppCollection(Model): 'next_link': {'key': 'nextLink', 'type': 'str'}, } - def __init__(self, value): - super(WebAppCollection, self).__init__() - self.value = value + def __init__(self, **kwargs): + super(WebAppCollection, self).__init__(**kwargs) + self.value = kwargs.get('value', None) self.next_link = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/web_app_collection_py3.py b/azure-mgmt-web/azure/mgmt/web/models/web_app_collection_py3.py new file mode 100644 index 000000000000..855f2095a1a3 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/web_app_collection_py3.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 WebAppCollection(Model): + """Collection of App Service apps. + + Variables are only populated by the server, and will be ignored when + sending a request. + + All required parameters must be populated in order to send to Azure. + + :param value: Required. Collection of resources. + :type value: list[~azure.mgmt.web.models.Site] + :ivar next_link: Link to next page of resources. + :vartype next_link: str + """ + + _validation = { + 'value': {'required': True}, + 'next_link': {'readonly': True}, + } + + _attribute_map = { + 'value': {'key': 'value', 'type': '[Site]'}, + 'next_link': {'key': 'nextLink', 'type': 'str'}, + } + + def __init__(self, *, value, **kwargs) -> None: + super(WebAppCollection, self).__init__(**kwargs) + self.value = value + self.next_link = None 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..5454d02ccbe7 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/web_job.py +++ b/azure-mgmt-web/azure/mgmt/web/models/web_job.py @@ -67,13 +67,13 @@ class WebJob(ProxyOnlyResource): '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): - super(WebJob, self).__init__(kind=kind) + def __init__(self, **kwargs): + super(WebJob, self).__init__(**kwargs) 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.error = error - self.using_sdk = using_sdk - self.settings = settings + self.run_command = kwargs.get('run_command', None) + self.url = kwargs.get('url', None) + self.extra_info_url = kwargs.get('extra_info_url', None) + self.job_type = kwargs.get('job_type', None) + self.error = kwargs.get('error', None) + self.using_sdk = kwargs.get('using_sdk', None) + self.settings = kwargs.get('settings', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/web_job_py3.py b/azure-mgmt-web/azure/mgmt/web/models/web_job_py3.py new file mode 100644 index 000000000000..ce5d939e01a8 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/web_job_py3.py @@ -0,0 +1,79 @@ +# 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_py3 import ProxyOnlyResource + + +class WebJob(ProxyOnlyResource): + """Web Job Information. + + 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 + :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', + 'Triggered' + :type job_type: str or ~azure.mgmt.web.models.WebJobType + :param error: Error information. + :type error: str + :param using_sdk: Using SDK? + :type using_sdk: bool + :param settings: Job settings. + :type settings: dict[str, object] + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'web_job_name': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + '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'}, + 'url': {'key': 'properties.url', 'type': 'str'}, + 'extra_info_url': {'key': 'properties.extraInfoUrl', 'type': 'str'}, + 'job_type': {'key': 'properties.jobType', 'type': 'WebJobType'}, + 'error': {'key': 'properties.error', 'type': 'str'}, + 'using_sdk': {'key': 'properties.usingSdk', 'type': 'bool'}, + 'settings': {'key': 'properties.settings', 'type': '{object}'}, + } + + def __init__(self, *, kind: str=None, run_command: str=None, url: str=None, extra_info_url: str=None, job_type=None, error: str=None, using_sdk: bool=None, settings=None, **kwargs) -> None: + super(WebJob, self).__init__(kind=kind, **kwargs) + 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.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 4636a2b0e7d6..bfaeda5eb909 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 @@ -12,7 +12,7 @@ from enum import Enum -class KeyVaultSecretStatus(Enum): +class KeyVaultSecretStatus(str, Enum): initialized = "Initialized" waiting_on_certificate_order = "WaitingOnCertificateOrder" @@ -27,13 +27,13 @@ class KeyVaultSecretStatus(Enum): unknown = "Unknown" -class CertificateProductType(Enum): +class CertificateProductType(str, Enum): standard_domain_validated_ssl = "StandardDomainValidatedSsl" standard_domain_validated_wild_card_ssl = "StandardDomainValidatedWildCardSsl" -class ProvisioningState(Enum): +class ProvisioningState(str, Enum): succeeded = "Succeeded" failed = "Failed" @@ -42,7 +42,7 @@ class ProvisioningState(Enum): deleting = "Deleting" -class CertificateOrderStatus(Enum): +class CertificateOrderStatus(str, Enum): pendingissuance = "Pendingissuance" issued = "Issued" @@ -56,7 +56,7 @@ class CertificateOrderStatus(Enum): not_submitted = "NotSubmitted" -class CertificateOrderActionType(Enum): +class CertificateOrderActionType(str, Enum): certificate_issued = "CertificateIssued" certificate_order_canceled = "CertificateOrderCanceled" @@ -74,26 +74,26 @@ class CertificateOrderActionType(Enum): unknown = "Unknown" -class RouteType(Enum): +class RouteType(str, Enum): default = "DEFAULT" inherited = "INHERITED" static = "STATIC" -class ManagedServiceIdentityType(Enum): +class ManagedServiceIdentityType(str, Enum): system_assigned = "SystemAssigned" -class AutoHealActionType(Enum): +class AutoHealActionType(str, Enum): recycle = "Recycle" log_event = "LogEvent" custom_action = "CustomAction" -class ConnectionStringType(Enum): +class ConnectionStringType(str, Enum): my_sql = "MySql" sql_server = "SQLServer" @@ -108,7 +108,7 @@ class ConnectionStringType(Enum): postgre_sql = "PostgreSQL" -class ScmType(Enum): +class ScmType(str, Enum): none = "None" dropbox = "Dropbox" @@ -125,13 +125,13 @@ class ScmType(Enum): vso = "VSO" -class ManagedPipelineMode(Enum): +class ManagedPipelineMode(str, Enum): integrated = "Integrated" classic = "Classic" -class SiteLoadBalancing(Enum): +class SiteLoadBalancing(str, Enum): weighted_round_robin = "WeightedRoundRobin" least_requests = "LeastRequests" @@ -140,47 +140,47 @@ class SiteLoadBalancing(Enum): request_hash = "RequestHash" -class SupportedTlsVersions(Enum): +class SupportedTlsVersions(str, Enum): one_full_stop_zero = "1.0" one_full_stop_one = "1.1" one_full_stop_two = "1.2" -class SslState(Enum): +class SslState(str, Enum): disabled = "Disabled" sni_enabled = "SniEnabled" ip_based_enabled = "IpBasedEnabled" -class HostType(Enum): +class HostType(str, Enum): standard = "Standard" repository = "Repository" -class UsageState(Enum): +class UsageState(str, Enum): normal = "Normal" exceeded = "Exceeded" -class SiteAvailabilityState(Enum): +class SiteAvailabilityState(str, Enum): normal = "Normal" limited = "Limited" disaster_recovery_mode = "DisasterRecoveryMode" -class StatusOptions(Enum): +class StatusOptions(str, Enum): ready = "Ready" pending = "Pending" creating = "Creating" -class DomainStatus(Enum): +class DomainStatus(str, Enum): active = "Active" awaiting = "Awaiting" @@ -205,37 +205,37 @@ class DomainStatus(Enum): json_converter_failed = "JsonConverterFailed" -class AzureResourceType(Enum): +class AzureResourceType(str, Enum): website = "Website" traffic_manager = "TrafficManager" -class CustomHostNameDnsRecordType(Enum): +class CustomHostNameDnsRecordType(str, Enum): cname = "CName" a = "A" -class HostNameType(Enum): +class HostNameType(str, Enum): verified = "Verified" managed = "Managed" -class DnsType(Enum): +class DnsType(str, Enum): azure_dns = "AzureDns" default_domain_registrar_dns = "DefaultDomainRegistrarDns" -class DomainType(Enum): +class DomainType(str, Enum): regular = "Regular" soft_deleted = "SoftDeleted" -class HostingEnvironmentStatus(Enum): +class HostingEnvironmentStatus(str, Enum): preparing = "Preparing" ready = "Ready" @@ -243,21 +243,21 @@ class HostingEnvironmentStatus(Enum): deleting = "Deleting" -class InternalLoadBalancingMode(Enum): +class InternalLoadBalancingMode(str, Enum): none = "None" web = "Web" publishing = "Publishing" -class ComputeModeOptions(Enum): +class ComputeModeOptions(str, Enum): shared = "Shared" dedicated = "Dedicated" dynamic = "Dynamic" -class WorkerSizeOptions(Enum): +class WorkerSizeOptions(str, Enum): default = "Default" small = "Small" @@ -268,13 +268,13 @@ class WorkerSizeOptions(Enum): d3 = "D3" -class AccessControlEntryAction(Enum): +class AccessControlEntryAction(str, Enum): permit = "Permit" deny = "Deny" -class OperationStatus(Enum): +class OperationStatus(str, Enum): in_progress = "InProgress" failed = "Failed" @@ -283,7 +283,7 @@ class OperationStatus(Enum): created = "Created" -class IssueType(Enum): +class IssueType(str, Enum): service_incident = "ServiceIncident" app_deployment = "AppDeployment" @@ -295,14 +295,14 @@ class IssueType(Enum): other = "Other" -class SolutionType(Enum): +class SolutionType(str, Enum): quick_solution = "QuickSolution" deep_investigation = "DeepInvestigation" best_practices = "BestPractices" -class RenderingType(Enum): +class RenderingType(str, Enum): no_graph = "NoGraph" table = "Table" @@ -310,14 +310,14 @@ class RenderingType(Enum): time_series_per_instance = "TimeSeriesPerInstance" -class ResourceScopeType(Enum): +class ResourceScopeType(str, Enum): server_farm = "ServerFarm" subscription = "Subscription" web_site = "WebSite" -class NotificationLevel(Enum): +class NotificationLevel(str, Enum): critical = "Critical" warning = "Warning" @@ -325,7 +325,7 @@ class NotificationLevel(Enum): non_urgent_suggestion = "NonUrgentSuggestion" -class Channels(Enum): +class Channels(str, Enum): notification = "Notification" api = "Api" @@ -334,7 +334,7 @@ class Channels(Enum): all = "All" -class AppServicePlanRestrictions(Enum): +class AppServicePlanRestrictions(str, Enum): none = "None" free = "Free" @@ -344,13 +344,13 @@ class AppServicePlanRestrictions(Enum): premium = "Premium" -class InAvailabilityReasonType(Enum): +class InAvailabilityReasonType(str, Enum): invalid = "Invalid" already_exists = "AlreadyExists" -class CheckNameResourceTypes(Enum): +class CheckNameResourceTypes(str, Enum): site = "Site" slot = "Slot" @@ -362,13 +362,13 @@ class CheckNameResourceTypes(Enum): microsoft_webpublishing_users = "Microsoft.Web/publishingUsers" -class ValidateResourceTypes(Enum): +class ValidateResourceTypes(str, Enum): server_farm = "ServerFarm" site = "Site" -class LogLevel(Enum): +class LogLevel(str, Enum): off = "Off" verbose = "Verbose" @@ -377,7 +377,7 @@ class LogLevel(Enum): error = "Error" -class BackupItemStatus(Enum): +class BackupItemStatus(str, Enum): in_progress = "InProgress" failed = "Failed" @@ -391,7 +391,7 @@ class BackupItemStatus(Enum): deleted = "Deleted" -class DatabaseType(Enum): +class DatabaseType(str, Enum): sql_azure = "SqlAzure" my_sql = "MySql" @@ -399,13 +399,13 @@ class DatabaseType(Enum): postgre_sql = "PostgreSql" -class FrequencyUnit(Enum): +class FrequencyUnit(str, Enum): day = "Day" hour = "Hour" -class BackupRestoreOperationType(Enum): +class BackupRestoreOperationType(str, Enum): default = "Default" clone = "Clone" @@ -413,7 +413,7 @@ class BackupRestoreOperationType(Enum): snapshot = "Snapshot" -class ContinuousWebJobStatus(Enum): +class ContinuousWebJobStatus(str, Enum): initializing = "Initializing" starting = "Starting" @@ -422,34 +422,34 @@ class ContinuousWebJobStatus(Enum): stopped = "Stopped" -class WebJobType(Enum): +class WebJobType(str, Enum): continuous = "Continuous" triggered = "Triggered" -class PublishingProfileFormat(Enum): +class PublishingProfileFormat(str, Enum): file_zilla3 = "FileZilla3" web_deploy = "WebDeploy" ftp = "Ftp" -class DnsVerificationTestResult(Enum): +class DnsVerificationTestResult(str, Enum): passed = "Passed" failed = "Failed" skipped = "Skipped" -class MSDeployLogEntryType(Enum): +class MSDeployLogEntryType(str, Enum): message = "Message" warning = "Warning" error = "Error" -class MSDeployProvisioningState(Enum): +class MSDeployProvisioningState(str, Enum): accepted = "accepted" running = "running" @@ -458,26 +458,26 @@ class MSDeployProvisioningState(Enum): canceled = "canceled" -class MySqlMigrationType(Enum): +class MySqlMigrationType(str, Enum): local_to_remote = "LocalToRemote" remote_to_local = "RemoteToLocal" -class PublicCertificateLocation(Enum): +class PublicCertificateLocation(str, Enum): current_user_my = "CurrentUserMy" local_machine_my = "LocalMachineMy" unknown = "Unknown" -class UnauthenticatedClientAction(Enum): +class UnauthenticatedClientAction(str, Enum): redirect_to_login_page = "RedirectToLoginPage" allow_anonymous = "AllowAnonymous" -class BuiltInAuthenticationProvider(Enum): +class BuiltInAuthenticationProvider(str, Enum): azure_active_directory = "AzureActiveDirectory" facebook = "Facebook" @@ -486,27 +486,27 @@ class BuiltInAuthenticationProvider(Enum): twitter = "Twitter" -class CloneAbilityResult(Enum): +class CloneAbilityResult(str, Enum): cloneable = "Cloneable" partially_cloneable = "PartiallyCloneable" not_cloneable = "NotCloneable" -class SiteExtensionType(Enum): +class SiteExtensionType(str, Enum): gallery = "Gallery" web_root = "WebRoot" -class TriggeredWebJobStatus(Enum): +class TriggeredWebJobStatus(str, Enum): success = "Success" failed = "Failed" error = "Error" -class SkuName(Enum): +class SkuName(str, Enum): free = "Free" shared = "Shared" diff --git a/azure-mgmt-web/azure/mgmt/web/models/worker_pool.py b/azure-mgmt-web/azure/mgmt/web/models/worker_pool.py index c26d02899ed2..74b28651e46c 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/worker_pool.py +++ b/azure-mgmt-web/azure/mgmt/web/models/worker_pool.py @@ -44,10 +44,10 @@ class WorkerPool(Model): 'instance_names': {'key': 'instanceNames', 'type': '[str]'}, } - def __init__(self, worker_size_id=None, compute_mode=None, worker_size=None, worker_count=None): - super(WorkerPool, self).__init__() - self.worker_size_id = worker_size_id - self.compute_mode = compute_mode - self.worker_size = worker_size - self.worker_count = worker_count + def __init__(self, **kwargs): + super(WorkerPool, self).__init__(**kwargs) + self.worker_size_id = kwargs.get('worker_size_id', None) + self.compute_mode = kwargs.get('compute_mode', None) + self.worker_size = kwargs.get('worker_size', None) + self.worker_count = kwargs.get('worker_count', None) self.instance_names = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/worker_pool_py3.py b/azure-mgmt-web/azure/mgmt/web/models/worker_pool_py3.py new file mode 100644 index 000000000000..d320043e70b9 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/worker_pool_py3.py @@ -0,0 +1,53 @@ +# 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 WorkerPool(Model): + """Worker pool of an App Service Environment. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :param worker_size_id: Worker size ID for referencing this worker pool. + :type worker_size_id: int + :param compute_mode: Shared or dedicated app hosting. Possible values + include: 'Shared', 'Dedicated', 'Dynamic' + :type compute_mode: str or ~azure.mgmt.web.models.ComputeModeOptions + :param worker_size: VM size of the worker pool instances. + :type worker_size: str + :param worker_count: Number of instances in the worker pool. + :type worker_count: int + :ivar instance_names: Names of all instances in the worker pool (read + only). + :vartype instance_names: list[str] + """ + + _validation = { + 'instance_names': {'readonly': True}, + } + + _attribute_map = { + 'worker_size_id': {'key': 'workerSizeId', 'type': 'int'}, + 'compute_mode': {'key': 'computeMode', 'type': 'ComputeModeOptions'}, + 'worker_size': {'key': 'workerSize', 'type': 'str'}, + 'worker_count': {'key': 'workerCount', 'type': 'int'}, + 'instance_names': {'key': 'instanceNames', 'type': '[str]'}, + } + + def __init__(self, *, worker_size_id: int=None, compute_mode=None, worker_size: str=None, worker_count: int=None, **kwargs) -> None: + super(WorkerPool, self).__init__(**kwargs) + self.worker_size_id = worker_size_id + self.compute_mode = compute_mode + self.worker_size = worker_size + self.worker_count = worker_count + self.instance_names = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/worker_pool_resource.py b/azure-mgmt-web/azure/mgmt/web/models/worker_pool_resource.py index 869353189d58..ca90bf8d794d 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/worker_pool_resource.py +++ b/azure-mgmt-web/azure/mgmt/web/models/worker_pool_resource.py @@ -62,11 +62,11 @@ class WorkerPoolResource(ProxyOnlyResource): 'sku': {'key': 'sku', 'type': 'SkuDescription'}, } - def __init__(self, kind=None, worker_size_id=None, compute_mode=None, worker_size=None, worker_count=None, sku=None): - super(WorkerPoolResource, self).__init__(kind=kind) - self.worker_size_id = worker_size_id - self.compute_mode = compute_mode - self.worker_size = worker_size - self.worker_count = worker_count + def __init__(self, **kwargs): + super(WorkerPoolResource, self).__init__(**kwargs) + self.worker_size_id = kwargs.get('worker_size_id', None) + self.compute_mode = kwargs.get('compute_mode', None) + self.worker_size = kwargs.get('worker_size', None) + self.worker_count = kwargs.get('worker_count', None) self.instance_names = None - self.sku = sku + self.sku = kwargs.get('sku', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/worker_pool_resource_py3.py b/azure-mgmt-web/azure/mgmt/web/models/worker_pool_resource_py3.py new file mode 100644 index 000000000000..ab2c8333804b --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/worker_pool_resource_py3.py @@ -0,0 +1,72 @@ +# 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_py3 import ProxyOnlyResource + + +class WorkerPoolResource(ProxyOnlyResource): + """Worker pool of an App Service Environment ARM resource. + + 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 worker_size_id: Worker size ID for referencing this worker pool. + :type worker_size_id: int + :param compute_mode: Shared or dedicated app hosting. Possible values + include: 'Shared', 'Dedicated', 'Dynamic' + :type compute_mode: str or ~azure.mgmt.web.models.ComputeModeOptions + :param worker_size: VM size of the worker pool instances. + :type worker_size: str + :param worker_count: Number of instances in the worker pool. + :type worker_count: int + :ivar instance_names: Names of all instances in the worker pool (read + only). + :vartype instance_names: list[str] + :param sku: + :type sku: ~azure.mgmt.web.models.SkuDescription + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'instance_names': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'worker_size_id': {'key': 'properties.workerSizeId', 'type': 'int'}, + 'compute_mode': {'key': 'properties.computeMode', 'type': 'ComputeModeOptions'}, + 'worker_size': {'key': 'properties.workerSize', 'type': 'str'}, + 'worker_count': {'key': 'properties.workerCount', 'type': 'int'}, + 'instance_names': {'key': 'properties.instanceNames', 'type': '[str]'}, + 'sku': {'key': 'sku', 'type': 'SkuDescription'}, + } + + def __init__(self, *, kind: str=None, worker_size_id: int=None, compute_mode=None, worker_size: str=None, worker_count: int=None, sku=None, **kwargs) -> None: + super(WorkerPoolResource, self).__init__(kind=kind, **kwargs) + self.worker_size_id = worker_size_id + self.compute_mode = compute_mode + self.worker_size = worker_size + self.worker_count = worker_count + self.instance_names = None + self.sku = sku 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..756f74b6c1e5 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 @@ -12,8 +12,8 @@ import uuid from msrest.pipeline import ClientRawResponse from msrestazure.azure_exceptions import CloudError -from msrest.exceptions import DeserializationError -from msrestazure.azure_operation import AzureOperationPoller +from msrest.polling import LROPoller, NoPolling +from msrestazure.polling.arm_polling import ARMPolling from .. import models @@ -353,7 +353,7 @@ def _create_or_update_initial( return deserialized def create_or_update( - self, resource_group_name, certificate_order_name, certificate_distinguished_name, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, certificate_order_name, certificate_distinguished_name, custom_headers=None, raw=False, polling=True, **operation_config): """Create or update a certificate purchase order. Create or update a certificate purchase order. @@ -368,13 +368,17 @@ def create_or_update( :type certificate_distinguished_name: ~azure.mgmt.web.models.AppServiceCertificateOrder :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 - AppServiceCertificateOrder or ClientRawResponse if raw=true + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns + AppServiceCertificateOrder or + ClientRawResponse if raw==True :rtype: ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.AppServiceCertificateOrder] - or ~msrest.pipeline.ClientRawResponse + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.AppServiceCertificateOrder]] :raises: :class:`CloudError` """ raw_result = self._create_or_update_initial( @@ -385,30 +389,8 @@ def create_or_update( 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, 201]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp - deserialized = self._deserialize('AppServiceCertificateOrder', response) if raw: @@ -417,12 +399,13 @@ def get_long_running_output(response): return deserialized - long_running_operation_timeout = operation_config.get( + lro_delay = 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) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CertificateRegistration/certificateOrders/{certificateOrderName}'} def delete( @@ -754,7 +737,7 @@ def _create_or_update_certificate_initial( return deserialized def create_or_update_certificate( - self, resource_group_name, certificate_order_name, name, key_vault_certificate, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, certificate_order_name, name, key_vault_certificate, custom_headers=None, raw=False, polling=True, **operation_config): """Creates or updates a certificate and associates with key vault secret. Creates or updates a certificate and associates with key vault secret. @@ -770,13 +753,17 @@ def create_or_update_certificate( :type key_vault_certificate: ~azure.mgmt.web.models.AppServiceCertificateResource :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 - AppServiceCertificateResource or ClientRawResponse if raw=true + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns + AppServiceCertificateResource or + ClientRawResponse if raw==True :rtype: ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.AppServiceCertificateResource] - or ~msrest.pipeline.ClientRawResponse + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.AppServiceCertificateResource]] :raises: :class:`CloudError` """ raw_result = self._create_or_update_certificate_initial( @@ -788,30 +775,8 @@ def create_or_update_certificate( 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, 201]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp - deserialized = self._deserialize('AppServiceCertificateResource', response) if raw: @@ -820,12 +785,13 @@ def get_long_running_output(response): return deserialized - long_running_operation_timeout = operation_config.get( + lro_delay = 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) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) create_or_update_certificate.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CertificateRegistration/certificateOrders/{certificateOrderName}/certificates/{name}'} def delete_certificate( 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 b7d3c51d4d22..033fade0ec3e 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 @@ -12,8 +12,8 @@ import uuid from msrest.pipeline import ClientRawResponse from msrestazure.azure_exceptions import CloudError -from msrest.exceptions import DeserializationError -from msrestazure.azure_operation import AzureOperationPoller +from msrest.polling import LROPoller, NoPolling +from msrestazure.polling.arm_polling import ARMPolling from .. import models @@ -296,7 +296,7 @@ def _create_or_update_initial( return deserialized def create_or_update( - self, resource_group_name, name, hosting_environment_envelope, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, hosting_environment_envelope, custom_headers=None, raw=False, polling=True, **operation_config): """Create or update an App Service Environment. Create or update an App Service Environment. @@ -311,13 +311,17 @@ def create_or_update( :type hosting_environment_envelope: ~azure.mgmt.web.models.AppServiceEnvironmentResource :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 - AppServiceEnvironmentResource or ClientRawResponse if raw=true + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns + AppServiceEnvironmentResource or + ClientRawResponse if raw==True :rtype: ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.AppServiceEnvironmentResource] - or ~msrest.pipeline.ClientRawResponse + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.AppServiceEnvironmentResource]] :raises: :class:`CloudError` """ raw_result = self._create_or_update_initial( @@ -328,30 +332,8 @@ def create_or_update( 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, 400, 404, 409]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp - deserialized = self._deserialize('AppServiceEnvironmentResource', response) if raw: @@ -360,12 +342,13 @@ def get_long_running_output(response): return deserialized - long_running_operation_timeout = operation_config.get( + lro_delay = 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) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}'} @@ -410,7 +393,7 @@ def _delete_initial( return client_raw_response def delete( - self, resource_group_name, name, force_delete=None, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, force_delete=None, custom_headers=None, raw=False, polling=True, **operation_config): """Delete an App Service Environment. Delete an App Service Environment. @@ -425,12 +408,14 @@ def delete( false. :type force_delete: bool :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 None or - ClientRawResponse if raw=true + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns None or + ClientRawResponse if raw==True :rtype: ~msrestazure.azure_operation.AzureOperationPoller[None] or - ~msrest.pipeline.ClientRawResponse + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[None]] :raises: :class:`CloudError` """ raw_result = self._delete_initial( @@ -441,40 +426,19 @@ def delete( 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 [202, 204, 400, 404, 409]: - 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 - long_running_operation_timeout = operation_config.get( + lro_delay = 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) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}'} def update( @@ -1172,7 +1136,7 @@ def _create_or_update_multi_role_pool_initial( return deserialized def create_or_update_multi_role_pool( - self, resource_group_name, name, multi_role_pool_envelope, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, multi_role_pool_envelope, custom_headers=None, raw=False, polling=True, **operation_config): """Create or update a multi-role pool. Create or update a multi-role pool. @@ -1186,13 +1150,16 @@ def create_or_update_multi_role_pool( :type multi_role_pool_envelope: ~azure.mgmt.web.models.WorkerPoolResource :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 - WorkerPoolResource or ClientRawResponse if raw=true + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns WorkerPoolResource or + ClientRawResponse if raw==True :rtype: ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.WorkerPoolResource] - or ~msrest.pipeline.ClientRawResponse + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.WorkerPoolResource]] :raises: :class:`CloudError` """ raw_result = self._create_or_update_multi_role_pool_initial( @@ -1203,30 +1170,8 @@ def create_or_update_multi_role_pool( 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, 400, 404, 409]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp - deserialized = self._deserialize('WorkerPoolResource', response) if raw: @@ -1235,12 +1180,13 @@ def get_long_running_output(response): return deserialized - long_running_operation_timeout = operation_config.get( + lro_delay = 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) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) create_or_update_multi_role_pool.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools/default'} def update_multi_role_pool( @@ -1974,7 +1920,7 @@ def _resume_initial( return deserialized def resume( - self, resource_group_name, name, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, custom_headers=None, raw=False, polling=True, **operation_config): """Resume an App Service Environment. Resume an App Service Environment. @@ -1985,13 +1931,16 @@ def resume( :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 - :return: An instance of AzureOperationPoller that returns - WebAppCollection or ClientRawResponse if raw=true + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns WebAppCollection or + ClientRawResponse if raw==True :rtype: ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.WebAppCollection] - or ~msrest.pipeline.ClientRawResponse + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.WebAppCollection]] :raises: :class:`CloudError` """ raw_result = self._resume_initial( @@ -2001,30 +1950,8 @@ def resume( 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]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp - deserialized = self._deserialize('WebAppCollection', response) if raw: @@ -2033,12 +1960,13 @@ def get_long_running_output(response): return deserialized - long_running_operation_timeout = operation_config.get( + lro_delay = 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) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) resume.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/resume'} def list_app_service_plans( @@ -2242,7 +2170,7 @@ def _suspend_initial( return deserialized def suspend( - self, resource_group_name, name, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, custom_headers=None, raw=False, polling=True, **operation_config): """Suspend an App Service Environment. Suspend an App Service Environment. @@ -2253,13 +2181,16 @@ def suspend( :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 - :return: An instance of AzureOperationPoller that returns - WebAppCollection or ClientRawResponse if raw=true + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns WebAppCollection or + ClientRawResponse if raw==True :rtype: ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.WebAppCollection] - or ~msrest.pipeline.ClientRawResponse + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.WebAppCollection]] :raises: :class:`CloudError` """ raw_result = self._suspend_initial( @@ -2269,30 +2200,8 @@ def suspend( 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]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp - deserialized = self._deserialize('WebAppCollection', response) if raw: @@ -2301,12 +2210,13 @@ def get_long_running_output(response): return deserialized - long_running_operation_timeout = operation_config.get( + lro_delay = 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) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) suspend.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/suspend'} def list_usages( @@ -2587,7 +2497,7 @@ def _create_or_update_worker_pool_initial( return deserialized def create_or_update_worker_pool( - self, resource_group_name, name, worker_pool_name, worker_pool_envelope, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, worker_pool_name, worker_pool_envelope, custom_headers=None, raw=False, polling=True, **operation_config): """Create or update a worker pool. Create or update a worker pool. @@ -2602,13 +2512,16 @@ def create_or_update_worker_pool( :param worker_pool_envelope: Properties of the worker pool. :type worker_pool_envelope: ~azure.mgmt.web.models.WorkerPoolResource :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 - WorkerPoolResource or ClientRawResponse if raw=true + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns WorkerPoolResource or + ClientRawResponse if raw==True :rtype: ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.WorkerPoolResource] - or ~msrest.pipeline.ClientRawResponse + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.WorkerPoolResource]] :raises: :class:`CloudError` """ raw_result = self._create_or_update_worker_pool_initial( @@ -2620,30 +2533,8 @@ def create_or_update_worker_pool( 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, 400, 404, 409]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp - deserialized = self._deserialize('WorkerPoolResource', response) if raw: @@ -2652,12 +2543,13 @@ def get_long_running_output(response): return deserialized - long_running_operation_timeout = operation_config.get( + lro_delay = 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) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) create_or_update_worker_pool.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools/{workerPoolName}'} def update_worker_pool( 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..bf35c0a10ccd 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 @@ -12,8 +12,8 @@ import uuid from msrest.pipeline import ClientRawResponse from msrestazure.azure_exceptions import CloudError -from msrest.exceptions import DeserializationError -from msrestazure.azure_operation import AzureOperationPoller +from msrest.polling import LROPoller, NoPolling +from msrestazure.polling.arm_polling import ARMPolling from .. import models @@ -302,7 +302,7 @@ def _create_or_update_initial( return deserialized def create_or_update( - self, resource_group_name, name, app_service_plan, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, app_service_plan, custom_headers=None, raw=False, polling=True, **operation_config): """Creates or updates an App Service Plan. Creates or updates an App Service Plan. @@ -315,13 +315,16 @@ def create_or_update( :param app_service_plan: Details of the App Service plan. :type app_service_plan: ~azure.mgmt.web.models.AppServicePlan :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 - AppServicePlan or ClientRawResponse if raw=true + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns AppServicePlan or + ClientRawResponse if raw==True :rtype: ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.AppServicePlan] - or ~msrest.pipeline.ClientRawResponse + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.AppServicePlan]] :raises: :class:`CloudError` """ raw_result = self._create_or_update_initial( @@ -332,30 +335,8 @@ def create_or_update( 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]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp - deserialized = self._deserialize('AppServicePlan', response) if raw: @@ -364,12 +345,13 @@ def get_long_running_output(response): return deserialized - long_running_operation_timeout = operation_config.get( + lro_delay = 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) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}'} def delete( 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..b7c35bb85110 100644 --- a/azure-mgmt-web/azure/mgmt/web/operations/domains_operations.py +++ b/azure-mgmt-web/azure/mgmt/web/operations/domains_operations.py @@ -12,8 +12,8 @@ import uuid from msrest.pipeline import ClientRawResponse from msrestazure.azure_exceptions import CloudError -from msrest.exceptions import DeserializationError -from msrestazure.azure_operation import AzureOperationPoller +from msrest.polling import LROPoller, NoPolling +from msrestazure.polling.arm_polling import ARMPolling from .. import models @@ -498,7 +498,7 @@ def _create_or_update_initial( return deserialized def create_or_update( - self, resource_group_name, domain_name, domain, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, domain_name, domain, custom_headers=None, raw=False, polling=True, **operation_config): """Creates or updates a domain. Creates or updates a domain. @@ -511,13 +511,16 @@ def create_or_update( :param domain: Domain registration information. :type domain: ~azure.mgmt.web.models.Domain :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 Domain or - ClientRawResponse if raw=true + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns Domain or + ClientRawResponse if raw==True :rtype: ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.Domain] - or ~msrest.pipeline.ClientRawResponse + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.Domain]] :raises: :class:`CloudError` """ raw_result = self._create_or_update_initial( @@ -528,30 +531,8 @@ def create_or_update( 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]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp - deserialized = self._deserialize('Domain', response) if raw: @@ -560,12 +541,13 @@ def get_long_running_output(response): return deserialized - long_running_operation_timeout = operation_config.get( + lro_delay = 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) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DomainRegistration/domains/{domainName}'} def delete( 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 6f868fd1fc3d..944bd0ea99d2 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 @@ -12,8 +12,8 @@ import uuid from msrest.pipeline import ClientRawResponse from msrestazure.azure_exceptions import CloudError -from msrest.exceptions import DeserializationError -from msrestazure.azure_operation import AzureOperationPoller +from msrest.polling import LROPoller, NoPolling +from msrestazure.polling.arm_polling import ARMPolling from .. import models @@ -299,7 +299,7 @@ def _create_or_update_initial( return deserialized def create_or_update( - self, resource_group_name, name, site_envelope, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, site_envelope, custom_headers=None, raw=False, polling=True, **operation_config): """Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. @@ -316,13 +316,16 @@ def create_or_update( example. :type site_envelope: ~azure.mgmt.web.models.Site :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 Site or - ClientRawResponse if raw=true + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns Site or + ClientRawResponse if raw==True :rtype: ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.Site] - or ~msrest.pipeline.ClientRawResponse + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.Site]] :raises: :class:`CloudError` """ raw_result = self._create_or_update_initial( @@ -333,30 +336,8 @@ def create_or_update( 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]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp - deserialized = self._deserialize('Site', response) if raw: @@ -365,12 +346,13 @@ def get_long_running_output(response): return deserialized - long_running_operation_timeout = operation_config.get( + lro_delay = 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) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}'} def delete( @@ -1136,7 +1118,7 @@ def _restore_initial( return deserialized def restore( - self, resource_group_name, name, backup_id, request, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, backup_id, request, custom_headers=None, raw=False, polling=True, **operation_config): """Restores a specific backup to another app (or deployment slot, if specified). @@ -1153,13 +1135,16 @@ def restore( :param request: Information on restore request . :type request: ~azure.mgmt.web.models.RestoreRequest :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 - RestoreResponse or ClientRawResponse if raw=true + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns RestoreResponse or + ClientRawResponse if raw==True :rtype: ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.RestoreResponse] - or ~msrest.pipeline.ClientRawResponse + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.RestoreResponse]] :raises: :class:`CloudError` """ raw_result = self._restore_initial( @@ -1171,30 +1156,8 @@ def restore( 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]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp - deserialized = self._deserialize('RestoreResponse', response) if raw: @@ -1203,12 +1166,13 @@ def get_long_running_output(response): return deserialized - long_running_operation_timeout = operation_config.get( + lro_delay = 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) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) restore.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/backups/{backupId}/restore'} def list_configurations( @@ -2221,7 +2185,7 @@ def _list_publishing_credentials_initial( return deserialized def list_publishing_credentials( - self, resource_group_name, name, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, custom_headers=None, raw=False, polling=True, **operation_config): """Gets the Git/FTP publishing credentials of an app. Gets the Git/FTP publishing credentials of an app. @@ -2232,13 +2196,16 @@ def list_publishing_credentials( :param name: Name of the app. :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 - :return: An instance of AzureOperationPoller that returns User or - ClientRawResponse if raw=true + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns User or + ClientRawResponse if raw==True :rtype: ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.User] - or ~msrest.pipeline.ClientRawResponse + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.User]] :raises: :class:`CloudError` """ raw_result = self._list_publishing_credentials_initial( @@ -2248,30 +2215,8 @@ def list_publishing_credentials( 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]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp - deserialized = self._deserialize('User', response) if raw: @@ -2280,12 +2225,13 @@ def get_long_running_output(response): return deserialized - long_running_operation_timeout = operation_config.get( + lro_delay = 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) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) list_publishing_credentials.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/publishingcredentials/list'} def update_site_push_settings( @@ -4273,7 +4219,7 @@ def _create_ms_deploy_operation_initial( return deserialized def create_ms_deploy_operation( - self, resource_group_name, name, ms_deploy, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, ms_deploy, custom_headers=None, raw=False, polling=True, **operation_config): """Invoke the MSDeploy web app extension. Invoke the MSDeploy web app extension. @@ -4286,13 +4232,16 @@ def create_ms_deploy_operation( :param ms_deploy: Details of MSDeploy operation :type ms_deploy: ~azure.mgmt.web.models.MSDeploy :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 - MSDeployStatus or ClientRawResponse if raw=true + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns MSDeployStatus or + ClientRawResponse if raw==True :rtype: ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.MSDeployStatus] - or ~msrest.pipeline.ClientRawResponse + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.MSDeployStatus]] :raises: :class:`CloudError` """ raw_result = self._create_ms_deploy_operation_initial( @@ -4303,30 +4252,8 @@ def create_ms_deploy_operation( 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 [201, 409]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp - deserialized = self._deserialize('MSDeployStatus', response) if raw: @@ -4335,12 +4262,13 @@ def get_long_running_output(response): return deserialized - long_running_operation_timeout = operation_config.get( + lro_delay = 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) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) create_ms_deploy_operation.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/extensions/MSDeploy'} def get_ms_deploy_log( @@ -4666,7 +4594,7 @@ def _create_function_initial( return deserialized def create_function( - self, resource_group_name, name, function_name, function_envelope, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, function_name, function_envelope, custom_headers=None, raw=False, polling=True, **operation_config): """Create function for web site, or a deployment slot. Create function for web site, or a deployment slot. @@ -4681,13 +4609,16 @@ def create_function( :param function_envelope: Function details. :type function_envelope: ~azure.mgmt.web.models.FunctionEnvelope :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 - FunctionEnvelope or ClientRawResponse if raw=true + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns FunctionEnvelope or + ClientRawResponse if raw==True :rtype: ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.FunctionEnvelope] - or ~msrest.pipeline.ClientRawResponse + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.FunctionEnvelope]] :raises: :class:`CloudError` """ raw_result = self._create_function_initial( @@ -4699,30 +4630,8 @@ def create_function( 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 [201]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp - deserialized = self._deserialize('FunctionEnvelope', response) if raw: @@ -4731,12 +4640,13 @@ def get_long_running_output(response): return deserialized - long_running_operation_timeout = operation_config.get( + lro_delay = 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) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) create_function.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/functions/{functionName}'} def delete_function( @@ -6119,7 +6029,7 @@ def _create_instance_ms_deploy_operation_initial( return deserialized def create_instance_ms_deploy_operation( - self, resource_group_name, name, instance_id, ms_deploy, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, instance_id, ms_deploy, custom_headers=None, raw=False, polling=True, **operation_config): """Invoke the MSDeploy web app extension. Invoke the MSDeploy web app extension. @@ -6134,13 +6044,16 @@ def create_instance_ms_deploy_operation( :param ms_deploy: Details of MSDeploy operation :type ms_deploy: ~azure.mgmt.web.models.MSDeploy :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 - MSDeployStatus or ClientRawResponse if raw=true + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns MSDeployStatus or + ClientRawResponse if raw==True :rtype: ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.MSDeployStatus] - or ~msrest.pipeline.ClientRawResponse + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.MSDeployStatus]] :raises: :class:`CloudError` """ raw_result = self._create_instance_ms_deploy_operation_initial( @@ -6152,30 +6065,8 @@ def create_instance_ms_deploy_operation( 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 [201, 409]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp - deserialized = self._deserialize('MSDeployStatus', response) if raw: @@ -6184,12 +6075,13 @@ def get_long_running_output(response): return deserialized - long_running_operation_timeout = operation_config.get( + lro_delay = 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) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) create_instance_ms_deploy_operation.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/instances/{instanceId}/extensions/MSDeploy'} def get_instance_ms_deploy_log( @@ -7233,7 +7125,7 @@ def _migrate_storage_initial( return deserialized def migrate_storage( - self, subscription_name, resource_group_name, name, migration_options, custom_headers=None, raw=False, **operation_config): + self, subscription_name, resource_group_name, name, migration_options, custom_headers=None, raw=False, polling=True, **operation_config): """Restores a web app. Restores a web app. @@ -7249,13 +7141,17 @@ def migrate_storage( :type migration_options: ~azure.mgmt.web.models.StorageMigrationOptions :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 - StorageMigrationResponse or ClientRawResponse if raw=true + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns + StorageMigrationResponse or + ClientRawResponse if raw==True :rtype: ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.StorageMigrationResponse] - or ~msrest.pipeline.ClientRawResponse + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.StorageMigrationResponse]] :raises: :class:`CloudError` """ raw_result = self._migrate_storage_initial( @@ -7267,30 +7163,8 @@ def migrate_storage( 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]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp - deserialized = self._deserialize('StorageMigrationResponse', response) if raw: @@ -7299,12 +7173,13 @@ def get_long_running_output(response): return deserialized - long_running_operation_timeout = operation_config.get( + lro_delay = 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) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) migrate_storage.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/migrate'} @@ -7358,7 +7233,7 @@ def _migrate_my_sql_initial( return deserialized def migrate_my_sql( - self, resource_group_name, name, migration_request_envelope, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, migration_request_envelope, custom_headers=None, raw=False, polling=True, **operation_config): """Migrates a local (in-app) MySql database to a remote MySql database. Migrates a local (in-app) MySql database to a remote MySql database. @@ -7372,13 +7247,16 @@ def migrate_my_sql( :type migration_request_envelope: ~azure.mgmt.web.models.MigrateMySqlRequest :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 Operation or - ClientRawResponse if raw=true + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns Operation or + ClientRawResponse if raw==True :rtype: ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.Operation] - or ~msrest.pipeline.ClientRawResponse + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.Operation]] :raises: :class:`CloudError` """ raw_result = self._migrate_my_sql_initial( @@ -7389,30 +7267,8 @@ def migrate_my_sql( 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]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp - deserialized = self._deserialize('Operation', response) if raw: @@ -7421,12 +7277,13 @@ def get_long_running_output(response): return deserialized - long_running_operation_timeout = operation_config.get( + lro_delay = 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) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) migrate_my_sql.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/migratemysql'} def get_migrate_my_sql_status( @@ -9171,7 +9028,7 @@ def _recover_initial( return client_raw_response def recover( - self, resource_group_name, name, recovery_entity, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, recovery_entity, custom_headers=None, raw=False, polling=True, **operation_config): """Recovers a web app to a previous snapshot. Recovers a web app to a previous snapshot. @@ -9186,12 +9043,14 @@ def recover( GetSiteSnapshots API. :type recovery_entity: ~azure.mgmt.web.models.SnapshotRecoveryRequest :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 None or - ClientRawResponse if raw=true + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns None or + ClientRawResponse if raw==True :rtype: ~msrestazure.azure_operation.AzureOperationPoller[None] or - ~msrest.pipeline.ClientRawResponse + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[None]] :raises: :class:`CloudError` """ raw_result = self._recover_initial( @@ -9202,40 +9061,19 @@ def recover( 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]: - 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 - long_running_operation_timeout = operation_config.get( + lro_delay = 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) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) recover.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/recover'} def reset_production_slot_config( @@ -9560,7 +9398,7 @@ def _install_site_extension_initial( return deserialized def install_site_extension( - self, resource_group_name, name, site_extension_id, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, site_extension_id, custom_headers=None, raw=False, polling=True, **operation_config): """Install site extension on a web site, or a deployment slot. Install site extension on a web site, or a deployment slot. @@ -9573,13 +9411,16 @@ def install_site_extension( :param site_extension_id: Site extension name. :type site_extension_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 - :return: An instance of AzureOperationPoller that returns - SiteExtensionInfo or ClientRawResponse if raw=true + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns SiteExtensionInfo or + ClientRawResponse if raw==True :rtype: ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.SiteExtensionInfo] - or ~msrest.pipeline.ClientRawResponse + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.SiteExtensionInfo]] :raises: :class:`CloudError` """ raw_result = self._install_site_extension_initial( @@ -9590,30 +9431,8 @@ def install_site_extension( 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, 201, 429]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp - deserialized = self._deserialize('SiteExtensionInfo', response) if raw: @@ -9622,12 +9441,13 @@ def get_long_running_output(response): return deserialized - long_running_operation_timeout = operation_config.get( + lro_delay = 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) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) install_site_extension.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/siteextensions/{siteExtensionId}'} def delete_site_extension( @@ -9894,7 +9714,7 @@ def _create_or_update_slot_initial( return deserialized def create_or_update_slot( - self, resource_group_name, name, site_envelope, slot, 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, slot, skip_dns_registration=None, skip_custom_domain_verification=None, force_dns_registration=None, ttl_in_seconds=None, custom_headers=None, raw=False, polling=True, **operation_config): """Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. @@ -9927,13 +9747,16 @@ def create_or_update_slot( 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 - :return: An instance of AzureOperationPoller that returns Site or - ClientRawResponse if raw=true + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns Site or + ClientRawResponse if raw==True :rtype: ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.Site] - or ~msrest.pipeline.ClientRawResponse + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.Site]] :raises: :class:`CloudError` """ raw_result = self._create_or_update_slot_initial( @@ -9949,30 +9772,8 @@ def create_or_update_slot( 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]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp - deserialized = self._deserialize('Site', response) if raw: @@ -9981,12 +9782,13 @@ def get_long_running_output(response): return deserialized - long_running_operation_timeout = operation_config.get( + lro_delay = 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) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) create_or_update_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}'} def delete_slot( @@ -10818,7 +10620,7 @@ def _restore_slot_initial( return deserialized def restore_slot( - self, resource_group_name, name, backup_id, request, slot, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, backup_id, request, slot, custom_headers=None, raw=False, polling=True, **operation_config): """Restores a specific backup to another app (or deployment slot, if specified). @@ -10838,13 +10640,16 @@ def restore_slot( the API will restore a backup of the production slot. :type slot: 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 - RestoreResponse or ClientRawResponse if raw=true + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns RestoreResponse or + ClientRawResponse if raw==True :rtype: ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.RestoreResponse] - or ~msrest.pipeline.ClientRawResponse + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.RestoreResponse]] :raises: :class:`CloudError` """ raw_result = self._restore_slot_initial( @@ -10857,30 +10662,8 @@ def restore_slot( 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]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp - deserialized = self._deserialize('RestoreResponse', response) if raw: @@ -10889,12 +10672,13 @@ def get_long_running_output(response): return deserialized - long_running_operation_timeout = operation_config.get( + lro_delay = 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) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) restore_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/backups/{backupId}/restore'} def list_configurations_slot( @@ -11964,7 +11748,7 @@ def _list_publishing_credentials_slot_initial( return deserialized def list_publishing_credentials_slot( - self, resource_group_name, name, slot, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, slot, custom_headers=None, raw=False, polling=True, **operation_config): """Gets the Git/FTP publishing credentials of an app. Gets the Git/FTP publishing credentials of an app. @@ -11978,13 +11762,16 @@ def list_publishing_credentials_slot( the API will get the publishing credentials for the production slot. :type slot: 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 User or - ClientRawResponse if raw=true + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns User or + ClientRawResponse if raw==True :rtype: ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.User] - or ~msrest.pipeline.ClientRawResponse + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.User]] :raises: :class:`CloudError` """ raw_result = self._list_publishing_credentials_slot_initial( @@ -11995,30 +11782,8 @@ def list_publishing_credentials_slot( 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]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp - deserialized = self._deserialize('User', response) if raw: @@ -12027,12 +11792,13 @@ def get_long_running_output(response): return deserialized - long_running_operation_timeout = operation_config.get( + lro_delay = 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) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) list_publishing_credentials_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/publishingcredentials/list'} def update_site_push_settings_slot( @@ -13983,7 +13749,7 @@ def _create_ms_deploy_operation_slot_initial( return deserialized def create_ms_deploy_operation_slot( - self, resource_group_name, name, slot, ms_deploy, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, slot, ms_deploy, custom_headers=None, raw=False, polling=True, **operation_config): """Invoke the MSDeploy web app extension. Invoke the MSDeploy web app extension. @@ -13999,13 +13765,16 @@ def create_ms_deploy_operation_slot( :param ms_deploy: Details of MSDeploy operation :type ms_deploy: ~azure.mgmt.web.models.MSDeploy :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 - MSDeployStatus or ClientRawResponse if raw=true + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns MSDeployStatus or + ClientRawResponse if raw==True :rtype: ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.MSDeployStatus] - or ~msrest.pipeline.ClientRawResponse + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.MSDeployStatus]] :raises: :class:`CloudError` """ raw_result = self._create_ms_deploy_operation_slot_initial( @@ -14017,30 +13786,8 @@ def create_ms_deploy_operation_slot( 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 [201, 409]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp - deserialized = self._deserialize('MSDeployStatus', response) if raw: @@ -14049,12 +13796,13 @@ def get_long_running_output(response): return deserialized - long_running_operation_timeout = operation_config.get( + lro_delay = 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) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) create_ms_deploy_operation_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/extensions/MSDeploy'} def get_ms_deploy_log_slot( @@ -14397,7 +14145,7 @@ def _create_instance_function_slot_initial( return deserialized def create_instance_function_slot( - self, resource_group_name, name, function_name, slot, function_envelope, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, function_name, slot, function_envelope, custom_headers=None, raw=False, polling=True, **operation_config): """Create function for web site, or a deployment slot. Create function for web site, or a deployment slot. @@ -14415,13 +14163,16 @@ def create_instance_function_slot( :param function_envelope: Function details. :type function_envelope: ~azure.mgmt.web.models.FunctionEnvelope :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 - FunctionEnvelope or ClientRawResponse if raw=true + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns FunctionEnvelope or + ClientRawResponse if raw==True :rtype: ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.FunctionEnvelope] - or ~msrest.pipeline.ClientRawResponse + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.FunctionEnvelope]] :raises: :class:`CloudError` """ raw_result = self._create_instance_function_slot_initial( @@ -14434,30 +14185,8 @@ def create_instance_function_slot( 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 [201]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp - deserialized = self._deserialize('FunctionEnvelope', response) if raw: @@ -14466,12 +14195,13 @@ def get_long_running_output(response): return deserialized - long_running_operation_timeout = operation_config.get( + lro_delay = 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) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) create_instance_function_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/functions/{functionName}'} def delete_instance_function_slot( @@ -15927,7 +15657,7 @@ def _create_instance_ms_deploy_operation_slot_initial( return deserialized def create_instance_ms_deploy_operation_slot( - self, resource_group_name, name, slot, instance_id, ms_deploy, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, slot, instance_id, ms_deploy, custom_headers=None, raw=False, polling=True, **operation_config): """Invoke the MSDeploy web app extension. Invoke the MSDeploy web app extension. @@ -15945,13 +15675,16 @@ def create_instance_ms_deploy_operation_slot( :param ms_deploy: Details of MSDeploy operation :type ms_deploy: ~azure.mgmt.web.models.MSDeploy :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 - MSDeployStatus or ClientRawResponse if raw=true + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns MSDeployStatus or + ClientRawResponse if raw==True :rtype: ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.MSDeployStatus] - or ~msrest.pipeline.ClientRawResponse + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.MSDeployStatus]] :raises: :class:`CloudError` """ raw_result = self._create_instance_ms_deploy_operation_slot_initial( @@ -15964,30 +15697,8 @@ def create_instance_ms_deploy_operation_slot( 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 [201, 409]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp - deserialized = self._deserialize('MSDeployStatus', response) if raw: @@ -15996,12 +15707,13 @@ def get_long_running_output(response): return deserialized - long_running_operation_timeout = operation_config.get( + lro_delay = 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) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) create_instance_ms_deploy_operation_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/instances/{instanceId}/extensions/MSDeploy'} def get_instance_ms_deploy_log_slot( @@ -18881,7 +18593,7 @@ def _recover_slot_initial( return client_raw_response def recover_slot( - self, resource_group_name, name, recovery_entity, slot, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, recovery_entity, slot, custom_headers=None, raw=False, polling=True, **operation_config): """Recovers a web app to a previous snapshot. Recovers a web app to a previous snapshot. @@ -18899,12 +18611,14 @@ def recover_slot( to production slot. :type slot: 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 None or - ClientRawResponse if raw=true + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns None or + ClientRawResponse if raw==True :rtype: ~msrestazure.azure_operation.AzureOperationPoller[None] or - ~msrest.pipeline.ClientRawResponse + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[None]] :raises: :class:`CloudError` """ raw_result = self._recover_slot_initial( @@ -18916,40 +18630,19 @@ def recover_slot( 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]: - 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 - long_running_operation_timeout = operation_config.get( + lro_delay = 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) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) recover_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/recover'} def reset_slot_configuration_slot( @@ -19291,7 +18984,7 @@ def _install_site_extension_slot_initial( return deserialized def install_site_extension_slot( - self, resource_group_name, name, site_extension_id, slot, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, site_extension_id, slot, custom_headers=None, raw=False, polling=True, **operation_config): """Install site extension on a web site, or a deployment slot. Install site extension on a web site, or a deployment slot. @@ -19307,13 +19000,16 @@ def install_site_extension_slot( the API deletes a deployment for the production slot. :type slot: 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 - SiteExtensionInfo or ClientRawResponse if raw=true + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns SiteExtensionInfo or + ClientRawResponse if raw==True :rtype: ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.SiteExtensionInfo] - or ~msrest.pipeline.ClientRawResponse + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.SiteExtensionInfo]] :raises: :class:`CloudError` """ raw_result = self._install_site_extension_slot_initial( @@ -19325,30 +19021,8 @@ def install_site_extension_slot( 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, 201, 429]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp - deserialized = self._deserialize('SiteExtensionInfo', response) if raw: @@ -19357,12 +19031,13 @@ def get_long_running_output(response): return deserialized - long_running_operation_timeout = operation_config.get( + lro_delay = 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) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) install_site_extension_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/siteextensions/{siteExtensionId}'} def delete_site_extension_slot( @@ -19564,7 +19239,7 @@ def _swap_slot_slot_initial( return client_raw_response def swap_slot_slot( - self, resource_group_name, name, slot, target_slot, preserve_vnet, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, slot, target_slot, preserve_vnet, custom_headers=None, raw=False, polling=True, **operation_config): """Swaps two deployment slots of an app. Swaps two deployment slots of an app. @@ -19583,12 +19258,14 @@ def swap_slot_slot( the slot during swap; otherwise, false. :type preserve_vnet: bool :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 None or - ClientRawResponse if raw=true + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns None or + ClientRawResponse if raw==True :rtype: ~msrestazure.azure_operation.AzureOperationPoller[None] or - ~msrest.pipeline.ClientRawResponse + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[None]] :raises: :class:`CloudError` """ raw_result = self._swap_slot_slot_initial( @@ -19601,40 +19278,19 @@ def swap_slot_slot( 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]: - 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 - long_running_operation_timeout = operation_config.get( + lro_delay = 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) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) swap_slot_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/slotsswap'} def list_snapshots_slot( @@ -19844,7 +19500,7 @@ def _create_or_update_source_control_slot_initial( return deserialized def create_or_update_source_control_slot( - self, resource_group_name, name, site_source_control, slot, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, site_source_control, slot, custom_headers=None, raw=False, polling=True, **operation_config): """Updates the source control configuration of an app. Updates the source control configuration of an app. @@ -19862,13 +19518,16 @@ def create_or_update_source_control_slot( production slot. :type slot: 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 - SiteSourceControl or ClientRawResponse if raw=true + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns SiteSourceControl or + ClientRawResponse if raw==True :rtype: ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.SiteSourceControl] - or ~msrest.pipeline.ClientRawResponse + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.SiteSourceControl]] :raises: :class:`CloudError` """ raw_result = self._create_or_update_source_control_slot_initial( @@ -19880,30 +19539,8 @@ def create_or_update_source_control_slot( 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, 201, 202]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp - deserialized = self._deserialize('SiteSourceControl', response) if raw: @@ -19912,12 +19549,13 @@ def get_long_running_output(response): return deserialized - long_running_operation_timeout = operation_config.get( + lro_delay = 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) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) create_or_update_source_control_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/sourcecontrols/web'} def delete_source_control_slot( @@ -21728,7 +21366,7 @@ def _swap_slot_with_production_initial( return client_raw_response def swap_slot_with_production( - self, resource_group_name, name, target_slot, preserve_vnet, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, target_slot, preserve_vnet, custom_headers=None, raw=False, polling=True, **operation_config): """Swaps two deployment slots of an app. Swaps two deployment slots of an app. @@ -21744,12 +21382,14 @@ def swap_slot_with_production( the slot during swap; otherwise, false. :type preserve_vnet: bool :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 None or - ClientRawResponse if raw=true + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns None or + ClientRawResponse if raw==True :rtype: ~msrestazure.azure_operation.AzureOperationPoller[None] or - ~msrest.pipeline.ClientRawResponse + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[None]] :raises: :class:`CloudError` """ raw_result = self._swap_slot_with_production_initial( @@ -21761,40 +21401,19 @@ def swap_slot_with_production( 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]: - 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 - long_running_operation_timeout = operation_config.get( + lro_delay = 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) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) swap_slot_with_production.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slotsswap'} def list_snapshots( @@ -21995,7 +21614,7 @@ def _create_or_update_source_control_initial( return deserialized def create_or_update_source_control( - self, resource_group_name, name, site_source_control, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, site_source_control, custom_headers=None, raw=False, polling=True, **operation_config): """Updates the source control configuration of an app. Updates the source control configuration of an app. @@ -22009,13 +21628,16 @@ def create_or_update_source_control( object. See example. :type site_source_control: ~azure.mgmt.web.models.SiteSourceControl :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 - SiteSourceControl or ClientRawResponse if raw=true + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns SiteSourceControl or + ClientRawResponse if raw==True :rtype: ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.SiteSourceControl] - or ~msrest.pipeline.ClientRawResponse + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.SiteSourceControl]] :raises: :class:`CloudError` """ raw_result = self._create_or_update_source_control_initial( @@ -22026,30 +21648,8 @@ def create_or_update_source_control( 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, 201, 202]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp - deserialized = self._deserialize('SiteSourceControl', response) if raw: @@ -22058,12 +21658,13 @@ def get_long_running_output(response): return deserialized - long_running_operation_timeout = operation_config.get( + lro_delay = 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) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) create_or_update_source_control.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/sourcecontrols/web'} def delete_source_control( diff --git a/azure-mgmt-web/azure/mgmt/web/web_site_management_client.py b/azure-mgmt-web/azure/mgmt/web/web_site_management_client.py index a3891b93bd46..296ad78205d0 100644 --- a/azure-mgmt-web/azure/mgmt/web/web_site_management_client.py +++ b/azure-mgmt-web/azure/mgmt/web/web_site_management_client.py @@ -9,13 +9,14 @@ # regenerated. # -------------------------------------------------------------------------- -from msrest.service_client import ServiceClient +from msrest.service_client import SDKClient from msrest import Serializer, Deserializer from msrestazure import AzureConfiguration from .version import VERSION from msrest.pipeline import ClientRawResponse from msrestazure.azure_exceptions import CloudError -from msrestazure.azure_operation import AzureOperationPoller +from msrest.polling import LROPoller, NoPolling +from msrestazure.polling.arm_polling import ARMPolling import uuid from .operations.app_service_certificate_orders_operations import AppServiceCertificateOrdersOperations from .operations.certificate_registration_provider_operations import CertificateRegistrationProviderOperations @@ -68,7 +69,7 @@ def __init__( self.subscription_id = subscription_id -class WebSiteManagementClient(object): +class WebSiteManagementClient(SDKClient): """WebSite Management Client :ivar config: Configuration for client. @@ -118,7 +119,7 @@ def __init__( self, credentials, subscription_id, base_url=None): self.config = WebSiteManagementClientConfiguration(credentials, subscription_id, base_url) - self._client = ServiceClient(self.config.credentials, self.config) + super(WebSiteManagementClient, self).__init__(self.config.credentials, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} self._serialize = Serializer(client_models) From 1d38c2a025eab7e5ae29368c1c958c871952192f Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Wed, 18 Jul 2018 11:49:40 -0700 Subject: [PATCH 11/19] Generated from 0ba75505cddaddce442eb2172170ccd408e6cfd5 (#2925) Update default package version for WebSiteManagementClient --- .../azure/mgmt/web/models/__init__.py | 92 +- .../web/models/app_service_environment.py | 15 + .../app_service_environment_patch_resource.py | 15 + ..._service_environment_patch_resource_py3.py | 17 +- .../web/models/app_service_environment_py3.py | 17 +- .../app_service_environment_resource.py | 15 + .../app_service_environment_resource_py3.py | 17 +- .../azure/mgmt/web/models/app_service_plan.py | 15 +- .../models/app_service_plan_patch_resource.py | 18 +- .../app_service_plan_patch_resource_py3.py | 20 +- .../mgmt/web/models/app_service_plan_py3.py | 17 +- .../azure/mgmt/web/models/backup_request.py | 11 - .../mgmt/web/models/backup_request_py3.py | 13 +- .../azure/mgmt/web/models/billing_meter.py | 6 +- .../mgmt/web/models/billing_meter_py3.py | 8 +- .../azure/mgmt/web/models/certificate.py | 5 - .../web/models/certificate_order_action.py | 18 +- .../models/certificate_order_action_py3.py | 20 +- .../web/models/certificate_patch_resource.py | 5 - .../models/certificate_patch_resource_py3.py | 5 - .../azure/mgmt/web/models/certificate_py3.py | 5 - .../azure/mgmt/web/models/cloning_info.py | 5 - .../azure/mgmt/web/models/cloning_info_py3.py | 7 +- .../mgmt/web/models/continuous_web_job.py | 24 +- .../mgmt/web/models/continuous_web_job_py3.py | 26 +- .../web/models/deleted_app_restore_request.py | 61 + .../models/deleted_app_restore_request_py3.py | 61 + .../azure/mgmt/web/models/deleted_site.py | 19 +- .../azure/mgmt/web/models/deleted_site_py3.py | 21 +- .../azure/mgmt/web/models/deployment.py | 10 +- .../azure/mgmt/web/models/deployment_py3.py | 12 +- .../azure/mgmt/web/models/error_response.py | 45 - .../mgmt/web/models/error_response_py3.py | 45 - .../mgmt/web/models/function_envelope.py | 24 +- .../mgmt/web/models/function_envelope_py3.py | 26 +- .../azure/mgmt/web/models/function_secrets.py | 2 +- .../mgmt/web/models/function_secrets_py3.py | 2 +- .../azure/mgmt/web/models/geo_region.py | 5 - .../azure/mgmt/web/models/geo_region_py3.py | 5 - .../web/models/ip_security_restriction.py | 25 + .../web/models/ip_security_restriction_py3.py | 27 +- .../mgmt/web/models/log_specification.py | 36 + .../mgmt/web/models/log_specification_py3.py | 36 + .../web/models/managed_service_identity.py | 6 +- .../models/managed_service_identity_py3.py | 8 +- .../mgmt/web/models/metric_definition.py | 5 - .../mgmt/web/models/metric_definition_py3.py | 5 - .../azure/mgmt/web/models/perf_mon_sample.py | 4 - .../mgmt/web/models/perf_mon_sample_py3.py | 6 +- .../azure/mgmt/web/models/premier_add_on.py | 12 - .../mgmt/web/models/premier_add_on_offer.py | 4 - .../web/models/premier_add_on_offer_py3.py | 6 +- .../models/premier_add_on_patch_resource.py | 65 + .../premier_add_on_patch_resource_py3.py | 65 + .../mgmt/web/models/premier_add_on_py3.py | 14 +- ...{restore_response.py => private_access.py} | 22 +- ..._response_py3.py => private_access_py3.py} | 24 +- .../mgmt/web/models/private_access_subnet.py | 33 + .../web/models/private_access_subnet_py3.py | 33 + .../models/private_access_virtual_network.py | 42 + .../private_access_virtual_network_py3.py | 42 + .../azure/mgmt/web/models/process_info.py | 157 +- .../azure/mgmt/web/models/process_info_py3.py | 159 +- .../mgmt/web/models/process_module_info.py | 16 +- .../web/models/process_module_info_py3.py | 16 +- .../mgmt/web/models/process_thread_info.py | 27 +- .../web/models/process_thread_info_py3.py | 29 +- .../azure/mgmt/web/models/recommendation.py | 21 +- .../mgmt/web/models/recommendation_py3.py | 23 +- .../mgmt/web/models/recommendation_rule.py | 18 +- .../web/models/recommendation_rule_py3.py | 20 +- .../azure/mgmt/web/models/rendering.py | 10 +- .../azure/mgmt/web/models/rendering_py3.py | 12 +- .../models/resource_health_metadata_paged.py | 27 - .../web/models/resource_metric_definition.py | 11 - .../models/resource_metric_definition_py3.py | 11 - .../azure/mgmt/web/models/restore_request.py | 2 +- .../mgmt/web/models/restore_request_py3.py | 2 +- .../mgmt/web/models/service_specification.py | 4 + .../web/models/service_specification_py3.py | 6 +- azure-mgmt-web/azure/mgmt/web/models/site.py | 9 +- .../mgmt/web/models/site_auth_settings.py | 5 + .../mgmt/web/models/site_auth_settings_py3.py | 7 +- .../azure/mgmt/web/models/site_config.py | 23 + .../azure/mgmt/web/models/site_config_py3.py | 25 +- .../mgmt/web/models/site_config_resource.py | 23 + .../web/models/site_config_resource_py3.py | 25 +- .../site_configuration_snapshot_info.py | 10 +- .../site_configuration_snapshot_info_py3.py | 10 +- .../mgmt/web/models/site_extension_info.py | 49 +- .../web/models/site_extension_info_py3.py | 51 +- .../azure/mgmt/web/models/site_instance.py | 2 +- .../mgmt/web/models/site_instance_py3.py | 2 +- .../mgmt/web/models/site_patch_resource.py | 9 +- .../web/models/site_patch_resource_py3.py | 11 +- .../azure/mgmt/web/models/site_py3.py | 11 +- .../azure/mgmt/web/models/slot_difference.py | 11 +- .../mgmt/web/models/slot_difference_py3.py | 11 +- ..._target.py => snapshot_recovery_source.py} | 10 +- ...py3.py => snapshot_recovery_source_py3.py} | 10 +- ...request.py => snapshot_restore_request.py} | 23 +- ...py3.py => snapshot_restore_request_py3.py} | 25 +- .../azure/mgmt/web/models/source_control.py | 4 - .../mgmt/web/models/source_control_py3.py | 6 +- .../azure/mgmt/web/models/stamp_capacity.py | 6 +- .../mgmt/web/models/stamp_capacity_py3.py | 8 +- ...h_metadata.py => swift_virtual_network.py} | 27 +- ...ta_py3.py => swift_virtual_network_py3.py} | 29 +- .../azure/mgmt/web/models/top_level_domain.py | 5 - .../mgmt/web/models/top_level_domain_py3.py | 5 - .../mgmt/web/models/triggered_job_history.py | 8 +- .../web/models/triggered_job_history_py3.py | 10 +- .../mgmt/web/models/triggered_job_run.py | 27 +- .../mgmt/web/models/triggered_job_run_py3.py | 29 +- .../mgmt/web/models/triggered_web_job.py | 26 +- .../mgmt/web/models/triggered_web_job_py3.py | 28 +- azure-mgmt-web/azure/mgmt/web/models/usage.py | 5 - .../azure/mgmt/web/models/usage_py3.py | 5 - azure-mgmt-web/azure/mgmt/web/models/user.py | 8 +- .../azure/mgmt/web/models/user_py3.py | 10 +- .../azure/mgmt/web/models/validate_request.py | 5 + .../mgmt/web/models/validate_request_py3.py | 7 +- .../azure/mgmt/web/models/vnet_route.py | 5 - .../azure/mgmt/web/models/vnet_route_py3.py | 7 +- .../azure/mgmt/web/models/web_job.py | 19 +- .../azure/mgmt/web/models/web_job_py3.py | 21 +- .../web_site_management_client_enums.py | 35 +- .../azure/mgmt/web/operations/__init__.py | 4 - ...p_service_certificate_orders_operations.py | 88 +- .../app_service_environments_operations.py | 330 +- .../app_service_plans_operations.py | 137 +- .../operations/billing_meters_operations.py | 109 - ...ficate_registration_provider_operations.py | 12 +- .../web/operations/certificates_operations.py | 39 +- .../operations/deleted_web_apps_operations.py | 12 +- .../web/operations/diagnostics_operations.py | 159 +- ...domain_registration_provider_operations.py | 12 +- .../mgmt/web/operations/domains_operations.py | 97 +- .../web/operations/provider_operations.py | 26 +- .../operations/recommendations_operations.py | 40 +- .../resource_health_metadata_operations.py | 461 --- .../top_level_domains_operations.py | 26 +- .../web/operations/web_apps_operations.py | 3659 +++++++++++------ .../mgmt/web/web_site_management_client.py | 247 +- 144 files changed, 4542 insertions(+), 3468 deletions(-) create mode 100644 azure-mgmt-web/azure/mgmt/web/models/deleted_app_restore_request.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/deleted_app_restore_request_py3.py delete mode 100644 azure-mgmt-web/azure/mgmt/web/models/error_response.py delete mode 100644 azure-mgmt-web/azure/mgmt/web/models/error_response_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/log_specification.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/log_specification_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/premier_add_on_patch_resource.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/premier_add_on_patch_resource_py3.py rename azure-mgmt-web/azure/mgmt/web/models/{restore_response.py => private_access.py} (62%) rename azure-mgmt-web/azure/mgmt/web/models/{restore_response_py3.py => private_access_py3.py} (59%) create mode 100644 azure-mgmt-web/azure/mgmt/web/models/private_access_subnet.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/private_access_subnet_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/private_access_virtual_network.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/private_access_virtual_network_py3.py delete mode 100644 azure-mgmt-web/azure/mgmt/web/models/resource_health_metadata_paged.py rename azure-mgmt-web/azure/mgmt/web/models/{snapshot_recovery_target.py => snapshot_recovery_source.py} (79%) rename azure-mgmt-web/azure/mgmt/web/models/{snapshot_recovery_target_py3.py => snapshot_recovery_source_py3.py} (79%) rename azure-mgmt-web/azure/mgmt/web/models/{snapshot_recovery_request.py => snapshot_restore_request.py} (76%) rename azure-mgmt-web/azure/mgmt/web/models/{snapshot_recovery_request_py3.py => snapshot_restore_request_py3.py} (75%) rename azure-mgmt-web/azure/mgmt/web/models/{resource_health_metadata.py => swift_virtual_network.py} (56%) rename azure-mgmt-web/azure/mgmt/web/models/{resource_health_metadata_py3.py => swift_virtual_network_py3.py} (54%) delete mode 100644 azure-mgmt-web/azure/mgmt/web/operations/billing_meters_operations.py delete mode 100644 azure-mgmt-web/azure/mgmt/web/operations/resource_health_metadata_operations.py diff --git a/azure-mgmt-web/azure/mgmt/web/models/__init__.py b/azure-mgmt-web/azure/mgmt/web/models/__init__.py index 3e8d506ff635..06759925efc3 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/__init__.py +++ b/azure-mgmt-web/azure/mgmt/web/models/__init__.py @@ -26,10 +26,8 @@ from .vnet_info_py3 import VnetInfo from .vnet_gateway_py3 import VnetGateway from .user_py3 import User - from .snapshot_recovery_target_py3 import SnapshotRecoveryTarget - from .snapshot_recovery_request_py3 import SnapshotRecoveryRequest + from .snapshot_py3 import Snapshot from .resource_metric_availability_py3 import ResourceMetricAvailability - from .resource_metric_name_py3 import ResourceMetricName from .resource_metric_definition_py3 import ResourceMetricDefinition from .push_settings_py3 import PushSettings from .identifier_py3 import Identifier @@ -67,7 +65,11 @@ from .sku_description_py3 import SkuDescription from .app_service_plan_py3 import AppServicePlan from .resource_py3 import Resource + from .default_error_response_error_details_item_py3 import DefaultErrorResponseErrorDetailsItem + from .default_error_response_error_py3 import DefaultErrorResponseError + from .default_error_response_py3 import DefaultErrorResponse, DefaultErrorResponseException from .name_identifier_py3 import NameIdentifier + from .log_specification_py3 import LogSpecification from .metric_availability_py3 import MetricAvailability from .dimension_py3 import Dimension from .metric_specification_py3 import MetricSpecification @@ -85,7 +87,6 @@ from .domain_ownership_identifier_py3 import DomainOwnershipIdentifier from .domain_patch_resource_py3 import DomainPatchResource from .domain_recommendation_search_parameters_py3 import DomainRecommendationSearchParameters - from .error_response_py3 import ErrorResponse, ErrorResponseException from .tld_legal_agreement_py3 import TldLegalAgreement from .top_level_domain_py3 import TopLevelDomain from .top_level_domain_agreement_option_py3 import TopLevelDomainAgreementOption @@ -99,16 +100,14 @@ from .app_service_environment_py3 import AppServiceEnvironment from .localizable_string_py3 import LocalizableString from .csm_usage_quota_py3 import CsmUsageQuota + from .deleted_site_py3 import DeletedSite from .error_entity_py3 import ErrorEntity - from .default_error_response_error_details_item_py3 import DefaultErrorResponseErrorDetailsItem - from .default_error_response_error_py3 import DefaultErrorResponseError - from .default_error_response_py3 import DefaultErrorResponse, DefaultErrorResponseException from .operation_py3 import Operation + from .resource_metric_name_py3 import ResourceMetricName from .resource_metric_property_py3 import ResourceMetricProperty from .resource_metric_value_py3 import ResourceMetricValue from .resource_metric_py3 import ResourceMetric from .web_app_collection_py3 import WebAppCollection - from .deleted_site_py3 import DeletedSite from .solution_py3 import Solution from .detector_abnormal_time_period_py3 import DetectorAbnormalTimePeriod from .abnormal_time_period_py3 import AbnormalTimePeriod @@ -133,7 +132,6 @@ from .application_stack_py3 import ApplicationStack from .recommendation_py3 import Recommendation from .recommendation_rule_py3 import RecommendationRule - from .resource_health_metadata_py3 import ResourceHealthMetadata from .billing_meter_py3 import BillingMeter from .csm_move_resource_envelope_py3 import CsmMoveResourceEnvelope from .geo_region_py3 import GeoRegion @@ -166,6 +164,7 @@ from .csm_publishing_profile_options_py3 import CsmPublishingProfileOptions from .csm_slot_entity_py3 import CsmSlotEntity from .custom_hostname_analysis_result_py3 import CustomHostnameAnalysisResult + from .deleted_app_restore_request_py3 import DeletedAppRestoreRequest from .deployment_py3 import Deployment from .enabled_config_py3 import EnabledConfig from .file_system_http_logs_config_py3 import FileSystemHttpLogsConfig @@ -185,12 +184,15 @@ from .perf_mon_set_py3 import PerfMonSet from .perf_mon_response_py3 import PerfMonResponse from .premier_add_on_py3 import PremierAddOn + from .premier_add_on_patch_resource_py3 import PremierAddOnPatchResource + from .private_access_subnet_py3 import PrivateAccessSubnet + from .private_access_virtual_network_py3 import PrivateAccessVirtualNetwork + from .private_access_py3 import PrivateAccess from .process_thread_info_py3 import ProcessThreadInfo from .process_module_info_py3 import ProcessModuleInfo from .process_info_py3 import ProcessInfo from .public_certificate_py3 import PublicCertificate from .restore_request_py3 import RestoreRequest - from .restore_response_py3 import RestoreResponse from .site_auth_settings_py3 import SiteAuthSettings from .site_cloneability_criterion_py3 import SiteCloneabilityCriterion from .site_cloneability_py3 import SiteCloneability @@ -204,10 +206,12 @@ from .site_source_control_py3 import SiteSourceControl from .slot_config_names_resource_py3 import SlotConfigNamesResource from .slot_difference_py3 import SlotDifference - from .snapshot_py3 import Snapshot + from .snapshot_recovery_source_py3 import SnapshotRecoverySource + from .snapshot_restore_request_py3 import SnapshotRestoreRequest from .storage_migration_options_py3 import StorageMigrationOptions from .storage_migration_response_py3 import StorageMigrationResponse from .string_dictionary_py3 import StringDictionary + from .swift_virtual_network_py3 import SwiftVirtualNetwork from .triggered_job_run_py3 import TriggeredJobRun from .triggered_job_history_py3 import TriggeredJobHistory from .triggered_web_job_py3 import TriggeredWebJob @@ -240,10 +244,8 @@ from .vnet_info import VnetInfo from .vnet_gateway import VnetGateway from .user import User - from .snapshot_recovery_target import SnapshotRecoveryTarget - from .snapshot_recovery_request import SnapshotRecoveryRequest + from .snapshot import Snapshot 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 @@ -281,7 +283,11 @@ 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 .log_specification import LogSpecification from .metric_availability import MetricAvailability from .dimension import Dimension from .metric_specification import MetricSpecification @@ -299,7 +305,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 @@ -313,16 +318,14 @@ from .app_service_environment import AppServiceEnvironment from .localizable_string import LocalizableString from .csm_usage_quota import CsmUsageQuota + from .deleted_site import DeletedSite from .error_entity import ErrorEntity - from .default_error_response_error_details_item import DefaultErrorResponseErrorDetailsItem - from .default_error_response_error import DefaultErrorResponseError - from .default_error_response import DefaultErrorResponse, DefaultErrorResponseException 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 from .web_app_collection import WebAppCollection - from .deleted_site import DeletedSite from .solution import Solution from .detector_abnormal_time_period import DetectorAbnormalTimePeriod from .abnormal_time_period import AbnormalTimePeriod @@ -347,7 +350,6 @@ from .application_stack import ApplicationStack from .recommendation import Recommendation from .recommendation_rule import RecommendationRule - from .resource_health_metadata import ResourceHealthMetadata from .billing_meter import BillingMeter from .csm_move_resource_envelope import CsmMoveResourceEnvelope from .geo_region import GeoRegion @@ -380,6 +382,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 @@ -399,12 +402,15 @@ from .perf_mon_set import PerfMonSet from .perf_mon_response import PerfMonResponse from .premier_add_on import PremierAddOn + from .premier_add_on_patch_resource import PremierAddOnPatchResource + 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 @@ -418,10 +424,12 @@ from .site_source_control import SiteSourceControl 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 + from .swift_virtual_network import SwiftVirtualNetwork from .triggered_job_run import TriggeredJobRun from .triggered_job_history import TriggeredJobHistory from .triggered_web_job import TriggeredWebJob @@ -453,12 +461,11 @@ from .detector_definition_paged import DetectorDefinitionPaged from .application_stack_paged import ApplicationStackPaged from .recommendation_paged import RecommendationPaged -from .resource_health_metadata_paged import ResourceHealthMetadataPaged 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 -from .billing_meter_paged import BillingMeterPaged from .site_paged import SitePaged from .backup_item_paged import BackupItemPaged from .site_config_resource_paged import SiteConfigResourcePaged @@ -498,12 +505,14 @@ CertificateOrderActionType, RouteType, ManagedServiceIdentityType, + IpFilterTag, AutoHealActionType, ConnectionStringType, ScmType, ManagedPipelineMode, SiteLoadBalancing, SupportedTlsVersions, + FtpsState, SslState, HostType, UsageState, @@ -535,7 +544,6 @@ BackupItemStatus, DatabaseType, FrequencyUnit, - BackupRestoreOperationType, ContinuousWebJobStatus, WebJobType, PublishingProfileFormat, @@ -544,6 +552,7 @@ MSDeployProvisioningState, MySqlMigrationType, PublicCertificateLocation, + BackupRestoreOperationType, UnauthenticatedClientAction, BuiltInAuthenticationProvider, CloneAbilityResult, @@ -569,10 +578,8 @@ 'VnetInfo', 'VnetGateway', 'User', - 'SnapshotRecoveryTarget', - 'SnapshotRecoveryRequest', + 'Snapshot', 'ResourceMetricAvailability', - 'ResourceMetricName', 'ResourceMetricDefinition', 'PushSettings', 'Identifier', @@ -610,7 +617,11 @@ 'SkuDescription', 'AppServicePlan', 'Resource', + 'DefaultErrorResponseErrorDetailsItem', + 'DefaultErrorResponseError', + 'DefaultErrorResponse', 'DefaultErrorResponseException', 'NameIdentifier', + 'LogSpecification', 'MetricAvailability', 'Dimension', 'MetricSpecification', @@ -628,7 +639,6 @@ 'DomainOwnershipIdentifier', 'DomainPatchResource', 'DomainRecommendationSearchParameters', - 'ErrorResponse', 'ErrorResponseException', 'TldLegalAgreement', 'TopLevelDomain', 'TopLevelDomainAgreementOption', @@ -642,16 +652,14 @@ 'AppServiceEnvironment', 'LocalizableString', 'CsmUsageQuota', + 'DeletedSite', 'ErrorEntity', - 'DefaultErrorResponseErrorDetailsItem', - 'DefaultErrorResponseError', - 'DefaultErrorResponse', 'DefaultErrorResponseException', 'Operation', + 'ResourceMetricName', 'ResourceMetricProperty', 'ResourceMetricValue', 'ResourceMetric', 'WebAppCollection', - 'DeletedSite', 'Solution', 'DetectorAbnormalTimePeriod', 'AbnormalTimePeriod', @@ -676,7 +684,6 @@ 'ApplicationStack', 'Recommendation', 'RecommendationRule', - 'ResourceHealthMetadata', 'BillingMeter', 'CsmMoveResourceEnvelope', 'GeoRegion', @@ -709,6 +716,7 @@ 'CsmPublishingProfileOptions', 'CsmSlotEntity', 'CustomHostnameAnalysisResult', + 'DeletedAppRestoreRequest', 'Deployment', 'EnabledConfig', 'FileSystemHttpLogsConfig', @@ -728,12 +736,15 @@ 'PerfMonSet', 'PerfMonResponse', 'PremierAddOn', + 'PremierAddOnPatchResource', + 'PrivateAccessSubnet', + 'PrivateAccessVirtualNetwork', + 'PrivateAccess', 'ProcessThreadInfo', 'ProcessModuleInfo', 'ProcessInfo', 'PublicCertificate', 'RestoreRequest', - 'RestoreResponse', 'SiteAuthSettings', 'SiteCloneabilityCriterion', 'SiteCloneability', @@ -747,10 +758,12 @@ 'SiteSourceControl', 'SlotConfigNamesResource', 'SlotDifference', - 'Snapshot', + 'SnapshotRecoverySource', + 'SnapshotRestoreRequest', 'StorageMigrationOptions', 'StorageMigrationResponse', 'StringDictionary', + 'SwiftVirtualNetwork', 'TriggeredJobRun', 'TriggeredJobHistory', 'TriggeredWebJob', @@ -782,12 +795,11 @@ 'DetectorDefinitionPaged', 'ApplicationStackPaged', 'RecommendationPaged', - 'ResourceHealthMetadataPaged', 'SourceControlPaged', + 'BillingMeterPaged', 'GeoRegionPaged', 'IdentifierPaged', 'PremierAddOnOfferPaged', - 'BillingMeterPaged', 'SitePaged', 'BackupItemPaged', 'SiteConfigResourcePaged', @@ -826,12 +838,14 @@ 'CertificateOrderActionType', 'RouteType', 'ManagedServiceIdentityType', + 'IpFilterTag', 'AutoHealActionType', 'ConnectionStringType', 'ScmType', 'ManagedPipelineMode', 'SiteLoadBalancing', 'SupportedTlsVersions', + 'FtpsState', 'SslState', 'HostType', 'UsageState', @@ -863,7 +877,6 @@ 'BackupItemStatus', 'DatabaseType', 'FrequencyUnit', - 'BackupRestoreOperationType', 'ContinuousWebJobStatus', 'WebJobType', 'PublishingProfileFormat', @@ -872,6 +885,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 0188bc2cf194..357c0b6d603f 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 @@ -126,6 +126,15 @@ class AppServiceEnvironment(Model): :param user_whitelisted_ip_ranges: User added ip ranges to whitelist on ASE db :type user_whitelisted_ip_ranges: list[str] + :param has_linux_workers: Flag that displays whether an ASE has linux + workers or not + :type has_linux_workers: bool + :param ssl_cert_key_vault_id: Key Vault ID for ILB App Service Environment + default SSL certificate + :type ssl_cert_key_vault_id: str + :param ssl_cert_key_vault_secret_name: Key Vault Secret Name for ILB App + Service Environment default SSL certificate + :type ssl_cert_key_vault_secret_name: str """ _validation = { @@ -189,6 +198,9 @@ class AppServiceEnvironment(Model): 'dynamic_cache_enabled': {'key': 'dynamicCacheEnabled', 'type': 'bool'}, 'cluster_settings': {'key': 'clusterSettings', 'type': '[NameValuePair]'}, 'user_whitelisted_ip_ranges': {'key': 'userWhitelistedIpRanges', 'type': '[str]'}, + 'has_linux_workers': {'key': 'hasLinuxWorkers', 'type': 'bool'}, + 'ssl_cert_key_vault_id': {'key': 'sslCertKeyVaultId', 'type': 'str'}, + 'ssl_cert_key_vault_secret_name': {'key': 'sslCertKeyVaultSecretName', 'type': 'str'}, } def __init__(self, **kwargs): @@ -229,3 +241,6 @@ def __init__(self, **kwargs): self.dynamic_cache_enabled = kwargs.get('dynamic_cache_enabled', None) self.cluster_settings = kwargs.get('cluster_settings', None) self.user_whitelisted_ip_ranges = kwargs.get('user_whitelisted_ip_ranges', None) + self.has_linux_workers = kwargs.get('has_linux_workers', None) + self.ssl_cert_key_vault_id = kwargs.get('ssl_cert_key_vault_id', None) + self.ssl_cert_key_vault_secret_name = kwargs.get('ssl_cert_key_vault_secret_name', None) 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 d64026258130..4a4f9b8a267d 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 @@ -135,6 +135,15 @@ class AppServiceEnvironmentPatchResource(ProxyOnlyResource): :param user_whitelisted_ip_ranges: User added ip ranges to whitelist on ASE db :type user_whitelisted_ip_ranges: list[str] + :param has_linux_workers: Flag that displays whether an ASE has linux + workers or not + :type has_linux_workers: bool + :param ssl_cert_key_vault_id: Key Vault ID for ILB App Service Environment + default SSL certificate + :type ssl_cert_key_vault_id: str + :param ssl_cert_key_vault_secret_name: Key Vault Secret Name for ILB App + Service Environment default SSL certificate + :type ssl_cert_key_vault_secret_name: str """ _validation = { @@ -205,6 +214,9 @@ class AppServiceEnvironmentPatchResource(ProxyOnlyResource): 'dynamic_cache_enabled': {'key': 'properties.dynamicCacheEnabled', 'type': 'bool'}, 'cluster_settings': {'key': 'properties.clusterSettings', 'type': '[NameValuePair]'}, 'user_whitelisted_ip_ranges': {'key': 'properties.userWhitelistedIpRanges', 'type': '[str]'}, + 'has_linux_workers': {'key': 'properties.hasLinuxWorkers', 'type': 'bool'}, + 'ssl_cert_key_vault_id': {'key': 'properties.sslCertKeyVaultId', 'type': 'str'}, + 'ssl_cert_key_vault_secret_name': {'key': 'properties.sslCertKeyVaultSecretName', 'type': 'str'}, } def __init__(self, **kwargs): @@ -245,3 +257,6 @@ def __init__(self, **kwargs): self.dynamic_cache_enabled = kwargs.get('dynamic_cache_enabled', None) self.cluster_settings = kwargs.get('cluster_settings', None) self.user_whitelisted_ip_ranges = kwargs.get('user_whitelisted_ip_ranges', None) + self.has_linux_workers = kwargs.get('has_linux_workers', None) + self.ssl_cert_key_vault_id = kwargs.get('ssl_cert_key_vault_id', None) + self.ssl_cert_key_vault_secret_name = kwargs.get('ssl_cert_key_vault_secret_name', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/app_service_environment_patch_resource_py3.py b/azure-mgmt-web/azure/mgmt/web/models/app_service_environment_patch_resource_py3.py index a2a18b0fd543..f017aff5069e 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/app_service_environment_patch_resource_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/app_service_environment_patch_resource_py3.py @@ -135,6 +135,15 @@ class AppServiceEnvironmentPatchResource(ProxyOnlyResource): :param user_whitelisted_ip_ranges: User added ip ranges to whitelist on ASE db :type user_whitelisted_ip_ranges: list[str] + :param has_linux_workers: Flag that displays whether an ASE has linux + workers or not + :type has_linux_workers: bool + :param ssl_cert_key_vault_id: Key Vault ID for ILB App Service Environment + default SSL certificate + :type ssl_cert_key_vault_id: str + :param ssl_cert_key_vault_secret_name: Key Vault Secret Name for ILB App + Service Environment default SSL certificate + :type ssl_cert_key_vault_secret_name: str """ _validation = { @@ -205,9 +214,12 @@ class AppServiceEnvironmentPatchResource(ProxyOnlyResource): 'dynamic_cache_enabled': {'key': 'properties.dynamicCacheEnabled', 'type': 'bool'}, 'cluster_settings': {'key': 'properties.clusterSettings', 'type': '[NameValuePair]'}, 'user_whitelisted_ip_ranges': {'key': 'properties.userWhitelistedIpRanges', 'type': '[str]'}, + 'has_linux_workers': {'key': 'properties.hasLinuxWorkers', 'type': 'bool'}, + 'ssl_cert_key_vault_id': {'key': 'properties.sslCertKeyVaultId', 'type': 'str'}, + 'ssl_cert_key_vault_secret_name': {'key': 'properties.sslCertKeyVaultSecretName', 'type': 'str'}, } - def __init__(self, *, app_service_environment_patch_resource_name: str, location: str, virtual_network, worker_pools, kind: str=None, vnet_name: str=None, vnet_resource_group_name: str=None, vnet_subnet_name: str=None, internal_load_balancing_mode=None, multi_size: str=None, multi_role_count: int=None, ipssl_address_count: int=None, dns_suffix: str=None, network_access_control_list=None, front_end_scale_factor: int=None, api_management_account_id: str=None, suspended: bool=None, dynamic_cache_enabled: bool=None, cluster_settings=None, user_whitelisted_ip_ranges=None, **kwargs) -> None: + def __init__(self, *, app_service_environment_patch_resource_name: str, location: str, virtual_network, worker_pools, kind: str=None, vnet_name: str=None, vnet_resource_group_name: str=None, vnet_subnet_name: str=None, internal_load_balancing_mode=None, multi_size: str=None, multi_role_count: int=None, ipssl_address_count: int=None, dns_suffix: str=None, network_access_control_list=None, front_end_scale_factor: int=None, api_management_account_id: str=None, suspended: bool=None, dynamic_cache_enabled: bool=None, cluster_settings=None, user_whitelisted_ip_ranges=None, has_linux_workers: bool=None, ssl_cert_key_vault_id: str=None, ssl_cert_key_vault_secret_name: str=None, **kwargs) -> None: super(AppServiceEnvironmentPatchResource, self).__init__(kind=kind, **kwargs) self.app_service_environment_patch_resource_name = app_service_environment_patch_resource_name self.location = location @@ -245,3 +257,6 @@ def __init__(self, *, app_service_environment_patch_resource_name: str, location self.dynamic_cache_enabled = dynamic_cache_enabled self.cluster_settings = cluster_settings self.user_whitelisted_ip_ranges = user_whitelisted_ip_ranges + self.has_linux_workers = has_linux_workers + self.ssl_cert_key_vault_id = ssl_cert_key_vault_id + self.ssl_cert_key_vault_secret_name = ssl_cert_key_vault_secret_name diff --git a/azure-mgmt-web/azure/mgmt/web/models/app_service_environment_py3.py b/azure-mgmt-web/azure/mgmt/web/models/app_service_environment_py3.py index fd0968e50c29..7445b370c96d 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/app_service_environment_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/app_service_environment_py3.py @@ -126,6 +126,15 @@ class AppServiceEnvironment(Model): :param user_whitelisted_ip_ranges: User added ip ranges to whitelist on ASE db :type user_whitelisted_ip_ranges: list[str] + :param has_linux_workers: Flag that displays whether an ASE has linux + workers or not + :type has_linux_workers: bool + :param ssl_cert_key_vault_id: Key Vault ID for ILB App Service Environment + default SSL certificate + :type ssl_cert_key_vault_id: str + :param ssl_cert_key_vault_secret_name: Key Vault Secret Name for ILB App + Service Environment default SSL certificate + :type ssl_cert_key_vault_secret_name: str """ _validation = { @@ -189,9 +198,12 @@ class AppServiceEnvironment(Model): 'dynamic_cache_enabled': {'key': 'dynamicCacheEnabled', 'type': 'bool'}, 'cluster_settings': {'key': 'clusterSettings', 'type': '[NameValuePair]'}, 'user_whitelisted_ip_ranges': {'key': 'userWhitelistedIpRanges', 'type': '[str]'}, + 'has_linux_workers': {'key': 'hasLinuxWorkers', 'type': 'bool'}, + 'ssl_cert_key_vault_id': {'key': 'sslCertKeyVaultId', 'type': 'str'}, + 'ssl_cert_key_vault_secret_name': {'key': 'sslCertKeyVaultSecretName', 'type': 'str'}, } - def __init__(self, *, name: str, location: str, virtual_network, worker_pools, vnet_name: str=None, vnet_resource_group_name: str=None, vnet_subnet_name: str=None, internal_load_balancing_mode=None, multi_size: str=None, multi_role_count: int=None, ipssl_address_count: int=None, dns_suffix: str=None, network_access_control_list=None, front_end_scale_factor: int=None, api_management_account_id: str=None, suspended: bool=None, dynamic_cache_enabled: bool=None, cluster_settings=None, user_whitelisted_ip_ranges=None, **kwargs) -> None: + def __init__(self, *, name: str, location: str, virtual_network, worker_pools, vnet_name: str=None, vnet_resource_group_name: str=None, vnet_subnet_name: str=None, internal_load_balancing_mode=None, multi_size: str=None, multi_role_count: int=None, ipssl_address_count: int=None, dns_suffix: str=None, network_access_control_list=None, front_end_scale_factor: int=None, api_management_account_id: str=None, suspended: bool=None, dynamic_cache_enabled: bool=None, cluster_settings=None, user_whitelisted_ip_ranges=None, has_linux_workers: bool=None, ssl_cert_key_vault_id: str=None, ssl_cert_key_vault_secret_name: str=None, **kwargs) -> None: super(AppServiceEnvironment, self).__init__(**kwargs) self.name = name self.location = location @@ -229,3 +241,6 @@ def __init__(self, *, name: str, location: str, virtual_network, worker_pools, v self.dynamic_cache_enabled = dynamic_cache_enabled self.cluster_settings = cluster_settings self.user_whitelisted_ip_ranges = user_whitelisted_ip_ranges + self.has_linux_workers = has_linux_workers + self.ssl_cert_key_vault_id = ssl_cert_key_vault_id + self.ssl_cert_key_vault_secret_name = ssl_cert_key_vault_secret_name 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 c51a186cb590..5f48a8459372 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 @@ -139,6 +139,15 @@ class AppServiceEnvironmentResource(Resource): :param user_whitelisted_ip_ranges: User added ip ranges to whitelist on ASE db :type user_whitelisted_ip_ranges: list[str] + :param has_linux_workers: Flag that displays whether an ASE has linux + workers or not + :type has_linux_workers: bool + :param ssl_cert_key_vault_id: Key Vault ID for ILB App Service Environment + default SSL certificate + :type ssl_cert_key_vault_id: str + :param ssl_cert_key_vault_secret_name: Key Vault Secret Name for ILB App + Service Environment default SSL certificate + :type ssl_cert_key_vault_secret_name: str """ _validation = { @@ -212,6 +221,9 @@ class AppServiceEnvironmentResource(Resource): 'dynamic_cache_enabled': {'key': 'properties.dynamicCacheEnabled', 'type': 'bool'}, 'cluster_settings': {'key': 'properties.clusterSettings', 'type': '[NameValuePair]'}, 'user_whitelisted_ip_ranges': {'key': 'properties.userWhitelistedIpRanges', 'type': '[str]'}, + 'has_linux_workers': {'key': 'properties.hasLinuxWorkers', 'type': 'bool'}, + 'ssl_cert_key_vault_id': {'key': 'properties.sslCertKeyVaultId', 'type': 'str'}, + 'ssl_cert_key_vault_secret_name': {'key': 'properties.sslCertKeyVaultSecretName', 'type': 'str'}, } def __init__(self, **kwargs): @@ -252,3 +264,6 @@ def __init__(self, **kwargs): self.dynamic_cache_enabled = kwargs.get('dynamic_cache_enabled', None) self.cluster_settings = kwargs.get('cluster_settings', None) self.user_whitelisted_ip_ranges = kwargs.get('user_whitelisted_ip_ranges', None) + self.has_linux_workers = kwargs.get('has_linux_workers', None) + self.ssl_cert_key_vault_id = kwargs.get('ssl_cert_key_vault_id', None) + self.ssl_cert_key_vault_secret_name = kwargs.get('ssl_cert_key_vault_secret_name', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/app_service_environment_resource_py3.py b/azure-mgmt-web/azure/mgmt/web/models/app_service_environment_resource_py3.py index bcefe1f2fa7f..5ae07af3ea8b 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/app_service_environment_resource_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/app_service_environment_resource_py3.py @@ -139,6 +139,15 @@ class AppServiceEnvironmentResource(Resource): :param user_whitelisted_ip_ranges: User added ip ranges to whitelist on ASE db :type user_whitelisted_ip_ranges: list[str] + :param has_linux_workers: Flag that displays whether an ASE has linux + workers or not + :type has_linux_workers: bool + :param ssl_cert_key_vault_id: Key Vault ID for ILB App Service Environment + default SSL certificate + :type ssl_cert_key_vault_id: str + :param ssl_cert_key_vault_secret_name: Key Vault Secret Name for ILB App + Service Environment default SSL certificate + :type ssl_cert_key_vault_secret_name: str """ _validation = { @@ -212,9 +221,12 @@ class AppServiceEnvironmentResource(Resource): 'dynamic_cache_enabled': {'key': 'properties.dynamicCacheEnabled', 'type': 'bool'}, 'cluster_settings': {'key': 'properties.clusterSettings', 'type': '[NameValuePair]'}, 'user_whitelisted_ip_ranges': {'key': 'properties.userWhitelistedIpRanges', 'type': '[str]'}, + 'has_linux_workers': {'key': 'properties.hasLinuxWorkers', 'type': 'bool'}, + 'ssl_cert_key_vault_id': {'key': 'properties.sslCertKeyVaultId', 'type': 'str'}, + 'ssl_cert_key_vault_secret_name': {'key': 'properties.sslCertKeyVaultSecretName', 'type': 'str'}, } - def __init__(self, *, location: str, app_service_environment_resource_name: str, app_service_environment_resource_location: str, virtual_network, worker_pools, kind: str=None, tags=None, vnet_name: str=None, vnet_resource_group_name: str=None, vnet_subnet_name: str=None, internal_load_balancing_mode=None, multi_size: str=None, multi_role_count: int=None, ipssl_address_count: int=None, dns_suffix: str=None, network_access_control_list=None, front_end_scale_factor: int=None, api_management_account_id: str=None, suspended: bool=None, dynamic_cache_enabled: bool=None, cluster_settings=None, user_whitelisted_ip_ranges=None, **kwargs) -> None: + def __init__(self, *, location: str, app_service_environment_resource_name: str, app_service_environment_resource_location: str, virtual_network, worker_pools, kind: str=None, tags=None, vnet_name: str=None, vnet_resource_group_name: str=None, vnet_subnet_name: str=None, internal_load_balancing_mode=None, multi_size: str=None, multi_role_count: int=None, ipssl_address_count: int=None, dns_suffix: str=None, network_access_control_list=None, front_end_scale_factor: int=None, api_management_account_id: str=None, suspended: bool=None, dynamic_cache_enabled: bool=None, cluster_settings=None, user_whitelisted_ip_ranges=None, has_linux_workers: bool=None, ssl_cert_key_vault_id: str=None, ssl_cert_key_vault_secret_name: str=None, **kwargs) -> None: super(AppServiceEnvironmentResource, self).__init__(kind=kind, location=location, tags=tags, **kwargs) self.app_service_environment_resource_name = app_service_environment_resource_name self.app_service_environment_resource_location = app_service_environment_resource_location @@ -252,3 +264,6 @@ def __init__(self, *, location: str, app_service_environment_resource_name: str, self.dynamic_cache_enabled = dynamic_cache_enabled self.cluster_settings = cluster_settings self.user_whitelisted_ip_ranges = user_whitelisted_ip_ranges + self.has_linux_workers = has_linux_workers + self.ssl_cert_key_vault_id = ssl_cert_key_vault_id + self.ssl_cert_key_vault_secret_name = ssl_cert_key_vault_secret_name 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 3f7258ef8712..964fa959409c 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 @@ -32,8 +32,6 @@ class AppServicePlan(Resource): :vartype type: str :param tags: Resource tags. :type tags: dict[str, str] - :param app_service_plan_name: Required. Name for the App Service plan. - :type app_service_plan_name: str :param worker_tier_name: Target worker tier assigned to the App Service plan. :type worker_tier_name: str @@ -66,11 +64,17 @@ class AppServicePlan(Resource): :param spot_expiration_time: The time when the server farm expires. Valid only if it is a spot server farm. :type spot_expiration_time: datetime + :param free_offer_expiration_time: The time when the server farm free + offer expires. + :type free_offer_expiration_time: datetime :ivar resource_group: Resource group of the App Service plan. :vartype resource_group: str :param reserved: If Linux app service plan 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. @@ -89,7 +93,6 @@ class AppServicePlan(Resource): 'name': {'readonly': True}, 'location': {'required': True}, 'type': {'readonly': True}, - 'app_service_plan_name': {'required': True}, 'status': {'readonly': True}, 'subscription': {'readonly': True}, 'maximum_number_of_workers': {'readonly': True}, @@ -106,7 +109,6 @@ class AppServicePlan(Resource): 'location': {'key': 'location', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, - 'app_service_plan_name': {'key': 'properties.name', 'type': 'str'}, 'worker_tier_name': {'key': 'properties.workerTierName', 'type': 'str'}, 'status': {'key': 'properties.status', 'type': 'StatusOptions'}, 'subscription': {'key': 'properties.subscription', 'type': 'str'}, @@ -118,8 +120,10 @@ class AppServicePlan(Resource): 'number_of_sites': {'key': 'properties.numberOfSites', 'type': 'int'}, 'is_spot': {'key': 'properties.isSpot', 'type': 'bool'}, 'spot_expiration_time': {'key': 'properties.spotExpirationTime', 'type': 'iso-8601'}, + 'free_offer_expiration_time': {'key': 'properties.freeOfferExpirationTime', 'type': 'iso-8601'}, 'resource_group': {'key': 'properties.resourceGroup', 'type': 'str'}, 'reserved': {'key': 'properties.reserved', 'type': 'bool'}, + 'is_xenon': {'key': 'properties.isXenon', 'type': 'bool'}, 'target_worker_count': {'key': 'properties.targetWorkerCount', 'type': 'int'}, 'target_worker_size_id': {'key': 'properties.targetWorkerSizeId', 'type': 'int'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'ProvisioningState'}, @@ -128,7 +132,6 @@ class AppServicePlan(Resource): def __init__(self, **kwargs): super(AppServicePlan, self).__init__(**kwargs) - self.app_service_plan_name = kwargs.get('app_service_plan_name', None) self.worker_tier_name = kwargs.get('worker_tier_name', None) self.status = None self.subscription = None @@ -140,8 +143,10 @@ def __init__(self, **kwargs): self.number_of_sites = None self.is_spot = kwargs.get('is_spot', None) self.spot_expiration_time = kwargs.get('spot_expiration_time', None) + self.free_offer_expiration_time = kwargs.get('free_offer_expiration_time', None) self.resource_group = None self.reserved = kwargs.get('reserved', False) + self.is_xenon = kwargs.get('is_xenon', False) self.target_worker_count = kwargs.get('target_worker_count', None) self.target_worker_size_id = kwargs.get('target_worker_size_id', None) self.provisioning_state = None 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 f7bee7ea7449..f1ee1e51c04c 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 @@ -18,8 +18,6 @@ class AppServicePlanPatchResource(ProxyOnlyResource): Variables are only populated by the server, and will be ignored when sending a request. - All required parameters must be populated in order to send to Azure. - :ivar id: Resource Id. :vartype id: str :ivar name: Resource Name. @@ -28,9 +26,6 @@ class AppServicePlanPatchResource(ProxyOnlyResource): :type kind: str :ivar type: Resource type. :vartype type: str - :param app_service_plan_patch_resource_name: Required. 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 @@ -63,11 +58,17 @@ class AppServicePlanPatchResource(ProxyOnlyResource): :param spot_expiration_time: The time when the server farm expires. Valid only if it is a spot server farm. :type spot_expiration_time: datetime + :param free_offer_expiration_time: The time when the server farm free + offer expires. + :type free_offer_expiration_time: datetime :ivar resource_group: Resource group of the App Service plan. :vartype resource_group: str :param reserved: If Linux app service plan 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. @@ -83,7 +84,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}, @@ -98,7 +98,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,8 +109,10 @@ class AppServicePlanPatchResource(ProxyOnlyResource): 'number_of_sites': {'key': 'properties.numberOfSites', 'type': 'int'}, 'is_spot': {'key': 'properties.isSpot', 'type': 'bool'}, 'spot_expiration_time': {'key': 'properties.spotExpirationTime', 'type': 'iso-8601'}, + 'free_offer_expiration_time': {'key': 'properties.freeOfferExpirationTime', 'type': 'iso-8601'}, 'resource_group': {'key': 'properties.resourceGroup', 'type': 'str'}, 'reserved': {'key': 'properties.reserved', 'type': 'bool'}, + 'is_xenon': {'key': 'properties.isXenon', 'type': 'bool'}, 'target_worker_count': {'key': 'properties.targetWorkerCount', 'type': 'int'}, 'target_worker_size_id': {'key': 'properties.targetWorkerSizeId', 'type': 'int'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'ProvisioningState'}, @@ -119,7 +120,6 @@ class AppServicePlanPatchResource(ProxyOnlyResource): def __init__(self, **kwargs): super(AppServicePlanPatchResource, self).__init__(**kwargs) - self.app_service_plan_patch_resource_name = kwargs.get('app_service_plan_patch_resource_name', None) self.worker_tier_name = kwargs.get('worker_tier_name', None) self.status = None self.subscription = None @@ -131,8 +131,10 @@ def __init__(self, **kwargs): self.number_of_sites = None self.is_spot = kwargs.get('is_spot', None) self.spot_expiration_time = kwargs.get('spot_expiration_time', None) + self.free_offer_expiration_time = kwargs.get('free_offer_expiration_time', None) self.resource_group = None self.reserved = kwargs.get('reserved', False) + self.is_xenon = kwargs.get('is_xenon', False) self.target_worker_count = kwargs.get('target_worker_count', None) self.target_worker_size_id = kwargs.get('target_worker_size_id', None) self.provisioning_state = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/app_service_plan_patch_resource_py3.py b/azure-mgmt-web/azure/mgmt/web/models/app_service_plan_patch_resource_py3.py index 4703daa63be4..10d555ee877c 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/app_service_plan_patch_resource_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/app_service_plan_patch_resource_py3.py @@ -18,8 +18,6 @@ class AppServicePlanPatchResource(ProxyOnlyResource): Variables are only populated by the server, and will be ignored when sending a request. - All required parameters must be populated in order to send to Azure. - :ivar id: Resource Id. :vartype id: str :ivar name: Resource Name. @@ -28,9 +26,6 @@ class AppServicePlanPatchResource(ProxyOnlyResource): :type kind: str :ivar type: Resource type. :vartype type: str - :param app_service_plan_patch_resource_name: Required. 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 @@ -63,11 +58,17 @@ class AppServicePlanPatchResource(ProxyOnlyResource): :param spot_expiration_time: The time when the server farm expires. Valid only if it is a spot server farm. :type spot_expiration_time: datetime + :param free_offer_expiration_time: The time when the server farm free + offer expires. + :type free_offer_expiration_time: datetime :ivar resource_group: Resource group of the App Service plan. :vartype resource_group: str :param reserved: If Linux app service plan 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. @@ -83,7 +84,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}, @@ -98,7 +98,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,16 +109,17 @@ class AppServicePlanPatchResource(ProxyOnlyResource): 'number_of_sites': {'key': 'properties.numberOfSites', 'type': 'int'}, 'is_spot': {'key': 'properties.isSpot', 'type': 'bool'}, 'spot_expiration_time': {'key': 'properties.spotExpirationTime', 'type': 'iso-8601'}, + 'free_offer_expiration_time': {'key': 'properties.freeOfferExpirationTime', 'type': 'iso-8601'}, 'resource_group': {'key': 'properties.resourceGroup', 'type': 'str'}, 'reserved': {'key': 'properties.reserved', 'type': 'bool'}, + 'is_xenon': {'key': 'properties.isXenon', 'type': 'bool'}, 'target_worker_count': {'key': 'properties.targetWorkerCount', 'type': 'int'}, 'target_worker_size_id': {'key': 'properties.targetWorkerSizeId', 'type': 'int'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'ProvisioningState'}, } - def __init__(self, *, app_service_plan_patch_resource_name: str, kind: str=None, worker_tier_name: str=None, admin_site_name: str=None, hosting_environment_profile=None, per_site_scaling: bool=False, is_spot: bool=None, spot_expiration_time=None, reserved: bool=False, target_worker_count: int=None, target_worker_size_id: int=None, **kwargs) -> None: + def __init__(self, *, kind: str=None, worker_tier_name: str=None, admin_site_name: str=None, hosting_environment_profile=None, per_site_scaling: bool=False, is_spot: bool=None, spot_expiration_time=None, free_offer_expiration_time=None, reserved: bool=False, is_xenon: bool=False, target_worker_count: int=None, target_worker_size_id: int=None, **kwargs) -> None: super(AppServicePlanPatchResource, self).__init__(kind=kind, **kwargs) - 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,8 +131,10 @@ def __init__(self, *, app_service_plan_patch_resource_name: str, kind: str=None, self.number_of_sites = None self.is_spot = is_spot self.spot_expiration_time = spot_expiration_time + self.free_offer_expiration_time = free_offer_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_py3.py b/azure-mgmt-web/azure/mgmt/web/models/app_service_plan_py3.py index dd8ff1f5e490..5ce4203df04f 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/app_service_plan_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/app_service_plan_py3.py @@ -32,8 +32,6 @@ class AppServicePlan(Resource): :vartype type: str :param tags: Resource tags. :type tags: dict[str, str] - :param app_service_plan_name: Required. Name for the App Service plan. - :type app_service_plan_name: str :param worker_tier_name: Target worker tier assigned to the App Service plan. :type worker_tier_name: str @@ -66,11 +64,17 @@ class AppServicePlan(Resource): :param spot_expiration_time: The time when the server farm expires. Valid only if it is a spot server farm. :type spot_expiration_time: datetime + :param free_offer_expiration_time: The time when the server farm free + offer expires. + :type free_offer_expiration_time: datetime :ivar resource_group: Resource group of the App Service plan. :vartype resource_group: str :param reserved: If Linux app service plan 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. @@ -89,7 +93,6 @@ class AppServicePlan(Resource): 'name': {'readonly': True}, 'location': {'required': True}, 'type': {'readonly': True}, - 'app_service_plan_name': {'required': True}, 'status': {'readonly': True}, 'subscription': {'readonly': True}, 'maximum_number_of_workers': {'readonly': True}, @@ -106,7 +109,6 @@ class AppServicePlan(Resource): 'location': {'key': 'location', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, - 'app_service_plan_name': {'key': 'properties.name', 'type': 'str'}, 'worker_tier_name': {'key': 'properties.workerTierName', 'type': 'str'}, 'status': {'key': 'properties.status', 'type': 'StatusOptions'}, 'subscription': {'key': 'properties.subscription', 'type': 'str'}, @@ -118,17 +120,18 @@ class AppServicePlan(Resource): 'number_of_sites': {'key': 'properties.numberOfSites', 'type': 'int'}, 'is_spot': {'key': 'properties.isSpot', 'type': 'bool'}, 'spot_expiration_time': {'key': 'properties.spotExpirationTime', 'type': 'iso-8601'}, + 'free_offer_expiration_time': {'key': 'properties.freeOfferExpirationTime', 'type': 'iso-8601'}, 'resource_group': {'key': 'properties.resourceGroup', 'type': 'str'}, 'reserved': {'key': 'properties.reserved', 'type': 'bool'}, + 'is_xenon': {'key': 'properties.isXenon', 'type': 'bool'}, 'target_worker_count': {'key': 'properties.targetWorkerCount', 'type': 'int'}, 'target_worker_size_id': {'key': 'properties.targetWorkerSizeId', 'type': 'int'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'ProvisioningState'}, 'sku': {'key': 'sku', 'type': 'SkuDescription'}, } - def __init__(self, *, location: str, app_service_plan_name: str, kind: str=None, tags=None, worker_tier_name: str=None, admin_site_name: str=None, hosting_environment_profile=None, per_site_scaling: bool=False, is_spot: bool=None, spot_expiration_time=None, reserved: bool=False, target_worker_count: int=None, target_worker_size_id: int=None, sku=None, **kwargs) -> None: + def __init__(self, *, location: str, kind: str=None, tags=None, worker_tier_name: str=None, admin_site_name: str=None, hosting_environment_profile=None, per_site_scaling: bool=False, is_spot: bool=None, spot_expiration_time=None, free_offer_expiration_time=None, reserved: bool=False, is_xenon: bool=False, target_worker_count: int=None, target_worker_size_id: int=None, sku=None, **kwargs) -> None: super(AppServicePlan, self).__init__(kind=kind, location=location, tags=tags, **kwargs) - self.app_service_plan_name = app_service_plan_name self.worker_tier_name = worker_tier_name self.status = None self.subscription = None @@ -140,8 +143,10 @@ def __init__(self, *, location: str, app_service_plan_name: str, kind: str=None, self.number_of_sites = None self.is_spot = is_spot self.spot_expiration_time = spot_expiration_time + self.free_offer_expiration_time = free_offer_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 9eeb28e28cf0..8d7f6e58cbb3 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/backup_request.py +++ b/azure-mgmt-web/azure/mgmt/web/models/backup_request.py @@ -28,8 +28,6 @@ class BackupRequest(ProxyOnlyResource): :type kind: str :ivar type: Resource type. :vartype type: str - :param backup_request_name: Required. 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 @@ -40,17 +38,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}, } @@ -59,19 +52,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, **kwargs): super(BackupRequest, self).__init__(**kwargs) - self.backup_request_name = kwargs.get('backup_request_name', None) self.enabled = kwargs.get('enabled', None) self.storage_account_url = kwargs.get('storage_account_url', None) self.backup_schedule = kwargs.get('backup_schedule', None) self.databases = kwargs.get('databases', None) - self.backup_request_type = kwargs.get('backup_request_type', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/backup_request_py3.py b/azure-mgmt-web/azure/mgmt/web/models/backup_request_py3.py index b7ffa99ef06e..ce7a46fe117f 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/backup_request_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/backup_request_py3.py @@ -28,8 +28,6 @@ class BackupRequest(ProxyOnlyResource): :type kind: str :ivar type: Resource type. :vartype type: str - :param backup_request_name: Required. 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 @@ -40,17 +38,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}, } @@ -59,19 +52,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: str, storage_account_url: str, kind: str=None, enabled: bool=None, backup_schedule=None, databases=None, backup_request_type=None, **kwargs) -> None: + def __init__(self, *, storage_account_url: str, kind: str=None, enabled: bool=None, backup_schedule=None, databases=None, **kwargs) -> None: super(BackupRequest, self).__init__(kind=kind, **kwargs) - 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 index e83d0a976d74..580c168f394a 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/billing_meter.py +++ b/azure-mgmt-web/azure/mgmt/web/models/billing_meter.py @@ -35,8 +35,10 @@ class BillingMeter(ProxyOnlyResource): :type short_name: str :param friendly_name: Friendly name of the meter :type friendly_name: str - :param resource_type: App Service resource type meter used for + :param resource_type: App Service ResourceType meter used for :type resource_type: str + :param os_type: App Service OS type meter used for + :type os_type: str """ _validation = { @@ -55,6 +57,7 @@ class BillingMeter(ProxyOnlyResource): 'short_name': {'key': 'properties.shortName', 'type': 'str'}, 'friendly_name': {'key': 'properties.friendlyName', 'type': 'str'}, 'resource_type': {'key': 'properties.resourceType', 'type': 'str'}, + 'os_type': {'key': 'properties.osType', 'type': 'str'}, } def __init__(self, **kwargs): @@ -64,3 +67,4 @@ def __init__(self, **kwargs): self.short_name = kwargs.get('short_name', None) self.friendly_name = kwargs.get('friendly_name', None) self.resource_type = kwargs.get('resource_type', None) + self.os_type = kwargs.get('os_type', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/billing_meter_py3.py b/azure-mgmt-web/azure/mgmt/web/models/billing_meter_py3.py index 665932586dee..4d44fbd9f2df 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/billing_meter_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/billing_meter_py3.py @@ -35,8 +35,10 @@ class BillingMeter(ProxyOnlyResource): :type short_name: str :param friendly_name: Friendly name of the meter :type friendly_name: str - :param resource_type: App Service resource type meter used for + :param resource_type: App Service ResourceType meter used for :type resource_type: str + :param os_type: App Service OS type meter used for + :type os_type: str """ _validation = { @@ -55,12 +57,14 @@ class BillingMeter(ProxyOnlyResource): 'short_name': {'key': 'properties.shortName', 'type': 'str'}, 'friendly_name': {'key': 'properties.friendlyName', 'type': 'str'}, 'resource_type': {'key': 'properties.resourceType', 'type': 'str'}, + 'os_type': {'key': 'properties.osType', 'type': 'str'}, } - def __init__(self, *, kind: str=None, meter_id: str=None, billing_location: str=None, short_name: str=None, friendly_name: str=None, resource_type: str=None, **kwargs) -> None: + def __init__(self, *, kind: str=None, meter_id: str=None, billing_location: str=None, short_name: str=None, friendly_name: str=None, resource_type: str=None, os_type: str=None, **kwargs) -> None: super(BillingMeter, self).__init__(kind=kind, **kwargs) 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 + self.os_type = os_type diff --git a/azure-mgmt-web/azure/mgmt/web/models/certificate.py b/azure-mgmt-web/azure/mgmt/web/models/certificate.py index bdf7ba410ff1..bd2c25e366d8 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/certificate.py +++ b/azure-mgmt-web/azure/mgmt/web/models/certificate.py @@ -76,8 +76,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}". @@ -103,7 +101,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 = { @@ -131,7 +128,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'}, } @@ -155,5 +151,4 @@ def __init__(self, **kwargs): self.key_vault_id = kwargs.get('key_vault_id', None) self.key_vault_secret_name = kwargs.get('key_vault_secret_name', None) self.key_vault_secret_status = None - self.geo_region = None self.server_farm_id = kwargs.get('server_farm_id', None) 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 90b968f54f3f..2331dd37d7f8 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, **kwargs): super(CertificateOrderAction, self).__init__(**kwargs) - self.certificate_order_action_type = kwargs.get('certificate_order_action_type', None) - self.created_at = kwargs.get('created_at', None) + self.action_type = None + self.created_at = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/certificate_order_action_py3.py b/azure-mgmt-web/azure/mgmt/web/models/certificate_order_action_py3.py index 775fdbd427db..d6bc846e4ab1 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/certificate_order_action_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/certificate_order_action_py3.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: str=None, certificate_order_action_type=None, created_at=None, **kwargs) -> None: + def __init__(self, *, kind: str=None, **kwargs) -> None: super(CertificateOrderAction, self).__init__(kind=kind, **kwargs) - 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 9ea811e73399..00640f893069 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 @@ -72,8 +72,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}". @@ -98,7 +96,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 = { @@ -124,7 +121,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'}, } @@ -148,5 +144,4 @@ def __init__(self, **kwargs): self.key_vault_id = kwargs.get('key_vault_id', None) self.key_vault_secret_name = kwargs.get('key_vault_secret_name', None) self.key_vault_secret_status = None - self.geo_region = None self.server_farm_id = kwargs.get('server_farm_id', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/certificate_patch_resource_py3.py b/azure-mgmt-web/azure/mgmt/web/models/certificate_patch_resource_py3.py index b583592cbe24..afe00d21362b 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/certificate_patch_resource_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/certificate_patch_resource_py3.py @@ -72,8 +72,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}". @@ -98,7 +96,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 = { @@ -124,7 +121,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'}, } @@ -148,5 +144,4 @@ def __init__(self, *, password: str, kind: str=None, host_names=None, pfx_blob: 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_py3.py b/azure-mgmt-web/azure/mgmt/web/models/certificate_py3.py index e3878b9bf774..e18577a8f98c 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/certificate_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/certificate_py3.py @@ -76,8 +76,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}". @@ -103,7 +101,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 = { @@ -131,7 +128,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'}, } @@ -155,5 +151,4 @@ def __init__(self, *, location: str, password: str, kind: str=None, tags=None, h 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 233f7df1599c..8402c4680845 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/cloning_info.py +++ b/azure-mgmt-web/azure/mgmt/web/models/cloning_info.py @@ -55,9 +55,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 = { @@ -75,7 +72,6 @@ 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, **kwargs): @@ -90,4 +86,3 @@ def __init__(self, **kwargs): self.configure_load_balancing = kwargs.get('configure_load_balancing', None) self.traffic_manager_profile_id = kwargs.get('traffic_manager_profile_id', None) self.traffic_manager_profile_name = kwargs.get('traffic_manager_profile_name', None) - self.ignore_quotas = kwargs.get('ignore_quotas', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/cloning_info_py3.py b/azure-mgmt-web/azure/mgmt/web/models/cloning_info_py3.py index 2540e9b3dd8f..1fbc28e74499 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/cloning_info_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/cloning_info_py3.py @@ -55,9 +55,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 = { @@ -75,10 +72,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: str, correlation_id: str=None, overwrite: bool=None, clone_custom_host_names: bool=None, clone_source_control: bool=None, hosting_environment: str=None, app_settings_overrides=None, configure_load_balancing: bool=None, traffic_manager_profile_id: str=None, traffic_manager_profile_name: str=None, ignore_quotas: bool=None, **kwargs) -> None: + def __init__(self, *, source_web_app_id: str, correlation_id: str=None, overwrite: bool=None, clone_custom_host_names: bool=None, clone_source_control: bool=None, hosting_environment: str=None, app_settings_overrides=None, configure_load_balancing: bool=None, traffic_manager_profile_id: str=None, traffic_manager_profile_name: str=None, **kwargs) -> None: super(CloningInfo, self).__init__(**kwargs) self.correlation_id = correlation_id self.overwrite = overwrite @@ -90,4 +86,3 @@ def __init__(self, *, source_web_app_id: str, correlation_id: str=None, overwrit 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 5e3e2d22cce5..fa05a6d53c26 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,15 +62,14 @@ 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}'}, } @@ -83,11 +78,10 @@ def __init__(self, **kwargs): self.status = kwargs.get('status', None) self.detailed_status = kwargs.get('detailed_status', None) self.log_url = kwargs.get('log_url', None) - self.continuous_web_job_name = None self.run_command = kwargs.get('run_command', None) self.url = kwargs.get('url', None) self.extra_info_url = kwargs.get('extra_info_url', None) - self.job_type = kwargs.get('job_type', None) + self.web_job_type = kwargs.get('web_job_type', None) self.error = kwargs.get('error', None) self.using_sdk = kwargs.get('using_sdk', None) self.settings = kwargs.get('settings', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/continuous_web_job_py3.py b/azure-mgmt-web/azure/mgmt/web/models/continuous_web_job_py3.py index 8124a7dc494f..4dcc908c916a 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/continuous_web_job_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/continuous_web_job_py3.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: str=None, status=None, detailed_status: str=None, log_url: str=None, run_command: str=None, url: str=None, extra_info_url: str=None, job_type=None, error: str=None, using_sdk: bool=None, settings=None, **kwargs) -> None: + def __init__(self, *, kind: str=None, status=None, detailed_status: str=None, log_url: str=None, run_command: str=None, url: str=None, extra_info_url: str=None, web_job_type=None, error: str=None, using_sdk: bool=None, settings=None, **kwargs) -> None: super(ContinuousWebJob, self).__init__(kind=kind, **kwargs) 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/deleted_app_restore_request.py b/azure-mgmt-web/azure/mgmt/web/models/deleted_app_restore_request.py new file mode 100644 index 000000000000..0fe0f903f66d --- /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, **kwargs): + super(DeletedAppRestoreRequest, self).__init__(**kwargs) + self.deleted_site_id = kwargs.get('deleted_site_id', None) + self.recover_configuration = kwargs.get('recover_configuration', None) + self.snapshot_time = kwargs.get('snapshot_time', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/deleted_app_restore_request_py3.py b/azure-mgmt-web/azure/mgmt/web/models/deleted_app_restore_request_py3.py new file mode 100644 index 000000000000..69ca457e864b --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/deleted_app_restore_request_py3.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_py3 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: str=None, deleted_site_id: str=None, recover_configuration: bool=None, snapshot_time: str=None, **kwargs) -> None: + super(DeletedAppRestoreRequest, self).__init__(kind=kind, **kwargs) + self.deleted_site_id = deleted_site_id + self.recover_configuration = recover_configuration + self.snapshot_time = snapshot_time 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 5aa094a18f0e..b93573234957 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/deleted_site.py +++ b/azure-mgmt-web/azure/mgmt/web/models/deleted_site.py @@ -18,42 +18,43 @@ 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 + :ivar deleted_site_id: Numeric id for the deleted site + :vartype 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 """ _validation = { + 'deleted_site_id': {'readonly': True}, '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, **kwargs): super(DeletedSite, self).__init__(**kwargs) - self.id = kwargs.get('id', None) + self.deleted_site_id = None 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/deleted_site_py3.py b/azure-mgmt-web/azure/mgmt/web/models/deleted_site_py3.py index a6d712ebec38..f014d769c5dc 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/deleted_site_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/deleted_site_py3.py @@ -18,42 +18,43 @@ 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 + :ivar deleted_site_id: Numeric id for the deleted site + :vartype 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 """ _validation = { + 'deleted_site_id': {'readonly': True}, '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: int=None, **kwargs) -> None: + def __init__(self, **kwargs) -> None: super(DeletedSite, self).__init__(**kwargs) - self.id = id + self.deleted_site_id = None 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 c6ab92e0e999..75a3a6e26b9e 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, **kwargs): super(Deployment, self).__init__(**kwargs) - self.deployment_id = kwargs.get('deployment_id', None) self.status = kwargs.get('status', None) self.message = kwargs.get('message', None) self.author = kwargs.get('author', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/deployment_py3.py b/azure-mgmt-web/azure/mgmt/web/models/deployment_py3.py index d5f75d46699f..abc4448dc021 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/deployment_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/deployment_py3.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: str=None, deployment_id: str=None, status: int=None, message: str=None, author: str=None, deployer: str=None, author_email: str=None, start_time=None, end_time=None, active: bool=None, details: str=None, **kwargs) -> None: + def __init__(self, *, kind: str=None, status: int=None, message: str=None, author: str=None, deployer: str=None, author_email: str=None, start_time=None, end_time=None, active: bool=None, details: str=None, **kwargs) -> None: super(Deployment, self).__init__(kind=kind, **kwargs) - self.deployment_id = deployment_id self.status = status self.message = message self.author = author diff --git a/azure-mgmt-web/azure/mgmt/web/models/error_response.py b/azure-mgmt-web/azure/mgmt/web/models/error_response.py deleted file mode 100644 index e20829bcf7b2..000000000000 --- a/azure-mgmt-web/azure/mgmt/web/models/error_response.py +++ /dev/null @@ -1,45 +0,0 @@ -# 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 -from msrest.exceptions import HttpOperationError - - -class ErrorResponse(Model): - """Error Response. - - :param code: Error code. - :type code: str - :param message: Error message indicating why the operation failed. - :type message: str - """ - - _attribute_map = { - 'code': {'key': 'code', 'type': 'str'}, - 'message': {'key': 'message', 'type': 'str'}, - } - - def __init__(self, **kwargs): - super(ErrorResponse, self).__init__(**kwargs) - self.code = kwargs.get('code', None) - self.message = kwargs.get('message', None) - - -class ErrorResponseException(HttpOperationError): - """Server responsed with exception of type: 'ErrorResponse'. - - :param deserialize: A deserializer - :param response: Server response to be deserialized. - """ - - def __init__(self, deserialize, response, *args): - - super(ErrorResponseException, self).__init__(deserialize, response, 'ErrorResponse', *args) diff --git a/azure-mgmt-web/azure/mgmt/web/models/error_response_py3.py b/azure-mgmt-web/azure/mgmt/web/models/error_response_py3.py deleted file mode 100644 index 1b2f05f1d4d6..000000000000 --- a/azure-mgmt-web/azure/mgmt/web/models/error_response_py3.py +++ /dev/null @@ -1,45 +0,0 @@ -# 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 -from msrest.exceptions import HttpOperationError - - -class ErrorResponse(Model): - """Error Response. - - :param code: Error code. - :type code: str - :param message: Error message indicating why the operation failed. - :type message: str - """ - - _attribute_map = { - 'code': {'key': 'code', 'type': 'str'}, - 'message': {'key': 'message', 'type': 'str'}, - } - - def __init__(self, *, code: str=None, message: str=None, **kwargs) -> None: - super(ErrorResponse, self).__init__(**kwargs) - self.code = code - self.message = message - - -class ErrorResponseException(HttpOperationError): - """Server responsed with exception of type: 'ErrorResponse'. - - :param deserialize: A deserializer - :param response: Server response to be deserialized. - """ - - def __init__(self, deserialize, response, *args): - - super(ErrorResponseException, self).__init__(deserialize, response, 'ErrorResponse', *args) 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 6e19dd9fb439..94725f15457b 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, **kwargs): super(FunctionEnvelope, self).__init__(**kwargs) - self.function_envelope_name = None - self.function_app_id = None + self.function_app_id = kwargs.get('function_app_id', None) self.script_root_path_href = kwargs.get('script_root_path_href', None) self.script_href = kwargs.get('script_href', None) self.config_href = kwargs.get('config_href', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/function_envelope_py3.py b/azure-mgmt-web/azure/mgmt/web/models/function_envelope_py3.py index 2386521c5fa8..4cc49ab6b0aa 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/function_envelope_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/function_envelope_py3.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: str=None, script_root_path_href: str=None, script_href: str=None, config_href: str=None, secrets_file_href: str=None, href: str=None, config=None, files=None, test_data: str=None, **kwargs) -> None: + def __init__(self, *, kind: str=None, function_app_id: str=None, script_root_path_href: str=None, script_href: str=None, config_href: str=None, secrets_file_href: str=None, href: str=None, config=None, files=None, test_data: str=None, **kwargs) -> None: super(FunctionEnvelope, self).__init__(kind=kind, **kwargs) - 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 6f0746e1e7c8..aab991c49289 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, **kwargs): diff --git a/azure-mgmt-web/azure/mgmt/web/models/function_secrets_py3.py b/azure-mgmt-web/azure/mgmt/web/models/function_secrets_py3.py index 6b351eae0cbe..e559db2773b6 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/function_secrets_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/function_secrets_py3.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: str=None, key: str=None, trigger_url: str=None, **kwargs) -> 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 c59c3987e0f5..2bc435a404a8 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, **kwargs): super(GeoRegion, self).__init__(**kwargs) - self.geo_region_name = None self.description = None self.display_name = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/geo_region_py3.py b/azure-mgmt-web/azure/mgmt/web/models/geo_region_py3.py index 2729ae2b843d..774b350eb460 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/geo_region_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/geo_region_py3.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: str=None, **kwargs) -> None: super(GeoRegion, self).__init__(kind=kind, **kwargs) - self.geo_region_name = None self.description = None self.display_name = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/ip_security_restriction.py b/azure-mgmt-web/azure/mgmt/web/models/ip_security_restriction.py index 5a1b16ba64d4..d74f523c3fe7 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/ip_security_restriction.py +++ b/azure-mgmt-web/azure/mgmt/web/models/ip_security_restriction.py @@ -19,10 +19,25 @@ class IpSecurityRestriction(Model): :param ip_address: Required. IP address the security restriction is valid for. + It can be in form of pure ipv4 address (required SubnetMask property) or + CIDR notation such as ipv4/mask (leading bit match). For CIDR, + SubnetMask property must not be specified. :type ip_address: str :param subnet_mask: Subnet mask for the range of IP addresses the restriction is valid for. :type subnet_mask: str + :param action: Allow or Deny access for this IP range. + :type action: str + :param tag: Defines what this IP filter will be used for. This is to + support IP filtering on proxies. Possible values include: 'Default', + 'XffProxy' + :type tag: str or ~azure.mgmt.web.models.IpFilterTag + :param priority: Priority of IP restriction rule. + :type priority: int + :param name: IP restriction rule name. + :type name: str + :param description: IP restriction rule description. + :type description: str """ _validation = { @@ -32,9 +47,19 @@ class IpSecurityRestriction(Model): _attribute_map = { 'ip_address': {'key': 'ipAddress', 'type': 'str'}, 'subnet_mask': {'key': 'subnetMask', 'type': 'str'}, + 'action': {'key': 'action', 'type': 'str'}, + 'tag': {'key': 'tag', 'type': 'IpFilterTag'}, + 'priority': {'key': 'priority', 'type': 'int'}, + 'name': {'key': 'name', 'type': 'str'}, + 'description': {'key': 'description', 'type': 'str'}, } def __init__(self, **kwargs): super(IpSecurityRestriction, self).__init__(**kwargs) self.ip_address = kwargs.get('ip_address', None) self.subnet_mask = kwargs.get('subnet_mask', None) + self.action = kwargs.get('action', None) + self.tag = kwargs.get('tag', None) + self.priority = kwargs.get('priority', None) + self.name = kwargs.get('name', None) + self.description = kwargs.get('description', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/ip_security_restriction_py3.py b/azure-mgmt-web/azure/mgmt/web/models/ip_security_restriction_py3.py index 1abf651f9978..a494599a9ba0 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/ip_security_restriction_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/ip_security_restriction_py3.py @@ -19,10 +19,25 @@ class IpSecurityRestriction(Model): :param ip_address: Required. IP address the security restriction is valid for. + It can be in form of pure ipv4 address (required SubnetMask property) or + CIDR notation such as ipv4/mask (leading bit match). For CIDR, + SubnetMask property must not be specified. :type ip_address: str :param subnet_mask: Subnet mask for the range of IP addresses the restriction is valid for. :type subnet_mask: str + :param action: Allow or Deny access for this IP range. + :type action: str + :param tag: Defines what this IP filter will be used for. This is to + support IP filtering on proxies. Possible values include: 'Default', + 'XffProxy' + :type tag: str or ~azure.mgmt.web.models.IpFilterTag + :param priority: Priority of IP restriction rule. + :type priority: int + :param name: IP restriction rule name. + :type name: str + :param description: IP restriction rule description. + :type description: str """ _validation = { @@ -32,9 +47,19 @@ class IpSecurityRestriction(Model): _attribute_map = { 'ip_address': {'key': 'ipAddress', 'type': 'str'}, 'subnet_mask': {'key': 'subnetMask', 'type': 'str'}, + 'action': {'key': 'action', 'type': 'str'}, + 'tag': {'key': 'tag', 'type': 'IpFilterTag'}, + 'priority': {'key': 'priority', 'type': 'int'}, + 'name': {'key': 'name', 'type': 'str'}, + 'description': {'key': 'description', 'type': 'str'}, } - def __init__(self, *, ip_address: str, subnet_mask: str=None, **kwargs) -> None: + def __init__(self, *, ip_address: str, subnet_mask: str=None, action: str=None, tag=None, priority: int=None, name: str=None, description: str=None, **kwargs) -> None: super(IpSecurityRestriction, self).__init__(**kwargs) self.ip_address = ip_address self.subnet_mask = subnet_mask + self.action = action + self.tag = tag + self.priority = priority + self.name = name + self.description = description diff --git a/azure-mgmt-web/azure/mgmt/web/models/log_specification.py b/azure-mgmt-web/azure/mgmt/web/models/log_specification.py new file mode 100644 index 000000000000..77ec75c5496a --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/log_specification.py @@ -0,0 +1,36 @@ +# 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 LogSpecification(Model): + """Log Definition of a single resource metric. + + :param name: + :type name: str + :param display_name: + :type display_name: str + :param blob_duration: + :type blob_duration: str + """ + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'display_name': {'key': 'displayName', 'type': 'str'}, + 'blob_duration': {'key': 'blobDuration', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(LogSpecification, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.display_name = kwargs.get('display_name', None) + self.blob_duration = kwargs.get('blob_duration', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/log_specification_py3.py b/azure-mgmt-web/azure/mgmt/web/models/log_specification_py3.py new file mode 100644 index 000000000000..8c9ae74d7f86 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/log_specification_py3.py @@ -0,0 +1,36 @@ +# 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 LogSpecification(Model): + """Log Definition of a single resource metric. + + :param name: + :type name: str + :param display_name: + :type display_name: str + :param blob_duration: + :type blob_duration: str + """ + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'display_name': {'key': 'displayName', 'type': 'str'}, + 'blob_duration': {'key': 'blobDuration', 'type': 'str'}, + } + + def __init__(self, *, name: str=None, display_name: str=None, blob_duration: str=None, **kwargs) -> None: + super(LogSpecification, self).__init__(**kwargs) + self.name = name + self.display_name = display_name + self.blob_duration = blob_duration 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 3b89a39c5cc1..d9f06eedc9e5 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 @@ -19,12 +19,14 @@ class ManagedServiceIdentity(Model): sending a request. :param type: Type of managed service identity. Possible values include: - 'SystemAssigned' + '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 = { @@ -36,6 +38,7 @@ class ManagedServiceIdentity(Model): '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, **kwargs): @@ -43,3 +46,4 @@ def __init__(self, **kwargs): self.type = kwargs.get('type', None) self.tenant_id = None self.principal_id = None + self.identity_ids = kwargs.get('identity_ids', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/managed_service_identity_py3.py b/azure-mgmt-web/azure/mgmt/web/models/managed_service_identity_py3.py index c174551d8f8f..ae59c0b21029 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/managed_service_identity_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/managed_service_identity_py3.py @@ -19,12 +19,14 @@ class ManagedServiceIdentity(Model): sending a request. :param type: Type of managed service identity. Possible values include: - 'SystemAssigned' + '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 = { @@ -36,10 +38,12 @@ class ManagedServiceIdentity(Model): '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, **kwargs) -> None: + def __init__(self, *, type=None, identity_ids=None, **kwargs) -> None: super(ManagedServiceIdentity, self).__init__(**kwargs) 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 2c9c99bbc3c7..5dbd639fe069 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, **kwargs): super(MetricDefinition, self).__init__(**kwargs) - 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/metric_definition_py3.py b/azure-mgmt-web/azure/mgmt/web/models/metric_definition_py3.py index b5cdff7d4618..0771757d742d 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/metric_definition_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/metric_definition_py3.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: str=None, **kwargs) -> None: super(MetricDefinition, self).__init__(kind=kind, **kwargs) - 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 59350baef1e9..83a1d71f9571 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,15 +21,12 @@ 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, **kwargs): @@ -37,4 +34,3 @@ def __init__(self, **kwargs): self.time = kwargs.get('time', None) self.instance_name = kwargs.get('instance_name', None) self.value = kwargs.get('value', None) - self.core_count = kwargs.get('core_count', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/perf_mon_sample_py3.py b/azure-mgmt-web/azure/mgmt/web/models/perf_mon_sample_py3.py index ecd677f263f1..106ee15ca2fd 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/perf_mon_sample_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/perf_mon_sample_py3.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: str=None, value: float=None, core_count: int=None, **kwargs) -> None: + def __init__(self, *, time=None, instance_name: str=None, value: float=None, **kwargs) -> None: super(PerfMonSample, self).__init__(**kwargs) 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 443ae16d40e1..e04bf6d23140 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 @@ -38,12 +38,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. @@ -67,9 +61,6 @@ 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'}, } @@ -79,8 +70,5 @@ def __init__(self, **kwargs): self.sku = kwargs.get('sku', None) self.product = kwargs.get('product', None) self.vendor = kwargs.get('vendor', None) - self.premier_add_on_name = kwargs.get('premier_add_on_name', None) - self.premier_add_on_location = kwargs.get('premier_add_on_location', None) - self.premier_add_on_tags = kwargs.get('premier_add_on_tags', None) self.marketplace_publisher = kwargs.get('marketplace_publisher', None) self.marketplace_offer = kwargs.get('marketplace_offer', None) 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 cbd4e54f5a91..d2cbd4494680 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'}, @@ -83,7 +80,6 @@ def __init__(self, **kwargs): self.sku = kwargs.get('sku', None) self.product = kwargs.get('product', None) self.vendor = kwargs.get('vendor', None) - self.premier_add_on_offer_name = kwargs.get('premier_add_on_offer_name', None) self.promo_code_required = kwargs.get('promo_code_required', None) self.quota = kwargs.get('quota', None) self.web_hosting_plan_restrictions = kwargs.get('web_hosting_plan_restrictions', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/premier_add_on_offer_py3.py b/azure-mgmt-web/azure/mgmt/web/models/premier_add_on_offer_py3.py index 277e9f04c4b9..b32044596b64 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/premier_add_on_offer_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/premier_add_on_offer_py3.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: str=None, sku: str=None, product: str=None, vendor: str=None, premier_add_on_offer_name: str=None, promo_code_required: bool=None, quota: int=None, web_hosting_plan_restrictions=None, privacy_policy_url: str=None, legal_terms_url: str=None, marketplace_publisher: str=None, marketplace_offer: str=None, **kwargs) -> None: + def __init__(self, *, kind: str=None, sku: str=None, product: str=None, vendor: str=None, promo_code_required: bool=None, quota: int=None, web_hosting_plan_restrictions=None, privacy_policy_url: str=None, legal_terms_url: str=None, marketplace_publisher: str=None, marketplace_offer: str=None, **kwargs) -> None: super(PremierAddOnOffer, self).__init__(kind=kind, **kwargs) 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/premier_add_on_patch_resource.py b/azure-mgmt-web/azure/mgmt/web/models/premier_add_on_patch_resource.py new file mode 100644 index 000000000000..2365c7546578 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/premier_add_on_patch_resource.py @@ -0,0 +1,65 @@ +# 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 PremierAddOnPatchResource(ProxyOnlyResource): + """ARM resource for a PremierAddOn. + + 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 sku: Premier add on SKU. + :type sku: str + :param product: Premier add on Product. + :type product: str + :param vendor: Premier add on Vendor. + :type vendor: str + :param marketplace_publisher: Premier add on Marketplace publisher. + :type marketplace_publisher: str + :param marketplace_offer: Premier add on Marketplace offer. + :type marketplace_offer: 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'}, + 'sku': {'key': 'properties.sku', 'type': 'str'}, + 'product': {'key': 'properties.product', 'type': 'str'}, + 'vendor': {'key': 'properties.vendor', 'type': 'str'}, + 'marketplace_publisher': {'key': 'properties.marketplacePublisher', 'type': 'str'}, + 'marketplace_offer': {'key': 'properties.marketplaceOffer', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(PremierAddOnPatchResource, self).__init__(**kwargs) + self.sku = kwargs.get('sku', None) + self.product = kwargs.get('product', None) + self.vendor = kwargs.get('vendor', None) + self.marketplace_publisher = kwargs.get('marketplace_publisher', None) + self.marketplace_offer = kwargs.get('marketplace_offer', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/premier_add_on_patch_resource_py3.py b/azure-mgmt-web/azure/mgmt/web/models/premier_add_on_patch_resource_py3.py new file mode 100644 index 000000000000..7f3ef23a46e0 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/premier_add_on_patch_resource_py3.py @@ -0,0 +1,65 @@ +# 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_py3 import ProxyOnlyResource + + +class PremierAddOnPatchResource(ProxyOnlyResource): + """ARM resource for a PremierAddOn. + + 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 sku: Premier add on SKU. + :type sku: str + :param product: Premier add on Product. + :type product: str + :param vendor: Premier add on Vendor. + :type vendor: str + :param marketplace_publisher: Premier add on Marketplace publisher. + :type marketplace_publisher: str + :param marketplace_offer: Premier add on Marketplace offer. + :type marketplace_offer: 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'}, + 'sku': {'key': 'properties.sku', 'type': 'str'}, + 'product': {'key': 'properties.product', 'type': 'str'}, + 'vendor': {'key': 'properties.vendor', 'type': 'str'}, + 'marketplace_publisher': {'key': 'properties.marketplacePublisher', 'type': 'str'}, + 'marketplace_offer': {'key': 'properties.marketplaceOffer', 'type': 'str'}, + } + + def __init__(self, *, kind: str=None, sku: str=None, product: str=None, vendor: str=None, marketplace_publisher: str=None, marketplace_offer: str=None, **kwargs) -> None: + super(PremierAddOnPatchResource, self).__init__(kind=kind, **kwargs) + self.sku = sku + self.product = product + self.vendor = vendor + self.marketplace_publisher = marketplace_publisher + self.marketplace_offer = marketplace_offer diff --git a/azure-mgmt-web/azure/mgmt/web/models/premier_add_on_py3.py b/azure-mgmt-web/azure/mgmt/web/models/premier_add_on_py3.py index fa6aceeea48c..e52675f59da8 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/premier_add_on_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/premier_add_on_py3.py @@ -38,12 +38,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. @@ -67,20 +61,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: str, kind: str=None, tags=None, sku: str=None, product: str=None, vendor: str=None, premier_add_on_name: str=None, premier_add_on_location: str=None, premier_add_on_tags=None, marketplace_publisher: str=None, marketplace_offer: str=None, **kwargs) -> None: + def __init__(self, *, location: str, kind: str=None, tags=None, sku: str=None, product: str=None, vendor: str=None, marketplace_publisher: str=None, marketplace_offer: str=None, **kwargs) -> None: super(PremierAddOn, self).__init__(kind=kind, location=location, tags=tags, **kwargs) 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/restore_response.py b/azure-mgmt-web/azure/mgmt/web/models/private_access.py similarity index 62% 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 2650a39c521b..09aa73f722dc 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, **kwargs): - super(RestoreResponse, self).__init__(**kwargs) - self.operation_id = None + super(PrivateAccess, self).__init__(**kwargs) + self.enabled = kwargs.get('enabled', None) + self.virtual_networks = kwargs.get('virtual_networks', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/restore_response_py3.py b/azure-mgmt-web/azure/mgmt/web/models/private_access_py3.py similarity index 59% rename from azure-mgmt-web/azure/mgmt/web/models/restore_response_py3.py rename to azure-mgmt-web/azure/mgmt/web/models/private_access_py3.py index 0e9c36e7c2a5..44dfced0920b 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/restore_response_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/private_access_py3.py @@ -12,8 +12,8 @@ from .proxy_only_resource_py3 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: str=None, **kwargs) -> None: - super(RestoreResponse, self).__init__(kind=kind, **kwargs) - self.operation_id = None + def __init__(self, *, kind: str=None, enabled: bool=None, virtual_networks=None, **kwargs) -> None: + super(PrivateAccess, self).__init__(kind=kind, **kwargs) + 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..7107b2414157 --- /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, **kwargs): + super(PrivateAccessSubnet, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.key = kwargs.get('key', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/private_access_subnet_py3.py b/azure-mgmt-web/azure/mgmt/web/models/private_access_subnet_py3.py new file mode 100644 index 000000000000..c232743ce98e --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/private_access_subnet_py3.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: str=None, key: int=None, **kwargs) -> None: + super(PrivateAccessSubnet, self).__init__(**kwargs) + 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..c9b0fa5d54dd --- /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, **kwargs): + super(PrivateAccessVirtualNetwork, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.key = kwargs.get('key', None) + self.resource_id = kwargs.get('resource_id', None) + self.subnets = kwargs.get('subnets', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/private_access_virtual_network_py3.py b/azure-mgmt-web/azure/mgmt/web/models/private_access_virtual_network_py3.py new file mode 100644 index 000000000000..62b1bdfc91b9 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/private_access_virtual_network_py3.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: str=None, key: int=None, resource_id: str=None, subnets=None, **kwargs) -> None: + super(PrivateAccessVirtualNetwork, self).__init__(**kwargs) + 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 51cdae331682..8b2d416b7c1f 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, **kwargs): super(ProcessInfo, self).__init__(**kwargs) - self.process_info_id = kwargs.get('process_info_id', None) - self.process_info_name = kwargs.get('process_info_name', None) + self.identifier = None + self.deployment_name = kwargs.get('deployment_name', None) self.href = kwargs.get('href', None) - self.mini_dump = kwargs.get('mini_dump', None) + self.minidump = kwargs.get('minidump', None) self.is_profile_running = kwargs.get('is_profile_running', None) self.is_iis_profile_running = kwargs.get('is_iis_profile_running', None) self.iis_profile_timeout_in_seconds = kwargs.get('iis_profile_timeout_in_seconds', None) @@ -170,20 +171,20 @@ def __init__(self, **kwargs): self.module_count = kwargs.get('module_count', None) self.thread_count = kwargs.get('thread_count', None) self.start_time = kwargs.get('start_time', None) - self.total_processor_time = kwargs.get('total_processor_time', None) - self.user_processor_time = kwargs.get('user_processor_time', None) - self.privileged_processor_time = kwargs.get('privileged_processor_time', None) - self.working_set64 = kwargs.get('working_set64', None) - self.peak_working_set64 = kwargs.get('peak_working_set64', None) - self.private_memory_size64 = kwargs.get('private_memory_size64', None) - self.virtual_memory_size64 = kwargs.get('virtual_memory_size64', None) - self.peak_virtual_memory_size64 = kwargs.get('peak_virtual_memory_size64', None) - self.paged_system_memory_size64 = kwargs.get('paged_system_memory_size64', None) - self.nonpaged_system_memory_size64 = kwargs.get('nonpaged_system_memory_size64', None) - self.paged_memory_size64 = kwargs.get('paged_memory_size64', None) - self.peak_paged_memory_size64 = kwargs.get('peak_paged_memory_size64', None) + self.total_cpu_time = kwargs.get('total_cpu_time', None) + self.user_cpu_time = kwargs.get('user_cpu_time', None) + self.privileged_cpu_time = kwargs.get('privileged_cpu_time', None) + self.working_set = kwargs.get('working_set', None) + self.peak_working_set = kwargs.get('peak_working_set', None) + self.private_memory = kwargs.get('private_memory', None) + self.virtual_memory = kwargs.get('virtual_memory', None) + self.peak_virtual_memory = kwargs.get('peak_virtual_memory', None) + self.paged_system_memory = kwargs.get('paged_system_memory', None) + self.non_paged_system_memory = kwargs.get('non_paged_system_memory', None) + self.paged_memory = kwargs.get('paged_memory', None) + self.peak_paged_memory = kwargs.get('peak_paged_memory', None) self.time_stamp = kwargs.get('time_stamp', None) self.environment_variables = kwargs.get('environment_variables', None) self.is_scm_site = kwargs.get('is_scm_site', None) - self.is_web_job = kwargs.get('is_web_job', None) + self.is_webjob = kwargs.get('is_webjob', None) self.description = kwargs.get('description', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/process_info_py3.py b/azure-mgmt-web/azure/mgmt/web/models/process_info_py3.py index 5dc0bc8591c0..5b22a5a7e35a 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/process_info_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/process_info_py3.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: str=None, process_info_id: int=None, process_info_name: str=None, href: str=None, mini_dump: str=None, is_profile_running: bool=None, is_iis_profile_running: bool=None, iis_profile_timeout_in_seconds: float=None, parent: str=None, children=None, threads=None, open_file_handles=None, modules=None, file_name: str=None, command_line: str=None, user_name: str=None, handle_count: int=None, module_count: int=None, thread_count: int=None, start_time=None, total_processor_time: str=None, user_processor_time: str=None, privileged_processor_time: str=None, working_set64: int=None, peak_working_set64: int=None, private_memory_size64: int=None, virtual_memory_size64: int=None, peak_virtual_memory_size64: int=None, paged_system_memory_size64: int=None, nonpaged_system_memory_size64: int=None, paged_memory_size64: int=None, peak_paged_memory_size64: int=None, time_stamp=None, environment_variables=None, is_scm_site: bool=None, is_web_job: bool=None, description: str=None, **kwargs) -> None: + def __init__(self, *, kind: str=None, deployment_name: str=None, href: str=None, minidump: str=None, is_profile_running: bool=None, is_iis_profile_running: bool=None, iis_profile_timeout_in_seconds: float=None, parent: str=None, children=None, threads=None, open_file_handles=None, modules=None, file_name: str=None, command_line: str=None, user_name: str=None, handle_count: int=None, module_count: int=None, thread_count: int=None, start_time=None, total_cpu_time: str=None, user_cpu_time: str=None, privileged_cpu_time: str=None, working_set: int=None, peak_working_set: int=None, private_memory: int=None, virtual_memory: int=None, peak_virtual_memory: int=None, paged_system_memory: int=None, non_paged_system_memory: int=None, paged_memory: int=None, peak_paged_memory: int=None, time_stamp=None, environment_variables=None, is_scm_site: bool=None, is_webjob: bool=None, description: str=None, **kwargs) -> None: super(ProcessInfo, self).__init__(kind=kind, **kwargs) - 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: str=None, process_info_id: int=None, process_info_na 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 5a53481499e7..f57e5396f6dd 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_module_info_py3.py b/azure-mgmt-web/azure/mgmt/web/models/process_module_info_py3.py index 35f0cd3d9571..458d7777a922 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/process_module_info_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/process_module_info_py3.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 ca254312f6c1..fa19e32d621c 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, **kwargs): super(ProcessThreadInfo, self).__init__(**kwargs) - self.process_thread_info_id = kwargs.get('process_thread_info_id', None) + self.identifier = None self.href = kwargs.get('href', None) self.process = kwargs.get('process', None) self.start_address = kwargs.get('start_address', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/process_thread_info_py3.py b/azure-mgmt-web/azure/mgmt/web/models/process_thread_info_py3.py index 89c943f54419..573193cc1855 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/process_thread_info_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/process_thread_info_py3.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: str=None, process_thread_info_id: int=None, href: str=None, process: str=None, start_address: str=None, current_priority: int=None, priority_level: str=None, base_priority: int=None, start_time=None, total_processor_time: str=None, user_processor_time: str=None, priviledged_processor_time: str=None, state: str=None, wait_reason: str=None, **kwargs) -> None: + def __init__(self, *, kind: str=None, href: str=None, process: str=None, start_address: str=None, current_priority: int=None, priority_level: str=None, base_priority: int=None, start_time=None, total_processor_time: str=None, user_processor_time: str=None, priviledged_processor_time: str=None, state: str=None, wait_reason: str=None, **kwargs) -> None: super(ProcessThreadInfo, self).__init__(kind=kind, **kwargs) - 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 060828030b7f..05e942d4c9dc 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/recommendation.py +++ b/azure-mgmt-web/azure/mgmt/web/models/recommendation.py @@ -51,11 +51,17 @@ class Recommendation(ProxyOnlyResource): :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 @@ -89,6 +95,7 @@ class Recommendation(ProxyOnlyResource): 'id': {'readonly': True}, 'name': {'readonly': True}, 'type': {'readonly': True}, + 'category_tags': {'readonly': True}, } _attribute_map = { @@ -105,8 +112,10 @@ class Recommendation(ProxyOnlyResource): 'message': {'key': 'properties.message', 'type': 'str'}, 'level': {'key': 'properties.level', 'type': 'NotificationLevel'}, 'channels': {'key': 'properties.channels', 'type': 'Channels'}, - 'tags': {'key': 'properties.tags', 'type': '[str]'}, + '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'}, @@ -130,8 +139,10 @@ def __init__(self, **kwargs): self.message = kwargs.get('message', None) self.level = kwargs.get('level', None) self.channels = kwargs.get('channels', None) - self.tags = kwargs.get('tags', None) + self.category_tags = None self.action_name = kwargs.get('action_name', None) + self.enabled = kwargs.get('enabled', None) + self.states = kwargs.get('states', None) self.start_time = kwargs.get('start_time', None) self.end_time = kwargs.get('end_time', None) self.next_notification_time = kwargs.get('next_notification_time', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/recommendation_py3.py b/azure-mgmt-web/azure/mgmt/web/models/recommendation_py3.py index 5eca6b18103c..02241485d2d1 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/recommendation_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/recommendation_py3.py @@ -51,11 +51,17 @@ class Recommendation(ProxyOnlyResource): :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 @@ -89,6 +95,7 @@ class Recommendation(ProxyOnlyResource): 'id': {'readonly': True}, 'name': {'readonly': True}, 'type': {'readonly': True}, + 'category_tags': {'readonly': True}, } _attribute_map = { @@ -105,8 +112,10 @@ class Recommendation(ProxyOnlyResource): 'message': {'key': 'properties.message', 'type': 'str'}, 'level': {'key': 'properties.level', 'type': 'NotificationLevel'}, 'channels': {'key': 'properties.channels', 'type': 'Channels'}, - 'tags': {'key': 'properties.tags', 'type': '[str]'}, + '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'}, @@ -119,7 +128,7 @@ class Recommendation(ProxyOnlyResource): 'forward_link': {'key': 'properties.forwardLink', 'type': 'str'}, } - def __init__(self, *, kind: str=None, creation_time=None, recommendation_id: str=None, resource_id: str=None, resource_scope=None, rule_name: str=None, display_name: str=None, message: str=None, level=None, channels=None, tags=None, action_name: str=None, start_time=None, end_time=None, next_notification_time=None, notification_expiration_time=None, notified_time=None, score: float=None, is_dynamic: bool=None, extension_name: str=None, blade_name: str=None, forward_link: str=None, **kwargs) -> None: + def __init__(self, *, kind: str=None, creation_time=None, recommendation_id: str=None, resource_id: str=None, resource_scope=None, rule_name: str=None, display_name: str=None, message: str=None, level=None, channels=None, action_name: str=None, enabled: int=None, states=None, start_time=None, end_time=None, next_notification_time=None, notification_expiration_time=None, notified_time=None, score: float=None, is_dynamic: bool=None, extension_name: str=None, blade_name: str=None, forward_link: str=None, **kwargs) -> None: super(Recommendation, self).__init__(kind=kind, **kwargs) self.creation_time = creation_time self.recommendation_id = recommendation_id @@ -130,8 +139,10 @@ def __init__(self, *, kind: str=None, creation_time=None, recommendation_id: str 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_rule.py b/azure-mgmt-web/azure/mgmt/web/models/recommendation_rule.py index 09d8a19b874f..75df7b4a8508 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/recommendation_rule.py +++ b/azure-mgmt-web/azure/mgmt/web/models/recommendation_rule.py @@ -27,8 +27,8 @@ class RecommendationRule(ProxyOnlyResource): :type kind: str :ivar type: Resource type. :vartype type: str - :param recommendation_rule_name: Unique name of the rule. - :type recommendation_rule_name: 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). @@ -49,8 +49,9 @@ class RecommendationRule(ProxyOnlyResource): :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 @@ -69,6 +70,7 @@ class RecommendationRule(ProxyOnlyResource): 'id': {'readonly': True}, 'name': {'readonly': True}, 'type': {'readonly': True}, + 'category_tags': {'readonly': True}, } _attribute_map = { @@ -76,7 +78,7 @@ class RecommendationRule(ProxyOnlyResource): 'name': {'key': 'name', 'type': 'str'}, 'kind': {'key': 'kind', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, - 'recommendation_rule_name': {'key': 'properties.name', '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'}, @@ -84,7 +86,7 @@ class RecommendationRule(ProxyOnlyResource): 'action_name': {'key': 'properties.actionName', 'type': 'str'}, 'level': {'key': 'properties.level', 'type': 'NotificationLevel'}, 'channels': {'key': 'properties.channels', 'type': 'Channels'}, - 'tags': {'key': 'properties.tags', 'type': '[str]'}, + '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'}, @@ -93,7 +95,7 @@ class RecommendationRule(ProxyOnlyResource): def __init__(self, **kwargs): super(RecommendationRule, self).__init__(**kwargs) - self.recommendation_rule_name = kwargs.get('recommendation_rule_name', None) + self.recommendation_name = kwargs.get('recommendation_name', None) self.display_name = kwargs.get('display_name', None) self.message = kwargs.get('message', None) self.recommendation_id = kwargs.get('recommendation_id', None) @@ -101,7 +103,7 @@ def __init__(self, **kwargs): self.action_name = kwargs.get('action_name', None) self.level = kwargs.get('level', None) self.channels = kwargs.get('channels', None) - self.tags = kwargs.get('tags', None) + self.category_tags = None self.is_dynamic = kwargs.get('is_dynamic', None) self.extension_name = kwargs.get('extension_name', None) self.blade_name = kwargs.get('blade_name', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/recommendation_rule_py3.py b/azure-mgmt-web/azure/mgmt/web/models/recommendation_rule_py3.py index 544c7d2e3cad..2626ea719e72 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/recommendation_rule_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/recommendation_rule_py3.py @@ -27,8 +27,8 @@ class RecommendationRule(ProxyOnlyResource): :type kind: str :ivar type: Resource type. :vartype type: str - :param recommendation_rule_name: Unique name of the rule. - :type recommendation_rule_name: 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). @@ -49,8 +49,9 @@ class RecommendationRule(ProxyOnlyResource): :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 @@ -69,6 +70,7 @@ class RecommendationRule(ProxyOnlyResource): 'id': {'readonly': True}, 'name': {'readonly': True}, 'type': {'readonly': True}, + 'category_tags': {'readonly': True}, } _attribute_map = { @@ -76,7 +78,7 @@ class RecommendationRule(ProxyOnlyResource): 'name': {'key': 'name', 'type': 'str'}, 'kind': {'key': 'kind', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, - 'recommendation_rule_name': {'key': 'properties.name', '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'}, @@ -84,16 +86,16 @@ class RecommendationRule(ProxyOnlyResource): 'action_name': {'key': 'properties.actionName', 'type': 'str'}, 'level': {'key': 'properties.level', 'type': 'NotificationLevel'}, 'channels': {'key': 'properties.channels', 'type': 'Channels'}, - 'tags': {'key': 'properties.tags', 'type': '[str]'}, + '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, *, kind: str=None, recommendation_rule_name: str=None, display_name: str=None, message: str=None, recommendation_id: str=None, description: str=None, action_name: str=None, level=None, channels=None, tags=None, is_dynamic: bool=None, extension_name: str=None, blade_name: str=None, forward_link: str=None, **kwargs) -> None: + def __init__(self, *, kind: str=None, recommendation_name: str=None, display_name: str=None, message: str=None, recommendation_id: str=None, description: str=None, action_name: str=None, level=None, channels=None, is_dynamic: bool=None, extension_name: str=None, blade_name: str=None, forward_link: str=None, **kwargs) -> None: super(RecommendationRule, self).__init__(kind=kind, **kwargs) - self.recommendation_rule_name = recommendation_rule_name + self.recommendation_name = recommendation_name self.display_name = display_name self.message = message self.recommendation_id = recommendation_id @@ -101,7 +103,7 @@ def __init__(self, *, kind: str=None, recommendation_rule_name: str=None, displa 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/rendering.py b/azure-mgmt-web/azure/mgmt/web/models/rendering.py index 3cf7f498121e..e2327cb854ef 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/rendering.py +++ b/azure-mgmt-web/azure/mgmt/web/models/rendering.py @@ -15,9 +15,9 @@ class Rendering(Model): """Instructions for rendering the data. - :param rendering_type: Rendering Type. Possible values include: 'NoGraph', - 'Table', 'TimeSeries', 'TimeSeriesPerInstance' - :type rendering_type: str or ~azure.mgmt.web.models.RenderingType + :param type: Rendering Type. Possible values include: 'NoGraph', 'Table', + 'TimeSeries', 'TimeSeriesPerInstance' + :type type: str or ~azure.mgmt.web.models.RenderingType :param title: Title of data :type title: str :param description: Description of the data that will help it be @@ -26,13 +26,13 @@ class Rendering(Model): """ _attribute_map = { - 'rendering_type': {'key': 'renderingType', 'type': 'RenderingType'}, + 'type': {'key': 'type', 'type': 'RenderingType'}, 'title': {'key': 'title', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, } def __init__(self, **kwargs): super(Rendering, self).__init__(**kwargs) - self.rendering_type = kwargs.get('rendering_type', None) + self.type = kwargs.get('type', None) self.title = kwargs.get('title', None) self.description = kwargs.get('description', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/rendering_py3.py b/azure-mgmt-web/azure/mgmt/web/models/rendering_py3.py index df9a5069f91f..7b2a87cf5a00 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/rendering_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/rendering_py3.py @@ -15,9 +15,9 @@ class Rendering(Model): """Instructions for rendering the data. - :param rendering_type: Rendering Type. Possible values include: 'NoGraph', - 'Table', 'TimeSeries', 'TimeSeriesPerInstance' - :type rendering_type: str or ~azure.mgmt.web.models.RenderingType + :param type: Rendering Type. Possible values include: 'NoGraph', 'Table', + 'TimeSeries', 'TimeSeriesPerInstance' + :type type: str or ~azure.mgmt.web.models.RenderingType :param title: Title of data :type title: str :param description: Description of the data that will help it be @@ -26,13 +26,13 @@ class Rendering(Model): """ _attribute_map = { - 'rendering_type': {'key': 'renderingType', 'type': 'RenderingType'}, + 'type': {'key': 'type', 'type': 'RenderingType'}, 'title': {'key': 'title', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, } - def __init__(self, *, rendering_type=None, title: str=None, description: str=None, **kwargs) -> None: + def __init__(self, *, type=None, title: str=None, description: str=None, **kwargs) -> None: super(Rendering, self).__init__(**kwargs) - self.rendering_type = rendering_type + self.type = type self.title = title self.description = description diff --git a/azure-mgmt-web/azure/mgmt/web/models/resource_health_metadata_paged.py b/azure-mgmt-web/azure/mgmt/web/models/resource_health_metadata_paged.py deleted file mode 100644 index 45c9b8c4945b..000000000000 --- a/azure-mgmt-web/azure/mgmt/web/models/resource_health_metadata_paged.py +++ /dev/null @@ -1,27 +0,0 @@ -# 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 ResourceHealthMetadataPaged(Paged): - """ - A paging container for iterating over a list of :class:`ResourceHealthMetadata ` object - """ - - _attribute_map = { - 'next_link': {'key': 'nextLink', 'type': 'str'}, - 'current_page': {'key': 'value', 'type': '[ResourceHealthMetadata]'} - } - - def __init__(self, *args, **kwargs): - - super(ResourceHealthMetadataPaged, self).__init__(*args, **kwargs) 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 4e0a78f03d0a..fa01c3611c5d 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, **kwargs): super(ResourceMetricDefinition, self).__init__(**kwargs) - 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/resource_metric_definition_py3.py b/azure-mgmt-web/azure/mgmt/web/models/resource_metric_definition_py3.py index 1e1e1f05de9f..bde300209a34 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/resource_metric_definition_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/resource_metric_definition_py3.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: str=None, **kwargs) -> None: super(ResourceMetricDefinition, self).__init__(kind=kind, **kwargs) - 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 6ffd33cc679b..8decaf97ba5e 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/restore_request.py +++ b/azure-mgmt-web/azure/mgmt/web/models/restore_request.py @@ -54,7 +54,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/restore_request_py3.py b/azure-mgmt-web/azure/mgmt/web/models/restore_request_py3.py index 402362b48610..33d11d7c2eef 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/restore_request_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/restore_request_py3.py @@ -54,7 +54,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/service_specification.py b/azure-mgmt-web/azure/mgmt/web/models/service_specification.py index fe2efb3d6d84..f0a1c80fe7ae 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/service_specification.py +++ b/azure-mgmt-web/azure/mgmt/web/models/service_specification.py @@ -18,12 +18,16 @@ class ServiceSpecification(Model): :param metric_specifications: :type metric_specifications: list[~azure.mgmt.web.models.MetricSpecification] + :param log_specifications: + :type log_specifications: list[~azure.mgmt.web.models.LogSpecification] """ _attribute_map = { 'metric_specifications': {'key': 'metricSpecifications', 'type': '[MetricSpecification]'}, + 'log_specifications': {'key': 'logSpecifications', 'type': '[LogSpecification]'}, } def __init__(self, **kwargs): super(ServiceSpecification, self).__init__(**kwargs) self.metric_specifications = kwargs.get('metric_specifications', None) + self.log_specifications = kwargs.get('log_specifications', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/service_specification_py3.py b/azure-mgmt-web/azure/mgmt/web/models/service_specification_py3.py index ea5fcf80b034..9845f59148e5 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/service_specification_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/service_specification_py3.py @@ -18,12 +18,16 @@ class ServiceSpecification(Model): :param metric_specifications: :type metric_specifications: list[~azure.mgmt.web.models.MetricSpecification] + :param log_specifications: + :type log_specifications: list[~azure.mgmt.web.models.LogSpecification] """ _attribute_map = { 'metric_specifications': {'key': 'metricSpecifications', 'type': '[MetricSpecification]'}, + 'log_specifications': {'key': 'logSpecifications', 'type': '[LogSpecification]'}, } - def __init__(self, *, metric_specifications=None, **kwargs) -> None: + def __init__(self, *, metric_specifications=None, log_specifications=None, **kwargs) -> None: super(ServiceSpecification, self).__init__(**kwargs) self.metric_specifications = metric_specifications + self.log_specifications = log_specifications diff --git a/azure-mgmt-web/azure/mgmt/web/models/site.py b/azure-mgmt-web/azure/mgmt/web/models/site.py index 177c71de2077..f244ac523067 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/site.py +++ b/azure-mgmt-web/azure/mgmt/web/models/site.py @@ -64,6 +64,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 @@ -119,9 +121,6 @@ class Site(Resource): :param cloning_info: If specified during app creation, the app is cloned from a source app. :type cloning_info: ~azure.mgmt.web.models.CloningInfo - :param snapshot_info: If specified during app creation, the app is created - from a previous snapshot. - :type snapshot_info: ~azure.mgmt.web.models.SnapshotRecoveryRequest :ivar resource_group: Name of the resource group the app belongs to. Read-only. :vartype resource_group: str @@ -181,6 +180,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]'}, @@ -197,7 +197,6 @@ class Site(Resource): 'suspended_till': {'key': 'properties.suspendedTill', 'type': 'iso-8601'}, 'max_number_of_workers': {'key': 'properties.maxNumberOfWorkers', 'type': 'int'}, 'cloning_info': {'key': 'properties.cloningInfo', 'type': 'CloningInfo'}, - 'snapshot_info': {'key': 'properties.snapshotInfo', 'type': 'SnapshotRecoveryRequest'}, 'resource_group': {'key': 'properties.resourceGroup', 'type': 'str'}, 'is_default_container': {'key': 'properties.isDefaultContainer', 'type': 'bool'}, 'default_host_name': {'key': 'properties.defaultHostName', 'type': 'str'}, @@ -218,6 +217,7 @@ def __init__(self, **kwargs): self.host_name_ssl_states = kwargs.get('host_name_ssl_states', None) self.server_farm_id = kwargs.get('server_farm_id', None) self.reserved = kwargs.get('reserved', False) + self.is_xenon = kwargs.get('is_xenon', False) self.last_modified_time_utc = None self.site_config = kwargs.get('site_config', None) self.traffic_manager_host_names = None @@ -234,7 +234,6 @@ def __init__(self, **kwargs): self.suspended_till = None self.max_number_of_workers = None self.cloning_info = kwargs.get('cloning_info', None) - self.snapshot_info = kwargs.get('snapshot_info', None) self.resource_group = None self.is_default_container = None self.default_host_name = 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 7418c31642f2..c280193927e4 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'}, @@ -215,6 +219,7 @@ def __init__(self, **kwargs): self.client_id = kwargs.get('client_id', None) self.client_secret = kwargs.get('client_secret', None) self.issuer = kwargs.get('issuer', None) + self.validate_issuer = kwargs.get('validate_issuer', None) self.allowed_audiences = kwargs.get('allowed_audiences', None) self.additional_login_params = kwargs.get('additional_login_params', None) self.google_client_id = kwargs.get('google_client_id', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_auth_settings_py3.py b/azure-mgmt-web/azure/mgmt/web/models/site_auth_settings_py3.py index 9e832491c6d3..b2b246e30079 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/site_auth_settings_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/site_auth_settings_py3.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: str=None, enabled: bool=None, runtime_version: str=None, unauthenticated_client_action=None, token_store_enabled: bool=None, allowed_external_redirect_urls=None, default_provider=None, token_refresh_extension_hours: float=None, client_id: str=None, client_secret: str=None, issuer: str=None, allowed_audiences=None, additional_login_params=None, google_client_id: str=None, google_client_secret: str=None, google_oauth_scopes=None, facebook_app_id: str=None, facebook_app_secret: str=None, facebook_oauth_scopes=None, twitter_consumer_key: str=None, twitter_consumer_secret: str=None, microsoft_account_client_id: str=None, microsoft_account_client_secret: str=None, microsoft_account_oauth_scopes=None, **kwargs) -> None: + def __init__(self, *, kind: str=None, enabled: bool=None, runtime_version: str=None, unauthenticated_client_action=None, token_store_enabled: bool=None, allowed_external_redirect_urls=None, default_provider=None, token_refresh_extension_hours: float=None, client_id: str=None, client_secret: str=None, issuer: str=None, validate_issuer: bool=None, allowed_audiences=None, additional_login_params=None, google_client_id: str=None, google_client_secret: str=None, google_oauth_scopes=None, facebook_app_id: str=None, facebook_app_secret: str=None, facebook_oauth_scopes=None, twitter_consumer_key: str=None, twitter_consumer_secret: str=None, microsoft_account_client_id: str=None, microsoft_account_client_secret: str=None, microsoft_account_oauth_scopes=None, **kwargs) -> None: super(SiteAuthSettings, self).__init__(kind=kind, **kwargs) self.enabled = enabled self.runtime_version = runtime_version @@ -215,6 +219,7 @@ def __init__(self, *, kind: str=None, enabled: bool=None, runtime_version: str=N 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 b598addfbdc0..34156a60e078 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 windows_fx_version: Xenon App Framework and version + :type windows_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,10 +136,17 @@ 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 + :param reserved_instance_count: Number of reserved instances. + This setting only applies to the Consumption Plan + :type reserved_instance_count: int """ _validation = { 'machine_key': {'readonly': True}, + 'reserved_instance_count': {'maximum': 10, 'minimum': 0}, } _attribute_map = { @@ -144,6 +157,7 @@ class SiteConfig(Model): 'python_version': {'key': 'pythonVersion', 'type': 'str'}, 'node_version': {'key': 'nodeVersion', 'type': 'str'}, 'linux_fx_version': {'key': 'linuxFxVersion', 'type': 'str'}, + 'windows_fx_version': {'key': 'windowsFxVersion', '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,9 +193,13 @@ 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'}, + 'reserved_instance_count': {'key': 'reservedInstanceCount', 'type': 'int'}, } def __init__(self, **kwargs): @@ -193,6 +211,7 @@ def __init__(self, **kwargs): self.python_version = kwargs.get('python_version', None) self.node_version = kwargs.get('node_version', None) self.linux_fx_version = kwargs.get('linux_fx_version', None) + self.windows_fx_version = kwargs.get('windows_fx_version', None) self.request_tracing_enabled = kwargs.get('request_tracing_enabled', None) self.request_tracing_expiration_time = kwargs.get('request_tracing_expiration_time', None) self.remote_debugging_enabled = kwargs.get('remote_debugging_enabled', None) @@ -228,6 +247,10 @@ def __init__(self, **kwargs): self.api_definition = kwargs.get('api_definition', None) self.auto_swap_slot_name = kwargs.get('auto_swap_slot_name', None) self.local_my_sql_enabled = kwargs.get('local_my_sql_enabled', False) + self.managed_service_identity_id = kwargs.get('managed_service_identity_id', None) + self.x_managed_service_identity_id = kwargs.get('x_managed_service_identity_id', None) self.ip_security_restrictions = kwargs.get('ip_security_restrictions', None) self.http20_enabled = kwargs.get('http20_enabled', True) self.min_tls_version = kwargs.get('min_tls_version', None) + self.ftps_state = kwargs.get('ftps_state', None) + self.reserved_instance_count = kwargs.get('reserved_instance_count', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_config_py3.py b/azure-mgmt-web/azure/mgmt/web/models/site_config_py3.py index fad1c217018c..85f59f15a970 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/site_config_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/site_config_py3.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 windows_fx_version: Xenon App Framework and version + :type windows_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,10 +136,17 @@ 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 + :param reserved_instance_count: Number of reserved instances. + This setting only applies to the Consumption Plan + :type reserved_instance_count: int """ _validation = { 'machine_key': {'readonly': True}, + 'reserved_instance_count': {'maximum': 10, 'minimum': 0}, } _attribute_map = { @@ -144,6 +157,7 @@ class SiteConfig(Model): 'python_version': {'key': 'pythonVersion', 'type': 'str'}, 'node_version': {'key': 'nodeVersion', 'type': 'str'}, 'linux_fx_version': {'key': 'linuxFxVersion', 'type': 'str'}, + 'windows_fx_version': {'key': 'windowsFxVersion', '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 +193,16 @@ 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'}, + 'reserved_instance_count': {'key': 'reservedInstanceCount', 'type': 'int'}, } - def __init__(self, *, number_of_workers: int=None, default_documents=None, net_framework_version: str="v4.6", php_version: str=None, python_version: str=None, node_version: str=None, linux_fx_version: str=None, request_tracing_enabled: bool=None, request_tracing_expiration_time=None, remote_debugging_enabled: bool=None, remote_debugging_version: str=None, http_logging_enabled: bool=None, logs_directory_size_limit: int=None, detailed_error_logging_enabled: bool=None, publishing_username: str=None, app_settings=None, connection_strings=None, handler_mappings=None, document_root: str=None, scm_type=None, use32_bit_worker_process: bool=None, web_sockets_enabled: bool=None, always_on: bool=None, java_version: str=None, java_container: str=None, java_container_version: str=None, app_command_line: str=None, managed_pipeline_mode=None, virtual_applications=None, load_balancing=None, experiments=None, limits=None, auto_heal_enabled: bool=None, auto_heal_rules=None, tracing_options: str=None, vnet_name: str=None, cors=None, push=None, api_definition=None, auto_swap_slot_name: str=None, local_my_sql_enabled: bool=False, ip_security_restrictions=None, http20_enabled: bool=True, min_tls_version=None, **kwargs) -> None: + def __init__(self, *, number_of_workers: int=None, default_documents=None, net_framework_version: str="v4.6", php_version: str=None, python_version: str=None, node_version: str=None, linux_fx_version: str=None, windows_fx_version: str=None, request_tracing_enabled: bool=None, request_tracing_expiration_time=None, remote_debugging_enabled: bool=None, remote_debugging_version: str=None, http_logging_enabled: bool=None, logs_directory_size_limit: int=None, detailed_error_logging_enabled: bool=None, publishing_username: str=None, app_settings=None, connection_strings=None, handler_mappings=None, document_root: str=None, scm_type=None, use32_bit_worker_process: bool=None, web_sockets_enabled: bool=None, always_on: bool=None, java_version: str=None, java_container: str=None, java_container_version: str=None, app_command_line: str=None, managed_pipeline_mode=None, virtual_applications=None, load_balancing=None, experiments=None, limits=None, auto_heal_enabled: bool=None, auto_heal_rules=None, tracing_options: str=None, vnet_name: str=None, cors=None, push=None, api_definition=None, auto_swap_slot_name: str=None, local_my_sql_enabled: bool=False, managed_service_identity_id: int=None, x_managed_service_identity_id: int=None, ip_security_restrictions=None, http20_enabled: bool=True, min_tls_version=None, ftps_state=None, reserved_instance_count: int=None, **kwargs) -> None: super(SiteConfig, self).__init__(**kwargs) self.number_of_workers = number_of_workers self.default_documents = default_documents @@ -193,6 +211,7 @@ def __init__(self, *, number_of_workers: int=None, default_documents=None, net_f self.python_version = python_version self.node_version = node_version self.linux_fx_version = linux_fx_version + self.windows_fx_version = windows_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 +247,10 @@ def __init__(self, *, number_of_workers: int=None, default_documents=None, net_f 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 + self.reserved_instance_count = reserved_instance_count 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 2023ff28665e..bf1b5fd08b4e 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 windows_fx_version: Xenon App Framework and version + :type windows_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,12 @@ 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 + :param reserved_instance_count: Number of reserved instances. + This setting only applies to the Consumption Plan + :type reserved_instance_count: int """ _validation = { @@ -145,6 +157,7 @@ class SiteConfigResource(ProxyOnlyResource): 'name': {'readonly': True}, 'type': {'readonly': True}, 'machine_key': {'readonly': True}, + 'reserved_instance_count': {'maximum': 10, 'minimum': 0}, } _attribute_map = { @@ -159,6 +172,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'}, + 'windows_fx_version': {'key': 'properties.windowsFxVersion', '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,9 +208,13 @@ 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'}, + 'reserved_instance_count': {'key': 'properties.reservedInstanceCount', 'type': 'int'}, } def __init__(self, **kwargs): @@ -208,6 +226,7 @@ def __init__(self, **kwargs): self.python_version = kwargs.get('python_version', None) self.node_version = kwargs.get('node_version', None) self.linux_fx_version = kwargs.get('linux_fx_version', None) + self.windows_fx_version = kwargs.get('windows_fx_version', None) self.request_tracing_enabled = kwargs.get('request_tracing_enabled', None) self.request_tracing_expiration_time = kwargs.get('request_tracing_expiration_time', None) self.remote_debugging_enabled = kwargs.get('remote_debugging_enabled', None) @@ -243,6 +262,10 @@ def __init__(self, **kwargs): self.api_definition = kwargs.get('api_definition', None) self.auto_swap_slot_name = kwargs.get('auto_swap_slot_name', None) self.local_my_sql_enabled = kwargs.get('local_my_sql_enabled', False) + self.managed_service_identity_id = kwargs.get('managed_service_identity_id', None) + self.x_managed_service_identity_id = kwargs.get('x_managed_service_identity_id', None) self.ip_security_restrictions = kwargs.get('ip_security_restrictions', None) self.http20_enabled = kwargs.get('http20_enabled', True) self.min_tls_version = kwargs.get('min_tls_version', None) + self.ftps_state = kwargs.get('ftps_state', None) + self.reserved_instance_count = kwargs.get('reserved_instance_count', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_config_resource_py3.py b/azure-mgmt-web/azure/mgmt/web/models/site_config_resource_py3.py index 97437aea7fcd..6d9e30ad6f7c 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/site_config_resource_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/site_config_resource_py3.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 windows_fx_version: Xenon App Framework and version + :type windows_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,12 @@ 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 + :param reserved_instance_count: Number of reserved instances. + This setting only applies to the Consumption Plan + :type reserved_instance_count: int """ _validation = { @@ -145,6 +157,7 @@ class SiteConfigResource(ProxyOnlyResource): 'name': {'readonly': True}, 'type': {'readonly': True}, 'machine_key': {'readonly': True}, + 'reserved_instance_count': {'maximum': 10, 'minimum': 0}, } _attribute_map = { @@ -159,6 +172,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'}, + 'windows_fx_version': {'key': 'properties.windowsFxVersion', '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 +208,16 @@ 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'}, + 'reserved_instance_count': {'key': 'properties.reservedInstanceCount', 'type': 'int'}, } - def __init__(self, *, kind: str=None, number_of_workers: int=None, default_documents=None, net_framework_version: str="v4.6", php_version: str=None, python_version: str=None, node_version: str=None, linux_fx_version: str=None, request_tracing_enabled: bool=None, request_tracing_expiration_time=None, remote_debugging_enabled: bool=None, remote_debugging_version: str=None, http_logging_enabled: bool=None, logs_directory_size_limit: int=None, detailed_error_logging_enabled: bool=None, publishing_username: str=None, app_settings=None, connection_strings=None, handler_mappings=None, document_root: str=None, scm_type=None, use32_bit_worker_process: bool=None, web_sockets_enabled: bool=None, always_on: bool=None, java_version: str=None, java_container: str=None, java_container_version: str=None, app_command_line: str=None, managed_pipeline_mode=None, virtual_applications=None, load_balancing=None, experiments=None, limits=None, auto_heal_enabled: bool=None, auto_heal_rules=None, tracing_options: str=None, vnet_name: str=None, cors=None, push=None, api_definition=None, auto_swap_slot_name: str=None, local_my_sql_enabled: bool=False, ip_security_restrictions=None, http20_enabled: bool=True, min_tls_version=None, **kwargs) -> None: + def __init__(self, *, kind: str=None, number_of_workers: int=None, default_documents=None, net_framework_version: str="v4.6", php_version: str=None, python_version: str=None, node_version: str=None, linux_fx_version: str=None, windows_fx_version: str=None, request_tracing_enabled: bool=None, request_tracing_expiration_time=None, remote_debugging_enabled: bool=None, remote_debugging_version: str=None, http_logging_enabled: bool=None, logs_directory_size_limit: int=None, detailed_error_logging_enabled: bool=None, publishing_username: str=None, app_settings=None, connection_strings=None, handler_mappings=None, document_root: str=None, scm_type=None, use32_bit_worker_process: bool=None, web_sockets_enabled: bool=None, always_on: bool=None, java_version: str=None, java_container: str=None, java_container_version: str=None, app_command_line: str=None, managed_pipeline_mode=None, virtual_applications=None, load_balancing=None, experiments=None, limits=None, auto_heal_enabled: bool=None, auto_heal_rules=None, tracing_options: str=None, vnet_name: str=None, cors=None, push=None, api_definition=None, auto_swap_slot_name: str=None, local_my_sql_enabled: bool=False, managed_service_identity_id: int=None, x_managed_service_identity_id: int=None, ip_security_restrictions=None, http20_enabled: bool=True, min_tls_version=None, ftps_state=None, reserved_instance_count: int=None, **kwargs) -> None: super(SiteConfigResource, self).__init__(kind=kind, **kwargs) self.number_of_workers = number_of_workers self.default_documents = default_documents @@ -208,6 +226,7 @@ def __init__(self, *, kind: str=None, number_of_workers: int=None, default_docum self.python_version = python_version self.node_version = node_version self.linux_fx_version = linux_fx_version + self.windows_fx_version = windows_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 +262,10 @@ def __init__(self, *, kind: str=None, number_of_workers: int=None, default_docum 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 + self.reserved_instance_count = reserved_instance_count 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 3e73e8b95d20..75c2e76208dd 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, **kwargs): super(SiteConfigurationSnapshotInfo, self).__init__(**kwargs) 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_configuration_snapshot_info_py3.py b/azure-mgmt-web/azure/mgmt/web/models/site_configuration_snapshot_info_py3.py index 1f6ecef24754..e43d434c2d75 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/site_configuration_snapshot_info_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/site_configuration_snapshot_info_py3.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: str=None, **kwargs) -> None: super(SiteConfigurationSnapshotInfo, self).__init__(kind=kind, **kwargs) 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 d00ab6c3dbfe..2084a3facb71 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, **kwargs): super(SiteExtensionInfo, self).__init__(**kwargs) - self.site_extension_info_id = kwargs.get('site_extension_info_id', None) + self.extension_id = kwargs.get('extension_id', None) self.title = kwargs.get('title', None) - self.site_extension_info_type = kwargs.get('site_extension_info_type', None) + self.extension_type = kwargs.get('extension_type', None) self.summary = kwargs.get('summary', None) self.description = kwargs.get('description', None) self.version = kwargs.get('version', None) @@ -118,7 +117,7 @@ def __init__(self, **kwargs): self.license_url = kwargs.get('license_url', None) self.feed_url = kwargs.get('feed_url', None) self.authors = kwargs.get('authors', None) - self.installation_args = kwargs.get('installation_args', None) + self.installer_command_line_params = kwargs.get('installer_command_line_params', None) self.published_date_time = kwargs.get('published_date_time', None) self.download_count = kwargs.get('download_count', None) self.local_is_latest_version = kwargs.get('local_is_latest_version', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_extension_info_py3.py b/azure-mgmt-web/azure/mgmt/web/models/site_extension_info_py3.py index e8e9736cfd05..b4bb23a9631f 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/site_extension_info_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/site_extension_info_py3.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: str=None, site_extension_info_id: str=None, title: str=None, site_extension_info_type=None, summary: str=None, description: str=None, version: str=None, extension_url: str=None, project_url: str=None, icon_url: str=None, license_url: str=None, feed_url: str=None, authors=None, installation_args: str=None, published_date_time=None, download_count: int=None, local_is_latest_version: bool=None, local_path: str=None, installed_date_time=None, provisioning_state: str=None, comment: str=None, **kwargs) -> None: + def __init__(self, *, kind: str=None, extension_id: str=None, title: str=None, extension_type=None, summary: str=None, description: str=None, version: str=None, extension_url: str=None, project_url: str=None, icon_url: str=None, license_url: str=None, feed_url: str=None, authors=None, installer_command_line_params: str=None, published_date_time=None, download_count: int=None, local_is_latest_version: bool=None, local_path: str=None, installed_date_time=None, provisioning_state: str=None, comment: str=None, **kwargs) -> None: super(SiteExtensionInfo, self).__init__(kind=kind, **kwargs) - 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: str=None, site_extension_info_id: str=None, title: s 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 fa25964c4357..708d731a2e67 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, **kwargs): diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_instance_py3.py b/azure-mgmt-web/azure/mgmt/web/models/site_instance_py3.py index 49bedfee2116..d6a93ac4600e 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/site_instance_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/site_instance_py3.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: str=None, **kwargs) -> 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 029f78ffa8dc..291bbff47844 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 @@ -113,9 +115,6 @@ class SitePatchResource(ProxyOnlyResource): :param cloning_info: If specified during app creation, the app is cloned from a source app. :type cloning_info: ~azure.mgmt.web.models.CloningInfo - :param snapshot_info: If specified during app creation, the app is created - from a previous snapshot. - :type snapshot_info: ~azure.mgmt.web.models.SnapshotRecoveryRequest :ivar resource_group: Name of the resource group the app belongs to. Read-only. :vartype resource_group: str @@ -170,6 +169,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]'}, @@ -186,7 +186,6 @@ class SitePatchResource(ProxyOnlyResource): 'suspended_till': {'key': 'properties.suspendedTill', 'type': 'iso-8601'}, 'max_number_of_workers': {'key': 'properties.maxNumberOfWorkers', 'type': 'int'}, 'cloning_info': {'key': 'properties.cloningInfo', 'type': 'CloningInfo'}, - 'snapshot_info': {'key': 'properties.snapshotInfo', 'type': 'SnapshotRecoveryRequest'}, 'resource_group': {'key': 'properties.resourceGroup', 'type': 'str'}, 'is_default_container': {'key': 'properties.isDefaultContainer', 'type': 'bool'}, 'default_host_name': {'key': 'properties.defaultHostName', 'type': 'str'}, @@ -206,6 +205,7 @@ def __init__(self, **kwargs): self.host_name_ssl_states = kwargs.get('host_name_ssl_states', None) self.server_farm_id = kwargs.get('server_farm_id', None) self.reserved = kwargs.get('reserved', False) + self.is_xenon = kwargs.get('is_xenon', False) self.last_modified_time_utc = None self.site_config = kwargs.get('site_config', None) self.traffic_manager_host_names = None @@ -222,7 +222,6 @@ def __init__(self, **kwargs): self.suspended_till = None self.max_number_of_workers = None self.cloning_info = kwargs.get('cloning_info', None) - self.snapshot_info = kwargs.get('snapshot_info', None) self.resource_group = None self.is_default_container = None self.default_host_name = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_patch_resource_py3.py b/azure-mgmt-web/azure/mgmt/web/models/site_patch_resource_py3.py index 9f66719d0271..f3e23f94d291 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/site_patch_resource_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/site_patch_resource_py3.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 @@ -113,9 +115,6 @@ class SitePatchResource(ProxyOnlyResource): :param cloning_info: If specified during app creation, the app is cloned from a source app. :type cloning_info: ~azure.mgmt.web.models.CloningInfo - :param snapshot_info: If specified during app creation, the app is created - from a previous snapshot. - :type snapshot_info: ~azure.mgmt.web.models.SnapshotRecoveryRequest :ivar resource_group: Name of the resource group the app belongs to. Read-only. :vartype resource_group: str @@ -170,6 +169,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]'}, @@ -186,7 +186,6 @@ class SitePatchResource(ProxyOnlyResource): 'suspended_till': {'key': 'properties.suspendedTill', 'type': 'iso-8601'}, 'max_number_of_workers': {'key': 'properties.maxNumberOfWorkers', 'type': 'int'}, 'cloning_info': {'key': 'properties.cloningInfo', 'type': 'CloningInfo'}, - 'snapshot_info': {'key': 'properties.snapshotInfo', 'type': 'SnapshotRecoveryRequest'}, 'resource_group': {'key': 'properties.resourceGroup', 'type': 'str'}, 'is_default_container': {'key': 'properties.isDefaultContainer', 'type': 'bool'}, 'default_host_name': {'key': 'properties.defaultHostName', 'type': 'str'}, @@ -194,7 +193,7 @@ class SitePatchResource(ProxyOnlyResource): 'https_only': {'key': 'properties.httpsOnly', 'type': 'bool'}, } - def __init__(self, *, kind: str=None, enabled: bool=None, host_name_ssl_states=None, server_farm_id: str=None, reserved: bool=False, site_config=None, scm_site_also_stopped: bool=False, hosting_environment_profile=None, client_affinity_enabled: bool=None, client_cert_enabled: bool=None, host_names_disabled: bool=None, container_size: int=None, daily_memory_time_quota: int=None, cloning_info=None, snapshot_info=None, https_only: bool=None, **kwargs) -> None: + def __init__(self, *, kind: str=None, enabled: bool=None, host_name_ssl_states=None, server_farm_id: str=None, reserved: bool=False, is_xenon: bool=False, site_config=None, scm_site_also_stopped: bool=False, hosting_environment_profile=None, client_affinity_enabled: bool=None, client_cert_enabled: bool=None, host_names_disabled: bool=None, container_size: int=None, daily_memory_time_quota: int=None, cloning_info=None, https_only: bool=None, **kwargs) -> None: super(SitePatchResource, self).__init__(kind=kind, **kwargs) self.state = None self.host_names = None @@ -206,6 +205,7 @@ def __init__(self, *, kind: str=None, enabled: bool=None, host_name_ssl_states=N 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 @@ -222,7 +222,6 @@ def __init__(self, *, kind: str=None, enabled: bool=None, host_name_ssl_states=N self.suspended_till = None self.max_number_of_workers = None self.cloning_info = cloning_info - self.snapshot_info = snapshot_info self.resource_group = None self.is_default_container = None self.default_host_name = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_py3.py b/azure-mgmt-web/azure/mgmt/web/models/site_py3.py index 64901a32b37a..3fb9e61bdede 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/site_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/site_py3.py @@ -64,6 +64,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 @@ -119,9 +121,6 @@ class Site(Resource): :param cloning_info: If specified during app creation, the app is cloned from a source app. :type cloning_info: ~azure.mgmt.web.models.CloningInfo - :param snapshot_info: If specified during app creation, the app is created - from a previous snapshot. - :type snapshot_info: ~azure.mgmt.web.models.SnapshotRecoveryRequest :ivar resource_group: Name of the resource group the app belongs to. Read-only. :vartype resource_group: str @@ -181,6 +180,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]'}, @@ -197,7 +197,6 @@ class Site(Resource): 'suspended_till': {'key': 'properties.suspendedTill', 'type': 'iso-8601'}, 'max_number_of_workers': {'key': 'properties.maxNumberOfWorkers', 'type': 'int'}, 'cloning_info': {'key': 'properties.cloningInfo', 'type': 'CloningInfo'}, - 'snapshot_info': {'key': 'properties.snapshotInfo', 'type': 'SnapshotRecoveryRequest'}, 'resource_group': {'key': 'properties.resourceGroup', 'type': 'str'}, 'is_default_container': {'key': 'properties.isDefaultContainer', 'type': 'bool'}, 'default_host_name': {'key': 'properties.defaultHostName', 'type': 'str'}, @@ -206,7 +205,7 @@ class Site(Resource): 'identity': {'key': 'identity', 'type': 'ManagedServiceIdentity'}, } - def __init__(self, *, location: str, kind: str=None, tags=None, enabled: bool=None, host_name_ssl_states=None, server_farm_id: str=None, reserved: bool=False, site_config=None, scm_site_also_stopped: bool=False, hosting_environment_profile=None, client_affinity_enabled: bool=None, client_cert_enabled: bool=None, host_names_disabled: bool=None, container_size: int=None, daily_memory_time_quota: int=None, cloning_info=None, snapshot_info=None, https_only: bool=None, identity=None, **kwargs) -> None: + def __init__(self, *, location: str, kind: str=None, tags=None, enabled: bool=None, host_name_ssl_states=None, server_farm_id: str=None, reserved: bool=False, is_xenon: bool=False, site_config=None, scm_site_also_stopped: bool=False, hosting_environment_profile=None, client_affinity_enabled: bool=None, client_cert_enabled: bool=None, host_names_disabled: bool=None, container_size: int=None, daily_memory_time_quota: int=None, cloning_info=None, https_only: bool=None, identity=None, **kwargs) -> None: super(Site, self).__init__(kind=kind, location=location, tags=tags, **kwargs) self.state = None self.host_names = None @@ -218,6 +217,7 @@ def __init__(self, *, location: str, kind: str=None, tags=None, enabled: bool=No 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 @@ -234,7 +234,6 @@ def __init__(self, *, location: str, kind: str=None, tags=None, enabled: bool=No self.suspended_till = None self.max_number_of_workers = None self.cloning_info = cloning_info - self.snapshot_info = snapshot_info self.resource_group = None self.is_default_container = None self.default_host_name = 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 cc203a46d259..26b9c0e541b0 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, **kwargs): super(SlotDifference, self).__init__(**kwargs) - 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/slot_difference_py3.py b/azure-mgmt-web/azure/mgmt/web/models/slot_difference_py3.py index 943d958637f1..e2cb4e6fc1c5 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/slot_difference_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/slot_difference_py3.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: str=None, **kwargs) -> None: super(SlotDifference, self).__init__(kind=kind, **kwargs) - 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_target.py b/azure-mgmt-web/azure/mgmt/web/models/snapshot_recovery_source.py similarity index 79% rename from azure-mgmt-web/azure/mgmt/web/models/snapshot_recovery_target.py rename to azure-mgmt-web/azure/mgmt/web/models/snapshot_recovery_source.py index 38f3c267bc68..94034c76d0ed 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/snapshot_recovery_target.py +++ b/azure-mgmt-web/azure/mgmt/web/models/snapshot_recovery_source.py @@ -12,13 +12,13 @@ from msrest.serialization import Model -class SnapshotRecoveryTarget(Model): - """Specifies the web app that snapshot contents will be written to. +class SnapshotRecoverySource(Model): + """Specifies the web app that snapshot contents will be retrieved from. - :param location: Geographical location of the target web app, e.g. + :param location: Geographical location of the source web app, e.g. SouthEastAsia, SouthCentralUS :type location: str - :param id: ARM resource ID of the target app. + :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} @@ -32,6 +32,6 @@ class SnapshotRecoveryTarget(Model): } def __init__(self, **kwargs): - super(SnapshotRecoveryTarget, self).__init__(**kwargs) + super(SnapshotRecoverySource, self).__init__(**kwargs) self.location = kwargs.get('location', None) self.id = kwargs.get('id', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/snapshot_recovery_target_py3.py b/azure-mgmt-web/azure/mgmt/web/models/snapshot_recovery_source_py3.py similarity index 79% rename from azure-mgmt-web/azure/mgmt/web/models/snapshot_recovery_target_py3.py rename to azure-mgmt-web/azure/mgmt/web/models/snapshot_recovery_source_py3.py index 07035487add4..bfb6ee873dae 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/snapshot_recovery_target_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/snapshot_recovery_source_py3.py @@ -12,13 +12,13 @@ from msrest.serialization import Model -class SnapshotRecoveryTarget(Model): - """Specifies the web app that snapshot contents will be written to. +class SnapshotRecoverySource(Model): + """Specifies the web app that snapshot contents will be retrieved from. - :param location: Geographical location of the target web app, e.g. + :param location: Geographical location of the source web app, e.g. SouthEastAsia, SouthCentralUS :type location: str - :param id: ARM resource ID of the target app. + :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} @@ -32,6 +32,6 @@ class SnapshotRecoveryTarget(Model): } def __init__(self, *, location: str=None, id: str=None, **kwargs) -> None: - super(SnapshotRecoveryTarget, self).__init__(**kwargs) + super(SnapshotRecoverySource, self).__init__(**kwargs) self.location = location self.id = id diff --git a/azure-mgmt-web/azure/mgmt/web/models/snapshot_recovery_request.py b/azure-mgmt-web/azure/mgmt/web/models/snapshot_restore_request.py similarity index 76% rename from azure-mgmt-web/azure/mgmt/web/models/snapshot_recovery_request.py rename to azure-mgmt-web/azure/mgmt/web/models/snapshot_restore_request.py index 73f8ff371733..ef65405d81ab 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/snapshot_recovery_request.py +++ b/azure-mgmt-web/azure/mgmt/web/models/snapshot_restore_request.py @@ -12,7 +12,7 @@ from .proxy_only_resource import ProxyOnlyResource -class SnapshotRecoveryRequest(ProxyOnlyResource): +class SnapshotRestoreRequest(ProxyOnlyResource): """Details about app recovery operation. Variables are only populated by the server, and will be ignored when @@ -28,14 +28,15 @@ class SnapshotRecoveryRequest(ProxyOnlyResource): :type kind: str :ivar type: Resource type. :vartype type: str - :param snapshot_time: Point in time in which the app recovery should be - attempted, formatted as a DateTime string. + :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_target: Specifies the web app that snapshot contents will - be written to. - :type recovery_target: ~azure.mgmt.web.models.SnapshotRecoveryTarget - :param overwrite: Required. If true the recovery operation - can overwrite source app; otherwise, false. + :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: Required. 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. @@ -59,16 +60,16 @@ class SnapshotRecoveryRequest(ProxyOnlyResource): 'kind': {'key': 'kind', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'snapshot_time': {'key': 'properties.snapshotTime', 'type': 'str'}, - 'recovery_target': {'key': 'properties.recoveryTarget', 'type': 'SnapshotRecoveryTarget'}, + '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, **kwargs): - super(SnapshotRecoveryRequest, self).__init__(**kwargs) + super(SnapshotRestoreRequest, self).__init__(**kwargs) self.snapshot_time = kwargs.get('snapshot_time', None) - self.recovery_target = kwargs.get('recovery_target', None) + self.recovery_source = kwargs.get('recovery_source', None) self.overwrite = kwargs.get('overwrite', None) self.recover_configuration = kwargs.get('recover_configuration', None) self.ignore_conflicting_host_names = kwargs.get('ignore_conflicting_host_names', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/snapshot_recovery_request_py3.py b/azure-mgmt-web/azure/mgmt/web/models/snapshot_restore_request_py3.py similarity index 75% rename from azure-mgmt-web/azure/mgmt/web/models/snapshot_recovery_request_py3.py rename to azure-mgmt-web/azure/mgmt/web/models/snapshot_restore_request_py3.py index ef077653b9b7..e32f278bc028 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/snapshot_recovery_request_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/snapshot_restore_request_py3.py @@ -12,7 +12,7 @@ from .proxy_only_resource_py3 import ProxyOnlyResource -class SnapshotRecoveryRequest(ProxyOnlyResource): +class SnapshotRestoreRequest(ProxyOnlyResource): """Details about app recovery operation. Variables are only populated by the server, and will be ignored when @@ -28,14 +28,15 @@ class SnapshotRecoveryRequest(ProxyOnlyResource): :type kind: str :ivar type: Resource type. :vartype type: str - :param snapshot_time: Point in time in which the app recovery should be - attempted, formatted as a DateTime string. + :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_target: Specifies the web app that snapshot contents will - be written to. - :type recovery_target: ~azure.mgmt.web.models.SnapshotRecoveryTarget - :param overwrite: Required. If true the recovery operation - can overwrite source app; otherwise, false. + :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: Required. 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. @@ -59,16 +60,16 @@ class SnapshotRecoveryRequest(ProxyOnlyResource): 'kind': {'key': 'kind', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'snapshot_time': {'key': 'properties.snapshotTime', 'type': 'str'}, - 'recovery_target': {'key': 'properties.recoveryTarget', 'type': 'SnapshotRecoveryTarget'}, + '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: bool, kind: str=None, snapshot_time: str=None, recovery_target=None, recover_configuration: bool=None, ignore_conflicting_host_names: bool=None, **kwargs) -> None: - super(SnapshotRecoveryRequest, self).__init__(kind=kind, **kwargs) + def __init__(self, *, overwrite: bool, kind: str=None, snapshot_time: str=None, recovery_source=None, recover_configuration: bool=None, ignore_conflicting_host_names: bool=None, **kwargs) -> None: + super(SnapshotRestoreRequest, self).__init__(kind=kind, **kwargs) self.snapshot_time = snapshot_time - self.recovery_target = recovery_target + 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 6f018d16e3f0..b6897f5cd8f7 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,7 +47,6 @@ 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'}, @@ -58,7 +55,6 @@ class SourceControl(ProxyOnlyResource): def __init__(self, **kwargs): super(SourceControl, self).__init__(**kwargs) - self.source_control_name = kwargs.get('source_control_name', None) self.token = kwargs.get('token', None) self.token_secret = kwargs.get('token_secret', None) self.refresh_token = kwargs.get('refresh_token', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/source_control_py3.py b/azure-mgmt-web/azure/mgmt/web/models/source_control_py3.py index 4b160caa147a..be9ec85d95b1 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/source_control_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/source_control_py3.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: str=None, source_control_name: str=None, token: str=None, token_secret: str=None, refresh_token: str=None, expiration_time=None, **kwargs) -> None: + def __init__(self, *, kind: str=None, token: str=None, token_secret: str=None, refresh_token: str=None, expiration_time=None, **kwargs) -> None: super(SourceControl, self).__init__(kind=kind, **kwargs) - 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 bb62863d4176..0366dae90070 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,6 +60,7 @@ 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, **kwargs): @@ -72,3 +75,4 @@ def __init__(self, **kwargs): self.exclude_from_capacity_allocation = kwargs.get('exclude_from_capacity_allocation', None) self.is_applicable_for_all_compute_modes = kwargs.get('is_applicable_for_all_compute_modes', None) self.site_mode = kwargs.get('site_mode', None) + self.is_linux = kwargs.get('is_linux', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/stamp_capacity_py3.py b/azure-mgmt-web/azure/mgmt/web/models/stamp_capacity_py3.py index f9135aa4057c..2b0bd5ade14e 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/stamp_capacity_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/stamp_capacity_py3.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: str=None, available_capacity: int=None, total_capacity: int=None, unit: str=None, compute_mode=None, worker_size=None, worker_size_id: int=None, exclude_from_capacity_allocation: bool=None, is_applicable_for_all_compute_modes: bool=None, site_mode: str=None, **kwargs) -> None: + def __init__(self, *, name: str=None, available_capacity: int=None, total_capacity: int=None, unit: str=None, compute_mode=None, worker_size=None, worker_size_id: int=None, exclude_from_capacity_allocation: bool=None, is_applicable_for_all_compute_modes: bool=None, site_mode: str=None, is_linux: bool=None, **kwargs) -> None: super(StampCapacity, self).__init__(**kwargs) self.name = name self.available_capacity = available_capacity @@ -72,3 +75,4 @@ def __init__(self, *, name: str=None, available_capacity: int=None, total_capaci 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/resource_health_metadata.py b/azure-mgmt-web/azure/mgmt/web/models/swift_virtual_network.py similarity index 56% rename from azure-mgmt-web/azure/mgmt/web/models/resource_health_metadata.py rename to azure-mgmt-web/azure/mgmt/web/models/swift_virtual_network.py index 0c6c14f68dc4..a4ee784810b8 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/resource_health_metadata.py +++ b/azure-mgmt-web/azure/mgmt/web/models/swift_virtual_network.py @@ -12,8 +12,9 @@ from .proxy_only_resource import ProxyOnlyResource -class ResourceHealthMetadata(ProxyOnlyResource): - """Used for getting ResourceHealthCheck settings. +class SwiftVirtualNetwork(ProxyOnlyResource): + """Swift Virtual Network Contract. This is used to enable the new Swift way of + doing virtual network integration. Variables are only populated by the server, and will be ignored when sending a request. @@ -26,11 +27,13 @@ class ResourceHealthMetadata(ProxyOnlyResource): :type kind: str :ivar type: Resource type. :vartype type: str - :param category: The category that the resource matches in the RHC Policy - File - :type category: str - :param signal_availability: Is there a health signal for the resource - :type signal_availability: bool + :param subnet_resource_id: The Virtual Network subnet's resource ID. This + is the subnet that this Web App will join. This subnet must have a + delegation to Microsoft.Web/serverFarms defined first. + :type subnet_resource_id: str + :param swift_supported: A flag that specifies if the scale unit this Web + App is on supports Swift integration. + :type swift_supported: bool """ _validation = { @@ -44,11 +47,11 @@ class ResourceHealthMetadata(ProxyOnlyResource): 'name': {'key': 'name', 'type': 'str'}, 'kind': {'key': 'kind', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, - 'category': {'key': 'properties.category', 'type': 'str'}, - 'signal_availability': {'key': 'properties.signalAvailability', 'type': 'bool'}, + 'subnet_resource_id': {'key': 'properties.subnetResourceId', 'type': 'str'}, + 'swift_supported': {'key': 'properties.swiftSupported', 'type': 'bool'}, } def __init__(self, **kwargs): - super(ResourceHealthMetadata, self).__init__(**kwargs) - self.category = kwargs.get('category', None) - self.signal_availability = kwargs.get('signal_availability', None) + super(SwiftVirtualNetwork, self).__init__(**kwargs) + self.subnet_resource_id = kwargs.get('subnet_resource_id', None) + self.swift_supported = kwargs.get('swift_supported', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/resource_health_metadata_py3.py b/azure-mgmt-web/azure/mgmt/web/models/swift_virtual_network_py3.py similarity index 54% rename from azure-mgmt-web/azure/mgmt/web/models/resource_health_metadata_py3.py rename to azure-mgmt-web/azure/mgmt/web/models/swift_virtual_network_py3.py index 1e151f270086..30c7551eef50 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/resource_health_metadata_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/swift_virtual_network_py3.py @@ -12,8 +12,9 @@ from .proxy_only_resource_py3 import ProxyOnlyResource -class ResourceHealthMetadata(ProxyOnlyResource): - """Used for getting ResourceHealthCheck settings. +class SwiftVirtualNetwork(ProxyOnlyResource): + """Swift Virtual Network Contract. This is used to enable the new Swift way of + doing virtual network integration. Variables are only populated by the server, and will be ignored when sending a request. @@ -26,11 +27,13 @@ class ResourceHealthMetadata(ProxyOnlyResource): :type kind: str :ivar type: Resource type. :vartype type: str - :param category: The category that the resource matches in the RHC Policy - File - :type category: str - :param signal_availability: Is there a health signal for the resource - :type signal_availability: bool + :param subnet_resource_id: The Virtual Network subnet's resource ID. This + is the subnet that this Web App will join. This subnet must have a + delegation to Microsoft.Web/serverFarms defined first. + :type subnet_resource_id: str + :param swift_supported: A flag that specifies if the scale unit this Web + App is on supports Swift integration. + :type swift_supported: bool """ _validation = { @@ -44,11 +47,11 @@ class ResourceHealthMetadata(ProxyOnlyResource): 'name': {'key': 'name', 'type': 'str'}, 'kind': {'key': 'kind', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, - 'category': {'key': 'properties.category', 'type': 'str'}, - 'signal_availability': {'key': 'properties.signalAvailability', 'type': 'bool'}, + 'subnet_resource_id': {'key': 'properties.subnetResourceId', 'type': 'str'}, + 'swift_supported': {'key': 'properties.swiftSupported', 'type': 'bool'}, } - def __init__(self, *, kind: str=None, category: str=None, signal_availability: bool=None, **kwargs) -> None: - super(ResourceHealthMetadata, self).__init__(kind=kind, **kwargs) - self.category = category - self.signal_availability = signal_availability + def __init__(self, *, kind: str=None, subnet_resource_id: str=None, swift_supported: bool=None, **kwargs) -> None: + super(SwiftVirtualNetwork, self).__init__(kind=kind, **kwargs) + self.subnet_resource_id = subnet_resource_id + self.swift_supported = swift_supported 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 cdd7cbd07acd..a7d255ea8ecd 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, **kwargs): super(TopLevelDomain, self).__init__(**kwargs) - self.domain_name = None self.privacy = kwargs.get('privacy', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/top_level_domain_py3.py b/azure-mgmt-web/azure/mgmt/web/models/top_level_domain_py3.py index 4d76becde767..4af488b1730a 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/top_level_domain_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/top_level_domain_py3.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: str=None, privacy: bool=None, **kwargs) -> None: super(TopLevelDomain, self).__init__(kind=kind, **kwargs) - 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 4bd86dd9efe2..0e585f4b9c8d 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, **kwargs): super(TriggeredJobHistory, self).__init__(**kwargs) - self.triggered_job_runs = kwargs.get('triggered_job_runs', None) + self.runs = kwargs.get('runs', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/triggered_job_history_py3.py b/azure-mgmt-web/azure/mgmt/web/models/triggered_job_history_py3.py index 404156b42f0d..e5da0604cde4 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/triggered_job_history_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/triggered_job_history_py3.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: str=None, triggered_job_runs=None, **kwargs) -> None: + def __init__(self, *, kind: str=None, runs=None, **kwargs) -> None: super(TriggeredJobHistory, self).__init__(kind=kind, **kwargs) - 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 e0d3653c3690..1caecf94e018 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, **kwargs): super(TriggeredJobRun, self).__init__(**kwargs) - self.triggered_job_run_id = kwargs.get('triggered_job_run_id', None) - self.triggered_job_run_name = None + self.web_job_id = kwargs.get('web_job_id', None) + self.web_job_name = kwargs.get('web_job_name', None) self.status = kwargs.get('status', None) self.start_time = kwargs.get('start_time', None) self.end_time = kwargs.get('end_time', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/triggered_job_run_py3.py b/azure-mgmt-web/azure/mgmt/web/models/triggered_job_run_py3.py index 631559f3102f..e939a2017f08 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/triggered_job_run_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/triggered_job_run_py3.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: str=None, triggered_job_run_id: str=None, status=None, start_time=None, end_time=None, duration: str=None, output_url: str=None, error_url: str=None, url: str=None, job_name: str=None, trigger: str=None, **kwargs) -> None: + def __init__(self, *, kind: str=None, web_job_id: str=None, web_job_name: str=None, status=None, start_time=None, end_time=None, duration: str=None, output_url: str=None, error_url: str=None, url: str=None, job_name: str=None, trigger: str=None, **kwargs) -> None: super(TriggeredJobRun, self).__init__(kind=kind, **kwargs) - 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 f3a58d01e26c..7c5bf24dbff4 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,16 +60,15 @@ 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}'}, } @@ -82,11 +77,10 @@ def __init__(self, **kwargs): self.latest_run = kwargs.get('latest_run', None) self.history_url = kwargs.get('history_url', None) self.scheduler_logs_url = kwargs.get('scheduler_logs_url', None) - self.triggered_web_job_name = None self.run_command = kwargs.get('run_command', None) self.url = kwargs.get('url', None) self.extra_info_url = kwargs.get('extra_info_url', None) - self.job_type = kwargs.get('job_type', None) + self.web_job_type = kwargs.get('web_job_type', None) self.error = kwargs.get('error', None) self.using_sdk = kwargs.get('using_sdk', None) self.settings = kwargs.get('settings', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/triggered_web_job_py3.py b/azure-mgmt-web/azure/mgmt/web/models/triggered_web_job_py3.py index c3fc83e4a1df..3701608eafe0 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/triggered_web_job_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/triggered_web_job_py3.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: str=None, latest_run=None, history_url: str=None, scheduler_logs_url: str=None, run_command: str=None, url: str=None, extra_info_url: str=None, job_type=None, error: str=None, using_sdk: bool=None, settings=None, **kwargs) -> None: + def __init__(self, *, kind: str=None, latest_run=None, history_url: str=None, scheduler_logs_url: str=None, run_command: str=None, url: str=None, extra_info_url: str=None, web_job_type=None, error: str=None, using_sdk: bool=None, settings=None, **kwargs) -> None: super(TriggeredWebJob, self).__init__(kind=kind, **kwargs) 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 8cc6e379603e..54f3cc94538c 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, **kwargs): super(Usage, self).__init__(**kwargs) 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/usage_py3.py b/azure-mgmt-web/azure/mgmt/web/models/usage_py3.py index 90497208ad04..81c94d115bd8 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/usage_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/usage_py3.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: str=None, **kwargs) -> None: super(Usage, self).__init__(kind=kind, **kwargs) 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 d34af225db0b..548b51584a9e 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/user.py +++ b/azure-mgmt-web/azure/mgmt/web/models/user.py @@ -28,8 +28,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: Required. Username used for publishing. :type publishing_user_name: str :param publishing_password: Password used for publishing. @@ -39,6 +37,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 = { @@ -53,17 +53,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, **kwargs): super(User, self).__init__(**kwargs) - self.user_name = kwargs.get('user_name', None) self.publishing_user_name = kwargs.get('publishing_user_name', None) self.publishing_password = kwargs.get('publishing_password', None) self.publishing_password_hash = kwargs.get('publishing_password_hash', None) self.publishing_password_hash_salt = kwargs.get('publishing_password_hash_salt', None) + self.scm_uri = kwargs.get('scm_uri', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/user_py3.py b/azure-mgmt-web/azure/mgmt/web/models/user_py3.py index 78fc453a89e0..6f57069f740b 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/user_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/user_py3.py @@ -28,8 +28,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: Required. Username used for publishing. :type publishing_user_name: str :param publishing_password: Password used for publishing. @@ -39,6 +37,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 = { @@ -53,17 +53,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: str, kind: str=None, user_name: str=None, publishing_password: str=None, publishing_password_hash: str=None, publishing_password_hash_salt: str=None, **kwargs) -> None: + def __init__(self, *, publishing_user_name: str, kind: str=None, publishing_password: str=None, publishing_password_hash: str=None, publishing_password_hash_salt: str=None, scm_uri: str=None, **kwargs) -> None: super(User, self).__init__(kind=kind, **kwargs) - 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/validate_request.py b/azure-mgmt-web/azure/mgmt/web/models/validate_request.py index 472cbbc7612b..6d1deca2bc5e 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/validate_request.py +++ b/azure-mgmt-web/azure/mgmt/web/models/validate_request.py @@ -40,6 +40,9 @@ class ValidateRequest(Model): :param hosting_environment: Name of App Service Environment where app or App Service plan should be created. :type hosting_environment: str + :param is_xenon: true if App Service plan is running as a + windows container + :type is_xenon: bool """ _validation = { @@ -59,6 +62,7 @@ class ValidateRequest(Model): 'is_spot': {'key': 'properties.isSpot', 'type': 'bool'}, 'capacity': {'key': 'properties.capacity', 'type': 'int'}, 'hosting_environment': {'key': 'properties.hostingEnvironment', 'type': 'str'}, + 'is_xenon': {'key': 'properties.isXenon', 'type': 'bool'}, } def __init__(self, **kwargs): @@ -72,3 +76,4 @@ def __init__(self, **kwargs): self.is_spot = kwargs.get('is_spot', None) self.capacity = kwargs.get('capacity', None) self.hosting_environment = kwargs.get('hosting_environment', None) + self.is_xenon = kwargs.get('is_xenon', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/validate_request_py3.py b/azure-mgmt-web/azure/mgmt/web/models/validate_request_py3.py index 711a94575335..848236c53bd2 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/validate_request_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/validate_request_py3.py @@ -40,6 +40,9 @@ class ValidateRequest(Model): :param hosting_environment: Name of App Service Environment where app or App Service plan should be created. :type hosting_environment: str + :param is_xenon: true if App Service plan is running as a + windows container + :type is_xenon: bool """ _validation = { @@ -59,9 +62,10 @@ class ValidateRequest(Model): 'is_spot': {'key': 'properties.isSpot', 'type': 'bool'}, 'capacity': {'key': 'properties.capacity', 'type': 'int'}, 'hosting_environment': {'key': 'properties.hostingEnvironment', 'type': 'str'}, + 'is_xenon': {'key': 'properties.isXenon', 'type': 'bool'}, } - def __init__(self, *, name: str, type, location: str, server_farm_id: str=None, sku_name: str=None, need_linux_workers: bool=None, is_spot: bool=None, capacity: int=None, hosting_environment: str=None, **kwargs) -> None: + def __init__(self, *, name: str, type, location: str, server_farm_id: str=None, sku_name: str=None, need_linux_workers: bool=None, is_spot: bool=None, capacity: int=None, hosting_environment: str=None, is_xenon: bool=None, **kwargs) -> None: super(ValidateRequest, self).__init__(**kwargs) self.name = name self.type = type @@ -72,3 +76,4 @@ def __init__(self, *, name: str, type, location: str, server_farm_id: str=None, self.is_spot = is_spot self.capacity = capacity self.hosting_environment = hosting_environment + self.is_xenon = is_xenon 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 43a33b9d117e..8e0158098ceb 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,7 +55,6 @@ 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'}, @@ -66,7 +62,6 @@ class VnetRoute(ProxyOnlyResource): def __init__(self, **kwargs): super(VnetRoute, self).__init__(**kwargs) - self.vnet_route_name = kwargs.get('vnet_route_name', None) self.start_address = kwargs.get('start_address', None) self.end_address = kwargs.get('end_address', None) self.route_type = kwargs.get('route_type', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/vnet_route_py3.py b/azure-mgmt-web/azure/mgmt/web/models/vnet_route_py3.py index 9412206ce11b..1816fa5834c9 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/vnet_route_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/vnet_route_py3.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: str=None, vnet_route_name: str=None, start_address: str=None, end_address: str=None, route_type=None, **kwargs) -> None: + def __init__(self, *, kind: str=None, start_address: str=None, end_address: str=None, route_type=None, **kwargs) -> None: super(VnetRoute, self).__init__(kind=kind, **kwargs) - 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 5454d02ccbe7..d162868885d3 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, **kwargs): super(WebJob, self).__init__(**kwargs) - self.web_job_name = None self.run_command = kwargs.get('run_command', None) self.url = kwargs.get('url', None) self.extra_info_url = kwargs.get('extra_info_url', None) - self.job_type = kwargs.get('job_type', None) + self.web_job_type = kwargs.get('web_job_type', None) self.error = kwargs.get('error', None) self.using_sdk = kwargs.get('using_sdk', None) self.settings = kwargs.get('settings', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/web_job_py3.py b/azure-mgmt-web/azure/mgmt/web/models/web_job_py3.py index ce5d939e01a8..47bb10e340b6 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/web_job_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/web_job_py3.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: str=None, run_command: str=None, url: str=None, extra_info_url: str=None, job_type=None, error: str=None, using_sdk: bool=None, settings=None, **kwargs) -> None: + def __init__(self, *, kind: str=None, run_command: str=None, url: str=None, extra_info_url: str=None, web_job_type=None, error: str=None, using_sdk: bool=None, settings=None, **kwargs) -> None: super(WebJob, self).__init__(kind=kind, **kwargs) - 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 bfaeda5eb909..087cf3dfcdd2 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 @@ -84,6 +84,13 @@ class RouteType(str, Enum): class ManagedServiceIdentityType(str, Enum): system_assigned = "SystemAssigned" + user_assigned = "UserAssigned" + + +class IpFilterTag(str, Enum): + + default = "Default" + xff_proxy = "XffProxy" class AutoHealActionType(str, Enum): @@ -147,6 +154,13 @@ class SupportedTlsVersions(str, Enum): one_full_stop_two = "1.2" +class FtpsState(str, Enum): + + all_allowed = "AllAllowed" + ftps_only = "FtpsOnly" + disabled = "Disabled" + + class SslState(str, Enum): disabled = "Disabled" @@ -259,13 +273,13 @@ class ComputeModeOptions(str, Enum): class WorkerSizeOptions(str, Enum): - default = "Default" small = "Small" medium = "Medium" large = "Large" d1 = "D1" d2 = "D2" d3 = "D3" + default = "Default" class AccessControlEntryAction(str, Enum): @@ -405,14 +419,6 @@ class FrequencyUnit(str, Enum): hour = "Hour" -class BackupRestoreOperationType(str, Enum): - - default = "Default" - clone = "Clone" - relocation = "Relocation" - snapshot = "Snapshot" - - class ContinuousWebJobStatus(str, Enum): initializing = "Initializing" @@ -471,6 +477,15 @@ class PublicCertificateLocation(str, Enum): unknown = "Unknown" +class BackupRestoreOperationType(str, Enum): + + default = "Default" + clone = "Clone" + relocation = "Relocation" + snapshot = "Snapshot" + cloud_fs = "CloudFS" + + class UnauthenticatedClientAction(str, Enum): redirect_to_login_page = "RedirectToLoginPage" @@ -513,6 +528,6 @@ class SkuName(str, 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/__init__.py b/azure-mgmt-web/azure/mgmt/web/operations/__init__.py index 5ceaac0d94eb..93d9712f46bd 100644 --- a/azure-mgmt-web/azure/mgmt/web/operations/__init__.py +++ b/azure-mgmt-web/azure/mgmt/web/operations/__init__.py @@ -19,8 +19,6 @@ from .diagnostics_operations import DiagnosticsOperations from .provider_operations import ProviderOperations from .recommendations_operations import RecommendationsOperations -from .resource_health_metadata_operations import ResourceHealthMetadataOperations -from .billing_meters_operations import BillingMetersOperations from .web_apps_operations import WebAppsOperations from .app_service_environments_operations import AppServiceEnvironmentsOperations from .app_service_plans_operations import AppServicePlansOperations @@ -36,8 +34,6 @@ 'DiagnosticsOperations', 'ProviderOperations', 'RecommendationsOperations', - 'ResourceHealthMetadataOperations', - 'BillingMetersOperations', 'WebAppsOperations', 'AppServiceEnvironmentsOperations', 'AppServicePlansOperations', 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 756f74b6c1e5..24d43ce7eb3d 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 @@ -379,7 +374,8 @@ def create_or_update( ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.AppServiceCertificateOrder] or ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.AppServiceCertificateOrder]] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ raw_result = self._create_or_update_initial( resource_group_name=resource_group_name, @@ -488,7 +484,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'] @@ -522,9 +519,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 @@ -559,7 +554,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): @@ -597,9 +593,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 @@ -636,7 +630,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'] @@ -667,9 +662,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 @@ -719,9 +712,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 @@ -764,7 +755,8 @@ def create_or_update_certificate( ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.AppServiceCertificateResource] or ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.AppServiceCertificateResource]] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ raw_result = self._create_or_update_certificate_initial( resource_group_name=resource_group_name, @@ -879,7 +871,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'] @@ -914,9 +907,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 @@ -1206,7 +1197,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) @@ -1242,9 +1234,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 @@ -1334,7 +1324,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'] @@ -1364,9 +1355,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 @@ -1399,7 +1388,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'] @@ -1429,9 +1419,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 033fade0ec3e..59804fc6d34a 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 @@ -538,7 +535,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): @@ -576,9 +574,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 @@ -612,7 +608,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'] @@ -642,9 +639,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 @@ -658,6 +653,115 @@ 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, polling=True, **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: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns WebAppCollection or + ClientRawResponse if raw==True + :rtype: + ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.WebAppCollection] + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.WebAppCollection]] + :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 + ) + + def get_long_running_output(response): + deserialized = self._deserialize('WebAppCollection', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + + lro_delay = operation_config.get( + 'long_running_operation_timeout', + self.config.long_running_operation_timeout) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) + 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. @@ -677,7 +781,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'] @@ -707,9 +812,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 @@ -745,7 +848,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'] @@ -776,9 +880,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 @@ -811,7 +913,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'] @@ -841,9 +944,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 @@ -885,7 +986,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): @@ -927,9 +1029,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 @@ -963,7 +1063,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): @@ -1001,9 +1102,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 @@ -1037,7 +1136,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'] @@ -1067,9 +1167,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 @@ -1286,7 +1384,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): @@ -1325,9 +1424,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 @@ -1368,7 +1465,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): @@ -1409,9 +1507,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 @@ -1447,7 +1543,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): @@ -1485,9 +1582,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 @@ -1536,7 +1631,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): @@ -1584,9 +1680,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 @@ -1620,7 +1714,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): @@ -1658,9 +1753,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 @@ -1694,7 +1787,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): @@ -1732,9 +1826,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 @@ -1768,7 +1860,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'] @@ -1798,9 +1891,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 @@ -1902,9 +1993,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 @@ -1941,7 +2030,8 @@ def resume( ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.WebAppCollection] or ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.WebAppCollection]] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ raw_result = self._resume_initial( resource_group_name=resource_group_name, @@ -1988,7 +2078,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): @@ -2026,9 +2117,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 @@ -2064,7 +2153,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): @@ -2104,9 +2194,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 @@ -2152,9 +2240,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 @@ -2191,7 +2277,8 @@ def suspend( ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.WebAppCollection] or ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.WebAppCollection]] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ raw_result = self._suspend_initial( resource_group_name=resource_group_name, @@ -2244,7 +2331,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): @@ -2284,9 +2372,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 @@ -2320,7 +2406,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): @@ -2358,9 +2445,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 @@ -2396,7 +2481,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'] @@ -2427,9 +2513,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 @@ -2653,7 +2737,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): @@ -2693,9 +2778,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 @@ -2744,7 +2827,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): @@ -2788,9 +2872,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 @@ -2826,7 +2908,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): @@ -2865,9 +2948,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 @@ -2914,7 +2995,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): @@ -2957,9 +3039,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 @@ -2995,7 +3075,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): @@ -3034,9 +3115,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 @@ -3072,7 +3151,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): @@ -3111,9 +3191,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 bf35c0a10ccd..a80f65980427 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 @@ -325,7 +321,8 @@ def create_or_update( ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.AppServicePlan] or ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.AppServicePlan]] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ raw_result = self._create_or_update_initial( resource_group_name=resource_group_name, @@ -433,7 +430,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'] @@ -467,9 +465,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 @@ -504,7 +500,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'] @@ -534,9 +531,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 @@ -573,7 +568,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'] @@ -605,9 +601,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 @@ -707,7 +701,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'] @@ -739,9 +734,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 @@ -777,7 +770,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): @@ -817,9 +811,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 @@ -855,7 +847,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'] @@ -885,9 +878,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 @@ -920,7 +911,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): @@ -958,9 +950,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 @@ -996,7 +986,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): @@ -1034,9 +1025,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 @@ -1079,7 +1068,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): @@ -1121,9 +1111,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 @@ -1230,7 +1218,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): @@ -1274,9 +1263,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 @@ -1309,7 +1296,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'] @@ -1339,9 +1327,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 @@ -1378,7 +1364,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): @@ -1418,9 +1405,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 @@ -1454,7 +1439,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'] @@ -1484,9 +1470,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 @@ -1592,7 +1576,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'] @@ -1624,9 +1609,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 @@ -1666,7 +1649,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'] @@ -1702,9 +1686,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 @@ -1741,7 +1723,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'] @@ -1772,9 +1755,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/billing_meters_operations.py b/azure-mgmt-web/azure/mgmt/web/operations/billing_meters_operations.py deleted file mode 100644 index 1fd793c46673..000000000000 --- a/azure-mgmt-web/azure/mgmt/web/operations/billing_meters_operations.py +++ /dev/null @@ -1,109 +0,0 @@ -# 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. -# -------------------------------------------------------------------------- - -import uuid -from msrest.pipeline import ClientRawResponse -from msrestazure.azure_exceptions import CloudError - -from .. import models - - -class BillingMetersOperations(object): - """BillingMetersOperations operations. - - :param client: Client for service requests. - :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". - """ - - models = models - - def __init__(self, client, config, serializer, deserializer): - - self._client = client - self._serialize = serializer - self._deserialize = deserializer - self.api_version = "2016-03-01" - - self.config = config - - def list( - self, billing_location=None, custom_headers=None, raw=False, **operation_config): - """Gets a list of meters for a given location. - - Gets a list of meters for a given location. - - :param billing_location: Azure Location of billable resource - :type billing_location: 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: An iterator like instance of BillingMeter - :rtype: - ~azure.mgmt.web.models.BillingMeterPaged[~azure.mgmt.web.models.BillingMeter] - :raises: :class:`CloudError` - """ - 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 billing_location is not None: - query_parameters['billingLocation'] = self._serialize.query("billing_location", billing_location, 'str') - 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]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp - - return response - - # Deserialize response - deserialized = models.BillingMeterPaged(internal_paging, self._deserialize.dependencies) - - if raw: - header_dict = {} - client_raw_response = models.BillingMeterPaged(internal_paging, self._deserialize.dependencies, header_dict) - return client_raw_response - - return deserialized - list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Web/billingMeters'} 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 90609947d199..4ea0569b1ad7 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_hosting_environment_detector_responses( :return: An iterator like instance of DetectorResponse :rtype: ~azure.mgmt.web.models.DetectorResponsePaged[~azure.mgmt.web.models.DetectorResponse] - :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 @@ -138,7 +136,8 @@ def get_hosting_environment_detector_response( :return: DetectorResponse or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.DetectorResponse or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.get_hosting_environment_detector_response.metadata['url'] @@ -175,9 +174,7 @@ def get_hosting_environment_detector_response( 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 @@ -210,7 +207,8 @@ def list_site_detector_responses( :return: An iterator like instance of DetectorResponse :rtype: ~azure.mgmt.web.models.DetectorResponsePaged[~azure.mgmt.web.models.DetectorResponse] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ def internal_paging(next_link=None, raw=False): @@ -248,9 +246,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 @@ -292,7 +288,8 @@ def get_site_detector_response( :return: DetectorResponse or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.DetectorResponse or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.get_site_detector_response.metadata['url'] @@ -329,9 +326,7 @@ def get_site_detector_response( 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 @@ -364,7 +359,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): @@ -402,9 +398,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 @@ -440,7 +434,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'] @@ -471,9 +466,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 @@ -508,7 +501,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): @@ -547,9 +541,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 @@ -587,7 +579,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'] @@ -619,9 +612,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 @@ -664,7 +655,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'] @@ -702,9 +694,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 @@ -739,7 +729,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): @@ -778,9 +769,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 @@ -818,7 +807,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): @@ -858,9 +848,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 @@ -904,7 +892,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'] @@ -942,9 +931,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 @@ -979,7 +966,8 @@ def list_site_detector_responses_slot( :return: An iterator like instance of DetectorResponse :rtype: ~azure.mgmt.web.models.DetectorResponsePaged[~azure.mgmt.web.models.DetectorResponse] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ def internal_paging(next_link=None, raw=False): @@ -1018,9 +1006,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 @@ -1064,7 +1050,8 @@ def get_site_detector_response_slot( :return: DetectorResponse or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.DetectorResponse or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.get_site_detector_response_slot.metadata['url'] @@ -1102,9 +1089,7 @@ def get_site_detector_response_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 @@ -1139,7 +1124,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): @@ -1178,9 +1164,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 @@ -1218,7 +1202,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'] @@ -1250,9 +1235,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 @@ -1289,7 +1272,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): @@ -1329,9 +1313,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 @@ -1371,7 +1353,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'] @@ -1404,9 +1387,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 @@ -1451,7 +1432,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'] @@ -1490,9 +1472,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 @@ -1529,7 +1509,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): @@ -1569,9 +1550,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 @@ -1611,7 +1590,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): @@ -1652,9 +1632,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 @@ -1700,7 +1678,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'] @@ -1739,9 +1718,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 b7c35bb85110..f414a9d997b3 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 @@ -521,7 +513,8 @@ def create_or_update( ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.Domain] or ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.Domain]] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ raw_result = self._create_or_update_initial( resource_group_name=resource_group_name, @@ -634,7 +627,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'] @@ -668,9 +662,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 @@ -705,7 +697,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): @@ -743,9 +736,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 @@ -781,7 +772,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'] @@ -812,9 +804,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 @@ -855,7 +845,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) @@ -892,9 +883,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 @@ -995,7 +984,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) @@ -1032,9 +1022,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 @@ -1066,8 +1054,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'] @@ -1096,8 +1083,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 79c8c4c870fd..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 @@ -60,7 +60,8 @@ def list( :return: An iterator like instance of Recommendation :rtype: ~azure.mgmt.web.models.RecommendationPaged[~azure.mgmt.web.models.Recommendation] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ def internal_paging(next_link=None, raw=False): @@ -100,9 +101,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 @@ -223,7 +222,7 @@ def disable_recommendation_for_subscription( 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. @@ -235,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 @@ -248,7 +251,8 @@ def list_history_for_web_app( :return: An iterator like instance of Recommendation :rtype: ~azure.mgmt.web.models.RecommendationPaged[~azure.mgmt.web.models.Recommendation] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ def internal_paging(next_link=None, raw=False): @@ -264,6 +268,8 @@ def internal_paging(next_link=None, raw=False): # 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') @@ -288,9 +294,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 @@ -332,7 +336,8 @@ def list_recommended_rules_for_web_app( :return: An iterator like instance of Recommendation :rtype: ~azure.mgmt.web.models.RecommendationPaged[~azure.mgmt.web.models.Recommendation] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ def internal_paging(next_link=None, raw=False): @@ -374,9 +379,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 @@ -533,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'] @@ -568,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 diff --git a/azure-mgmt-web/azure/mgmt/web/operations/resource_health_metadata_operations.py b/azure-mgmt-web/azure/mgmt/web/operations/resource_health_metadata_operations.py deleted file mode 100644 index 2b8b44f45e60..000000000000 --- a/azure-mgmt-web/azure/mgmt/web/operations/resource_health_metadata_operations.py +++ /dev/null @@ -1,461 +0,0 @@ -# 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. -# -------------------------------------------------------------------------- - -import uuid -from msrest.pipeline import ClientRawResponse - -from .. import models - - -class ResourceHealthMetadataOperations(object): - """ResourceHealthMetadataOperations operations. - - :param client: Client for service requests. - :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". - """ - - models = models - - def __init__(self, client, config, serializer, deserializer): - - self._client = client - self._serialize = serializer - self._deserialize = deserializer - self.api_version = "2016-03-01" - - self.config = config - - def list( - self, custom_headers=None, raw=False, **operation_config): - """List all ResourceHealthMetadata for all sites in the subscription. - - List all ResourceHealthMetadata for all sites in the 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: An iterator like instance of ResourceHealthMetadata - :rtype: - ~azure.mgmt.web.models.ResourceHealthMetadataPaged[~azure.mgmt.web.models.ResourceHealthMetadata] - :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 = {} - 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.ResourceHealthMetadataPaged(internal_paging, self._deserialize.dependencies) - - if raw: - header_dict = {} - client_raw_response = models.ResourceHealthMetadataPaged(internal_paging, self._deserialize.dependencies, header_dict) - return client_raw_response - - return deserialized - list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Web/resourceHealthMetadata'} - - def list_by_resource_group( - self, resource_group_name, custom_headers=None, raw=False, **operation_config): - """List all ResourceHealthMetadata for all sites in the resource group in - the subscription. - - List all ResourceHealthMetadata for all sites in the resource group in - the subscription. - - :param resource_group_name: Name of the resource group to which the - resource belongs. - :type resource_group_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: An iterator like instance of ResourceHealthMetadata - :rtype: - ~azure.mgmt.web.models.ResourceHealthMetadataPaged[~azure.mgmt.web.models.ResourceHealthMetadata] - :raises: - :class:`DefaultErrorResponseException` - """ - def internal_paging(next_link=None, raw=False): - - if not next_link: - # Construct URL - url = self.list_by_resource_group.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\._\(\)]+[^\.]$'), - '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') - - 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.ResourceHealthMetadataPaged(internal_paging, self._deserialize.dependencies) - - if raw: - header_dict = {} - client_raw_response = models.ResourceHealthMetadataPaged(internal_paging, self._deserialize.dependencies, header_dict) - return client_raw_response - - return deserialized - list_by_resource_group.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/resourceHealthMetadata'} - - def list_by_site( - self, resource_group_name, name, custom_headers=None, raw=False, **operation_config): - """Gets the category of ResourceHealthMetadata to use for the given site - as a collection. - - Gets the category of ResourceHealthMetadata to use for the given site - as a collection. - - :param resource_group_name: Name of the resource group to which the - resource belongs. - :type resource_group_name: str - :param name: Name of web app. - :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: An iterator like instance of ResourceHealthMetadata - :rtype: - ~azure.mgmt.web.models.ResourceHealthMetadataPaged[~azure.mgmt.web.models.ResourceHealthMetadata] - :raises: - :class:`DefaultErrorResponseException` - """ - def internal_paging(next_link=None, raw=False): - - if not next_link: - # Construct URL - url = self.list_by_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\._\(\)]+[^\.]$'), - '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') - - 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.ResourceHealthMetadataPaged(internal_paging, self._deserialize.dependencies) - - if raw: - header_dict = {} - client_raw_response = models.ResourceHealthMetadataPaged(internal_paging, self._deserialize.dependencies, header_dict) - return client_raw_response - - return deserialized - list_by_site.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/resourceHealthMetadata'} - - def get_by_site( - self, resource_group_name, name, custom_headers=None, raw=False, **operation_config): - """Gets the category of ResourceHealthMetadata to use for the given site. - - Gets the category of ResourceHealthMetadata to use for the given site. - - :param resource_group_name: Name of the resource group to which the - resource belongs. - :type resource_group_name: str - :param name: Name of web app - :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: ResourceHealthMetadata or ClientRawResponse if raw=true - :rtype: ~azure.mgmt.web.models.ResourceHealthMetadata or - ~msrest.pipeline.ClientRawResponse - :raises: - :class:`DefaultErrorResponseException` - """ - # Construct URL - url = self.get_by_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\._\(\)]+[^\.]$'), - '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.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) - - deserialized = None - - if response.status_code == 200: - deserialized = self._deserialize('ResourceHealthMetadata', response) - - if raw: - client_raw_response = ClientRawResponse(deserialized, response) - return client_raw_response - - return deserialized - get_by_site.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/resourceHealthMetadata/default'} - - def list_by_site_slot( - self, resource_group_name, name, slot, custom_headers=None, raw=False, **operation_config): - """Gets the category of ResourceHealthMetadata to use for the given site - as a collection. - - Gets the category of ResourceHealthMetadata to use for the given site - as a collection. - - :param resource_group_name: Name of the resource group to which the - resource belongs. - :type resource_group_name: str - :param name: Name of web app. - :type name: str - :param slot: Name of web app slot. If not specified then will default - to production slot. - :type slot: 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: An iterator like instance of ResourceHealthMetadata - :rtype: - ~azure.mgmt.web.models.ResourceHealthMetadataPaged[~azure.mgmt.web.models.ResourceHealthMetadata] - :raises: - :class:`DefaultErrorResponseException` - """ - def internal_paging(next_link=None, raw=False): - - if not next_link: - # Construct URL - url = self.list_by_site_slot.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'), - 'slot': self._serialize.url("slot", slot, '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') - - 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.ResourceHealthMetadataPaged(internal_paging, self._deserialize.dependencies) - - if raw: - header_dict = {} - client_raw_response = models.ResourceHealthMetadataPaged(internal_paging, self._deserialize.dependencies, header_dict) - return client_raw_response - - return deserialized - list_by_site_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/resourceHealthMetadata'} - - def get_by_site_slot( - self, resource_group_name, name, slot, custom_headers=None, raw=False, **operation_config): - """Gets the category of ResourceHealthMetadata to use for the given site. - - Gets the category of ResourceHealthMetadata to use for the given site. - - :param resource_group_name: Name of the resource group to which the - resource belongs. - :type resource_group_name: str - :param name: Name of web app - :type name: str - :param slot: Name of web app slot. If not specified then will default - to production slot. - :type slot: 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: ResourceHealthMetadata or ClientRawResponse if raw=true - :rtype: ~azure.mgmt.web.models.ResourceHealthMetadata or - ~msrest.pipeline.ClientRawResponse - :raises: - :class:`DefaultErrorResponseException` - """ - # Construct URL - url = self.get_by_site_slot.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'), - 'slot': self._serialize.url("slot", slot, '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.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) - - deserialized = None - - if response.status_code == 200: - deserialized = self._deserialize('ResourceHealthMetadata', response) - - if raw: - client_raw_response = ClientRawResponse(deserialized, response) - return client_raw_response - - return deserialized - get_by_site_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/resourceHealthMetadata/default'} 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 944bd0ea99d2..ca889dacddb1 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 @@ -281,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 @@ -326,7 +322,8 @@ def create_or_update( ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.Site] or ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.Site]] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ raw_result = self._create_or_update_initial( resource_group_name=resource_group_name, @@ -447,7 +444,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'] @@ -481,9 +479,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 @@ -520,7 +516,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'] @@ -552,9 +549,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 @@ -660,7 +655,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'] @@ -694,9 +690,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 @@ -729,7 +723,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): @@ -767,9 +762,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 @@ -784,80 +777,6 @@ def internal_paging(next_link=None, raw=False): return deserialized list_backups.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/backups'} - def discover_restore( - self, resource_group_name, name, request, custom_headers=None, raw=False, **operation_config): - """Discovers an existing app backup that can be restored from a blob in - Azure storage. - - Discovers an existing app backup that can be restored from a blob in - Azure storage. - - :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. - :type name: str - :param request: A RestoreRequest object that includes Azure storage - URL and blog name for discovery of backup. - :type request: ~azure.mgmt.web.models.RestoreRequest - :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: RestoreRequest or ClientRawResponse if raw=true - :rtype: ~azure.mgmt.web.models.RestoreRequest or - ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` - """ - # Construct URL - url = self.discover_restore.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(request, 'RestoreRequest') - - # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - 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 - - deserialized = None - - if response.status_code == 200: - deserialized = self._deserialize('RestoreRequest', response) - - if raw: - client_raw_response = ClientRawResponse(deserialized, response) - return client_raw_response - - return deserialized - discover_restore.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/backups/discover'} - def get_backup_status( self, resource_group_name, name, backup_id, custom_headers=None, raw=False, **operation_config): """Gets a backup of an app by its ID. @@ -879,7 +798,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` """ # Construct URL url = self.get_backup_status.metadata['url'] @@ -910,9 +830,7 @@ def get_backup_status( 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 @@ -1015,7 +933,8 @@ def list_backup_status_secrets( :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.list_backup_status_secrets.metadata['url'] @@ -1050,9 +969,7 @@ def list_backup_status_secrets( 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 @@ -1101,22 +1018,15 @@ def _restore_initial( response = self._client.send( request, header_parameters, body_content, stream=False, **operation_config) - if response.status_code not in [200]: + if response.status_code not in [200, 202]: 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('RestoreResponse', response) - if raw: - client_raw_response = ClientRawResponse(deserialized, response) + client_raw_response = ClientRawResponse(None, response) return client_raw_response - return deserialized - def restore( self, resource_group_name, name, backup_id, request, custom_headers=None, raw=False, polling=True, **operation_config): """Restores a specific backup to another app (or deployment slot, if @@ -1139,12 +1049,10 @@ def restore( direct response alongside the deserialized response :param polling: True for ARMPolling, False for no polling, or a polling object for personal polling strategy - :return: An instance of LROPoller that returns RestoreResponse or - ClientRawResponse if raw==True - :rtype: - ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.RestoreResponse] - or - ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.RestoreResponse]] + :return: An instance of LROPoller that returns None or + ClientRawResponse if raw==True + :rtype: ~msrestazure.azure_operation.AzureOperationPoller[None] or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[None]] :raises: :class:`CloudError` """ raw_result = self._restore_initial( @@ -1158,14 +1066,10 @@ def restore( ) def get_long_running_output(response): - deserialized = self._deserialize('RestoreResponse', response) - if raw: - client_raw_response = ClientRawResponse(deserialized, response) + client_raw_response = ClientRawResponse(None, response) return client_raw_response - return deserialized - lro_delay = operation_config.get( 'long_running_operation_timeout', self.config.long_running_operation_timeout) @@ -1194,7 +1098,8 @@ def list_configurations( :return: An iterator like instance of SiteConfigResource :rtype: ~azure.mgmt.web.models.SiteConfigResourcePaged[~azure.mgmt.web.models.SiteConfigResource] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ def internal_paging(next_link=None, raw=False): @@ -1232,9 +1137,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 @@ -1272,7 +1175,8 @@ def update_application_settings( :return: StringDictionary or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.StringDictionary or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ app_settings = models.StringDictionary(kind=kind, properties=properties) @@ -1308,9 +1212,7 @@ def update_application_settings( 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 @@ -1343,7 +1245,8 @@ def list_application_settings( :return: StringDictionary or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.StringDictionary or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.list_application_settings.metadata['url'] @@ -1373,9 +1276,7 @@ def list_application_settings( 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 @@ -1412,7 +1313,8 @@ def update_auth_settings( :return: SiteAuthSettings or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.SiteAuthSettings or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.update_auth_settings.metadata['url'] @@ -1446,9 +1348,7 @@ def update_auth_settings( 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 @@ -1481,7 +1381,8 @@ def get_auth_settings( :return: SiteAuthSettings or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.SiteAuthSettings or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.get_auth_settings.metadata['url'] @@ -1511,9 +1412,7 @@ def get_auth_settings( 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 @@ -1548,7 +1447,8 @@ def update_backup_configuration( :return: BackupRequest or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.BackupRequest or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.update_backup_configuration.metadata['url'] @@ -1582,9 +1482,7 @@ def update_backup_configuration( 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 @@ -1674,7 +1572,8 @@ def get_backup_configuration( :return: BackupRequest or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.BackupRequest or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.get_backup_configuration.metadata['url'] @@ -1704,9 +1603,7 @@ def get_backup_configuration( 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 @@ -1744,7 +1641,8 @@ def update_connection_strings( :return: ConnectionStringDictionary or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.ConnectionStringDictionary or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ connection_strings = models.ConnectionStringDictionary(kind=kind, properties=properties) @@ -1780,9 +1678,7 @@ def update_connection_strings( 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 @@ -1815,7 +1711,8 @@ def list_connection_strings( :return: ConnectionStringDictionary or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.ConnectionStringDictionary or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.list_connection_strings.metadata['url'] @@ -1845,9 +1742,7 @@ def list_connection_strings( 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 @@ -1880,7 +1775,8 @@ def get_diagnostic_logs_configuration( :return: SiteLogsConfig or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.SiteLogsConfig or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.get_diagnostic_logs_configuration.metadata['url'] @@ -1910,9 +1806,7 @@ def get_diagnostic_logs_configuration( 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 @@ -1948,7 +1842,8 @@ def update_diagnostic_logs_config( :return: SiteLogsConfig or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.SiteLogsConfig or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.update_diagnostic_logs_config.metadata['url'] @@ -1982,9 +1877,7 @@ def update_diagnostic_logs_config( 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 @@ -2021,7 +1914,8 @@ def update_metadata( :return: StringDictionary or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.StringDictionary or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ metadata = models.StringDictionary(kind=kind, properties=properties) @@ -2057,9 +1951,7 @@ def update_metadata( 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 @@ -2092,7 +1984,8 @@ def list_metadata( :return: StringDictionary or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.StringDictionary or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.list_metadata.metadata['url'] @@ -2122,9 +2015,7 @@ def list_metadata( 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 @@ -2169,9 +2060,7 @@ def _list_publishing_credentials_initial( 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 @@ -2206,7 +2095,8 @@ def list_publishing_credentials( ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.User] or ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.User]] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ raw_result = self._list_publishing_credentials_initial( resource_group_name=resource_group_name, @@ -2255,7 +2145,8 @@ def update_site_push_settings( :return: PushSettings or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.PushSettings or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.update_site_push_settings.metadata['url'] @@ -2289,9 +2180,7 @@ def update_site_push_settings( 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 @@ -2324,7 +2213,8 @@ def list_site_push_settings( :return: PushSettings or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.PushSettings or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.list_site_push_settings.metadata['url'] @@ -2354,9 +2244,7 @@ def list_site_push_settings( 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 @@ -2391,7 +2279,8 @@ def list_slot_configuration_names( :return: SlotConfigNamesResource or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.SlotConfigNamesResource or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.list_slot_configuration_names.metadata['url'] @@ -2421,9 +2310,7 @@ def list_slot_configuration_names( 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 @@ -2462,7 +2349,8 @@ def update_slot_configuration_names( :return: SlotConfigNamesResource or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.SlotConfigNamesResource or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.update_slot_configuration_names.metadata['url'] @@ -2496,9 +2384,7 @@ def update_slot_configuration_names( 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 @@ -2512,13 +2398,11 @@ def update_slot_configuration_names( return deserialized update_slot_configuration_names.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/slotConfigNames'} - def get_configuration( + def get_swift_virtual_network_connection( self, resource_group_name, name, custom_headers=None, raw=False, **operation_config): - """Gets the configuration of an app, such as platform version and bitness, - default documents, virtual applications, Always On, etc. + """Gets a Swift Virtual Network connection. - Gets the configuration of an app, such as platform version and bitness, - default documents, virtual applications, Always On, etc. + Gets a Swift Virtual Network connection. :param resource_group_name: Name of the resource group to which the resource belongs. @@ -2530,13 +2414,14 @@ def get_configuration( deserialized response :param operation_config: :ref:`Operation configuration overrides`. - :return: SiteConfigResource or ClientRawResponse if raw=true - :rtype: ~azure.mgmt.web.models.SiteConfigResource or + :return: SwiftVirtualNetwork or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.SwiftVirtualNetwork or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL - url = self.get_configuration.metadata['url'] + url = self.get_swift_virtual_network_connection.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'), @@ -2563,48 +2448,53 @@ def get_configuration( 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 if response.status_code == 200: - deserialized = self._deserialize('SiteConfigResource', response) + deserialized = self._deserialize('SwiftVirtualNetwork', response) if raw: client_raw_response = ClientRawResponse(deserialized, response) return client_raw_response return deserialized - get_configuration.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/web'} + get_swift_virtual_network_connection.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/virtualNetwork'} - def create_or_update_configuration( - self, resource_group_name, name, site_config, custom_headers=None, raw=False, **operation_config): - """Updates the configuration of an app. + def create_or_update_swift_virtual_network_connection( + self, resource_group_name, name, connection_envelope, custom_headers=None, raw=False, **operation_config): + """Integrates this Web App with a Virtual Network. This requires that 1) + "swiftSupported" is true when doing a GET against this resource, and 2) + that the target Subnet has already been delegated, and is not + in use by another App Service Plan other than the one this App is in. - Updates the configuration of an app. + Integrates this Web App with a Virtual Network. This requires that 1) + "swiftSupported" is true when doing a GET against this resource, and 2) + that the target Subnet has already been delegated, and is not + in use by another App Service Plan other than the one this App is in. :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. :type name: str - :param site_config: JSON representation of a SiteConfig object. See - example. - :type site_config: ~azure.mgmt.web.models.SiteConfigResource + :param connection_envelope: Properties of the Virtual Network + connection. See example. + :type connection_envelope: ~azure.mgmt.web.models.SwiftVirtualNetwork :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: SiteConfigResource or ClientRawResponse if raw=true - :rtype: ~azure.mgmt.web.models.SiteConfigResource or + :return: SwiftVirtualNetwork or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.SwiftVirtualNetwork or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL - url = self.create_or_update_configuration.metadata['url'] + url = self.create_or_update_swift_virtual_network_connection.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'), @@ -2627,7 +2517,7 @@ def create_or_update_configuration( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct body - body_content = self._serialize.body(site_config, 'SiteConfigResource') + body_content = self._serialize.body(connection_envelope, 'SwiftVirtualNetwork') # Construct and send request request = self._client.put(url, query_parameters) @@ -2635,48 +2525,44 @@ def create_or_update_configuration( 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 if response.status_code == 200: - deserialized = self._deserialize('SiteConfigResource', response) + deserialized = self._deserialize('SwiftVirtualNetwork', response) if raw: client_raw_response = ClientRawResponse(deserialized, response) return client_raw_response return deserialized - create_or_update_configuration.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/web'} + create_or_update_swift_virtual_network_connection.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/virtualNetwork'} - def update_configuration( - self, resource_group_name, name, site_config, custom_headers=None, raw=False, **operation_config): - """Updates the configuration of an app. + def delete_swift_virtual_network( + self, resource_group_name, name, custom_headers=None, raw=False, **operation_config): + """Deletes a Swift Virtual Network connection from an app (or deployment + slot). - Updates the configuration of an app. + Deletes a Swift Virtual Network connection from an app (or deployment + slot). :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. :type name: str - :param site_config: JSON representation of a SiteConfig object. See - example. - :type site_config: ~azure.mgmt.web.models.SiteConfigResource :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: SiteConfigResource or ClientRawResponse if raw=true - :rtype: ~azure.mgmt.web.models.SiteConfigResource or - ~msrest.pipeline.ClientRawResponse + :return: None or ClientRawResponse if raw=true + :rtype: None or ~msrest.pipeline.ClientRawResponse :raises: :class:`CloudError` """ # Construct URL - url = self.update_configuration.metadata['url'] + url = self.delete_swift_virtual_network.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'), @@ -2698,20 +2584,294 @@ def update_configuration( 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(site_config, 'SiteConfigResource') - # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.delete(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 [200, 404]: exp = CloudError(response) exp.request_id = response.headers.get('x-ms-request-id') raise exp - deserialized = None + if raw: + client_raw_response = ClientRawResponse(None, response) + return client_raw_response + delete_swift_virtual_network.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/virtualNetwork'} + + def update_swift_virtual_network_connection( + self, resource_group_name, name, connection_envelope, custom_headers=None, raw=False, **operation_config): + """Integrates this Web App with a Virtual Network. This requires that 1) + "swiftSupported" is true when doing a GET against this resource, and 2) + that the target Subnet has already been delegated, and is not + in use by another App Service Plan other than the one this App is in. + + Integrates this Web App with a Virtual Network. This requires that 1) + "swiftSupported" is true when doing a GET against this resource, and 2) + that the target Subnet has already been delegated, and is not + in use by another App Service Plan other than the one this App is in. + + :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. + :type name: str + :param connection_envelope: Properties of the Virtual Network + connection. See example. + :type connection_envelope: ~azure.mgmt.web.models.SwiftVirtualNetwork + :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: SwiftVirtualNetwork or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.SwiftVirtualNetwork or + ~msrest.pipeline.ClientRawResponse + :raises: + :class:`DefaultErrorResponseException` + """ + # Construct URL + url = self.update_swift_virtual_network_connection.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(connection_envelope, 'SwiftVirtualNetwork') + + # Construct and send request + request = self._client.patch(url, query_parameters) + response = self._client.send( + request, header_parameters, body_content, stream=False, **operation_config) + + if response.status_code not in [200]: + raise models.DefaultErrorResponseException(self._deserialize, response) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('SwiftVirtualNetwork', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + update_swift_virtual_network_connection.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/virtualNetwork'} + + def get_configuration( + self, resource_group_name, name, custom_headers=None, raw=False, **operation_config): + """Gets the configuration of an app, such as platform version and bitness, + default documents, virtual applications, Always On, etc. + + Gets the configuration of an app, such as platform version and bitness, + default documents, virtual applications, Always On, etc. + + :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. + :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: SiteConfigResource or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.SiteConfigResource or + ~msrest.pipeline.ClientRawResponse + :raises: + :class:`DefaultErrorResponseException` + """ + # Construct URL + url = self.get_configuration.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.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) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('SiteConfigResource', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + get_configuration.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/web'} + + def create_or_update_configuration( + self, resource_group_name, name, site_config, custom_headers=None, raw=False, **operation_config): + """Updates the configuration of an app. + + Updates the configuration of an app. + + :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. + :type name: str + :param site_config: JSON representation of a SiteConfig object. See + example. + :type site_config: ~azure.mgmt.web.models.SiteConfigResource + :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: SiteConfigResource or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.SiteConfigResource or + ~msrest.pipeline.ClientRawResponse + :raises: + :class:`DefaultErrorResponseException` + """ + # Construct URL + url = self.create_or_update_configuration.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(site_config, 'SiteConfigResource') + + # Construct and send request + request = self._client.put(url, query_parameters) + response = self._client.send( + request, header_parameters, body_content, stream=False, **operation_config) + + if response.status_code not in [200]: + raise models.DefaultErrorResponseException(self._deserialize, response) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('SiteConfigResource', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + create_or_update_configuration.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/web'} + + def update_configuration( + self, resource_group_name, name, site_config, custom_headers=None, raw=False, **operation_config): + """Updates the configuration of an app. + + Updates the configuration of an app. + + :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. + :type name: str + :param site_config: JSON representation of a SiteConfig object. See + example. + :type site_config: ~azure.mgmt.web.models.SiteConfigResource + :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: SiteConfigResource or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.SiteConfigResource or + ~msrest.pipeline.ClientRawResponse + :raises: + :class:`DefaultErrorResponseException` + """ + # Construct URL + url = self.update_configuration.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(site_config, 'SiteConfigResource') + + # Construct and send request + request = self._client.patch(url, query_parameters) + response = self._client.send( + request, header_parameters, body_content, stream=False, **operation_config) + + if response.status_code not in [200]: + raise models.DefaultErrorResponseException(self._deserialize, response) + + deserialized = None if response.status_code == 200: deserialized = self._deserialize('SiteConfigResource', response) @@ -2744,7 +2904,8 @@ def list_configuration_snapshot_info( :return: An iterator like instance of SiteConfigurationSnapshotInfo :rtype: ~azure.mgmt.web.models.SiteConfigurationSnapshotInfoPaged[~azure.mgmt.web.models.SiteConfigurationSnapshotInfo] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ def internal_paging(next_link=None, raw=False): @@ -2782,9 +2943,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 @@ -2822,7 +2981,8 @@ def get_configuration_snapshot( :return: SiteConfigResource or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.SiteConfigResource or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.get_configuration_snapshot.metadata['url'] @@ -2853,9 +3013,7 @@ def get_configuration_snapshot( 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 @@ -2998,7 +3156,7 @@ def get_web_site_container_logs( return deserialized get_web_site_container_logs.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/containerlogs'} - def get_web_site_container_logs_zip( + def get_container_logs_zip( self, resource_group_name, name, custom_headers=None, raw=False, callback=None, **operation_config): """Gets the ZIP archived docker log files for the given site. @@ -3024,7 +3182,7 @@ def get_web_site_container_logs_zip( :raises: :class:`CloudError` """ # Construct URL - url = self.get_web_site_container_logs_zip.metadata['url'] + url = self.get_container_logs_zip.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'), @@ -3065,7 +3223,7 @@ def get_web_site_container_logs_zip( return client_raw_response return deserialized - get_web_site_container_logs_zip.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/containerlogs/zip/download'} + get_container_logs_zip.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/containerlogs/zip/download'} def list_continuous_web_jobs( self, resource_group_name, name, custom_headers=None, raw=False, **operation_config): @@ -3086,7 +3244,8 @@ def list_continuous_web_jobs( :return: An iterator like instance of ContinuousWebJob :rtype: ~azure.mgmt.web.models.ContinuousWebJobPaged[~azure.mgmt.web.models.ContinuousWebJob] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ def internal_paging(next_link=None, raw=False): @@ -3124,9 +3283,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 @@ -3408,7 +3565,8 @@ def list_deployments( :return: An iterator like instance of Deployment :rtype: ~azure.mgmt.web.models.DeploymentPaged[~azure.mgmt.web.models.Deployment] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ def internal_paging(next_link=None, raw=False): @@ -3446,9 +3604,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 @@ -3484,7 +3640,8 @@ def get_deployment( :return: Deployment or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.Deployment or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.get_deployment.metadata['url'] @@ -3515,9 +3672,7 @@ def get_deployment( 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 @@ -3554,7 +3709,8 @@ def create_deployment( :return: Deployment or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.Deployment or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.create_deployment.metadata['url'] @@ -3589,9 +3745,7 @@ def create_deployment( 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 @@ -3690,7 +3844,8 @@ def list_deployment_log( :return: Deployment or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.Deployment or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.list_deployment_log.metadata['url'] @@ -3721,9 +3876,7 @@ def list_deployment_log( 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 @@ -3737,6 +3890,81 @@ def list_deployment_log( return deserialized list_deployment_log.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/deployments/{id}/log'} + def discover_backup( + self, resource_group_name, name, request, custom_headers=None, raw=False, **operation_config): + """Discovers an existing app backup that can be restored from a blob in + Azure storage. Use this to get information about the databases stored + in a backup. + + Discovers an existing app backup that can be restored from a blob in + Azure storage. Use this to get information about the databases stored + in a backup. + + :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. + :type name: str + :param request: A RestoreRequest object that includes Azure storage + URL and blog name for discovery of backup. + :type request: ~azure.mgmt.web.models.RestoreRequest + :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: RestoreRequest or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.RestoreRequest or + ~msrest.pipeline.ClientRawResponse + :raises: + :class:`DefaultErrorResponseException` + """ + # Construct URL + url = self.discover_backup.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(request, 'RestoreRequest') + + # 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]: + raise models.DefaultErrorResponseException(self._deserialize, response) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('RestoreRequest', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + discover_backup.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/discoverbackup'} + def list_domain_ownership_identifiers( self, resource_group_name, name, custom_headers=None, raw=False, **operation_config): """Lists ownership identifiers for domain associated with web app. @@ -3756,7 +3984,8 @@ def list_domain_ownership_identifiers( :return: An iterator like instance of Identifier :rtype: ~azure.mgmt.web.models.IdentifierPaged[~azure.mgmt.web.models.Identifier] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ def internal_paging(next_link=None, raw=False): @@ -3794,9 +4023,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 @@ -3833,7 +4060,8 @@ def get_domain_ownership_identifier( :return: Identifier or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.Identifier or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.get_domain_ownership_identifier.metadata['url'] @@ -3864,9 +4092,7 @@ def get_domain_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 @@ -3908,7 +4134,8 @@ def create_or_update_domain_ownership_identifier( :return: Identifier or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.Identifier or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ domain_ownership_identifier = models.Identifier(kind=kind, identifier_id=identifier_id) @@ -3945,9 +4172,7 @@ def create_or_update_domain_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 @@ -4050,7 +4275,8 @@ def update_domain_ownership_identifier( :return: Identifier or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.Identifier or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ domain_ownership_identifier = models.Identifier(kind=kind, identifier_id=identifier_id) @@ -4087,9 +4313,7 @@ def update_domain_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 @@ -4122,7 +4346,8 @@ def get_ms_deploy_status( :return: MSDeployStatus or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.MSDeployStatus or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.get_ms_deploy_status.metadata['url'] @@ -4152,9 +4377,7 @@ def get_ms_deploy_status( 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 @@ -4428,7 +4651,8 @@ def get_functions_admin_token( overrides`. :return: str or ClientRawResponse if raw=true :rtype: str or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.get_functions_admin_token.metadata['url'] @@ -4458,9 +4682,7 @@ def get_functions_admin_token( 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 @@ -4578,9 +4800,7 @@ def _create_function_initial( request, header_parameters, body_content, stream=False, **operation_config) if response.status_code not in [201]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp + raise models.DefaultErrorResponseException(self._deserialize, response) deserialized = None @@ -4619,7 +4839,8 @@ def create_function( ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.FunctionEnvelope] or ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.FunctionEnvelope]] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ raw_result = self._create_function_initial( resource_group_name=resource_group_name, @@ -4732,7 +4953,8 @@ def list_function_secrets( :return: FunctionSecrets or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.FunctionSecrets or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.list_function_secrets.metadata['url'] @@ -4763,9 +4985,7 @@ def list_function_secrets( 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 @@ -4798,7 +5018,8 @@ def list_host_name_bindings( :return: An iterator like instance of HostNameBinding :rtype: ~azure.mgmt.web.models.HostNameBindingPaged[~azure.mgmt.web.models.HostNameBinding] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ def internal_paging(next_link=None, raw=False): @@ -4836,9 +5057,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 @@ -4876,7 +5095,8 @@ def get_host_name_binding( :return: HostNameBinding or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.HostNameBinding or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.get_host_name_binding.metadata['url'] @@ -4907,9 +5127,7 @@ def get_host_name_binding( 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 @@ -4947,7 +5165,8 @@ def create_or_update_host_name_binding( :return: HostNameBinding or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.HostNameBinding or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.create_or_update_host_name_binding.metadata['url'] @@ -4982,9 +5201,7 @@ def create_or_update_host_name_binding( 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 @@ -5083,7 +5300,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'] @@ -5115,9 +5333,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 @@ -5156,7 +5372,8 @@ def create_or_update_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.create_or_update_hybrid_connection.metadata['url'] @@ -5192,9 +5409,7 @@ def create_or_update_hybrid_connection( 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 @@ -5296,7 +5511,8 @@ def update_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.update_hybrid_connection.metadata['url'] @@ -5332,9 +5548,7 @@ def update_hybrid_connection( 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 @@ -5371,7 +5585,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'] @@ -5403,9 +5618,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 @@ -5438,7 +5651,8 @@ def list_hybrid_connections( :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.list_hybrid_connections.metadata['url'] @@ -5468,9 +5682,7 @@ def list_hybrid_connections( 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 @@ -5505,7 +5717,8 @@ def list_relay_service_connections( :return: RelayServiceConnectionEntity or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.RelayServiceConnectionEntity or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.list_relay_service_connections.metadata['url'] @@ -5535,9 +5748,7 @@ def list_relay_service_connections( 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 @@ -5572,7 +5783,8 @@ def get_relay_service_connection( :return: RelayServiceConnectionEntity or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.RelayServiceConnectionEntity or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.get_relay_service_connection.metadata['url'] @@ -5603,9 +5815,7 @@ def get_relay_service_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 @@ -5646,7 +5856,8 @@ def create_or_update_relay_service_connection( :return: RelayServiceConnectionEntity or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.RelayServiceConnectionEntity or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.create_or_update_relay_service_connection.metadata['url'] @@ -5681,9 +5892,7 @@ def create_or_update_relay_service_connection( 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 @@ -5784,7 +5993,8 @@ def update_relay_service_connection( :return: RelayServiceConnectionEntity or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.RelayServiceConnectionEntity or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.update_relay_service_connection.metadata['url'] @@ -5819,9 +6029,7 @@ def update_relay_service_connection( 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 @@ -5854,7 +6062,8 @@ def list_instance_identifiers( :return: An iterator like instance of SiteInstance :rtype: ~azure.mgmt.web.models.SiteInstancePaged[~azure.mgmt.web.models.SiteInstance] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ def internal_paging(next_link=None, raw=False): @@ -5892,9 +6101,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 @@ -5930,7 +6137,8 @@ def get_instance_ms_deploy_status( :return: MSDeployStatus or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.MSDeployStatus or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.get_instance_ms_deploy_status.metadata['url'] @@ -5961,9 +6169,7 @@ def get_instance_ms_deploy_status( 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 @@ -6799,7 +7005,8 @@ def is_cloneable( :return: SiteCloneability or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.SiteCloneability or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.is_cloneable.metadata['url'] @@ -6829,9 +7036,7 @@ def is_cloneable( 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 @@ -6864,7 +7069,8 @@ def list_sync_function_triggers( :return: FunctionSecrets or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.FunctionSecrets or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.list_sync_function_triggers.metadata['url'] @@ -6894,9 +7100,7 @@ def list_sync_function_triggers( 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 @@ -6931,7 +7135,8 @@ def list_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): @@ -6969,9 +7174,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 @@ -7014,7 +7217,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): @@ -7056,9 +7260,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 @@ -7109,9 +7311,7 @@ def _migrate_storage_initial( 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 @@ -7152,7 +7352,8 @@ def migrate_storage( ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.StorageMigrationResponse] or ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.StorageMigrationResponse]] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ raw_result = self._migrate_storage_initial( subscription_name=subscription_name, @@ -7217,9 +7418,7 @@ def _migrate_my_sql_initial( 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 @@ -7257,7 +7456,8 @@ def migrate_my_sql( ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.Operation] or ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.Operation]] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ raw_result = self._migrate_my_sql_initial( resource_group_name=resource_group_name, @@ -7307,7 +7507,8 @@ def get_migrate_my_sql_status( :return: MigrateMySqlStatus or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.MigrateMySqlStatus or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.get_migrate_my_sql_status.metadata['url'] @@ -7337,9 +7538,7 @@ def get_migrate_my_sql_status( 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 @@ -7448,7 +7647,8 @@ def start_web_site_network_trace( overrides`. :return: str or ClientRawResponse if raw=true :rtype: str or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.start_web_site_network_trace.metadata['url'] @@ -7484,9 +7684,7 @@ def start_web_site_network_trace( 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 @@ -7518,7 +7716,8 @@ def stop_web_site_network_trace( overrides`. :return: str or ClientRawResponse if raw=true :rtype: str or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.stop_web_site_network_trace.metadata['url'] @@ -7548,9 +7747,7 @@ def stop_web_site_network_trace( 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 @@ -7647,7 +7844,8 @@ def list_perf_mon_counters( :return: An iterator like instance of PerfMonResponse :rtype: ~azure.mgmt.web.models.PerfMonResponsePaged[~azure.mgmt.web.models.PerfMonResponse] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ def internal_paging(next_link=None, raw=False): @@ -7687,9 +7885,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 @@ -7723,7 +7919,8 @@ def get_site_php_error_log_flag( :return: SitePhpErrorLogFlag or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.SitePhpErrorLogFlag or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.get_site_php_error_log_flag.metadata['url'] @@ -7753,9 +7950,7 @@ def get_site_php_error_log_flag( 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 @@ -7773,28 +7968,235 @@ def list_premier_add_ons( self, resource_group_name, name, custom_headers=None, raw=False, **operation_config): """Gets the premier add-ons of an app. - Gets the premier add-ons of an app. + Gets the premier add-ons of an app. + + :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. + :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: PremierAddOn or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.PremierAddOn or + ~msrest.pipeline.ClientRawResponse + :raises: + :class:`DefaultErrorResponseException` + """ + # Construct URL + url = self.list_premier_add_ons.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.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) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('PremierAddOn', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + list_premier_add_ons.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/premieraddons'} + + def get_premier_add_on( + self, resource_group_name, name, premier_add_on_name, custom_headers=None, raw=False, **operation_config): + """Gets a named add-on of an app. + + Gets a named add-on of an app. + + :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. + :type name: str + :param premier_add_on_name: Add-on name. + :type premier_add_on_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: PremierAddOn or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.PremierAddOn or + ~msrest.pipeline.ClientRawResponse + :raises: + :class:`DefaultErrorResponseException` + """ + # Construct URL + url = self.get_premier_add_on.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'), + 'premierAddOnName': self._serialize.url("premier_add_on_name", premier_add_on_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.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) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('PremierAddOn', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + get_premier_add_on.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/premieraddons/{premierAddOnName}'} + + def add_premier_add_on( + self, resource_group_name, name, premier_add_on_name, premier_add_on, custom_headers=None, raw=False, **operation_config): + """Updates a named add-on of an app. + + Updates a named add-on of an app. + + :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. + :type name: str + :param premier_add_on_name: Add-on name. + :type premier_add_on_name: str + :param premier_add_on: A JSON representation of the edited premier + add-on. + :type premier_add_on: ~azure.mgmt.web.models.PremierAddOn + :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: PremierAddOn or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.PremierAddOn or + ~msrest.pipeline.ClientRawResponse + :raises: + :class:`DefaultErrorResponseException` + """ + # Construct URL + url = self.add_premier_add_on.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'), + 'premierAddOnName': self._serialize.url("premier_add_on_name", premier_add_on_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(premier_add_on, 'PremierAddOn') + + # Construct and send request + request = self._client.put(url, query_parameters) + response = self._client.send( + request, header_parameters, body_content, stream=False, **operation_config) + + if response.status_code not in [200]: + raise models.DefaultErrorResponseException(self._deserialize, response) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('PremierAddOn', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + add_premier_add_on.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/premieraddons/{premierAddOnName}'} + + def delete_premier_add_on( + self, resource_group_name, name, premier_add_on_name, custom_headers=None, raw=False, **operation_config): + """Delete a premier add-on from an app. + + Delete a premier add-on from an app. :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. :type name: str + :param premier_add_on_name: Add-on name. + :type premier_add_on_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: PremierAddOn or ClientRawResponse if raw=true - :rtype: ~azure.mgmt.web.models.PremierAddOn or - ~msrest.pipeline.ClientRawResponse + :return: None or ClientRawResponse if raw=true + :rtype: None or ~msrest.pipeline.ClientRawResponse :raises: :class:`CloudError` """ # Construct URL - url = self.list_premier_add_ons.metadata['url'] + url = self.delete_premier_add_on.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'), + 'premierAddOnName': self._serialize.url("premier_add_on_name", premier_add_on_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') } url = self._client.format_url(url, **path_format_arguments) @@ -7814,7 +8216,7 @@ def list_premier_add_ons( 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.delete(url, query_parameters) response = self._client.send(request, header_parameters, stream=False, **operation_config) if response.status_code not in [200]: @@ -7822,23 +8224,16 @@ def list_premier_add_ons( exp.request_id = response.headers.get('x-ms-request-id') raise exp - deserialized = None - - if response.status_code == 200: - deserialized = self._deserialize('PremierAddOn', response) - if raw: - client_raw_response = ClientRawResponse(deserialized, response) + client_raw_response = ClientRawResponse(None, response) return client_raw_response + delete_premier_add_on.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/premieraddons/{premierAddOnName}'} - return deserialized - list_premier_add_ons.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/premieraddons'} - - def get_premier_add_on( - self, resource_group_name, name, premier_add_on_name, custom_headers=None, raw=False, **operation_config): - """Gets a named add-on of an app. + def update_premier_add_on( + self, resource_group_name, name, premier_add_on_name, premier_add_on, custom_headers=None, raw=False, **operation_config): + """Updates a named add-on of an app. - Gets a named add-on of an app. + Updates a named add-on of an app. :param resource_group_name: Name of the resource group to which the resource belongs. @@ -7847,6 +8242,9 @@ def get_premier_add_on( :type name: str :param premier_add_on_name: Add-on name. :type premier_add_on_name: str + :param premier_add_on: A JSON representation of the edited premier + add-on. + :type premier_add_on: ~azure.mgmt.web.models.PremierAddOnPatchResource :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -7855,10 +8253,11 @@ def get_premier_add_on( :return: PremierAddOn or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.PremierAddOn or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL - url = self.get_premier_add_on.metadata['url'] + url = self.update_premier_add_on.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'), @@ -7881,14 +8280,16 @@ def get_premier_add_on( 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(premier_add_on, 'PremierAddOnPatchResource') + # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.patch(url, query_parameters) + response = self._client.send( + 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 @@ -7900,40 +8301,37 @@ def get_premier_add_on( return client_raw_response return deserialized - get_premier_add_on.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/premieraddons/{premierAddOnName}'} + update_premier_add_on.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/premieraddons/{premierAddOnName}'} - def add_premier_add_on( - self, resource_group_name, name, premier_add_on_name, premier_add_on, custom_headers=None, raw=False, **operation_config): - """Updates a named add-on of an app. + def get_private_access( + self, resource_group_name, name, custom_headers=None, raw=False, **operation_config): + """Gets data around private site access enablement and authorized Virtual + Networks that can access the site. - Updates a named add-on of an app. + Gets data around private site access enablement and authorized Virtual + Networks that can access the site. :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. + :param name: The name of the web app. :type name: str - :param premier_add_on_name: Add-on name. - :type premier_add_on_name: str - :param premier_add_on: A JSON representation of the edited premier - add-on. - :type premier_add_on: ~azure.mgmt.web.models.PremierAddOn :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: PremierAddOn or ClientRawResponse if raw=true - :rtype: ~azure.mgmt.web.models.PremierAddOn or + :return: PrivateAccess or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.PrivateAccess or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL - url = self.add_premier_add_on.metadata['url'] + url = self.get_private_access.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'), - 'premierAddOnName': self._serialize.url("premier_add_on_name", premier_add_on_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') } url = self._client.format_url(url, **path_format_arguments) @@ -7952,59 +8350,56 @@ def add_premier_add_on( 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(premier_add_on, 'PremierAddOn') - # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + 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 + raise models.DefaultErrorResponseException(self._deserialize, response) deserialized = None if response.status_code == 200: - deserialized = self._deserialize('PremierAddOn', response) + deserialized = self._deserialize('PrivateAccess', response) if raw: client_raw_response = ClientRawResponse(deserialized, response) return client_raw_response return deserialized - add_premier_add_on.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/premieraddons/{premierAddOnName}'} + get_private_access.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/privateAccess/virtualNetworks'} - def delete_premier_add_on( - self, resource_group_name, name, premier_add_on_name, custom_headers=None, raw=False, **operation_config): - """Delete a premier add-on from an app. + def put_private_access_vnet( + self, resource_group_name, name, access, custom_headers=None, raw=False, **operation_config): + """Sets data around private site access enablement and authorized Virtual + Networks that can access the site. - Delete a premier add-on from an app. + Sets data around private site access enablement and authorized Virtual + Networks that can access the site. :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. + :param name: The name of the web app. :type name: str - :param premier_add_on_name: Add-on name. - :type premier_add_on_name: str + :param access: The information for the private access + :type access: ~azure.mgmt.web.models.PrivateAccess :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` + :return: PrivateAccess or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.PrivateAccess or + ~msrest.pipeline.ClientRawResponse + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL - url = self.delete_premier_add_on.metadata['url'] + url = self.put_private_access_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'), - 'premierAddOnName': self._serialize.url("premier_add_on_name", premier_add_on_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') } url = self._client.format_url(url, **path_format_arguments) @@ -8023,19 +8418,28 @@ def delete_premier_add_on( 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(access, 'PrivateAccess') + # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.put(url, query_parameters) + response = self._client.send( + 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 + + if response.status_code == 200: + deserialized = self._deserialize('PrivateAccess', response) if raw: - client_raw_response = ClientRawResponse(None, response) + client_raw_response = ClientRawResponse(deserialized, response) return client_raw_response - delete_premier_add_on.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/premieraddons/{premierAddOnName}'} + + return deserialized + put_private_access_vnet.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/privateAccess/virtualNetworks'} def list_processes( self, resource_group_name, name, custom_headers=None, raw=False, **operation_config): @@ -8642,7 +9046,8 @@ def list_public_certificates( :return: An iterator like instance of PublicCertificate :rtype: ~azure.mgmt.web.models.PublicCertificatePaged[~azure.mgmt.web.models.PublicCertificate] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ def internal_paging(next_link=None, raw=False): @@ -8680,9 +9085,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 @@ -8720,7 +9123,8 @@ def get_public_certificate( :return: PublicCertificate or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.PublicCertificate or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.get_public_certificate.metadata['url'] @@ -8751,9 +9155,7 @@ def get_public_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 @@ -8791,7 +9193,8 @@ def create_or_update_public_certificate( :return: PublicCertificate or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.PublicCertificate or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.create_or_update_public_certificate.metadata['url'] @@ -8826,9 +9229,7 @@ def create_or_update_public_certificate( 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 @@ -8932,7 +9333,8 @@ def list_publishing_profile_xml_with_secrets( overrides`. :return: object or ClientRawResponse if raw=true :rtype: Generator or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ publishing_profile_options = models.CsmPublishingProfileOptions(format=format) @@ -8968,9 +9370,7 @@ def list_publishing_profile_xml_with_secrets( request, header_parameters, body_content, stream=True, **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 @@ -8984,11 +9384,139 @@ def list_publishing_profile_xml_with_secrets( return deserialized list_publishing_profile_xml_with_secrets.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/publishxml'} + def reset_production_slot_config( + self, resource_group_name, name, custom_headers=None, raw=False, **operation_config): + """Resets the configuration settings of the current slot if they were + previously modified by calling the API with POST. + + Resets the configuration settings of the current slot if they were + previously modified by calling the API with POST. + + :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. + :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.reset_production_slot_config.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]: + 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 + reset_production_slot_config.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/resetSlotConfig'} + + def restart( + self, resource_group_name, name, soft_restart=None, synchronous=None, custom_headers=None, raw=False, **operation_config): + """Restarts an app (or deployment slot, if specified). + + Restarts an app (or deployment slot, if specified). + + :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. + :type name: str + :param soft_restart: Specify true to apply the configuration settings + and restarts the app only if necessary. By default, the API always + restarts and reprovisions the app. + :type soft_restart: bool + :param synchronous: Specify true to block until the app is restarted. + By default, it is set to false, and the API responds immediately + (asynchronous). + :type synchronous: bool + :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.restart.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 = {} + if soft_restart is not None: + query_parameters['softRestart'] = self._serialize.query("soft_restart", soft_restart, 'bool') + if synchronous is not None: + query_parameters['synchronous'] = self._serialize.query("synchronous", synchronous, 'bool') + 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 + restart.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/restart'} + - def _recover_initial( - self, resource_group_name, name, recovery_entity, custom_headers=None, raw=False, **operation_config): + def _restore_from_backup_blob_initial( + self, resource_group_name, name, request, custom_headers=None, raw=False, **operation_config): # Construct URL - url = self.recover.metadata['url'] + url = self.restore_from_backup_blob.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'), @@ -9011,7 +9539,7 @@ def _recover_initial( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct body - body_content = self._serialize.body(recovery_entity, 'SnapshotRecoveryRequest') + body_content = self._serialize.body(request, 'RestoreRequest') # Construct and send request request = self._client.post(url, query_parameters) @@ -9027,21 +9555,19 @@ def _recover_initial( client_raw_response = ClientRawResponse(None, response) return client_raw_response - def recover( - self, resource_group_name, name, recovery_entity, custom_headers=None, raw=False, polling=True, **operation_config): - """Recovers a web app to a previous snapshot. + def restore_from_backup_blob( + self, resource_group_name, name, request, custom_headers=None, raw=False, polling=True, **operation_config): + """Restores an app from a backup blob in Azure Storage. - Recovers a web app to a previous snapshot. + Restores an app from a backup blob in Azure Storage. :param resource_group_name: Name of the resource group to which the resource belongs. :type resource_group_name: str - :param name: Name of web app. + :param name: Name of the app. :type name: str - :param recovery_entity: Snapshot data used for web app recovery. - Snapshot information can be obtained by calling GetDeletedSites or - GetSiteSnapshots API. - :type recovery_entity: ~azure.mgmt.web.models.SnapshotRecoveryRequest + :param request: Information on restore request . + :type request: ~azure.mgmt.web.models.RestoreRequest :param dict custom_headers: headers that will be added to the request :param bool raw: The poller return type is ClientRawResponse, the direct response alongside the deserialized response @@ -9053,10 +9579,10 @@ def recover( ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[None]] :raises: :class:`CloudError` """ - raw_result = self._recover_initial( + raw_result = self._restore_from_backup_blob_initial( resource_group_name=resource_group_name, name=name, - recovery_entity=recovery_entity, + request=request, custom_headers=custom_headers, raw=True, **operation_config @@ -9074,32 +9600,13 @@ def get_long_running_output(response): elif polling is False: polling_method = NoPolling() else: polling_method = polling return LROPoller(self._client, raw_result, get_long_running_output, polling_method) - recover.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/recover'} - - def reset_production_slot_config( - self, resource_group_name, name, custom_headers=None, raw=False, **operation_config): - """Resets the configuration settings of the current slot if they were - previously modified by calling the API with POST. + restore_from_backup_blob.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/restoreFromBackupBlob'} - Resets the configuration settings of the current slot if they were - previously modified by calling the API with POST. - :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. - :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` - """ + def _restore_from_deleted_app_initial( + self, resource_group_name, name, restore_request, custom_headers=None, raw=False, **operation_config): # Construct URL - url = self.reset_production_slot_config.metadata['url'] + url = self.restore_from_deleted_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\._\(\)]+[^\.]$'), 'name': self._serialize.url("name", name, 'str'), @@ -9121,11 +9628,15 @@ def reset_production_slot_config( 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(restore_request, 'DeletedAppRestoreRequest') + # Construct and send request request = self._client.post(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + response = self._client.send( + request, header_parameters, body_content, stream=False, **operation_config) - if response.status_code not in [200]: + if response.status_code not in [200, 202]: exp = CloudError(response) exp.request_id = response.headers.get('x-ms-request-id') raise exp @@ -9133,38 +9644,59 @@ def reset_production_slot_config( if raw: client_raw_response = ClientRawResponse(None, response) return client_raw_response - reset_production_slot_config.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/resetSlotConfig'} - def restart( - self, resource_group_name, name, soft_restart=None, synchronous=None, custom_headers=None, raw=False, **operation_config): - """Restarts an app (or deployment slot, if specified). + def restore_from_deleted_app( + self, resource_group_name, name, restore_request, custom_headers=None, raw=False, polling=True, **operation_config): + """Restores a deleted web app to this web app. - Restarts an app (or deployment slot, if specified). + Restores a deleted web app to this web app. :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. + :param name: Name of web app. :type name: str - :param soft_restart: Specify true to apply the configuration settings - and restarts the app only if necessary. By default, the API always - restarts and reprovisions the app. - :type soft_restart: bool - :param synchronous: Specify true to block until the app is restarted. - By default, it is set to false, and the API responds immediately - (asynchronous). - :type synchronous: bool + :param restore_request: Deleted web app restore information. + :type restore_request: ~azure.mgmt.web.models.DeletedAppRestoreRequest :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 + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns None or + ClientRawResponse if raw==True + :rtype: ~msrestazure.azure_operation.AzureOperationPoller[None] or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[None]] :raises: :class:`CloudError` """ + raw_result = self._restore_from_deleted_app_initial( + resource_group_name=resource_group_name, + name=name, + restore_request=restore_request, + custom_headers=custom_headers, + raw=True, + **operation_config + ) + + def get_long_running_output(response): + if raw: + client_raw_response = ClientRawResponse(None, response) + return client_raw_response + + lro_delay = operation_config.get( + 'long_running_operation_timeout', + self.config.long_running_operation_timeout) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) + restore_from_deleted_app.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/restoreFromDeletedApp'} + + + def _restore_snapshot_initial( + self, resource_group_name, name, restore_request, custom_headers=None, raw=False, **operation_config): # Construct URL - url = self.restart.metadata['url'] + url = self.restore_snapshot.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'), @@ -9174,10 +9706,6 @@ def restart( # Construct parameters query_parameters = {} - if soft_restart is not None: - query_parameters['softRestart'] = self._serialize.query("soft_restart", soft_restart, 'bool') - if synchronous is not None: - query_parameters['synchronous'] = self._serialize.query("synchronous", synchronous, 'bool') query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') # Construct headers @@ -9190,11 +9718,15 @@ def restart( 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(restore_request, 'SnapshotRestoreRequest') + # Construct and send request request = self._client.post(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + response = self._client.send( + request, header_parameters, body_content, stream=False, **operation_config) - if response.status_code not in [200]: + if response.status_code not in [200, 202]: exp = CloudError(response) exp.request_id = response.headers.get('x-ms-request-id') raise exp @@ -9202,7 +9734,55 @@ def restart( if raw: client_raw_response = ClientRawResponse(None, response) return client_raw_response - restart.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/restart'} + + def restore_snapshot( + self, resource_group_name, name, restore_request, custom_headers=None, raw=False, polling=True, **operation_config): + """Restores a web app from a snapshot. + + Restores a web app from a snapshot. + + :param resource_group_name: Name of the resource group to which the + resource belongs. + :type resource_group_name: str + :param name: Name of web app. + :type name: str + :param restore_request: Snapshot restore settings. Snapshot + information can be obtained by calling GetDeletedSites or + GetSiteSnapshots API. + :type restore_request: ~azure.mgmt.web.models.SnapshotRestoreRequest + :param dict custom_headers: headers that will be added to the request + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns None or + ClientRawResponse if raw==True + :rtype: ~msrestazure.azure_operation.AzureOperationPoller[None] or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[None]] + :raises: :class:`CloudError` + """ + raw_result = self._restore_snapshot_initial( + resource_group_name=resource_group_name, + name=name, + restore_request=restore_request, + custom_headers=custom_headers, + raw=True, + **operation_config + ) + + def get_long_running_output(response): + if raw: + client_raw_response = ClientRawResponse(None, response) + return client_raw_response + + lro_delay = operation_config.get( + 'long_running_operation_timeout', + self.config.long_running_operation_timeout) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) + restore_snapshot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/restoreSnapshot'} def list_site_extensions( self, resource_group_name, name, custom_headers=None, raw=False, **operation_config): @@ -9528,7 +10108,8 @@ def list_slots( 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): @@ -9566,9 +10147,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 @@ -9654,7 +10233,7 @@ def get_slot( def _create_or_update_slot_initial( - self, resource_group_name, name, site_envelope, slot, 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, slot, custom_headers=None, raw=False, **operation_config): # Construct URL url = self.create_or_update_slot.metadata['url'] path_format_arguments = { @@ -9667,14 +10246,6 @@ def _create_or_update_slot_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 @@ -9696,9 +10267,7 @@ def _create_or_update_slot_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 @@ -9714,7 +10283,7 @@ def _create_or_update_slot_initial( return deserialized def create_or_update_slot( - self, resource_group_name, name, site_envelope, slot, skip_dns_registration=None, skip_custom_domain_verification=None, force_dns_registration=None, ttl_in_seconds=None, custom_headers=None, raw=False, polling=True, **operation_config): + self, resource_group_name, name, site_envelope, slot, custom_headers=None, raw=False, polling=True, **operation_config): """Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. @@ -9733,19 +10302,6 @@ def create_or_update_slot( :param slot: Name of the deployment slot to create or update. By default, this API attempts to create or modify the production slot. :type slot: str - :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: The poller return type is ClientRawResponse, the direct response alongside the deserialized response @@ -9757,17 +10313,14 @@ def create_or_update_slot( ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.Site] or ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.Site]] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ raw_result = self._create_or_update_slot_initial( resource_group_name=resource_group_name, name=name, site_envelope=site_envelope, slot=slot, - 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 @@ -9792,7 +10345,7 @@ def get_long_running_output(response): create_or_update_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}'} def delete_slot( - self, resource_group_name, name, slot, delete_metrics=None, delete_empty_server_farm=None, skip_dns_registration=None, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, slot, 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. @@ -9811,8 +10364,6 @@ def delete_slot( 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 @@ -9838,8 +10389,6 @@ def delete_slot( 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 @@ -9867,7 +10416,7 @@ def delete_slot( delete_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}'} def update_slot( - self, resource_group_name, name, site_envelope, slot, 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, slot, 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. @@ -9886,19 +10435,6 @@ def update_slot( :param slot: Name of the deployment slot to create or update. By default, this API attempts to create or modify the production slot. :type slot: str - :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 @@ -9907,7 +10443,8 @@ def update_slot( :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_slot.metadata['url'] @@ -9921,14 +10458,6 @@ def update_slot( # 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 @@ -9950,9 +10479,7 @@ def update_slot( 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 @@ -9992,7 +10519,8 @@ def analyze_custom_hostname_slot( :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_slot.metadata['url'] @@ -10025,9 +10553,7 @@ def analyze_custom_hostname_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 @@ -10140,7 +10666,8 @@ def backup_slot( :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_slot.metadata['url'] @@ -10175,9 +10702,7 @@ def backup_slot( 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 @@ -10213,7 +10738,8 @@ def list_backups_slot( :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): @@ -10252,9 +10778,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 @@ -10269,84 +10793,6 @@ def internal_paging(next_link=None, raw=False): return deserialized list_backups_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/backups'} - def discover_restore_slot( - self, resource_group_name, name, request, slot, custom_headers=None, raw=False, **operation_config): - """Discovers an existing app backup that can be restored from a blob in - Azure storage. - - Discovers an existing app backup that can be restored from a blob in - Azure storage. - - :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. - :type name: str - :param request: A RestoreRequest object that includes Azure storage - URL and blog name for discovery of backup. - :type request: ~azure.mgmt.web.models.RestoreRequest - :param slot: Name of the deployment slot. If a slot is not specified, - the API will perform discovery for the production slot. - :type slot: 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: RestoreRequest or ClientRawResponse if raw=true - :rtype: ~azure.mgmt.web.models.RestoreRequest or - ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` - """ - # Construct URL - url = self.discover_restore_slot.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'), - 'slot': self._serialize.url("slot", slot, '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(request, 'RestoreRequest') - - # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - 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 - - deserialized = None - - if response.status_code == 200: - deserialized = self._deserialize('RestoreRequest', response) - - if raw: - client_raw_response = ClientRawResponse(deserialized, response) - return client_raw_response - - return deserialized - discover_restore_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/backups/discover'} - def get_backup_status_slot( self, resource_group_name, name, backup_id, slot, custom_headers=None, raw=False, **operation_config): """Gets a backup of an app by its ID. @@ -10371,7 +10817,8 @@ def get_backup_status_slot( :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.get_backup_status_slot.metadata['url'] @@ -10403,9 +10850,7 @@ def get_backup_status_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 @@ -10515,7 +10960,8 @@ def list_backup_status_secrets_slot( :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.list_backup_status_secrets_slot.metadata['url'] @@ -10551,9 +10997,7 @@ def list_backup_status_secrets_slot( 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 @@ -10603,22 +11047,15 @@ def _restore_slot_initial( response = self._client.send( request, header_parameters, body_content, stream=False, **operation_config) - if response.status_code not in [200]: + if response.status_code not in [200, 202]: 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('RestoreResponse', response) - if raw: - client_raw_response = ClientRawResponse(deserialized, response) + client_raw_response = ClientRawResponse(None, response) return client_raw_response - return deserialized - def restore_slot( self, resource_group_name, name, backup_id, request, slot, custom_headers=None, raw=False, polling=True, **operation_config): """Restores a specific backup to another app (or deployment slot, if @@ -10644,12 +11081,10 @@ def restore_slot( direct response alongside the deserialized response :param polling: True for ARMPolling, False for no polling, or a polling object for personal polling strategy - :return: An instance of LROPoller that returns RestoreResponse or - ClientRawResponse if raw==True - :rtype: - ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.RestoreResponse] - or - ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.RestoreResponse]] + :return: An instance of LROPoller that returns None or + ClientRawResponse if raw==True + :rtype: ~msrestazure.azure_operation.AzureOperationPoller[None] or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[None]] :raises: :class:`CloudError` """ raw_result = self._restore_slot_initial( @@ -10664,14 +11099,10 @@ def restore_slot( ) def get_long_running_output(response): - deserialized = self._deserialize('RestoreResponse', response) - if raw: - client_raw_response = ClientRawResponse(deserialized, response) + client_raw_response = ClientRawResponse(None, response) return client_raw_response - return deserialized - lro_delay = operation_config.get( 'long_running_operation_timeout', self.config.long_running_operation_timeout) @@ -10703,7 +11134,8 @@ def list_configurations_slot( :return: An iterator like instance of SiteConfigResource :rtype: ~azure.mgmt.web.models.SiteConfigResourcePaged[~azure.mgmt.web.models.SiteConfigResource] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ def internal_paging(next_link=None, raw=False): @@ -10742,9 +11174,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 @@ -10785,7 +11215,8 @@ def update_application_settings_slot( :return: StringDictionary or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.StringDictionary or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ app_settings = models.StringDictionary(kind=kind, properties=properties) @@ -10822,9 +11253,7 @@ def update_application_settings_slot( 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 @@ -10860,7 +11289,8 @@ def list_application_settings_slot( :return: StringDictionary or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.StringDictionary or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.list_application_settings_slot.metadata['url'] @@ -10891,9 +11321,7 @@ def list_application_settings_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 @@ -10933,7 +11361,8 @@ def update_auth_settings_slot( :return: SiteAuthSettings or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.SiteAuthSettings or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.update_auth_settings_slot.metadata['url'] @@ -10968,9 +11397,7 @@ def update_auth_settings_slot( 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 @@ -11006,7 +11433,8 @@ def get_auth_settings_slot( :return: SiteAuthSettings or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.SiteAuthSettings or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.get_auth_settings_slot.metadata['url'] @@ -11037,9 +11465,7 @@ def get_auth_settings_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 @@ -11077,7 +11503,8 @@ def update_backup_configuration_slot( :return: BackupRequest or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.BackupRequest or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.update_backup_configuration_slot.metadata['url'] @@ -11112,9 +11539,7 @@ def update_backup_configuration_slot( 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 @@ -11211,7 +11636,8 @@ def get_backup_configuration_slot( :return: BackupRequest or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.BackupRequest or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.get_backup_configuration_slot.metadata['url'] @@ -11242,9 +11668,7 @@ def get_backup_configuration_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 @@ -11285,7 +11709,8 @@ def update_connection_strings_slot( :return: ConnectionStringDictionary or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.ConnectionStringDictionary or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ connection_strings = models.ConnectionStringDictionary(kind=kind, properties=properties) @@ -11322,9 +11747,7 @@ def update_connection_strings_slot( 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 @@ -11360,7 +11783,8 @@ def list_connection_strings_slot( :return: ConnectionStringDictionary or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.ConnectionStringDictionary or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.list_connection_strings_slot.metadata['url'] @@ -11391,9 +11815,7 @@ def list_connection_strings_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 @@ -11429,7 +11851,8 @@ def get_diagnostic_logs_configuration_slot( :return: SiteLogsConfig or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.SiteLogsConfig or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.get_diagnostic_logs_configuration_slot.metadata['url'] @@ -11460,9 +11883,7 @@ def get_diagnostic_logs_configuration_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 @@ -11501,7 +11922,8 @@ def update_diagnostic_logs_config_slot( :return: SiteLogsConfig or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.SiteLogsConfig or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.update_diagnostic_logs_config_slot.metadata['url'] @@ -11536,9 +11958,7 @@ def update_diagnostic_logs_config_slot( 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 @@ -11578,7 +11998,8 @@ def update_metadata_slot( :return: StringDictionary or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.StringDictionary or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ metadata = models.StringDictionary(kind=kind, properties=properties) @@ -11615,9 +12036,7 @@ def update_metadata_slot( 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 @@ -11653,7 +12072,8 @@ def list_metadata_slot( :return: StringDictionary or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.StringDictionary or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.list_metadata_slot.metadata['url'] @@ -11684,9 +12104,7 @@ def list_metadata_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 @@ -11732,9 +12150,7 @@ def _list_publishing_credentials_slot_initial( 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 @@ -11772,7 +12188,8 @@ def list_publishing_credentials_slot( ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.User] or ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.User]] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ raw_result = self._list_publishing_credentials_slot_initial( resource_group_name=resource_group_name, @@ -11822,13 +12239,231 @@ def update_site_push_settings_slot( deserialized response :param operation_config: :ref:`Operation configuration overrides`. - :return: PushSettings or ClientRawResponse if raw=true - :rtype: ~azure.mgmt.web.models.PushSettings or + :return: PushSettings or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.PushSettings or + ~msrest.pipeline.ClientRawResponse + :raises: + :class:`DefaultErrorResponseException` + """ + # Construct URL + url = self.update_site_push_settings_slot.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'), + 'slot': self._serialize.url("slot", slot, '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(push_settings, 'PushSettings') + + # Construct and send request + request = self._client.put(url, query_parameters) + response = self._client.send( + request, header_parameters, body_content, stream=False, **operation_config) + + if response.status_code not in [200]: + raise models.DefaultErrorResponseException(self._deserialize, response) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('PushSettings', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + update_site_push_settings_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/pushsettings'} + + def list_site_push_settings_slot( + self, resource_group_name, name, slot, custom_headers=None, raw=False, **operation_config): + """Gets the Push settings associated with web app. + + Gets the Push settings associated with web app. + + :param resource_group_name: Name of the resource group to which the + resource belongs. + :type resource_group_name: str + :param name: Name of web app. + :type name: str + :param slot: Name of web app slot. If not specified then will default + to production slot. + :type slot: 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: PushSettings or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.PushSettings or + ~msrest.pipeline.ClientRawResponse + :raises: + :class:`DefaultErrorResponseException` + """ + # Construct URL + url = self.list_site_push_settings_slot.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'), + 'slot': self._serialize.url("slot", slot, '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]: + raise models.DefaultErrorResponseException(self._deserialize, response) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('PushSettings', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + list_site_push_settings_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/pushsettings/list'} + + def get_swift_virtual_network_connection_slot( + self, resource_group_name, name, slot, custom_headers=None, raw=False, **operation_config): + """Gets a Swift Virtual Network connection. + + Gets a Swift Virtual Network connection. + + :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. + :type name: str + :param slot: Name of the deployment slot. If a slot is not specified, + the API will get a gateway for the production slot's Virtual Network. + :type slot: 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: SwiftVirtualNetwork or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.SwiftVirtualNetwork or + ~msrest.pipeline.ClientRawResponse + :raises: + :class:`DefaultErrorResponseException` + """ + # Construct URL + url = self.get_swift_virtual_network_connection_slot.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'), + 'slot': self._serialize.url("slot", slot, '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.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) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('SwiftVirtualNetwork', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + get_swift_virtual_network_connection_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/virtualNetwork'} + + def create_or_update_swift_virtual_network_connection_slot( + self, resource_group_name, name, connection_envelope, slot, custom_headers=None, raw=False, **operation_config): + """Integrates this Web App with a Virtual Network. This requires that 1) + "swiftSupported" is true when doing a GET against this resource, and 2) + that the target Subnet has already been delegated, and is not + in use by another App Service Plan other than the one this App is in. + + Integrates this Web App with a Virtual Network. This requires that 1) + "swiftSupported" is true when doing a GET against this resource, and 2) + that the target Subnet has already been delegated, and is not + in use by another App Service Plan other than the one this App is in. + + :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. + :type name: str + :param connection_envelope: Properties of the Virtual Network + connection. See example. + :type connection_envelope: ~azure.mgmt.web.models.SwiftVirtualNetwork + :param slot: Name of the deployment slot. If a slot is not specified, + the API will add or update connections for the production slot. + :type slot: 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: SwiftVirtualNetwork or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.SwiftVirtualNetwork or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL - url = self.update_site_push_settings_slot.metadata['url'] + url = self.create_or_update_swift_virtual_network_connection_slot.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'), @@ -11852,7 +12487,7 @@ def update_site_push_settings_slot( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct body - body_content = self._serialize.body(push_settings, 'PushSettings') + body_content = self._serialize.body(connection_envelope, 'SwiftVirtualNetwork') # Construct and send request request = self._client.put(url, query_parameters) @@ -11860,48 +12495,47 @@ def update_site_push_settings_slot( 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 if response.status_code == 200: - deserialized = self._deserialize('PushSettings', response) + deserialized = self._deserialize('SwiftVirtualNetwork', response) if raw: client_raw_response = ClientRawResponse(deserialized, response) return client_raw_response return deserialized - update_site_push_settings_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/pushsettings'} + create_or_update_swift_virtual_network_connection_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/virtualNetwork'} - def list_site_push_settings_slot( + def delete_swift_virtual_network_slot( self, resource_group_name, name, slot, custom_headers=None, raw=False, **operation_config): - """Gets the Push settings associated with web app. + """Deletes a Swift Virtual Network connection from an app (or deployment + slot). - Gets the Push settings associated with web app. + Deletes a Swift Virtual Network connection from an app (or deployment + slot). :param resource_group_name: Name of the resource group to which the resource belongs. :type resource_group_name: str - :param name: Name of web app. + :param name: Name of the app. :type name: str - :param slot: Name of web app slot. If not specified then will default - to production slot. + :param slot: Name of the deployment slot. If a slot is not specified, + the API will delete the connection for the production slot. :type slot: 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: PushSettings or ClientRawResponse if raw=true - :rtype: ~azure.mgmt.web.models.PushSettings or - ~msrest.pipeline.ClientRawResponse + :return: None or ClientRawResponse if raw=true + :rtype: None or ~msrest.pipeline.ClientRawResponse :raises: :class:`CloudError` """ # Construct URL - url = self.list_site_push_settings_slot.metadata['url'] + url = self.delete_swift_virtual_network_slot.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'), @@ -11925,25 +12559,99 @@ def list_site_push_settings_slot( 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) + request = self._client.delete(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 [200, 404]: 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 + delete_swift_virtual_network_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/virtualNetwork'} + + def update_swift_virtual_network_connection_slot( + self, resource_group_name, name, connection_envelope, slot, custom_headers=None, raw=False, **operation_config): + """Integrates this Web App with a Virtual Network. This requires that 1) + "swiftSupported" is true when doing a GET against this resource, and 2) + that the target Subnet has already been delegated, and is not + in use by another App Service Plan other than the one this App is in. + + Integrates this Web App with a Virtual Network. This requires that 1) + "swiftSupported" is true when doing a GET against this resource, and 2) + that the target Subnet has already been delegated, and is not + in use by another App Service Plan other than the one this App is in. + + :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. + :type name: str + :param connection_envelope: Properties of the Virtual Network + connection. See example. + :type connection_envelope: ~azure.mgmt.web.models.SwiftVirtualNetwork + :param slot: Name of the deployment slot. If a slot is not specified, + the API will add or update connections for the production slot. + :type slot: 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: SwiftVirtualNetwork or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.SwiftVirtualNetwork or + ~msrest.pipeline.ClientRawResponse + :raises: + :class:`DefaultErrorResponseException` + """ + # Construct URL + url = self.update_swift_virtual_network_connection_slot.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'), + 'slot': self._serialize.url("slot", slot, '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(connection_envelope, 'SwiftVirtualNetwork') + + # Construct and send request + request = self._client.patch(url, query_parameters) + response = self._client.send( + request, header_parameters, body_content, stream=False, **operation_config) + + if response.status_code not in [200]: + raise models.DefaultErrorResponseException(self._deserialize, response) + deserialized = None if response.status_code == 200: - deserialized = self._deserialize('PushSettings', response) + deserialized = self._deserialize('SwiftVirtualNetwork', response) if raw: client_raw_response = ClientRawResponse(deserialized, response) return client_raw_response return deserialized - list_site_push_settings_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/pushsettings/list'} + update_swift_virtual_network_connection_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/virtualNetwork'} def get_configuration_slot( self, resource_group_name, name, slot, custom_headers=None, raw=False, **operation_config): @@ -11969,7 +12677,8 @@ def get_configuration_slot( :return: SiteConfigResource or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.SiteConfigResource or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.get_configuration_slot.metadata['url'] @@ -12000,9 +12709,7 @@ def get_configuration_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 @@ -12041,7 +12748,8 @@ def create_or_update_configuration_slot( :return: SiteConfigResource or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.SiteConfigResource or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.create_or_update_configuration_slot.metadata['url'] @@ -12076,9 +12784,7 @@ def create_or_update_configuration_slot( 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 @@ -12117,7 +12823,8 @@ def update_configuration_slot( :return: SiteConfigResource or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.SiteConfigResource or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.update_configuration_slot.metadata['url'] @@ -12152,9 +12859,7 @@ def update_configuration_slot( 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 @@ -12192,7 +12897,8 @@ def list_configuration_snapshot_info_slot( :return: An iterator like instance of SiteConfigurationSnapshotInfo :rtype: ~azure.mgmt.web.models.SiteConfigurationSnapshotInfoPaged[~azure.mgmt.web.models.SiteConfigurationSnapshotInfo] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ def internal_paging(next_link=None, raw=False): @@ -12231,9 +12937,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 @@ -12274,7 +12978,8 @@ def get_configuration_snapshot_slot( :return: SiteConfigResource or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.SiteConfigResource or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.get_configuration_snapshot_slot.metadata['url'] @@ -12306,9 +13011,7 @@ def get_configuration_snapshot_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 @@ -12459,7 +13162,7 @@ def get_web_site_container_logs_slot( return deserialized get_web_site_container_logs_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/containerlogs'} - def get_web_site_container_logs_zip_slot( + def get_container_logs_zip_slot( self, resource_group_name, name, slot, custom_headers=None, raw=False, callback=None, **operation_config): """Gets the ZIP archived docker log files for the given site. @@ -12488,7 +13191,7 @@ def get_web_site_container_logs_zip_slot( :raises: :class:`CloudError` """ # Construct URL - url = self.get_web_site_container_logs_zip_slot.metadata['url'] + url = self.get_container_logs_zip_slot.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'), @@ -12530,7 +13233,7 @@ def get_web_site_container_logs_zip_slot( return client_raw_response return deserialized - get_web_site_container_logs_zip_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/containerlogs/zip/download'} + get_container_logs_zip_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/containerlogs/zip/download'} def list_continuous_web_jobs_slot( self, resource_group_name, name, slot, custom_headers=None, raw=False, **operation_config): @@ -12554,7 +13257,8 @@ def list_continuous_web_jobs_slot( :return: An iterator like instance of ContinuousWebJob :rtype: ~azure.mgmt.web.models.ContinuousWebJobPaged[~azure.mgmt.web.models.ContinuousWebJob] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ def internal_paging(next_link=None, raw=False): @@ -12593,9 +13297,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 @@ -12896,7 +13598,8 @@ def list_deployments_slot( :return: An iterator like instance of Deployment :rtype: ~azure.mgmt.web.models.DeploymentPaged[~azure.mgmt.web.models.Deployment] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ def internal_paging(next_link=None, raw=False): @@ -12935,9 +13638,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 @@ -12976,7 +13677,8 @@ def get_deployment_slot( :return: Deployment or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.Deployment or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.get_deployment_slot.metadata['url'] @@ -13008,9 +13710,7 @@ def get_deployment_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 @@ -13050,7 +13750,8 @@ def create_deployment_slot( :return: Deployment or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.Deployment or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.create_deployment_slot.metadata['url'] @@ -13086,9 +13787,7 @@ def create_deployment_slot( 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 @@ -13194,7 +13893,8 @@ def list_deployment_log_slot( :return: Deployment or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.Deployment or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.list_deployment_log_slot.metadata['url'] @@ -13226,9 +13926,7 @@ def list_deployment_log_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 @@ -13242,6 +13940,85 @@ def list_deployment_log_slot( return deserialized list_deployment_log_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/deployments/{id}/log'} + def discover_backup_slot( + self, resource_group_name, name, request, slot, custom_headers=None, raw=False, **operation_config): + """Discovers an existing app backup that can be restored from a blob in + Azure storage. Use this to get information about the databases stored + in a backup. + + Discovers an existing app backup that can be restored from a blob in + Azure storage. Use this to get information about the databases stored + in a backup. + + :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. + :type name: str + :param request: A RestoreRequest object that includes Azure storage + URL and blog name for discovery of backup. + :type request: ~azure.mgmt.web.models.RestoreRequest + :param slot: Name of the deployment slot. If a slot is not specified, + the API will perform discovery for the production slot. + :type slot: 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: RestoreRequest or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.RestoreRequest or + ~msrest.pipeline.ClientRawResponse + :raises: + :class:`DefaultErrorResponseException` + """ + # Construct URL + url = self.discover_backup_slot.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'), + 'slot': self._serialize.url("slot", slot, '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(request, 'RestoreRequest') + + # 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]: + raise models.DefaultErrorResponseException(self._deserialize, response) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('RestoreRequest', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + discover_backup_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/discoverbackup'} + def list_domain_ownership_identifiers_slot( self, resource_group_name, name, slot, custom_headers=None, raw=False, **operation_config): """Lists ownership identifiers for domain associated with web app. @@ -13264,7 +14041,8 @@ def list_domain_ownership_identifiers_slot( :return: An iterator like instance of Identifier :rtype: ~azure.mgmt.web.models.IdentifierPaged[~azure.mgmt.web.models.Identifier] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ def internal_paging(next_link=None, raw=False): @@ -13303,9 +14081,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 @@ -13345,7 +14121,8 @@ def get_domain_ownership_identifier_slot( :return: Identifier or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.Identifier or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.get_domain_ownership_identifier_slot.metadata['url'] @@ -13377,9 +14154,7 @@ def get_domain_ownership_identifier_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 @@ -13424,7 +14199,8 @@ def create_or_update_domain_ownership_identifier_slot( :return: Identifier or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.Identifier or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ domain_ownership_identifier = models.Identifier(kind=kind, identifier_id=identifier_id) @@ -13462,9 +14238,7 @@ def create_or_update_domain_ownership_identifier_slot( 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 @@ -13574,7 +14348,8 @@ def update_domain_ownership_identifier_slot( :return: Identifier or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.Identifier or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ domain_ownership_identifier = models.Identifier(kind=kind, identifier_id=identifier_id) @@ -13612,9 +14387,7 @@ def update_domain_ownership_identifier_slot( 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 @@ -13650,7 +14423,8 @@ def get_ms_deploy_status_slot( :return: MSDeployStatus or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.MSDeployStatus or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.get_ms_deploy_status_slot.metadata['url'] @@ -13681,9 +14455,7 @@ def get_ms_deploy_status_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 @@ -13973,7 +14745,8 @@ def get_functions_admin_token_slot( overrides`. :return: str or ClientRawResponse if raw=true :rtype: str or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.get_functions_admin_token_slot.metadata['url'] @@ -14004,9 +14777,7 @@ def get_functions_admin_token_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 @@ -14129,9 +14900,7 @@ def _create_instance_function_slot_initial( request, header_parameters, body_content, stream=False, **operation_config) if response.status_code not in [201]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp + raise models.DefaultErrorResponseException(self._deserialize, response) deserialized = None @@ -14173,7 +14942,8 @@ def create_instance_function_slot( ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.FunctionEnvelope] or ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.FunctionEnvelope]] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ raw_result = self._create_instance_function_slot_initial( resource_group_name=resource_group_name, @@ -14294,7 +15064,8 @@ def list_function_secrets_slot( :return: FunctionSecrets or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.FunctionSecrets or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.list_function_secrets_slot.metadata['url'] @@ -14326,9 +15097,7 @@ def list_function_secrets_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 @@ -14364,7 +15133,8 @@ def list_host_name_bindings_slot( :return: An iterator like instance of HostNameBinding :rtype: ~azure.mgmt.web.models.HostNameBindingPaged[~azure.mgmt.web.models.HostNameBinding] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ def internal_paging(next_link=None, raw=False): @@ -14403,9 +15173,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 @@ -14446,7 +15214,8 @@ def get_host_name_binding_slot( :return: HostNameBinding or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.HostNameBinding or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.get_host_name_binding_slot.metadata['url'] @@ -14478,9 +15247,7 @@ def get_host_name_binding_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 @@ -14521,7 +15288,8 @@ def create_or_update_host_name_binding_slot( :return: HostNameBinding or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.HostNameBinding or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.create_or_update_host_name_binding_slot.metadata['url'] @@ -14557,9 +15325,7 @@ def create_or_update_host_name_binding_slot( 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 @@ -14664,7 +15430,8 @@ def get_hybrid_connection_slot( :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_slot.metadata['url'] @@ -14697,9 +15464,7 @@ def get_hybrid_connection_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 @@ -14740,7 +15505,8 @@ def create_or_update_hybrid_connection_slot( :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.create_or_update_hybrid_connection_slot.metadata['url'] @@ -14777,9 +15543,7 @@ def create_or_update_hybrid_connection_slot( 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 @@ -14886,7 +15650,8 @@ def update_hybrid_connection_slot( :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.update_hybrid_connection_slot.metadata['url'] @@ -14923,9 +15688,7 @@ def update_hybrid_connection_slot( 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 @@ -14964,7 +15727,8 @@ def list_hybrid_connection_keys_slot( :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_slot.metadata['url'] @@ -14996,10 +15760,8 @@ def list_hybrid_connection_keys_slot( 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 response.status_code not in [200]: + raise models.DefaultErrorResponseException(self._deserialize, response) deserialized = None @@ -15034,7 +15796,8 @@ def list_hybrid_connections_slot( :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.list_hybrid_connections_slot.metadata['url'] @@ -15065,9 +15828,7 @@ def list_hybrid_connections_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 @@ -15105,7 +15866,8 @@ def list_relay_service_connections_slot( :return: RelayServiceConnectionEntity or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.RelayServiceConnectionEntity or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.list_relay_service_connections_slot.metadata['url'] @@ -15136,9 +15898,7 @@ def list_relay_service_connections_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 @@ -15176,7 +15936,8 @@ def get_relay_service_connection_slot( :return: RelayServiceConnectionEntity or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.RelayServiceConnectionEntity or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.get_relay_service_connection_slot.metadata['url'] @@ -15208,9 +15969,7 @@ def get_relay_service_connection_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 @@ -15255,7 +16014,8 @@ def create_or_update_relay_service_connection_slot( :return: RelayServiceConnectionEntity or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.RelayServiceConnectionEntity or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.create_or_update_relay_service_connection_slot.metadata['url'] @@ -15291,9 +16051,7 @@ def create_or_update_relay_service_connection_slot( 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 @@ -15402,7 +16160,8 @@ def update_relay_service_connection_slot( :return: RelayServiceConnectionEntity or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.RelayServiceConnectionEntity or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.update_relay_service_connection_slot.metadata['url'] @@ -15438,9 +16197,7 @@ def update_relay_service_connection_slot( 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 @@ -15476,7 +16233,8 @@ def list_instance_identifiers_slot( :return: An iterator like instance of SiteInstance :rtype: ~azure.mgmt.web.models.SiteInstancePaged[~azure.mgmt.web.models.SiteInstance] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ def internal_paging(next_link=None, raw=False): @@ -15515,9 +16273,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 @@ -15556,7 +16312,8 @@ def get_instance_ms_deploy_status_slot( :return: MSDeployStatus or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.MSDeployStatus or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.get_instance_ms_deploy_status_slot.metadata['url'] @@ -15588,9 +16345,7 @@ def get_instance_ms_deploy_status_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 @@ -16470,7 +17225,8 @@ def is_cloneable_slot( :return: SiteCloneability or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.SiteCloneability or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.is_cloneable_slot.metadata['url'] @@ -16501,9 +17257,7 @@ def is_cloneable_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 @@ -16539,7 +17293,8 @@ def list_sync_function_triggers_slot( :return: FunctionSecrets or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.FunctionSecrets or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.list_sync_function_triggers_slot.metadata['url'] @@ -16570,9 +17325,7 @@ def list_sync_function_triggers_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 @@ -16610,7 +17363,8 @@ def list_metric_definitions_slot( :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): @@ -16649,9 +17403,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 @@ -16697,7 +17449,8 @@ def list_metrics_slot( :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): @@ -16740,9 +17493,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 @@ -16780,7 +17531,8 @@ def get_migrate_my_sql_status_slot( :return: MigrateMySqlStatus or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.MigrateMySqlStatus or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.get_migrate_my_sql_status_slot.metadata['url'] @@ -16811,9 +17563,7 @@ def get_migrate_my_sql_status_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 @@ -16928,7 +17678,8 @@ def start_web_site_network_trace_slot( overrides`. :return: str or ClientRawResponse if raw=true :rtype: str or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.start_web_site_network_trace_slot.metadata['url'] @@ -16965,9 +17716,7 @@ def start_web_site_network_trace_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 @@ -17001,7 +17750,8 @@ def stop_web_site_network_trace_slot( overrides`. :return: str or ClientRawResponse if raw=true :rtype: str or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.stop_web_site_network_trace_slot.metadata['url'] @@ -17032,9 +17782,7 @@ def stop_web_site_network_trace_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 @@ -17138,7 +17886,8 @@ def list_perf_mon_counters_slot( :return: An iterator like instance of PerfMonResponse :rtype: ~azure.mgmt.web.models.PerfMonResponsePaged[~azure.mgmt.web.models.PerfMonResponse] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ def internal_paging(next_link=None, raw=False): @@ -17179,9 +17928,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 @@ -17218,7 +17965,8 @@ def get_site_php_error_log_flag_slot( :return: SitePhpErrorLogFlag or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.SitePhpErrorLogFlag or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.get_site_php_error_log_flag_slot.metadata['url'] @@ -17249,9 +17997,7 @@ def get_site_php_error_log_flag_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 @@ -17287,7 +18033,8 @@ def list_premier_add_ons_slot( :return: PremierAddOn or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.PremierAddOn or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.list_premier_add_ons_slot.metadata['url'] @@ -17318,9 +18065,7 @@ def list_premier_add_ons_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 @@ -17358,7 +18103,8 @@ def get_premier_add_on_slot( :return: PremierAddOn or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.PremierAddOn or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.get_premier_add_on_slot.metadata['url'] @@ -17390,9 +18136,7 @@ def get_premier_add_on_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 @@ -17433,7 +18177,8 @@ def add_premier_add_on_slot( :return: PremierAddOn or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.PremierAddOn or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.add_premier_add_on_slot.metadata['url'] @@ -17469,9 +18214,7 @@ def add_premier_add_on_slot( 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 @@ -17511,11 +18254,224 @@ def delete_premier_add_on_slot( :raises: :class:`CloudError` """ # Construct URL - url = self.delete_premier_add_on_slot.metadata['url'] + url = self.delete_premier_add_on_slot.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'), + 'premierAddOnName': self._serialize.url("premier_add_on_name", premier_add_on_name, 'str'), + 'slot': self._serialize.url("slot", slot, '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.delete(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 + delete_premier_add_on_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/premieraddons/{premierAddOnName}'} + + def update_premier_add_on_slot( + self, resource_group_name, name, premier_add_on_name, premier_add_on, slot, custom_headers=None, raw=False, **operation_config): + """Updates a named add-on of an app. + + Updates a named add-on of an app. + + :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. + :type name: str + :param premier_add_on_name: Add-on name. + :type premier_add_on_name: str + :param premier_add_on: A JSON representation of the edited premier + add-on. + :type premier_add_on: ~azure.mgmt.web.models.PremierAddOnPatchResource + :param slot: Name of the deployment slot. If a slot is not specified, + the API will update the named add-on for the production slot. + :type slot: 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: PremierAddOn or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.PremierAddOn or + ~msrest.pipeline.ClientRawResponse + :raises: + :class:`DefaultErrorResponseException` + """ + # Construct URL + url = self.update_premier_add_on_slot.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'), + 'premierAddOnName': self._serialize.url("premier_add_on_name", premier_add_on_name, 'str'), + 'slot': self._serialize.url("slot", slot, '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(premier_add_on, 'PremierAddOnPatchResource') + + # Construct and send request + request = self._client.patch(url, query_parameters) + response = self._client.send( + request, header_parameters, body_content, stream=False, **operation_config) + + if response.status_code not in [200]: + raise models.DefaultErrorResponseException(self._deserialize, response) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('PremierAddOn', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + update_premier_add_on_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/premieraddons/{premierAddOnName}'} + + def get_private_access_slot( + self, resource_group_name, name, slot, custom_headers=None, raw=False, **operation_config): + """Gets data around private site access enablement and authorized Virtual + Networks that can access the site. + + Gets data around private site access enablement and authorized Virtual + Networks that can access the site. + + :param resource_group_name: Name of the resource group to which the + resource belongs. + :type resource_group_name: str + :param name: The name of the web app. + :type name: str + :param slot: The name of the slot for the web app. + :type slot: 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: PrivateAccess or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.PrivateAccess or + ~msrest.pipeline.ClientRawResponse + :raises: + :class:`DefaultErrorResponseException` + """ + # Construct URL + url = self.get_private_access_slot.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'), + 'slot': self._serialize.url("slot", slot, '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.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) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('PrivateAccess', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + get_private_access_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/privateAccess/virtualNetworks'} + + def put_private_access_vnet_slot( + self, resource_group_name, name, access, slot, custom_headers=None, raw=False, **operation_config): + """Sets data around private site access enablement and authorized Virtual + Networks that can access the site. + + Sets data around private site access enablement and authorized Virtual + Networks that can access the site. + + :param resource_group_name: Name of the resource group to which the + resource belongs. + :type resource_group_name: str + :param name: The name of the web app. + :type name: str + :param access: The information for the private access + :type access: ~azure.mgmt.web.models.PrivateAccess + :param slot: The name of the slot for the web app. + :type slot: 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: PrivateAccess or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.PrivateAccess or + ~msrest.pipeline.ClientRawResponse + :raises: + :class:`DefaultErrorResponseException` + """ + # Construct URL + url = self.put_private_access_vnet_slot.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'), - 'premierAddOnName': self._serialize.url("premier_add_on_name", premier_add_on_name, 'str'), 'slot': self._serialize.url("slot", slot, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') } @@ -17535,19 +18491,28 @@ def delete_premier_add_on_slot( 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(access, 'PrivateAccess') + # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.put(url, query_parameters) + response = self._client.send( + 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 + + if response.status_code == 200: + deserialized = self._deserialize('PrivateAccess', response) if raw: - client_raw_response = ClientRawResponse(None, response) + client_raw_response = ClientRawResponse(deserialized, response) return client_raw_response - delete_premier_add_on_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/premieraddons/{premierAddOnName}'} + + return deserialized + put_private_access_vnet_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/privateAccess/virtualNetworks'} def list_processes_slot( self, resource_group_name, name, slot, custom_headers=None, raw=False, **operation_config): @@ -18189,7 +19154,8 @@ def list_public_certificates_slot( :return: An iterator like instance of PublicCertificate :rtype: ~azure.mgmt.web.models.PublicCertificatePaged[~azure.mgmt.web.models.PublicCertificate] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ def internal_paging(next_link=None, raw=False): @@ -18228,9 +19194,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 @@ -18271,7 +19235,8 @@ def get_public_certificate_slot( :return: PublicCertificate or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.PublicCertificate or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.get_public_certificate_slot.metadata['url'] @@ -18303,9 +19268,7 @@ def get_public_certificate_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 @@ -18346,7 +19309,8 @@ def create_or_update_public_certificate_slot( :return: PublicCertificate or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.PublicCertificate or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.create_or_update_public_certificate_slot.metadata['url'] @@ -18382,9 +19346,7 @@ def create_or_update_public_certificate_slot( 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 @@ -18495,7 +19457,8 @@ def list_publishing_profile_xml_with_secrets_slot( overrides`. :return: object or ClientRawResponse if raw=true :rtype: Generator or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ publishing_profile_options = models.CsmPublishingProfileOptions(format=format) @@ -18532,9 +19495,7 @@ def list_publishing_profile_xml_with_secrets_slot( request, header_parameters, body_content, stream=True, **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 @@ -18548,11 +19509,242 @@ def list_publishing_profile_xml_with_secrets_slot( return deserialized list_publishing_profile_xml_with_secrets_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/publishxml'} + def reset_slot_configuration_slot( + self, resource_group_name, name, slot, custom_headers=None, raw=False, **operation_config): + """Resets the configuration settings of the current slot if they were + previously modified by calling the API with POST. + + Resets the configuration settings of the current slot if they were + previously modified by calling the API with POST. + + :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. + :type name: str + :param slot: Name of the deployment slot. If a slot is not specified, + the API resets configuration settings for the production slot. + :type slot: 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.reset_slot_configuration_slot.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'), + 'slot': self._serialize.url("slot", slot, '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 + reset_slot_configuration_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/resetSlotConfig'} + + def restart_slot( + self, resource_group_name, name, slot, soft_restart=None, synchronous=None, custom_headers=None, raw=False, **operation_config): + """Restarts an app (or deployment slot, if specified). + + Restarts an app (or deployment slot, if specified). + + :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. + :type name: str + :param slot: Name of the deployment slot. If a slot is not specified, + the API will restart the production slot. + :type slot: str + :param soft_restart: Specify true to apply the configuration settings + and restarts the app only if necessary. By default, the API always + restarts and reprovisions the app. + :type soft_restart: bool + :param synchronous: Specify true to block until the app is restarted. + By default, it is set to false, and the API responds immediately + (asynchronous). + :type synchronous: bool + :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.restart_slot.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'), + 'slot': self._serialize.url("slot", slot, '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 soft_restart is not None: + query_parameters['softRestart'] = self._serialize.query("soft_restart", soft_restart, 'bool') + if synchronous is not None: + query_parameters['synchronous'] = self._serialize.query("synchronous", synchronous, 'bool') + 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 + restart_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/restart'} + + + def _restore_from_backup_blob_slot_initial( + self, resource_group_name, name, request, slot, custom_headers=None, raw=False, **operation_config): + # Construct URL + url = self.restore_from_backup_blob_slot.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'), + 'slot': self._serialize.url("slot", slot, '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(request, 'RestoreRequest') + + # 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]: + 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 + + def restore_from_backup_blob_slot( + self, resource_group_name, name, request, slot, custom_headers=None, raw=False, polling=True, **operation_config): + """Restores an app from a backup blob in Azure Storage. + + Restores an app from a backup blob in Azure Storage. + + :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. + :type name: str + :param request: Information on restore request . + :type request: ~azure.mgmt.web.models.RestoreRequest + :param slot: Name of the deployment slot. If a slot is not specified, + the API will restore a backup of the production slot. + :type slot: str + :param dict custom_headers: headers that will be added to the request + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns None or + ClientRawResponse if raw==True + :rtype: ~msrestazure.azure_operation.AzureOperationPoller[None] or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[None]] + :raises: :class:`CloudError` + """ + raw_result = self._restore_from_backup_blob_slot_initial( + resource_group_name=resource_group_name, + name=name, + request=request, + slot=slot, + custom_headers=custom_headers, + raw=True, + **operation_config + ) + + def get_long_running_output(response): + if raw: + client_raw_response = ClientRawResponse(None, response) + return client_raw_response + + lro_delay = operation_config.get( + 'long_running_operation_timeout', + self.config.long_running_operation_timeout) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) + restore_from_backup_blob_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/restoreFromBackupBlob'} + - def _recover_slot_initial( - self, resource_group_name, name, recovery_entity, slot, custom_headers=None, raw=False, **operation_config): + def _restore_from_deleted_app_slot_initial( + self, resource_group_name, name, restore_request, slot, custom_headers=None, raw=False, **operation_config): # Construct URL - url = self.recover_slot.metadata['url'] + url = self.restore_from_deleted_app_slot.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'), @@ -18576,7 +19768,7 @@ def _recover_slot_initial( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct body - body_content = self._serialize.body(recovery_entity, 'SnapshotRecoveryRequest') + body_content = self._serialize.body(restore_request, 'DeletedAppRestoreRequest') # Construct and send request request = self._client.post(url, query_parameters) @@ -18592,21 +19784,19 @@ def _recover_slot_initial( client_raw_response = ClientRawResponse(None, response) return client_raw_response - def recover_slot( - self, resource_group_name, name, recovery_entity, slot, custom_headers=None, raw=False, polling=True, **operation_config): - """Recovers a web app to a previous snapshot. + def restore_from_deleted_app_slot( + self, resource_group_name, name, restore_request, slot, custom_headers=None, raw=False, polling=True, **operation_config): + """Restores a deleted web app to this web app. - Recovers a web app to a previous snapshot. + Restores a deleted web app to this web app. :param resource_group_name: Name of the resource group to which the resource belongs. :type resource_group_name: str :param name: Name of web app. :type name: str - :param recovery_entity: Snapshot data used for web app recovery. - Snapshot information can be obtained by calling GetDeletedSites or - GetSiteSnapshots API. - :type recovery_entity: ~azure.mgmt.web.models.SnapshotRecoveryRequest + :param restore_request: Deleted web app restore information. + :type restore_request: ~azure.mgmt.web.models.DeletedAppRestoreRequest :param slot: Name of web app slot. If not specified then will default to production slot. :type slot: str @@ -18621,10 +19811,10 @@ def recover_slot( ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[None]] :raises: :class:`CloudError` """ - raw_result = self._recover_slot_initial( + raw_result = self._restore_from_deleted_app_slot_initial( resource_group_name=resource_group_name, name=name, - recovery_entity=recovery_entity, + restore_request=restore_request, slot=slot, custom_headers=custom_headers, raw=True, @@ -18643,35 +19833,13 @@ def get_long_running_output(response): elif polling is False: polling_method = NoPolling() else: polling_method = polling return LROPoller(self._client, raw_result, get_long_running_output, polling_method) - recover_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/recover'} - - def reset_slot_configuration_slot( - self, resource_group_name, name, slot, custom_headers=None, raw=False, **operation_config): - """Resets the configuration settings of the current slot if they were - previously modified by calling the API with POST. + restore_from_deleted_app_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/restoreFromDeletedApp'} - Resets the configuration settings of the current slot if they were - previously modified by calling the API with POST. - :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. - :type name: str - :param slot: Name of the deployment slot. If a slot is not specified, - the API resets configuration settings for the production slot. - :type slot: 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` - """ + def _restore_snapshot_slot_initial( + self, resource_group_name, name, restore_request, slot, custom_headers=None, raw=False, **operation_config): # Construct URL - url = self.reset_slot_configuration_slot.metadata['url'] + url = self.restore_snapshot_slot.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'), @@ -18694,11 +19862,15 @@ def reset_slot_configuration_slot( 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(restore_request, 'SnapshotRestoreRequest') + # Construct and send request request = self._client.post(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + response = self._client.send( + request, header_parameters, body_content, stream=False, **operation_config) - if response.status_code not in [200]: + if response.status_code not in [200, 202]: exp = CloudError(response) exp.request_id = response.headers.get('x-ms-request-id') raise exp @@ -18706,80 +19878,59 @@ def reset_slot_configuration_slot( if raw: client_raw_response = ClientRawResponse(None, response) return client_raw_response - reset_slot_configuration_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/resetSlotConfig'} - def restart_slot( - self, resource_group_name, name, slot, soft_restart=None, synchronous=None, custom_headers=None, raw=False, **operation_config): - """Restarts an app (or deployment slot, if specified). + def restore_snapshot_slot( + self, resource_group_name, name, restore_request, slot, custom_headers=None, raw=False, polling=True, **operation_config): + """Restores a web app from a snapshot. - Restarts an app (or deployment slot, if specified). + Restores a web app from a snapshot. :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. + :param name: Name of web app. :type name: str - :param slot: Name of the deployment slot. If a slot is not specified, - the API will restart the production slot. + :param restore_request: Snapshot restore settings. Snapshot + information can be obtained by calling GetDeletedSites or + GetSiteSnapshots API. + :type restore_request: ~azure.mgmt.web.models.SnapshotRestoreRequest + :param slot: Name of web app slot. If not specified then will default + to production slot. :type slot: str - :param soft_restart: Specify true to apply the configuration settings - and restarts the app only if necessary. By default, the API always - restarts and reprovisions the app. - :type soft_restart: bool - :param synchronous: Specify true to block until the app is restarted. - By default, it is set to false, and the API responds immediately - (asynchronous). - :type synchronous: bool :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 + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns None or + ClientRawResponse if raw==True + :rtype: ~msrestazure.azure_operation.AzureOperationPoller[None] or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[None]] :raises: :class:`CloudError` """ - # Construct URL - url = self.restart_slot.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'), - 'slot': self._serialize.url("slot", slot, '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 soft_restart is not None: - query_parameters['softRestart'] = self._serialize.query("soft_restart", soft_restart, 'bool') - if synchronous is not None: - query_parameters['synchronous'] = self._serialize.query("synchronous", synchronous, 'bool') - 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) + raw_result = self._restore_snapshot_slot_initial( + resource_group_name=resource_group_name, + name=name, + restore_request=restore_request, + slot=slot, + custom_headers=custom_headers, + raw=True, + **operation_config + ) - if response.status_code not in [200]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp + def get_long_running_output(response): + if raw: + client_raw_response = ClientRawResponse(None, response) + return client_raw_response - if raw: - client_raw_response = ClientRawResponse(None, response) - return client_raw_response - restart_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/restart'} + lro_delay = operation_config.get( + 'long_running_operation_timeout', + self.config.long_running_operation_timeout) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) + restore_snapshot_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/restoreSnapshot'} def list_site_extensions_slot( self, resource_group_name, name, slot, custom_headers=None, raw=False, **operation_config): @@ -19131,7 +20282,8 @@ def list_slot_differences_slot( :return: An iterator like instance of SlotDifference :rtype: ~azure.mgmt.web.models.SlotDifferencePaged[~azure.mgmt.web.models.SlotDifference] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ slot_swap_entity = models.CsmSlotEntity(target_slot=target_slot, preserve_vnet=preserve_vnet) @@ -19175,9 +20327,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 @@ -19314,7 +20464,8 @@ def list_snapshots_slot( :return: An iterator like instance of Snapshot :rtype: ~azure.mgmt.web.models.SnapshotPaged[~azure.mgmt.web.models.Snapshot] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ def internal_paging(next_link=None, raw=False): @@ -19353,9 +20504,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 @@ -19393,7 +20542,8 @@ def get_source_control_slot( :return: SiteSourceControl or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.SiteSourceControl or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.get_source_control_slot.metadata['url'] @@ -19424,9 +20574,7 @@ def get_source_control_slot( response = self._client.send(request, header_parameters, stream=False, **operation_config) if response.status_code not in [200, 201, 202]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp + raise models.DefaultErrorResponseException(self._deserialize, response) deserialized = None @@ -19480,9 +20628,7 @@ def _create_or_update_source_control_slot_initial( request, header_parameters, body_content, stream=False, **operation_config) if response.status_code not in [200, 201, 202]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp + raise models.DefaultErrorResponseException(self._deserialize, response) deserialized = None @@ -19528,7 +20674,8 @@ def create_or_update_source_control_slot( ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.SiteSourceControl] or ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.SiteSourceControl]] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ raw_result = self._create_or_update_source_control_slot_initial( resource_group_name=resource_group_name, @@ -19646,7 +20793,8 @@ def update_source_control_slot( :return: SiteSourceControl or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.SiteSourceControl or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.update_source_control_slot.metadata['url'] @@ -19680,10 +20828,8 @@ def update_source_control_slot( response = self._client.send( 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 + if response.status_code not in [200, 201, 202]: + raise models.DefaultErrorResponseException(self._deserialize, response) deserialized = None @@ -19691,6 +20837,8 @@ def update_source_control_slot( deserialized = self._deserialize('SiteSourceControl', response) if response.status_code == 201: deserialized = self._deserialize('SiteSourceControl', response) + if response.status_code == 202: + deserialized = self._deserialize('SiteSourceControl', response) if raw: client_raw_response = ClientRawResponse(deserialized, response) @@ -19965,7 +21113,8 @@ def list_triggered_web_jobs_slot( :return: An iterator like instance of TriggeredWebJob :rtype: ~azure.mgmt.web.models.TriggeredWebJobPaged[~azure.mgmt.web.models.TriggeredWebJob] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ def internal_paging(next_link=None, raw=False): @@ -20004,9 +21153,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 @@ -20409,7 +21556,8 @@ def list_usages_slot( :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): @@ -20450,9 +21598,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 @@ -20489,7 +21635,8 @@ def list_vnet_connections_slot( :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_vnet_connections_slot.metadata['url'] @@ -20520,9 +21667,7 @@ def list_vnet_connections_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 @@ -20562,7 +21707,8 @@ def get_vnet_connection_slot( :return: VnetInfo or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.VnetInfo or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.get_vnet_connection_slot.metadata['url'] @@ -20594,9 +21740,7 @@ def get_vnet_connection_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 @@ -20639,7 +21783,8 @@ def create_or_update_vnet_connection_slot( :return: VnetInfo or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.VnetInfo or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.create_or_update_vnet_connection_slot.metadata['url'] @@ -20675,9 +21820,7 @@ def create_or_update_vnet_connection_slot( 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 @@ -20786,7 +21929,8 @@ def update_vnet_connection_slot( :return: VnetInfo or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.VnetInfo or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.update_vnet_connection_slot.metadata['url'] @@ -20822,9 +21966,7 @@ def update_vnet_connection_slot( 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 @@ -20947,7 +22089,8 @@ def create_or_update_vnet_connection_gateway_slot( :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.create_or_update_vnet_connection_gateway_slot.metadata['url'] @@ -20984,9 +22127,7 @@ def create_or_update_vnet_connection_gateway_slot( 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 @@ -21033,7 +22174,8 @@ def update_vnet_connection_gateway_slot( :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_connection_gateway_slot.metadata['url'] @@ -21070,9 +22212,7 @@ def update_vnet_connection_gateway_slot( 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 @@ -21108,7 +22248,8 @@ def list_web_jobs_slot( :return: An iterator like instance of WebJob :rtype: ~azure.mgmt.web.models.WebJobPaged[~azure.mgmt.web.models.WebJob] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ def internal_paging(next_link=None, raw=False): @@ -21147,9 +22288,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 @@ -21188,7 +22327,8 @@ def get_web_job_slot( :return: WebJob or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.WebJob or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.get_web_job_slot.metadata['url'] @@ -21220,9 +22360,7 @@ def get_web_job_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 @@ -21260,7 +22398,8 @@ def list_slot_differences_from_production( :return: An iterator like instance of SlotDifference :rtype: ~azure.mgmt.web.models.SlotDifferencePaged[~azure.mgmt.web.models.SlotDifference] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ slot_swap_entity = models.CsmSlotEntity(target_slot=target_slot, preserve_vnet=preserve_vnet) @@ -21303,9 +22442,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 @@ -21435,7 +22572,8 @@ def list_snapshots( :return: An iterator like instance of Snapshot :rtype: ~azure.mgmt.web.models.SnapshotPaged[~azure.mgmt.web.models.Snapshot] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ def internal_paging(next_link=None, raw=False): @@ -21473,9 +22611,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 @@ -21509,7 +22645,8 @@ def get_source_control( :return: SiteSourceControl or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.SiteSourceControl or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.get_source_control.metadata['url'] @@ -21539,9 +22676,7 @@ def get_source_control( response = self._client.send(request, header_parameters, stream=False, **operation_config) if response.status_code not in [200, 201, 202]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp + raise models.DefaultErrorResponseException(self._deserialize, response) deserialized = None @@ -21594,9 +22729,7 @@ def _create_or_update_source_control_initial( request, header_parameters, body_content, stream=False, **operation_config) if response.status_code not in [200, 201, 202]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp + raise models.DefaultErrorResponseException(self._deserialize, response) deserialized = None @@ -21638,7 +22771,8 @@ def create_or_update_source_control( ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.web.models.SiteSourceControl] or ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.web.models.SiteSourceControl]] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ raw_result = self._create_or_update_source_control_initial( resource_group_name=resource_group_name, @@ -21746,7 +22880,8 @@ def update_source_control( :return: SiteSourceControl or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.SiteSourceControl or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.update_source_control.metadata['url'] @@ -21779,10 +22914,8 @@ def update_source_control( response = self._client.send( 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 + if response.status_code not in [200, 201, 202]: + raise models.DefaultErrorResponseException(self._deserialize, response) deserialized = None @@ -21790,6 +22923,8 @@ def update_source_control( deserialized = self._deserialize('SiteSourceControl', response) if response.status_code == 201: deserialized = self._deserialize('SiteSourceControl', response) + if response.status_code == 202: + deserialized = self._deserialize('SiteSourceControl', response) if raw: client_raw_response = ClientRawResponse(deserialized, response) @@ -22045,7 +23180,8 @@ def list_triggered_web_jobs( :return: An iterator like instance of TriggeredWebJob :rtype: ~azure.mgmt.web.models.TriggeredWebJobPaged[~azure.mgmt.web.models.TriggeredWebJob] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ def internal_paging(next_link=None, raw=False): @@ -22083,9 +23219,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 @@ -22465,7 +23599,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): @@ -22505,9 +23640,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 @@ -22541,7 +23674,8 @@ def list_vnet_connections( :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_vnet_connections.metadata['url'] @@ -22571,9 +23705,7 @@ def list_vnet_connections( 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 @@ -22610,7 +23742,8 @@ def get_vnet_connection( :return: VnetInfo or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.VnetInfo or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.get_vnet_connection.metadata['url'] @@ -22641,9 +23774,7 @@ def get_vnet_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 @@ -22683,7 +23814,8 @@ def create_or_update_vnet_connection( :return: VnetInfo or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.VnetInfo or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.create_or_update_vnet_connection.metadata['url'] @@ -22718,9 +23850,7 @@ def create_or_update_vnet_connection( 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 @@ -22822,7 +23952,8 @@ def update_vnet_connection( :return: VnetInfo or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.VnetInfo or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.update_vnet_connection.metadata['url'] @@ -22857,9 +23988,7 @@ def update_vnet_connection( 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 @@ -22974,7 +24103,8 @@ def create_or_update_vnet_connection_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.create_or_update_vnet_connection_gateway.metadata['url'] @@ -23010,9 +24140,7 @@ def create_or_update_vnet_connection_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 @@ -23055,7 +24183,8 @@ def update_vnet_connection_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_connection_gateway.metadata['url'] @@ -23091,9 +24220,7 @@ def update_vnet_connection_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 @@ -23126,7 +24253,8 @@ def list_web_jobs( :return: An iterator like instance of WebJob :rtype: ~azure.mgmt.web.models.WebJobPaged[~azure.mgmt.web.models.WebJob] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ def internal_paging(next_link=None, raw=False): @@ -23164,9 +24292,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 @@ -23202,7 +24328,8 @@ def get_web_job( :return: WebJob or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.WebJob or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ # Construct URL url = self.get_web_job.metadata['url'] @@ -23233,9 +24360,7 @@ def get_web_job( 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/web_site_management_client.py b/azure-mgmt-web/azure/mgmt/web/web_site_management_client.py index 296ad78205d0..6cce23de18b9 100644 --- a/azure-mgmt-web/azure/mgmt/web/web_site_management_client.py +++ b/azure-mgmt-web/azure/mgmt/web/web_site_management_client.py @@ -28,8 +28,6 @@ from .operations.diagnostics_operations import DiagnosticsOperations from .operations.provider_operations import ProviderOperations from .operations.recommendations_operations import RecommendationsOperations -from .operations.resource_health_metadata_operations import ResourceHealthMetadataOperations -from .operations.billing_meters_operations import BillingMetersOperations from .operations.web_apps_operations import WebAppsOperations from .operations.app_service_environments_operations import AppServiceEnvironmentsOperations from .operations.app_service_plans_operations import AppServicePlansOperations @@ -95,10 +93,6 @@ class WebSiteManagementClient(SDKClient): :vartype provider: azure.mgmt.web.operations.ProviderOperations :ivar recommendations: Recommendations operations :vartype recommendations: azure.mgmt.web.operations.RecommendationsOperations - :ivar resource_health_metadata: ResourceHealthMetadata operations - :vartype resource_health_metadata: azure.mgmt.web.operations.ResourceHealthMetadataOperations - :ivar billing_meters: BillingMeters operations - :vartype billing_meters: azure.mgmt.web.operations.BillingMetersOperations :ivar web_apps: WebApps operations :vartype web_apps: azure.mgmt.web.operations.WebAppsOperations :ivar app_service_environments: AppServiceEnvironments operations @@ -122,6 +116,7 @@ def __init__( super(WebSiteManagementClient, self).__init__(self.config.credentials, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} + self.api_version = '2018-02-01' self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) @@ -145,10 +140,6 @@ def __init__( self._client, self.config, self._serialize, self._deserialize) self.recommendations = RecommendationsOperations( self._client, self.config, self._serialize, self._deserialize) - self.resource_health_metadata = ResourceHealthMetadataOperations( - self._client, self.config, self._serialize, self._deserialize) - self.billing_meters = BillingMetersOperations( - self._client, self.config, self._serialize, self._deserialize) self.web_apps = WebAppsOperations( self._client, self.config, self._serialize, self._deserialize) self.app_service_environments = AppServiceEnvironmentsOperations( @@ -170,16 +161,15 @@ def get_publishing_user( :return: User or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.User or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ - api_version = "2016-03-01" - # Construct URL url = self.get_publishing_user.metadata['url'] # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') # Construct headers header_parameters = {} @@ -196,9 +186,7 @@ def get_publishing_user( 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 @@ -228,16 +216,15 @@ def update_publishing_user( :return: User or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.User or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ - api_version = "2016-03-01" - # Construct URL url = self.update_publishing_user.metadata['url'] # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') # Construct headers header_parameters = {} @@ -258,9 +245,7 @@ def update_publishing_user( 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 @@ -288,10 +273,9 @@ def list_source_controls( :return: An iterator like instance of SourceControl :rtype: ~azure.mgmt.web.models.SourceControlPaged[~azure.mgmt.web.models.SourceControl] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ - api_version = "2016-03-01" - def internal_paging(next_link=None, raw=False): if not next_link: @@ -300,7 +284,7 @@ def internal_paging(next_link=None, raw=False): # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') else: url = next_link @@ -322,9 +306,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 @@ -355,10 +337,9 @@ def get_source_control( :return: SourceControl or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.SourceControl or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ - api_version = "2016-03-01" - # Construct URL url = self.get_source_control.metadata['url'] path_format_arguments = { @@ -368,7 +349,7 @@ def get_source_control( # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') # Construct headers header_parameters = {} @@ -385,9 +366,7 @@ def get_source_control( 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 @@ -419,10 +398,9 @@ def update_source_control( :return: SourceControl or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.SourceControl or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ - api_version = "2016-03-01" - # Construct URL url = self.update_source_control.metadata['url'] path_format_arguments = { @@ -432,7 +410,7 @@ def update_source_control( # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') # Construct headers header_parameters = {} @@ -453,9 +431,7 @@ def update_source_control( 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 @@ -469,6 +445,80 @@ def update_source_control( return deserialized update_source_control.metadata = {'url': '/providers/Microsoft.Web/sourcecontrols/{sourceControlType}'} + def list_billing_meters( + self, billing_location=None, os_type=None, custom_headers=None, raw=False, **operation_config): + """Gets a list of meters for a given location. + + Gets a list of meters for a given location. + + :param billing_location: Azure Location of billable resource + :type billing_location: str + :param os_type: App Service OS type meters used for + :type os_type: 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: An iterator like instance of BillingMeter + :rtype: + ~azure.mgmt.web.models.BillingMeterPaged[~azure.mgmt.web.models.BillingMeter] + :raises: + :class:`DefaultErrorResponseException` + """ + def internal_paging(next_link=None, raw=False): + + if not next_link: + # Construct URL + url = self.list_billing_meters.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 billing_location is not None: + query_parameters['billingLocation'] = self._serialize.query("billing_location", billing_location, 'str') + if os_type is not None: + query_parameters['osType'] = self._serialize.query("os_type", os_type, 'str') + 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.BillingMeterPaged(internal_paging, self._deserialize.dependencies) + + if raw: + header_dict = {} + client_raw_response = models.BillingMeterPaged(internal_paging, self._deserialize.dependencies, header_dict) + return client_raw_response + + return deserialized + list_billing_meters.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Web/billingMeters'} + def check_name_availability( self, name, type, is_fqdn=None, custom_headers=None, raw=False, **operation_config): """Check if a resource name is available. @@ -492,12 +542,11 @@ def check_name_availability( :return: ResourceNameAvailability or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.ResourceNameAvailability or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ request = models.ResourceNameAvailabilityRequest(name=name, type=type, is_fqdn=is_fqdn) - api_version = "2016-03-01" - # Construct URL url = self.check_name_availability.metadata['url'] path_format_arguments = { @@ -507,7 +556,7 @@ def check_name_availability( # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') # Construct headers header_parameters = {} @@ -528,9 +577,7 @@ def check_name_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 @@ -558,10 +605,9 @@ def get_subscription_deployment_locations( :return: DeploymentLocations or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.DeploymentLocations or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ - api_version = "2016-03-01" - # Construct URL url = self.get_subscription_deployment_locations.metadata['url'] path_format_arguments = { @@ -571,7 +617,7 @@ def get_subscription_deployment_locations( # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') # Construct headers header_parameters = {} @@ -588,9 +634,7 @@ def get_subscription_deployment_locations( 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 @@ -605,18 +649,21 @@ def get_subscription_deployment_locations( get_subscription_deployment_locations.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Web/deploymentLocations'} def list_geo_regions( - self, sku=None, linux_workers_enabled=None, custom_headers=None, raw=False, **operation_config): + self, sku=None, linux_workers_enabled=None, xenon_workers_enabled=None, custom_headers=None, raw=False, **operation_config): """Get a list of available geographical regions. Get a list of available geographical regions. :param sku: Name of SKU used to filter the regions. Possible values - include: 'Free', 'Shared', 'Basic', 'Standard', 'Premium', - 'PremiumV2', 'Dynamic', 'Isolated' + include: 'Free', 'Shared', 'Basic', 'Standard', 'Premium', 'Dynamic', + 'Isolated', 'PremiumV2' :type sku: str or ~azure.mgmt.web.models.SkuName :param linux_workers_enabled: Specify true if you want to filter to only regions that support Linux workers. :type linux_workers_enabled: bool + :param xenon_workers_enabled: Specify true if you want to + filter to only regions that support Xenon workers. + :type xenon_workers_enabled: bool :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -625,10 +672,9 @@ def list_geo_regions( :return: An iterator like instance of GeoRegion :rtype: ~azure.mgmt.web.models.GeoRegionPaged[~azure.mgmt.web.models.GeoRegion] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ - api_version = "2016-03-01" - def internal_paging(next_link=None, raw=False): if not next_link: @@ -645,7 +691,9 @@ def internal_paging(next_link=None, raw=False): query_parameters['sku'] = self._serialize.query("sku", sku, 'str') if linux_workers_enabled is not None: query_parameters['linuxWorkersEnabled'] = self._serialize.query("linux_workers_enabled", linux_workers_enabled, 'bool') - query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str') + if xenon_workers_enabled is not None: + query_parameters['xenonWorkersEnabled'] = self._serialize.query("xenon_workers_enabled", xenon_workers_enabled, 'bool') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') else: url = next_link @@ -667,9 +715,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 @@ -700,12 +746,11 @@ def list_site_identifiers_assigned_to_host_name( :return: An iterator like instance of Identifier :rtype: ~azure.mgmt.web.models.IdentifierPaged[~azure.mgmt.web.models.Identifier] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ name_identifier = models.NameIdentifier(name=name) - api_version = "2016-03-01" - def internal_paging(next_link=None, raw=False): if not next_link: @@ -718,7 +763,7 @@ def internal_paging(next_link=None, raw=False): # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') else: url = next_link @@ -743,9 +788,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 @@ -774,10 +817,9 @@ def list_premier_add_on_offers( :return: An iterator like instance of PremierAddOnOffer :rtype: ~azure.mgmt.web.models.PremierAddOnOfferPaged[~azure.mgmt.web.models.PremierAddOnOffer] - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ - api_version = "2016-03-01" - def internal_paging(next_link=None, raw=False): if not next_link: @@ -790,7 +832,7 @@ def internal_paging(next_link=None, raw=False): # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') else: url = next_link @@ -812,9 +854,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 @@ -843,10 +883,9 @@ def list_skus( :return: SkuInfos or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.SkuInfos or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ - api_version = "2016-03-01" - # Construct URL url = self.list_skus.metadata['url'] path_format_arguments = { @@ -856,7 +895,7 @@ def list_skus( # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') # Construct headers header_parameters = {} @@ -873,9 +912,7 @@ def list_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 @@ -907,10 +944,9 @@ def verify_hosting_environment_vnet( :return: VnetValidationFailureDetails or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.VnetValidationFailureDetails or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ - api_version = "2016-03-01" - # Construct URL url = self.verify_hosting_environment_vnet.metadata['url'] path_format_arguments = { @@ -920,7 +956,7 @@ def verify_hosting_environment_vnet( # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') # Construct headers header_parameters = {} @@ -941,9 +977,7 @@ def verify_hosting_environment_vnet( 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 @@ -981,8 +1015,6 @@ def move( """ move_resource_envelope = models.CsmMoveResourceEnvelope(target_resource_group=target_resource_group, resources=resources) - api_version = "2016-03-01" - # Construct URL url = self.move.metadata['url'] path_format_arguments = { @@ -993,7 +1025,7 @@ def move( # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') # Construct headers header_parameters = {} @@ -1042,10 +1074,9 @@ def validate( :return: ValidateResponse or ClientRawResponse if raw=true :rtype: ~azure.mgmt.web.models.ValidateResponse or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` + :raises: + :class:`DefaultErrorResponseException` """ - api_version = "2016-03-01" - # Construct URL url = self.validate.metadata['url'] path_format_arguments = { @@ -1056,7 +1087,7 @@ def validate( # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') # Construct headers header_parameters = {} @@ -1077,9 +1108,7 @@ def validate( 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 @@ -1117,8 +1146,6 @@ def validate_move( """ move_resource_envelope = models.CsmMoveResourceEnvelope(target_resource_group=target_resource_group, resources=resources) - api_version = "2016-03-01" - # Construct URL url = self.validate_move.metadata['url'] path_format_arguments = { @@ -1129,7 +1156,7 @@ def validate_move( # Construct parameters query_parameters = {} - query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str') + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') # Construct headers header_parameters = {} From 150561b902ef62a9fede21c067f96f3ffa3b6869 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Thu, 19 Jul 2018 08:47:14 -0700 Subject: [PATCH 12/19] Generated from 783f10df76a37c1a43432530a30deb10d7aceb50 (#2955) Add API for adding external storage account configurations to a web app --- .../azure/mgmt/web/models/__init__.py | 10 + .../web/models/azure_storage_info_value.py | 53 ++++ .../models/azure_storage_info_value_py3.py | 53 ++++ ...re_storage_property_dictionary_resource.py | 49 +++ ...torage_property_dictionary_resource_py3.py | 49 +++ .../azure/mgmt/web/models/site_config.py | 5 + .../azure/mgmt/web/models/site_config_py3.py | 7 +- .../mgmt/web/models/site_config_resource.py | 5 + .../web/models/site_config_resource_py3.py | 7 +- .../web/models/slot_config_names_resource.py | 5 + .../models/slot_config_names_resource_py3.py | 7 +- .../web_site_management_client_enums.py | 13 + .../web/operations/web_apps_operations.py | 292 ++++++++++++++++++ 13 files changed, 552 insertions(+), 3 deletions(-) create mode 100644 azure-mgmt-web/azure/mgmt/web/models/azure_storage_info_value.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/azure_storage_info_value_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/azure_storage_property_dictionary_resource.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/azure_storage_property_dictionary_resource_py3.py diff --git a/azure-mgmt-web/azure/mgmt/web/models/__init__.py b/azure-mgmt-web/azure/mgmt/web/models/__init__.py index 06759925efc3..bd1762cc5238 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/__init__.py +++ b/azure-mgmt-web/azure/mgmt/web/models/__init__.py @@ -56,6 +56,7 @@ from .handler_mapping_py3 import HandlerMapping from .site_machine_key_py3 import SiteMachineKey from .conn_string_info_py3 import ConnStringInfo + from .azure_storage_info_value_py3 import AzureStorageInfoValue from .name_value_pair_py3 import NameValuePair from .site_config_py3 import SiteConfig from .host_name_ssl_state_py3 import HostNameSslState @@ -154,6 +155,7 @@ from .azure_blob_storage_application_logs_config_py3 import AzureBlobStorageApplicationLogsConfig from .application_logs_config_py3 import ApplicationLogsConfig from .azure_blob_storage_http_logs_config_py3 import AzureBlobStorageHttpLogsConfig + from .azure_storage_property_dictionary_resource_py3 import AzureStoragePropertyDictionaryResource from .database_backup_setting_py3 import DatabaseBackupSetting from .backup_item_py3 import BackupItem from .backup_schedule_py3 import BackupSchedule @@ -274,6 +276,7 @@ from .handler_mapping import HandlerMapping from .site_machine_key import SiteMachineKey from .conn_string_info import ConnStringInfo + from .azure_storage_info_value import AzureStorageInfoValue from .name_value_pair import NameValuePair from .site_config import SiteConfig from .host_name_ssl_state import HostNameSslState @@ -372,6 +375,7 @@ from .azure_blob_storage_application_logs_config import AzureBlobStorageApplicationLogsConfig from .application_logs_config import ApplicationLogsConfig from .azure_blob_storage_http_logs_config import AzureBlobStorageHttpLogsConfig + from .azure_storage_property_dictionary_resource import AzureStoragePropertyDictionaryResource from .database_backup_setting import DatabaseBackupSetting from .backup_item import BackupItem from .backup_schedule import BackupSchedule @@ -508,6 +512,8 @@ IpFilterTag, AutoHealActionType, ConnectionStringType, + AzureStorageType, + AzureStorageState, ScmType, ManagedPipelineMode, SiteLoadBalancing, @@ -608,6 +614,7 @@ 'HandlerMapping', 'SiteMachineKey', 'ConnStringInfo', + 'AzureStorageInfoValue', 'NameValuePair', 'SiteConfig', 'HostNameSslState', @@ -706,6 +713,7 @@ 'AzureBlobStorageApplicationLogsConfig', 'ApplicationLogsConfig', 'AzureBlobStorageHttpLogsConfig', + 'AzureStoragePropertyDictionaryResource', 'DatabaseBackupSetting', 'BackupItem', 'BackupSchedule', @@ -841,6 +849,8 @@ 'IpFilterTag', 'AutoHealActionType', 'ConnectionStringType', + 'AzureStorageType', + 'AzureStorageState', 'ScmType', 'ManagedPipelineMode', 'SiteLoadBalancing', diff --git a/azure-mgmt-web/azure/mgmt/web/models/azure_storage_info_value.py b/azure-mgmt-web/azure/mgmt/web/models/azure_storage_info_value.py new file mode 100644 index 000000000000..303ae406f8da --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/azure_storage_info_value.py @@ -0,0 +1,53 @@ +# 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 AzureStorageInfoValue(Model): + """Azure Files or Blob Storage access information value for dictionary + storage. + + :param type: Type of storage. Possible values include: 'AzureFiles', + 'AzureBlob' + :type type: str or ~azure.mgmt.web.models.AzureStorageType + :param account_name: Name of the storage account. + :type account_name: str + :param share_name: Name of the file share (container name, for Blob + storage). + :type share_name: str + :param access_key: Access key for the storage account. + :type access_key: str + :param mount_path: Path to mount the storage within the site's runtime + environment. + :type mount_path: str + :param state: State of the storage account. Possible values include: 'Ok', + 'InvalidCredentials', 'InvalidShare' + :type state: str or ~azure.mgmt.web.models.AzureStorageState + """ + + _attribute_map = { + 'type': {'key': 'type', 'type': 'AzureStorageType'}, + 'account_name': {'key': 'accountName', 'type': 'str'}, + 'share_name': {'key': 'shareName', 'type': 'str'}, + 'access_key': {'key': 'accessKey', 'type': 'str'}, + 'mount_path': {'key': 'mountPath', 'type': 'str'}, + 'state': {'key': 'state', 'type': 'AzureStorageState'}, + } + + def __init__(self, **kwargs): + super(AzureStorageInfoValue, self).__init__(**kwargs) + self.type = kwargs.get('type', None) + self.account_name = kwargs.get('account_name', None) + self.share_name = kwargs.get('share_name', None) + self.access_key = kwargs.get('access_key', None) + self.mount_path = kwargs.get('mount_path', None) + self.state = kwargs.get('state', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/azure_storage_info_value_py3.py b/azure-mgmt-web/azure/mgmt/web/models/azure_storage_info_value_py3.py new file mode 100644 index 000000000000..7652af5aee99 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/azure_storage_info_value_py3.py @@ -0,0 +1,53 @@ +# 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 AzureStorageInfoValue(Model): + """Azure Files or Blob Storage access information value for dictionary + storage. + + :param type: Type of storage. Possible values include: 'AzureFiles', + 'AzureBlob' + :type type: str or ~azure.mgmt.web.models.AzureStorageType + :param account_name: Name of the storage account. + :type account_name: str + :param share_name: Name of the file share (container name, for Blob + storage). + :type share_name: str + :param access_key: Access key for the storage account. + :type access_key: str + :param mount_path: Path to mount the storage within the site's runtime + environment. + :type mount_path: str + :param state: State of the storage account. Possible values include: 'Ok', + 'InvalidCredentials', 'InvalidShare' + :type state: str or ~azure.mgmt.web.models.AzureStorageState + """ + + _attribute_map = { + 'type': {'key': 'type', 'type': 'AzureStorageType'}, + 'account_name': {'key': 'accountName', 'type': 'str'}, + 'share_name': {'key': 'shareName', 'type': 'str'}, + 'access_key': {'key': 'accessKey', 'type': 'str'}, + 'mount_path': {'key': 'mountPath', 'type': 'str'}, + 'state': {'key': 'state', 'type': 'AzureStorageState'}, + } + + def __init__(self, *, type=None, account_name: str=None, share_name: str=None, access_key: str=None, mount_path: str=None, state=None, **kwargs) -> None: + super(AzureStorageInfoValue, self).__init__(**kwargs) + self.type = type + self.account_name = account_name + self.share_name = share_name + self.access_key = access_key + self.mount_path = mount_path + self.state = state diff --git a/azure-mgmt-web/azure/mgmt/web/models/azure_storage_property_dictionary_resource.py b/azure-mgmt-web/azure/mgmt/web/models/azure_storage_property_dictionary_resource.py new file mode 100644 index 000000000000..c3b0153b8d54 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/azure_storage_property_dictionary_resource.py @@ -0,0 +1,49 @@ +# 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 AzureStoragePropertyDictionaryResource(ProxyOnlyResource): + """AzureStorageInfo dictionary resource. + + 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 properties: Azure storage accounts. + :type properties: dict[str, ~azure.mgmt.web.models.AzureStorageInfoValue] + """ + + _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'}, + 'properties': {'key': 'properties', 'type': '{AzureStorageInfoValue}'}, + } + + def __init__(self, **kwargs): + super(AzureStoragePropertyDictionaryResource, self).__init__(**kwargs) + self.properties = kwargs.get('properties', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/azure_storage_property_dictionary_resource_py3.py b/azure-mgmt-web/azure/mgmt/web/models/azure_storage_property_dictionary_resource_py3.py new file mode 100644 index 000000000000..d00f95cb753f --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/azure_storage_property_dictionary_resource_py3.py @@ -0,0 +1,49 @@ +# 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_py3 import ProxyOnlyResource + + +class AzureStoragePropertyDictionaryResource(ProxyOnlyResource): + """AzureStorageInfo dictionary resource. + + 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 properties: Azure storage accounts. + :type properties: dict[str, ~azure.mgmt.web.models.AzureStorageInfoValue] + """ + + _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'}, + 'properties': {'key': 'properties', 'type': '{AzureStorageInfoValue}'}, + } + + def __init__(self, *, kind: str=None, properties=None, **kwargs) -> None: + super(AzureStoragePropertyDictionaryResource, self).__init__(kind=kind, **kwargs) + self.properties = properties 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 34156a60e078..759ff0876aaa 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/site_config.py +++ b/azure-mgmt-web/azure/mgmt/web/models/site_config.py @@ -57,6 +57,9 @@ class SiteConfig(Model): :type publishing_username: str :param app_settings: Application settings. :type app_settings: list[~azure.mgmt.web.models.NameValuePair] + :param azure_storage_accounts: User-provided Azure storage accounts. + :type azure_storage_accounts: dict[str, + ~azure.mgmt.web.models.AzureStorageInfoValue] :param connection_strings: Connection strings. :type connection_strings: list[~azure.mgmt.web.models.ConnStringInfo] :ivar machine_key: Site MachineKey. @@ -167,6 +170,7 @@ class SiteConfig(Model): 'detailed_error_logging_enabled': {'key': 'detailedErrorLoggingEnabled', 'type': 'bool'}, 'publishing_username': {'key': 'publishingUsername', 'type': 'str'}, 'app_settings': {'key': 'appSettings', 'type': '[NameValuePair]'}, + 'azure_storage_accounts': {'key': 'azureStorageAccounts', 'type': '{AzureStorageInfoValue}'}, 'connection_strings': {'key': 'connectionStrings', 'type': '[ConnStringInfo]'}, 'machine_key': {'key': 'machineKey', 'type': 'SiteMachineKey'}, 'handler_mappings': {'key': 'handlerMappings', 'type': '[HandlerMapping]'}, @@ -221,6 +225,7 @@ def __init__(self, **kwargs): self.detailed_error_logging_enabled = kwargs.get('detailed_error_logging_enabled', None) self.publishing_username = kwargs.get('publishing_username', None) self.app_settings = kwargs.get('app_settings', None) + self.azure_storage_accounts = kwargs.get('azure_storage_accounts', None) self.connection_strings = kwargs.get('connection_strings', None) self.machine_key = None self.handler_mappings = kwargs.get('handler_mappings', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_config_py3.py b/azure-mgmt-web/azure/mgmt/web/models/site_config_py3.py index 85f59f15a970..a8534e4686b4 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/site_config_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/site_config_py3.py @@ -57,6 +57,9 @@ class SiteConfig(Model): :type publishing_username: str :param app_settings: Application settings. :type app_settings: list[~azure.mgmt.web.models.NameValuePair] + :param azure_storage_accounts: User-provided Azure storage accounts. + :type azure_storage_accounts: dict[str, + ~azure.mgmt.web.models.AzureStorageInfoValue] :param connection_strings: Connection strings. :type connection_strings: list[~azure.mgmt.web.models.ConnStringInfo] :ivar machine_key: Site MachineKey. @@ -167,6 +170,7 @@ class SiteConfig(Model): 'detailed_error_logging_enabled': {'key': 'detailedErrorLoggingEnabled', 'type': 'bool'}, 'publishing_username': {'key': 'publishingUsername', 'type': 'str'}, 'app_settings': {'key': 'appSettings', 'type': '[NameValuePair]'}, + 'azure_storage_accounts': {'key': 'azureStorageAccounts', 'type': '{AzureStorageInfoValue}'}, 'connection_strings': {'key': 'connectionStrings', 'type': '[ConnStringInfo]'}, 'machine_key': {'key': 'machineKey', 'type': 'SiteMachineKey'}, 'handler_mappings': {'key': 'handlerMappings', 'type': '[HandlerMapping]'}, @@ -202,7 +206,7 @@ class SiteConfig(Model): 'reserved_instance_count': {'key': 'reservedInstanceCount', 'type': 'int'}, } - def __init__(self, *, number_of_workers: int=None, default_documents=None, net_framework_version: str="v4.6", php_version: str=None, python_version: str=None, node_version: str=None, linux_fx_version: str=None, windows_fx_version: str=None, request_tracing_enabled: bool=None, request_tracing_expiration_time=None, remote_debugging_enabled: bool=None, remote_debugging_version: str=None, http_logging_enabled: bool=None, logs_directory_size_limit: int=None, detailed_error_logging_enabled: bool=None, publishing_username: str=None, app_settings=None, connection_strings=None, handler_mappings=None, document_root: str=None, scm_type=None, use32_bit_worker_process: bool=None, web_sockets_enabled: bool=None, always_on: bool=None, java_version: str=None, java_container: str=None, java_container_version: str=None, app_command_line: str=None, managed_pipeline_mode=None, virtual_applications=None, load_balancing=None, experiments=None, limits=None, auto_heal_enabled: bool=None, auto_heal_rules=None, tracing_options: str=None, vnet_name: str=None, cors=None, push=None, api_definition=None, auto_swap_slot_name: str=None, local_my_sql_enabled: bool=False, managed_service_identity_id: int=None, x_managed_service_identity_id: int=None, ip_security_restrictions=None, http20_enabled: bool=True, min_tls_version=None, ftps_state=None, reserved_instance_count: int=None, **kwargs) -> None: + def __init__(self, *, number_of_workers: int=None, default_documents=None, net_framework_version: str="v4.6", php_version: str=None, python_version: str=None, node_version: str=None, linux_fx_version: str=None, windows_fx_version: str=None, request_tracing_enabled: bool=None, request_tracing_expiration_time=None, remote_debugging_enabled: bool=None, remote_debugging_version: str=None, http_logging_enabled: bool=None, logs_directory_size_limit: int=None, detailed_error_logging_enabled: bool=None, publishing_username: str=None, app_settings=None, azure_storage_accounts=None, connection_strings=None, handler_mappings=None, document_root: str=None, scm_type=None, use32_bit_worker_process: bool=None, web_sockets_enabled: bool=None, always_on: bool=None, java_version: str=None, java_container: str=None, java_container_version: str=None, app_command_line: str=None, managed_pipeline_mode=None, virtual_applications=None, load_balancing=None, experiments=None, limits=None, auto_heal_enabled: bool=None, auto_heal_rules=None, tracing_options: str=None, vnet_name: str=None, cors=None, push=None, api_definition=None, auto_swap_slot_name: str=None, local_my_sql_enabled: bool=False, managed_service_identity_id: int=None, x_managed_service_identity_id: int=None, ip_security_restrictions=None, http20_enabled: bool=True, min_tls_version=None, ftps_state=None, reserved_instance_count: int=None, **kwargs) -> None: super(SiteConfig, self).__init__(**kwargs) self.number_of_workers = number_of_workers self.default_documents = default_documents @@ -221,6 +225,7 @@ def __init__(self, *, number_of_workers: int=None, default_documents=None, net_f self.detailed_error_logging_enabled = detailed_error_logging_enabled self.publishing_username = publishing_username self.app_settings = app_settings + self.azure_storage_accounts = azure_storage_accounts self.connection_strings = connection_strings self.machine_key = None self.handler_mappings = handler_mappings 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 bf1b5fd08b4e..1c4b3bc66086 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 @@ -65,6 +65,9 @@ class SiteConfigResource(ProxyOnlyResource): :type publishing_username: str :param app_settings: Application settings. :type app_settings: list[~azure.mgmt.web.models.NameValuePair] + :param azure_storage_accounts: User-provided Azure storage accounts. + :type azure_storage_accounts: dict[str, + ~azure.mgmt.web.models.AzureStorageInfoValue] :param connection_strings: Connection strings. :type connection_strings: list[~azure.mgmt.web.models.ConnStringInfo] :ivar machine_key: Site MachineKey. @@ -182,6 +185,7 @@ class SiteConfigResource(ProxyOnlyResource): 'detailed_error_logging_enabled': {'key': 'properties.detailedErrorLoggingEnabled', 'type': 'bool'}, 'publishing_username': {'key': 'properties.publishingUsername', 'type': 'str'}, 'app_settings': {'key': 'properties.appSettings', 'type': '[NameValuePair]'}, + 'azure_storage_accounts': {'key': 'properties.azureStorageAccounts', 'type': '{AzureStorageInfoValue}'}, 'connection_strings': {'key': 'properties.connectionStrings', 'type': '[ConnStringInfo]'}, 'machine_key': {'key': 'properties.machineKey', 'type': 'SiteMachineKey'}, 'handler_mappings': {'key': 'properties.handlerMappings', 'type': '[HandlerMapping]'}, @@ -236,6 +240,7 @@ def __init__(self, **kwargs): self.detailed_error_logging_enabled = kwargs.get('detailed_error_logging_enabled', None) self.publishing_username = kwargs.get('publishing_username', None) self.app_settings = kwargs.get('app_settings', None) + self.azure_storage_accounts = kwargs.get('azure_storage_accounts', None) self.connection_strings = kwargs.get('connection_strings', None) self.machine_key = None self.handler_mappings = kwargs.get('handler_mappings', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_config_resource_py3.py b/azure-mgmt-web/azure/mgmt/web/models/site_config_resource_py3.py index 6d9e30ad6f7c..e766a1a891b2 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/site_config_resource_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/site_config_resource_py3.py @@ -65,6 +65,9 @@ class SiteConfigResource(ProxyOnlyResource): :type publishing_username: str :param app_settings: Application settings. :type app_settings: list[~azure.mgmt.web.models.NameValuePair] + :param azure_storage_accounts: User-provided Azure storage accounts. + :type azure_storage_accounts: dict[str, + ~azure.mgmt.web.models.AzureStorageInfoValue] :param connection_strings: Connection strings. :type connection_strings: list[~azure.mgmt.web.models.ConnStringInfo] :ivar machine_key: Site MachineKey. @@ -182,6 +185,7 @@ class SiteConfigResource(ProxyOnlyResource): 'detailed_error_logging_enabled': {'key': 'properties.detailedErrorLoggingEnabled', 'type': 'bool'}, 'publishing_username': {'key': 'properties.publishingUsername', 'type': 'str'}, 'app_settings': {'key': 'properties.appSettings', 'type': '[NameValuePair]'}, + 'azure_storage_accounts': {'key': 'properties.azureStorageAccounts', 'type': '{AzureStorageInfoValue}'}, 'connection_strings': {'key': 'properties.connectionStrings', 'type': '[ConnStringInfo]'}, 'machine_key': {'key': 'properties.machineKey', 'type': 'SiteMachineKey'}, 'handler_mappings': {'key': 'properties.handlerMappings', 'type': '[HandlerMapping]'}, @@ -217,7 +221,7 @@ class SiteConfigResource(ProxyOnlyResource): 'reserved_instance_count': {'key': 'properties.reservedInstanceCount', 'type': 'int'}, } - def __init__(self, *, kind: str=None, number_of_workers: int=None, default_documents=None, net_framework_version: str="v4.6", php_version: str=None, python_version: str=None, node_version: str=None, linux_fx_version: str=None, windows_fx_version: str=None, request_tracing_enabled: bool=None, request_tracing_expiration_time=None, remote_debugging_enabled: bool=None, remote_debugging_version: str=None, http_logging_enabled: bool=None, logs_directory_size_limit: int=None, detailed_error_logging_enabled: bool=None, publishing_username: str=None, app_settings=None, connection_strings=None, handler_mappings=None, document_root: str=None, scm_type=None, use32_bit_worker_process: bool=None, web_sockets_enabled: bool=None, always_on: bool=None, java_version: str=None, java_container: str=None, java_container_version: str=None, app_command_line: str=None, managed_pipeline_mode=None, virtual_applications=None, load_balancing=None, experiments=None, limits=None, auto_heal_enabled: bool=None, auto_heal_rules=None, tracing_options: str=None, vnet_name: str=None, cors=None, push=None, api_definition=None, auto_swap_slot_name: str=None, local_my_sql_enabled: bool=False, managed_service_identity_id: int=None, x_managed_service_identity_id: int=None, ip_security_restrictions=None, http20_enabled: bool=True, min_tls_version=None, ftps_state=None, reserved_instance_count: int=None, **kwargs) -> None: + def __init__(self, *, kind: str=None, number_of_workers: int=None, default_documents=None, net_framework_version: str="v4.6", php_version: str=None, python_version: str=None, node_version: str=None, linux_fx_version: str=None, windows_fx_version: str=None, request_tracing_enabled: bool=None, request_tracing_expiration_time=None, remote_debugging_enabled: bool=None, remote_debugging_version: str=None, http_logging_enabled: bool=None, logs_directory_size_limit: int=None, detailed_error_logging_enabled: bool=None, publishing_username: str=None, app_settings=None, azure_storage_accounts=None, connection_strings=None, handler_mappings=None, document_root: str=None, scm_type=None, use32_bit_worker_process: bool=None, web_sockets_enabled: bool=None, always_on: bool=None, java_version: str=None, java_container: str=None, java_container_version: str=None, app_command_line: str=None, managed_pipeline_mode=None, virtual_applications=None, load_balancing=None, experiments=None, limits=None, auto_heal_enabled: bool=None, auto_heal_rules=None, tracing_options: str=None, vnet_name: str=None, cors=None, push=None, api_definition=None, auto_swap_slot_name: str=None, local_my_sql_enabled: bool=False, managed_service_identity_id: int=None, x_managed_service_identity_id: int=None, ip_security_restrictions=None, http20_enabled: bool=True, min_tls_version=None, ftps_state=None, reserved_instance_count: int=None, **kwargs) -> None: super(SiteConfigResource, self).__init__(kind=kind, **kwargs) self.number_of_workers = number_of_workers self.default_documents = default_documents @@ -236,6 +240,7 @@ def __init__(self, *, kind: str=None, number_of_workers: int=None, default_docum self.detailed_error_logging_enabled = detailed_error_logging_enabled self.publishing_username = publishing_username self.app_settings = app_settings + self.azure_storage_accounts = azure_storage_accounts self.connection_strings = connection_strings self.machine_key = None self.handler_mappings = handler_mappings diff --git a/azure-mgmt-web/azure/mgmt/web/models/slot_config_names_resource.py b/azure-mgmt-web/azure/mgmt/web/models/slot_config_names_resource.py index 6c21dc922423..072c2237aa45 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/slot_config_names_resource.py +++ b/azure-mgmt-web/azure/mgmt/web/models/slot_config_names_resource.py @@ -30,6 +30,9 @@ class SlotConfigNamesResource(ProxyOnlyResource): :type connection_string_names: list[str] :param app_setting_names: List of application settings names. :type app_setting_names: list[str] + :param azure_storage_config_names: List of external Azure storage account + identifiers. + :type azure_storage_config_names: list[str] """ _validation = { @@ -45,9 +48,11 @@ class SlotConfigNamesResource(ProxyOnlyResource): 'type': {'key': 'type', 'type': 'str'}, 'connection_string_names': {'key': 'properties.connectionStringNames', 'type': '[str]'}, 'app_setting_names': {'key': 'properties.appSettingNames', 'type': '[str]'}, + 'azure_storage_config_names': {'key': 'properties.azureStorageConfigNames', 'type': '[str]'}, } def __init__(self, **kwargs): super(SlotConfigNamesResource, self).__init__(**kwargs) self.connection_string_names = kwargs.get('connection_string_names', None) self.app_setting_names = kwargs.get('app_setting_names', None) + self.azure_storage_config_names = kwargs.get('azure_storage_config_names', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/slot_config_names_resource_py3.py b/azure-mgmt-web/azure/mgmt/web/models/slot_config_names_resource_py3.py index adfc50723e23..44e1587a66f7 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/slot_config_names_resource_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/slot_config_names_resource_py3.py @@ -30,6 +30,9 @@ class SlotConfigNamesResource(ProxyOnlyResource): :type connection_string_names: list[str] :param app_setting_names: List of application settings names. :type app_setting_names: list[str] + :param azure_storage_config_names: List of external Azure storage account + identifiers. + :type azure_storage_config_names: list[str] """ _validation = { @@ -45,9 +48,11 @@ class SlotConfigNamesResource(ProxyOnlyResource): 'type': {'key': 'type', 'type': 'str'}, 'connection_string_names': {'key': 'properties.connectionStringNames', 'type': '[str]'}, 'app_setting_names': {'key': 'properties.appSettingNames', 'type': '[str]'}, + 'azure_storage_config_names': {'key': 'properties.azureStorageConfigNames', 'type': '[str]'}, } - def __init__(self, *, kind: str=None, connection_string_names=None, app_setting_names=None, **kwargs) -> None: + def __init__(self, *, kind: str=None, connection_string_names=None, app_setting_names=None, azure_storage_config_names=None, **kwargs) -> None: super(SlotConfigNamesResource, self).__init__(kind=kind, **kwargs) self.connection_string_names = connection_string_names self.app_setting_names = app_setting_names + self.azure_storage_config_names = azure_storage_config_names 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 087cf3dfcdd2..ab38e3030187 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 @@ -115,6 +115,19 @@ class ConnectionStringType(str, Enum): postgre_sql = "PostgreSQL" +class AzureStorageType(str, Enum): + + azure_files = "AzureFiles" + azure_blob = "AzureBlob" + + +class AzureStorageState(str, Enum): + + ok = "Ok" + invalid_credentials = "InvalidCredentials" + invalid_share = "InvalidShare" + + class ScmType(str, Enum): none = "None" 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 ca889dacddb1..6a6716bb0221 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 @@ -1426,6 +1426,147 @@ def get_auth_settings( return deserialized get_auth_settings.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/authsettings/list'} + def update_azure_storage_accounts( + self, resource_group_name, name, kind=None, properties=None, custom_headers=None, raw=False, **operation_config): + """Updates the Azure storage account configurations of an app. + + Updates the Azure storage account configurations of an app. + + :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. + :type name: str + :param kind: Kind of resource. + :type kind: str + :param properties: Azure storage accounts. + :type properties: dict[str, + ~azure.mgmt.web.models.AzureStorageInfoValue] + :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: AzureStoragePropertyDictionaryResource or ClientRawResponse + if raw=true + :rtype: ~azure.mgmt.web.models.AzureStoragePropertyDictionaryResource + or ~msrest.pipeline.ClientRawResponse + :raises: + :class:`DefaultErrorResponseException` + """ + azure_storage_accounts = models.AzureStoragePropertyDictionaryResource(kind=kind, properties=properties) + + # Construct URL + url = self.update_azure_storage_accounts.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(azure_storage_accounts, 'AzureStoragePropertyDictionaryResource') + + # Construct and send request + request = self._client.put(url, query_parameters) + response = self._client.send( + request, header_parameters, body_content, stream=False, **operation_config) + + if response.status_code not in [200]: + raise models.DefaultErrorResponseException(self._deserialize, response) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('AzureStoragePropertyDictionaryResource', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + update_azure_storage_accounts.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/azurestorageaccounts'} + + def list_azure_storage_accounts( + self, resource_group_name, name, custom_headers=None, raw=False, **operation_config): + """Gets the Azure storage account configurations of an app. + + Gets the Azure storage account configurations of an app. + + :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. + :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: AzureStoragePropertyDictionaryResource or ClientRawResponse + if raw=true + :rtype: ~azure.mgmt.web.models.AzureStoragePropertyDictionaryResource + or ~msrest.pipeline.ClientRawResponse + :raises: + :class:`DefaultErrorResponseException` + """ + # Construct URL + url = self.list_azure_storage_accounts.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]: + raise models.DefaultErrorResponseException(self._deserialize, response) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('AzureStoragePropertyDictionaryResource', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + list_azure_storage_accounts.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/azurestorageaccounts/list'} + def update_backup_configuration( self, resource_group_name, name, request, custom_headers=None, raw=False, **operation_config): """Updates the backup configuration of an app. @@ -11479,6 +11620,157 @@ def get_auth_settings_slot( return deserialized get_auth_settings_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/authsettings/list'} + def update_azure_storage_accounts_slot( + self, resource_group_name, name, slot, kind=None, properties=None, custom_headers=None, raw=False, **operation_config): + """Updates the Azure storage account configurations of an app. + + Updates the Azure storage account configurations of an app. + + :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. + :type name: str + :param slot: Name of the deployment slot. If a slot is not specified, + the API will update the Azure storage account configurations for the + production slot. + :type slot: str + :param kind: Kind of resource. + :type kind: str + :param properties: Azure storage accounts. + :type properties: dict[str, + ~azure.mgmt.web.models.AzureStorageInfoValue] + :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: AzureStoragePropertyDictionaryResource or ClientRawResponse + if raw=true + :rtype: ~azure.mgmt.web.models.AzureStoragePropertyDictionaryResource + or ~msrest.pipeline.ClientRawResponse + :raises: + :class:`DefaultErrorResponseException` + """ + azure_storage_accounts = models.AzureStoragePropertyDictionaryResource(kind=kind, properties=properties) + + # Construct URL + url = self.update_azure_storage_accounts_slot.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'), + 'slot': self._serialize.url("slot", slot, '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(azure_storage_accounts, 'AzureStoragePropertyDictionaryResource') + + # Construct and send request + request = self._client.put(url, query_parameters) + response = self._client.send( + request, header_parameters, body_content, stream=False, **operation_config) + + if response.status_code not in [200]: + raise models.DefaultErrorResponseException(self._deserialize, response) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('AzureStoragePropertyDictionaryResource', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + update_azure_storage_accounts_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/azurestorageaccounts'} + + def list_azure_storage_accounts_slot( + self, resource_group_name, name, slot, custom_headers=None, raw=False, **operation_config): + """Gets the Azure storage account configurations of an app. + + Gets the Azure storage account configurations of an app. + + :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. + :type name: str + :param slot: Name of the deployment slot. If a slot is not specified, + the API will update the Azure storage account configurations for the + production slot. + :type slot: 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: AzureStoragePropertyDictionaryResource or ClientRawResponse + if raw=true + :rtype: ~azure.mgmt.web.models.AzureStoragePropertyDictionaryResource + or ~msrest.pipeline.ClientRawResponse + :raises: + :class:`DefaultErrorResponseException` + """ + # Construct URL + url = self.list_azure_storage_accounts_slot.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'), + 'slot': self._serialize.url("slot", slot, '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]: + raise models.DefaultErrorResponseException(self._deserialize, response) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('AzureStoragePropertyDictionaryResource', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + list_azure_storage_accounts_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/azurestorageaccounts/list'} + def update_backup_configuration_slot( self, resource_group_name, name, request, slot, custom_headers=None, raw=False, **operation_config): """Updates the backup configuration of an app. From 0375f0dfbc8fbf0ef07670339cfaba3b53b0761e Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Tue, 31 Jul 2018 10:11:50 -0700 Subject: [PATCH 13/19] Generated from a20537a953e03d3177877f92d7c1fc00d79ac635 (#3048) Fix documentation issues with metrics APIs --- .../azure/mgmt/web/models/__init__.py | 10 - .../web/models/azure_storage_info_value.py | 53 --- .../models/azure_storage_info_value_py3.py | 53 --- ...re_storage_property_dictionary_resource.py | 49 --- ...torage_property_dictionary_resource_py3.py | 49 --- .../azure/mgmt/web/models/site_config.py | 5 - .../azure/mgmt/web/models/site_config_py3.py | 7 +- .../mgmt/web/models/site_config_resource.py | 5 - .../web/models/site_config_resource_py3.py | 7 +- .../web/models/slot_config_names_resource.py | 5 - .../models/slot_config_names_resource_py3.py | 7 +- .../web_site_management_client_enums.py | 13 - .../app_service_environments_operations.py | 20 +- .../app_service_plans_operations.py | 4 +- .../operations/recommendations_operations.py | 14 +- .../web/operations/web_apps_operations.py | 316 +----------------- 16 files changed, 34 insertions(+), 583 deletions(-) delete mode 100644 azure-mgmt-web/azure/mgmt/web/models/azure_storage_info_value.py delete mode 100644 azure-mgmt-web/azure/mgmt/web/models/azure_storage_info_value_py3.py delete mode 100644 azure-mgmt-web/azure/mgmt/web/models/azure_storage_property_dictionary_resource.py delete mode 100644 azure-mgmt-web/azure/mgmt/web/models/azure_storage_property_dictionary_resource_py3.py diff --git a/azure-mgmt-web/azure/mgmt/web/models/__init__.py b/azure-mgmt-web/azure/mgmt/web/models/__init__.py index bd1762cc5238..06759925efc3 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/__init__.py +++ b/azure-mgmt-web/azure/mgmt/web/models/__init__.py @@ -56,7 +56,6 @@ from .handler_mapping_py3 import HandlerMapping from .site_machine_key_py3 import SiteMachineKey from .conn_string_info_py3 import ConnStringInfo - from .azure_storage_info_value_py3 import AzureStorageInfoValue from .name_value_pair_py3 import NameValuePair from .site_config_py3 import SiteConfig from .host_name_ssl_state_py3 import HostNameSslState @@ -155,7 +154,6 @@ from .azure_blob_storage_application_logs_config_py3 import AzureBlobStorageApplicationLogsConfig from .application_logs_config_py3 import ApplicationLogsConfig from .azure_blob_storage_http_logs_config_py3 import AzureBlobStorageHttpLogsConfig - from .azure_storage_property_dictionary_resource_py3 import AzureStoragePropertyDictionaryResource from .database_backup_setting_py3 import DatabaseBackupSetting from .backup_item_py3 import BackupItem from .backup_schedule_py3 import BackupSchedule @@ -276,7 +274,6 @@ from .handler_mapping import HandlerMapping from .site_machine_key import SiteMachineKey from .conn_string_info import ConnStringInfo - from .azure_storage_info_value import AzureStorageInfoValue from .name_value_pair import NameValuePair from .site_config import SiteConfig from .host_name_ssl_state import HostNameSslState @@ -375,7 +372,6 @@ from .azure_blob_storage_application_logs_config import AzureBlobStorageApplicationLogsConfig from .application_logs_config import ApplicationLogsConfig from .azure_blob_storage_http_logs_config import AzureBlobStorageHttpLogsConfig - from .azure_storage_property_dictionary_resource import AzureStoragePropertyDictionaryResource from .database_backup_setting import DatabaseBackupSetting from .backup_item import BackupItem from .backup_schedule import BackupSchedule @@ -512,8 +508,6 @@ IpFilterTag, AutoHealActionType, ConnectionStringType, - AzureStorageType, - AzureStorageState, ScmType, ManagedPipelineMode, SiteLoadBalancing, @@ -614,7 +608,6 @@ 'HandlerMapping', 'SiteMachineKey', 'ConnStringInfo', - 'AzureStorageInfoValue', 'NameValuePair', 'SiteConfig', 'HostNameSslState', @@ -713,7 +706,6 @@ 'AzureBlobStorageApplicationLogsConfig', 'ApplicationLogsConfig', 'AzureBlobStorageHttpLogsConfig', - 'AzureStoragePropertyDictionaryResource', 'DatabaseBackupSetting', 'BackupItem', 'BackupSchedule', @@ -849,8 +841,6 @@ 'IpFilterTag', 'AutoHealActionType', 'ConnectionStringType', - 'AzureStorageType', - 'AzureStorageState', 'ScmType', 'ManagedPipelineMode', 'SiteLoadBalancing', diff --git a/azure-mgmt-web/azure/mgmt/web/models/azure_storage_info_value.py b/azure-mgmt-web/azure/mgmt/web/models/azure_storage_info_value.py deleted file mode 100644 index 303ae406f8da..000000000000 --- a/azure-mgmt-web/azure/mgmt/web/models/azure_storage_info_value.py +++ /dev/null @@ -1,53 +0,0 @@ -# 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 AzureStorageInfoValue(Model): - """Azure Files or Blob Storage access information value for dictionary - storage. - - :param type: Type of storage. Possible values include: 'AzureFiles', - 'AzureBlob' - :type type: str or ~azure.mgmt.web.models.AzureStorageType - :param account_name: Name of the storage account. - :type account_name: str - :param share_name: Name of the file share (container name, for Blob - storage). - :type share_name: str - :param access_key: Access key for the storage account. - :type access_key: str - :param mount_path: Path to mount the storage within the site's runtime - environment. - :type mount_path: str - :param state: State of the storage account. Possible values include: 'Ok', - 'InvalidCredentials', 'InvalidShare' - :type state: str or ~azure.mgmt.web.models.AzureStorageState - """ - - _attribute_map = { - 'type': {'key': 'type', 'type': 'AzureStorageType'}, - 'account_name': {'key': 'accountName', 'type': 'str'}, - 'share_name': {'key': 'shareName', 'type': 'str'}, - 'access_key': {'key': 'accessKey', 'type': 'str'}, - 'mount_path': {'key': 'mountPath', 'type': 'str'}, - 'state': {'key': 'state', 'type': 'AzureStorageState'}, - } - - def __init__(self, **kwargs): - super(AzureStorageInfoValue, self).__init__(**kwargs) - self.type = kwargs.get('type', None) - self.account_name = kwargs.get('account_name', None) - self.share_name = kwargs.get('share_name', None) - self.access_key = kwargs.get('access_key', None) - self.mount_path = kwargs.get('mount_path', None) - self.state = kwargs.get('state', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/azure_storage_info_value_py3.py b/azure-mgmt-web/azure/mgmt/web/models/azure_storage_info_value_py3.py deleted file mode 100644 index 7652af5aee99..000000000000 --- a/azure-mgmt-web/azure/mgmt/web/models/azure_storage_info_value_py3.py +++ /dev/null @@ -1,53 +0,0 @@ -# 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 AzureStorageInfoValue(Model): - """Azure Files or Blob Storage access information value for dictionary - storage. - - :param type: Type of storage. Possible values include: 'AzureFiles', - 'AzureBlob' - :type type: str or ~azure.mgmt.web.models.AzureStorageType - :param account_name: Name of the storage account. - :type account_name: str - :param share_name: Name of the file share (container name, for Blob - storage). - :type share_name: str - :param access_key: Access key for the storage account. - :type access_key: str - :param mount_path: Path to mount the storage within the site's runtime - environment. - :type mount_path: str - :param state: State of the storage account. Possible values include: 'Ok', - 'InvalidCredentials', 'InvalidShare' - :type state: str or ~azure.mgmt.web.models.AzureStorageState - """ - - _attribute_map = { - 'type': {'key': 'type', 'type': 'AzureStorageType'}, - 'account_name': {'key': 'accountName', 'type': 'str'}, - 'share_name': {'key': 'shareName', 'type': 'str'}, - 'access_key': {'key': 'accessKey', 'type': 'str'}, - 'mount_path': {'key': 'mountPath', 'type': 'str'}, - 'state': {'key': 'state', 'type': 'AzureStorageState'}, - } - - def __init__(self, *, type=None, account_name: str=None, share_name: str=None, access_key: str=None, mount_path: str=None, state=None, **kwargs) -> None: - super(AzureStorageInfoValue, self).__init__(**kwargs) - self.type = type - self.account_name = account_name - self.share_name = share_name - self.access_key = access_key - self.mount_path = mount_path - self.state = state diff --git a/azure-mgmt-web/azure/mgmt/web/models/azure_storage_property_dictionary_resource.py b/azure-mgmt-web/azure/mgmt/web/models/azure_storage_property_dictionary_resource.py deleted file mode 100644 index c3b0153b8d54..000000000000 --- a/azure-mgmt-web/azure/mgmt/web/models/azure_storage_property_dictionary_resource.py +++ /dev/null @@ -1,49 +0,0 @@ -# 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 AzureStoragePropertyDictionaryResource(ProxyOnlyResource): - """AzureStorageInfo dictionary resource. - - 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 properties: Azure storage accounts. - :type properties: dict[str, ~azure.mgmt.web.models.AzureStorageInfoValue] - """ - - _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'}, - 'properties': {'key': 'properties', 'type': '{AzureStorageInfoValue}'}, - } - - def __init__(self, **kwargs): - super(AzureStoragePropertyDictionaryResource, self).__init__(**kwargs) - self.properties = kwargs.get('properties', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/azure_storage_property_dictionary_resource_py3.py b/azure-mgmt-web/azure/mgmt/web/models/azure_storage_property_dictionary_resource_py3.py deleted file mode 100644 index d00f95cb753f..000000000000 --- a/azure-mgmt-web/azure/mgmt/web/models/azure_storage_property_dictionary_resource_py3.py +++ /dev/null @@ -1,49 +0,0 @@ -# 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_py3 import ProxyOnlyResource - - -class AzureStoragePropertyDictionaryResource(ProxyOnlyResource): - """AzureStorageInfo dictionary resource. - - 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 properties: Azure storage accounts. - :type properties: dict[str, ~azure.mgmt.web.models.AzureStorageInfoValue] - """ - - _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'}, - 'properties': {'key': 'properties', 'type': '{AzureStorageInfoValue}'}, - } - - def __init__(self, *, kind: str=None, properties=None, **kwargs) -> None: - super(AzureStoragePropertyDictionaryResource, self).__init__(kind=kind, **kwargs) - self.properties = properties 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 759ff0876aaa..34156a60e078 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/site_config.py +++ b/azure-mgmt-web/azure/mgmt/web/models/site_config.py @@ -57,9 +57,6 @@ class SiteConfig(Model): :type publishing_username: str :param app_settings: Application settings. :type app_settings: list[~azure.mgmt.web.models.NameValuePair] - :param azure_storage_accounts: User-provided Azure storage accounts. - :type azure_storage_accounts: dict[str, - ~azure.mgmt.web.models.AzureStorageInfoValue] :param connection_strings: Connection strings. :type connection_strings: list[~azure.mgmt.web.models.ConnStringInfo] :ivar machine_key: Site MachineKey. @@ -170,7 +167,6 @@ class SiteConfig(Model): 'detailed_error_logging_enabled': {'key': 'detailedErrorLoggingEnabled', 'type': 'bool'}, 'publishing_username': {'key': 'publishingUsername', 'type': 'str'}, 'app_settings': {'key': 'appSettings', 'type': '[NameValuePair]'}, - 'azure_storage_accounts': {'key': 'azureStorageAccounts', 'type': '{AzureStorageInfoValue}'}, 'connection_strings': {'key': 'connectionStrings', 'type': '[ConnStringInfo]'}, 'machine_key': {'key': 'machineKey', 'type': 'SiteMachineKey'}, 'handler_mappings': {'key': 'handlerMappings', 'type': '[HandlerMapping]'}, @@ -225,7 +221,6 @@ def __init__(self, **kwargs): self.detailed_error_logging_enabled = kwargs.get('detailed_error_logging_enabled', None) self.publishing_username = kwargs.get('publishing_username', None) self.app_settings = kwargs.get('app_settings', None) - self.azure_storage_accounts = kwargs.get('azure_storage_accounts', None) self.connection_strings = kwargs.get('connection_strings', None) self.machine_key = None self.handler_mappings = kwargs.get('handler_mappings', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_config_py3.py b/azure-mgmt-web/azure/mgmt/web/models/site_config_py3.py index a8534e4686b4..85f59f15a970 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/site_config_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/site_config_py3.py @@ -57,9 +57,6 @@ class SiteConfig(Model): :type publishing_username: str :param app_settings: Application settings. :type app_settings: list[~azure.mgmt.web.models.NameValuePair] - :param azure_storage_accounts: User-provided Azure storage accounts. - :type azure_storage_accounts: dict[str, - ~azure.mgmt.web.models.AzureStorageInfoValue] :param connection_strings: Connection strings. :type connection_strings: list[~azure.mgmt.web.models.ConnStringInfo] :ivar machine_key: Site MachineKey. @@ -170,7 +167,6 @@ class SiteConfig(Model): 'detailed_error_logging_enabled': {'key': 'detailedErrorLoggingEnabled', 'type': 'bool'}, 'publishing_username': {'key': 'publishingUsername', 'type': 'str'}, 'app_settings': {'key': 'appSettings', 'type': '[NameValuePair]'}, - 'azure_storage_accounts': {'key': 'azureStorageAccounts', 'type': '{AzureStorageInfoValue}'}, 'connection_strings': {'key': 'connectionStrings', 'type': '[ConnStringInfo]'}, 'machine_key': {'key': 'machineKey', 'type': 'SiteMachineKey'}, 'handler_mappings': {'key': 'handlerMappings', 'type': '[HandlerMapping]'}, @@ -206,7 +202,7 @@ class SiteConfig(Model): 'reserved_instance_count': {'key': 'reservedInstanceCount', 'type': 'int'}, } - def __init__(self, *, number_of_workers: int=None, default_documents=None, net_framework_version: str="v4.6", php_version: str=None, python_version: str=None, node_version: str=None, linux_fx_version: str=None, windows_fx_version: str=None, request_tracing_enabled: bool=None, request_tracing_expiration_time=None, remote_debugging_enabled: bool=None, remote_debugging_version: str=None, http_logging_enabled: bool=None, logs_directory_size_limit: int=None, detailed_error_logging_enabled: bool=None, publishing_username: str=None, app_settings=None, azure_storage_accounts=None, connection_strings=None, handler_mappings=None, document_root: str=None, scm_type=None, use32_bit_worker_process: bool=None, web_sockets_enabled: bool=None, always_on: bool=None, java_version: str=None, java_container: str=None, java_container_version: str=None, app_command_line: str=None, managed_pipeline_mode=None, virtual_applications=None, load_balancing=None, experiments=None, limits=None, auto_heal_enabled: bool=None, auto_heal_rules=None, tracing_options: str=None, vnet_name: str=None, cors=None, push=None, api_definition=None, auto_swap_slot_name: str=None, local_my_sql_enabled: bool=False, managed_service_identity_id: int=None, x_managed_service_identity_id: int=None, ip_security_restrictions=None, http20_enabled: bool=True, min_tls_version=None, ftps_state=None, reserved_instance_count: int=None, **kwargs) -> None: + def __init__(self, *, number_of_workers: int=None, default_documents=None, net_framework_version: str="v4.6", php_version: str=None, python_version: str=None, node_version: str=None, linux_fx_version: str=None, windows_fx_version: str=None, request_tracing_enabled: bool=None, request_tracing_expiration_time=None, remote_debugging_enabled: bool=None, remote_debugging_version: str=None, http_logging_enabled: bool=None, logs_directory_size_limit: int=None, detailed_error_logging_enabled: bool=None, publishing_username: str=None, app_settings=None, connection_strings=None, handler_mappings=None, document_root: str=None, scm_type=None, use32_bit_worker_process: bool=None, web_sockets_enabled: bool=None, always_on: bool=None, java_version: str=None, java_container: str=None, java_container_version: str=None, app_command_line: str=None, managed_pipeline_mode=None, virtual_applications=None, load_balancing=None, experiments=None, limits=None, auto_heal_enabled: bool=None, auto_heal_rules=None, tracing_options: str=None, vnet_name: str=None, cors=None, push=None, api_definition=None, auto_swap_slot_name: str=None, local_my_sql_enabled: bool=False, managed_service_identity_id: int=None, x_managed_service_identity_id: int=None, ip_security_restrictions=None, http20_enabled: bool=True, min_tls_version=None, ftps_state=None, reserved_instance_count: int=None, **kwargs) -> None: super(SiteConfig, self).__init__(**kwargs) self.number_of_workers = number_of_workers self.default_documents = default_documents @@ -225,7 +221,6 @@ def __init__(self, *, number_of_workers: int=None, default_documents=None, net_f self.detailed_error_logging_enabled = detailed_error_logging_enabled self.publishing_username = publishing_username self.app_settings = app_settings - self.azure_storage_accounts = azure_storage_accounts self.connection_strings = connection_strings self.machine_key = None self.handler_mappings = handler_mappings 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 1c4b3bc66086..bf1b5fd08b4e 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 @@ -65,9 +65,6 @@ class SiteConfigResource(ProxyOnlyResource): :type publishing_username: str :param app_settings: Application settings. :type app_settings: list[~azure.mgmt.web.models.NameValuePair] - :param azure_storage_accounts: User-provided Azure storage accounts. - :type azure_storage_accounts: dict[str, - ~azure.mgmt.web.models.AzureStorageInfoValue] :param connection_strings: Connection strings. :type connection_strings: list[~azure.mgmt.web.models.ConnStringInfo] :ivar machine_key: Site MachineKey. @@ -185,7 +182,6 @@ class SiteConfigResource(ProxyOnlyResource): 'detailed_error_logging_enabled': {'key': 'properties.detailedErrorLoggingEnabled', 'type': 'bool'}, 'publishing_username': {'key': 'properties.publishingUsername', 'type': 'str'}, 'app_settings': {'key': 'properties.appSettings', 'type': '[NameValuePair]'}, - 'azure_storage_accounts': {'key': 'properties.azureStorageAccounts', 'type': '{AzureStorageInfoValue}'}, 'connection_strings': {'key': 'properties.connectionStrings', 'type': '[ConnStringInfo]'}, 'machine_key': {'key': 'properties.machineKey', 'type': 'SiteMachineKey'}, 'handler_mappings': {'key': 'properties.handlerMappings', 'type': '[HandlerMapping]'}, @@ -240,7 +236,6 @@ def __init__(self, **kwargs): self.detailed_error_logging_enabled = kwargs.get('detailed_error_logging_enabled', None) self.publishing_username = kwargs.get('publishing_username', None) self.app_settings = kwargs.get('app_settings', None) - self.azure_storage_accounts = kwargs.get('azure_storage_accounts', None) self.connection_strings = kwargs.get('connection_strings', None) self.machine_key = None self.handler_mappings = kwargs.get('handler_mappings', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_config_resource_py3.py b/azure-mgmt-web/azure/mgmt/web/models/site_config_resource_py3.py index e766a1a891b2..6d9e30ad6f7c 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/site_config_resource_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/site_config_resource_py3.py @@ -65,9 +65,6 @@ class SiteConfigResource(ProxyOnlyResource): :type publishing_username: str :param app_settings: Application settings. :type app_settings: list[~azure.mgmt.web.models.NameValuePair] - :param azure_storage_accounts: User-provided Azure storage accounts. - :type azure_storage_accounts: dict[str, - ~azure.mgmt.web.models.AzureStorageInfoValue] :param connection_strings: Connection strings. :type connection_strings: list[~azure.mgmt.web.models.ConnStringInfo] :ivar machine_key: Site MachineKey. @@ -185,7 +182,6 @@ class SiteConfigResource(ProxyOnlyResource): 'detailed_error_logging_enabled': {'key': 'properties.detailedErrorLoggingEnabled', 'type': 'bool'}, 'publishing_username': {'key': 'properties.publishingUsername', 'type': 'str'}, 'app_settings': {'key': 'properties.appSettings', 'type': '[NameValuePair]'}, - 'azure_storage_accounts': {'key': 'properties.azureStorageAccounts', 'type': '{AzureStorageInfoValue}'}, 'connection_strings': {'key': 'properties.connectionStrings', 'type': '[ConnStringInfo]'}, 'machine_key': {'key': 'properties.machineKey', 'type': 'SiteMachineKey'}, 'handler_mappings': {'key': 'properties.handlerMappings', 'type': '[HandlerMapping]'}, @@ -221,7 +217,7 @@ class SiteConfigResource(ProxyOnlyResource): 'reserved_instance_count': {'key': 'properties.reservedInstanceCount', 'type': 'int'}, } - def __init__(self, *, kind: str=None, number_of_workers: int=None, default_documents=None, net_framework_version: str="v4.6", php_version: str=None, python_version: str=None, node_version: str=None, linux_fx_version: str=None, windows_fx_version: str=None, request_tracing_enabled: bool=None, request_tracing_expiration_time=None, remote_debugging_enabled: bool=None, remote_debugging_version: str=None, http_logging_enabled: bool=None, logs_directory_size_limit: int=None, detailed_error_logging_enabled: bool=None, publishing_username: str=None, app_settings=None, azure_storage_accounts=None, connection_strings=None, handler_mappings=None, document_root: str=None, scm_type=None, use32_bit_worker_process: bool=None, web_sockets_enabled: bool=None, always_on: bool=None, java_version: str=None, java_container: str=None, java_container_version: str=None, app_command_line: str=None, managed_pipeline_mode=None, virtual_applications=None, load_balancing=None, experiments=None, limits=None, auto_heal_enabled: bool=None, auto_heal_rules=None, tracing_options: str=None, vnet_name: str=None, cors=None, push=None, api_definition=None, auto_swap_slot_name: str=None, local_my_sql_enabled: bool=False, managed_service_identity_id: int=None, x_managed_service_identity_id: int=None, ip_security_restrictions=None, http20_enabled: bool=True, min_tls_version=None, ftps_state=None, reserved_instance_count: int=None, **kwargs) -> None: + def __init__(self, *, kind: str=None, number_of_workers: int=None, default_documents=None, net_framework_version: str="v4.6", php_version: str=None, python_version: str=None, node_version: str=None, linux_fx_version: str=None, windows_fx_version: str=None, request_tracing_enabled: bool=None, request_tracing_expiration_time=None, remote_debugging_enabled: bool=None, remote_debugging_version: str=None, http_logging_enabled: bool=None, logs_directory_size_limit: int=None, detailed_error_logging_enabled: bool=None, publishing_username: str=None, app_settings=None, connection_strings=None, handler_mappings=None, document_root: str=None, scm_type=None, use32_bit_worker_process: bool=None, web_sockets_enabled: bool=None, always_on: bool=None, java_version: str=None, java_container: str=None, java_container_version: str=None, app_command_line: str=None, managed_pipeline_mode=None, virtual_applications=None, load_balancing=None, experiments=None, limits=None, auto_heal_enabled: bool=None, auto_heal_rules=None, tracing_options: str=None, vnet_name: str=None, cors=None, push=None, api_definition=None, auto_swap_slot_name: str=None, local_my_sql_enabled: bool=False, managed_service_identity_id: int=None, x_managed_service_identity_id: int=None, ip_security_restrictions=None, http20_enabled: bool=True, min_tls_version=None, ftps_state=None, reserved_instance_count: int=None, **kwargs) -> None: super(SiteConfigResource, self).__init__(kind=kind, **kwargs) self.number_of_workers = number_of_workers self.default_documents = default_documents @@ -240,7 +236,6 @@ def __init__(self, *, kind: str=None, number_of_workers: int=None, default_docum self.detailed_error_logging_enabled = detailed_error_logging_enabled self.publishing_username = publishing_username self.app_settings = app_settings - self.azure_storage_accounts = azure_storage_accounts self.connection_strings = connection_strings self.machine_key = None self.handler_mappings = handler_mappings diff --git a/azure-mgmt-web/azure/mgmt/web/models/slot_config_names_resource.py b/azure-mgmt-web/azure/mgmt/web/models/slot_config_names_resource.py index 072c2237aa45..6c21dc922423 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/slot_config_names_resource.py +++ b/azure-mgmt-web/azure/mgmt/web/models/slot_config_names_resource.py @@ -30,9 +30,6 @@ class SlotConfigNamesResource(ProxyOnlyResource): :type connection_string_names: list[str] :param app_setting_names: List of application settings names. :type app_setting_names: list[str] - :param azure_storage_config_names: List of external Azure storage account - identifiers. - :type azure_storage_config_names: list[str] """ _validation = { @@ -48,11 +45,9 @@ class SlotConfigNamesResource(ProxyOnlyResource): 'type': {'key': 'type', 'type': 'str'}, 'connection_string_names': {'key': 'properties.connectionStringNames', 'type': '[str]'}, 'app_setting_names': {'key': 'properties.appSettingNames', 'type': '[str]'}, - 'azure_storage_config_names': {'key': 'properties.azureStorageConfigNames', 'type': '[str]'}, } def __init__(self, **kwargs): super(SlotConfigNamesResource, self).__init__(**kwargs) self.connection_string_names = kwargs.get('connection_string_names', None) self.app_setting_names = kwargs.get('app_setting_names', None) - self.azure_storage_config_names = kwargs.get('azure_storage_config_names', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/slot_config_names_resource_py3.py b/azure-mgmt-web/azure/mgmt/web/models/slot_config_names_resource_py3.py index 44e1587a66f7..adfc50723e23 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/slot_config_names_resource_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/slot_config_names_resource_py3.py @@ -30,9 +30,6 @@ class SlotConfigNamesResource(ProxyOnlyResource): :type connection_string_names: list[str] :param app_setting_names: List of application settings names. :type app_setting_names: list[str] - :param azure_storage_config_names: List of external Azure storage account - identifiers. - :type azure_storage_config_names: list[str] """ _validation = { @@ -48,11 +45,9 @@ class SlotConfigNamesResource(ProxyOnlyResource): 'type': {'key': 'type', 'type': 'str'}, 'connection_string_names': {'key': 'properties.connectionStringNames', 'type': '[str]'}, 'app_setting_names': {'key': 'properties.appSettingNames', 'type': '[str]'}, - 'azure_storage_config_names': {'key': 'properties.azureStorageConfigNames', 'type': '[str]'}, } - def __init__(self, *, kind: str=None, connection_string_names=None, app_setting_names=None, azure_storage_config_names=None, **kwargs) -> None: + def __init__(self, *, kind: str=None, connection_string_names=None, app_setting_names=None, **kwargs) -> None: super(SlotConfigNamesResource, self).__init__(kind=kind, **kwargs) self.connection_string_names = connection_string_names self.app_setting_names = app_setting_names - self.azure_storage_config_names = azure_storage_config_names 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 ab38e3030187..087cf3dfcdd2 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 @@ -115,19 +115,6 @@ class ConnectionStringType(str, Enum): postgre_sql = "PostgreSQL" -class AzureStorageType(str, Enum): - - azure_files = "AzureFiles" - azure_blob = "AzureBlob" - - -class AzureStorageState(str, Enum): - - ok = "Ok" - invalid_credentials = "InvalidCredentials" - invalid_share = "InvalidShare" - - class ScmType(str, Enum): none = "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 59804fc6d34a..a4a86229d471 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 @@ -975,8 +975,8 @@ def list_metrics( :param filter: Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq - '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and - timeGrain eq duration'[Hour|Minute|Day]'. + 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain + eq duration'[Hour|Minute|Day]'. :type filter: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the @@ -1620,8 +1620,8 @@ def list_multi_role_metrics( :param filter: Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq - '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and - timeGrain eq duration'[Hour|Minute|Day]'. + 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain + eq duration'[Hour|Minute|Day]'. :type filter: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the @@ -2320,8 +2320,8 @@ def list_usages( :param filter: Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq - '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and - timeGrain eq duration'[Hour|Minute|Day]'. + 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain + eq duration'[Hour|Minute|Day]'. :type filter: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the @@ -2816,8 +2816,8 @@ def list_worker_pool_instance_metrics( :param filter: Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq - '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and - timeGrain eq duration'[Hour|Minute|Day]'. + 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain + eq duration'[Hour|Minute|Day]'. :type filter: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the @@ -2984,8 +2984,8 @@ def list_web_worker_metrics( :param filter: Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq - '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and - timeGrain eq duration'[Hour|Minute|Day]'. + 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain + eq duration'[Hour|Minute|Day]'. :type filter: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the 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 a80f65980427..c9e74abcd1e9 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 @@ -1057,8 +1057,8 @@ def list_metrics( :param filter: Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq - '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and - timeGrain eq duration'[Hour|Minute|Day]'. + 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain + eq duration'[Hour|Minute|Day]'. :type filter: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the 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 45d9d9a5b4c6..8e210137f019 100644 --- a/azure-mgmt-web/azure/mgmt/web/operations/recommendations_operations.py +++ b/azure-mgmt-web/azure/mgmt/web/operations/recommendations_operations.py @@ -48,9 +48,9 @@ def list( returns all recommendations. :type featured: 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 - timeGrain eq duration'[PT1H|PT1M|P1D] + $filter=channel eq 'Api' or channel eq 'Notification' and startTime eq + 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain + eq duration'[PT1H|PT1M|P1D] :type filter: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the @@ -239,9 +239,9 @@ def list_history_for_web_app( 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 - timeGrain eq duration'[PT1H|PT1M|P1D] + $filter=channel eq 'Api' or channel eq 'Notification' and startTime eq + 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain + eq duration'[PT1H|PT1M|P1D] :type filter: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the @@ -325,7 +325,7 @@ def list_recommended_rules_for_web_app( returns all recommendations. :type featured: bool :param filter: Return only channels specified in the filter. Filter is - specified by using OData syntax. Example: $filter=channels eq 'Api' or + specified by using OData syntax. Example: $filter=channel eq 'Api' or channel eq 'Notification' :type filter: str :param dict custom_headers: headers that will be added to the request 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 6a6716bb0221..79090ac97919 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 @@ -1426,147 +1426,6 @@ def get_auth_settings( return deserialized get_auth_settings.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/authsettings/list'} - def update_azure_storage_accounts( - self, resource_group_name, name, kind=None, properties=None, custom_headers=None, raw=False, **operation_config): - """Updates the Azure storage account configurations of an app. - - Updates the Azure storage account configurations of an app. - - :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. - :type name: str - :param kind: Kind of resource. - :type kind: str - :param properties: Azure storage accounts. - :type properties: dict[str, - ~azure.mgmt.web.models.AzureStorageInfoValue] - :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: AzureStoragePropertyDictionaryResource or ClientRawResponse - if raw=true - :rtype: ~azure.mgmt.web.models.AzureStoragePropertyDictionaryResource - or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`DefaultErrorResponseException` - """ - azure_storage_accounts = models.AzureStoragePropertyDictionaryResource(kind=kind, properties=properties) - - # Construct URL - url = self.update_azure_storage_accounts.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(azure_storage_accounts, 'AzureStoragePropertyDictionaryResource') - - # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) - - if response.status_code not in [200]: - raise models.DefaultErrorResponseException(self._deserialize, response) - - deserialized = None - - if response.status_code == 200: - deserialized = self._deserialize('AzureStoragePropertyDictionaryResource', response) - - if raw: - client_raw_response = ClientRawResponse(deserialized, response) - return client_raw_response - - return deserialized - update_azure_storage_accounts.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/azurestorageaccounts'} - - def list_azure_storage_accounts( - self, resource_group_name, name, custom_headers=None, raw=False, **operation_config): - """Gets the Azure storage account configurations of an app. - - Gets the Azure storage account configurations of an app. - - :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. - :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: AzureStoragePropertyDictionaryResource or ClientRawResponse - if raw=true - :rtype: ~azure.mgmt.web.models.AzureStoragePropertyDictionaryResource - or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`DefaultErrorResponseException` - """ - # Construct URL - url = self.list_azure_storage_accounts.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]: - raise models.DefaultErrorResponseException(self._deserialize, response) - - deserialized = None - - if response.status_code == 200: - deserialized = self._deserialize('AzureStoragePropertyDictionaryResource', response) - - if raw: - client_raw_response = ClientRawResponse(deserialized, response) - return client_raw_response - - return deserialized - list_azure_storage_accounts.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/azurestorageaccounts/list'} - def update_backup_configuration( self, resource_group_name, name, request, custom_headers=None, raw=False, **operation_config): """Updates the backup configuration of an app. @@ -7346,8 +7205,8 @@ def list_metrics( :type details: bool :param filter: Return only metrics specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or - name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and - endTime eq '2014-12-31T23:59:59Z' and timeGrain eq + name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and + endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'. :type filter: str :param dict custom_headers: headers that will be added to the request @@ -7974,8 +7833,8 @@ def list_perf_mon_counters( :type name: str :param filter: Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(startTime eq - '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and - timeGrain eq duration'[Hour|Minute|Day]'. + 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain + eq duration'[Hour|Minute|Day]'. :type filter: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the @@ -11620,157 +11479,6 @@ def get_auth_settings_slot( return deserialized get_auth_settings_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/authsettings/list'} - def update_azure_storage_accounts_slot( - self, resource_group_name, name, slot, kind=None, properties=None, custom_headers=None, raw=False, **operation_config): - """Updates the Azure storage account configurations of an app. - - Updates the Azure storage account configurations of an app. - - :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. - :type name: str - :param slot: Name of the deployment slot. If a slot is not specified, - the API will update the Azure storage account configurations for the - production slot. - :type slot: str - :param kind: Kind of resource. - :type kind: str - :param properties: Azure storage accounts. - :type properties: dict[str, - ~azure.mgmt.web.models.AzureStorageInfoValue] - :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: AzureStoragePropertyDictionaryResource or ClientRawResponse - if raw=true - :rtype: ~azure.mgmt.web.models.AzureStoragePropertyDictionaryResource - or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`DefaultErrorResponseException` - """ - azure_storage_accounts = models.AzureStoragePropertyDictionaryResource(kind=kind, properties=properties) - - # Construct URL - url = self.update_azure_storage_accounts_slot.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'), - 'slot': self._serialize.url("slot", slot, '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(azure_storage_accounts, 'AzureStoragePropertyDictionaryResource') - - # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) - - if response.status_code not in [200]: - raise models.DefaultErrorResponseException(self._deserialize, response) - - deserialized = None - - if response.status_code == 200: - deserialized = self._deserialize('AzureStoragePropertyDictionaryResource', response) - - if raw: - client_raw_response = ClientRawResponse(deserialized, response) - return client_raw_response - - return deserialized - update_azure_storage_accounts_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/azurestorageaccounts'} - - def list_azure_storage_accounts_slot( - self, resource_group_name, name, slot, custom_headers=None, raw=False, **operation_config): - """Gets the Azure storage account configurations of an app. - - Gets the Azure storage account configurations of an app. - - :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. - :type name: str - :param slot: Name of the deployment slot. If a slot is not specified, - the API will update the Azure storage account configurations for the - production slot. - :type slot: 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: AzureStoragePropertyDictionaryResource or ClientRawResponse - if raw=true - :rtype: ~azure.mgmt.web.models.AzureStoragePropertyDictionaryResource - or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`DefaultErrorResponseException` - """ - # Construct URL - url = self.list_azure_storage_accounts_slot.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'), - 'slot': self._serialize.url("slot", slot, '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]: - raise models.DefaultErrorResponseException(self._deserialize, response) - - deserialized = None - - if response.status_code == 200: - deserialized = self._deserialize('AzureStoragePropertyDictionaryResource', response) - - if raw: - client_raw_response = ClientRawResponse(deserialized, response) - return client_raw_response - - return deserialized - list_azure_storage_accounts_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/azurestorageaccounts/list'} - def update_backup_configuration_slot( self, resource_group_name, name, request, slot, custom_headers=None, raw=False, **operation_config): """Updates the backup configuration of an app. @@ -17729,8 +17437,8 @@ def list_metrics_slot( :type details: bool :param filter: Return only metrics specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or - name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and - endTime eq '2014-12-31T23:59:59Z' and timeGrain eq + name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and + endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'. :type filter: str :param dict custom_headers: headers that will be added to the request @@ -18167,8 +17875,8 @@ def list_perf_mon_counters_slot( :type slot: str :param filter: Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(startTime eq - '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and - timeGrain eq duration'[Hour|Minute|Day]'. + 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain + eq duration'[Hour|Minute|Day]'. :type filter: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the @@ -21836,8 +21544,8 @@ def list_usages_slot( :type slot: str :param filter: Return only information specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or - name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and - endTime eq '2014-12-31T23:59:59Z' and timeGrain eq + name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and + endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'. :type filter: str :param dict custom_headers: headers that will be added to the request @@ -23879,8 +23587,8 @@ def list_usages( :type name: str :param filter: Return only information specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or - name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and - endTime eq '2014-12-31T23:59:59Z' and timeGrain eq + name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and + endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'. :type filter: str :param dict custom_headers: headers that will be added to the request From 5ac171bcdfa225511c9a49ae394b28a3eb608ba7 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Thu, 9 Aug 2018 10:31:49 -0700 Subject: [PATCH 14/19] Generated from 45ce1882ee5af7ce8fa4f25cf5f871bc7aa9821b (#3116) Include DRSecondary endpoint for GetPublishingProfileXml --- .../azure/mgmt/web/models/__init__.py | 10 + .../web/models/azure_storage_info_value.py | 60 + .../models/azure_storage_info_value_py3.py | 60 + ...re_storage_property_dictionary_resource.py | 49 + ...torage_property_dictionary_resource_py3.py | 49 + .../models/csm_publishing_profile_options.py | 5 + .../csm_publishing_profile_options_py3.py | 7 +- .../azure/mgmt/web/models/site_config.py | 5 + .../azure/mgmt/web/models/site_config_py3.py | 7 +- .../mgmt/web/models/site_config_resource.py | 5 + .../web/models/site_config_resource_py3.py | 7 +- .../web/models/slot_config_names_resource.py | 5 + .../models/slot_config_names_resource_py3.py | 7 +- .../web_site_management_client_enums.py | 13 + ...p_service_certificate_orders_operations.py | 115 +- .../app_service_environments_operations.py | 259 +- .../app_service_plans_operations.py | 177 +- ...ficate_registration_provider_operations.py | 7 +- .../web/operations/certificates_operations.py | 37 +- .../operations/deleted_web_apps_operations.py | 7 +- .../web/operations/diagnostics_operations.py | 143 +- ...domain_registration_provider_operations.py | 7 +- .../mgmt/web/operations/domains_operations.py | 90 +- .../web/operations/provider_operations.py | 21 +- .../operations/recommendations_operations.py | 52 +- .../top_level_domains_operations.py | 19 +- .../web/operations/web_apps_operations.py | 2261 +++++++++-------- .../mgmt/web/web_site_management_client.py | 98 +- 28 files changed, 1974 insertions(+), 1608 deletions(-) create mode 100644 azure-mgmt-web/azure/mgmt/web/models/azure_storage_info_value.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/azure_storage_info_value_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/azure_storage_property_dictionary_resource.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/azure_storage_property_dictionary_resource_py3.py diff --git a/azure-mgmt-web/azure/mgmt/web/models/__init__.py b/azure-mgmt-web/azure/mgmt/web/models/__init__.py index 06759925efc3..bd1762cc5238 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/__init__.py +++ b/azure-mgmt-web/azure/mgmt/web/models/__init__.py @@ -56,6 +56,7 @@ from .handler_mapping_py3 import HandlerMapping from .site_machine_key_py3 import SiteMachineKey from .conn_string_info_py3 import ConnStringInfo + from .azure_storage_info_value_py3 import AzureStorageInfoValue from .name_value_pair_py3 import NameValuePair from .site_config_py3 import SiteConfig from .host_name_ssl_state_py3 import HostNameSslState @@ -154,6 +155,7 @@ from .azure_blob_storage_application_logs_config_py3 import AzureBlobStorageApplicationLogsConfig from .application_logs_config_py3 import ApplicationLogsConfig from .azure_blob_storage_http_logs_config_py3 import AzureBlobStorageHttpLogsConfig + from .azure_storage_property_dictionary_resource_py3 import AzureStoragePropertyDictionaryResource from .database_backup_setting_py3 import DatabaseBackupSetting from .backup_item_py3 import BackupItem from .backup_schedule_py3 import BackupSchedule @@ -274,6 +276,7 @@ from .handler_mapping import HandlerMapping from .site_machine_key import SiteMachineKey from .conn_string_info import ConnStringInfo + from .azure_storage_info_value import AzureStorageInfoValue from .name_value_pair import NameValuePair from .site_config import SiteConfig from .host_name_ssl_state import HostNameSslState @@ -372,6 +375,7 @@ from .azure_blob_storage_application_logs_config import AzureBlobStorageApplicationLogsConfig from .application_logs_config import ApplicationLogsConfig from .azure_blob_storage_http_logs_config import AzureBlobStorageHttpLogsConfig + from .azure_storage_property_dictionary_resource import AzureStoragePropertyDictionaryResource from .database_backup_setting import DatabaseBackupSetting from .backup_item import BackupItem from .backup_schedule import BackupSchedule @@ -508,6 +512,8 @@ IpFilterTag, AutoHealActionType, ConnectionStringType, + AzureStorageType, + AzureStorageState, ScmType, ManagedPipelineMode, SiteLoadBalancing, @@ -608,6 +614,7 @@ 'HandlerMapping', 'SiteMachineKey', 'ConnStringInfo', + 'AzureStorageInfoValue', 'NameValuePair', 'SiteConfig', 'HostNameSslState', @@ -706,6 +713,7 @@ 'AzureBlobStorageApplicationLogsConfig', 'ApplicationLogsConfig', 'AzureBlobStorageHttpLogsConfig', + 'AzureStoragePropertyDictionaryResource', 'DatabaseBackupSetting', 'BackupItem', 'BackupSchedule', @@ -841,6 +849,8 @@ 'IpFilterTag', 'AutoHealActionType', 'ConnectionStringType', + 'AzureStorageType', + 'AzureStorageState', 'ScmType', 'ManagedPipelineMode', 'SiteLoadBalancing', diff --git a/azure-mgmt-web/azure/mgmt/web/models/azure_storage_info_value.py b/azure-mgmt-web/azure/mgmt/web/models/azure_storage_info_value.py new file mode 100644 index 000000000000..82f36284d597 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/azure_storage_info_value.py @@ -0,0 +1,60 @@ +# 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 AzureStorageInfoValue(Model): + """Azure Files or Blob Storage access information value for dictionary + storage. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :param type: Type of storage. Possible values include: 'AzureFiles', + 'AzureBlob' + :type type: str or ~azure.mgmt.web.models.AzureStorageType + :param account_name: Name of the storage account. + :type account_name: str + :param share_name: Name of the file share (container name, for Blob + storage). + :type share_name: str + :param access_key: Access key for the storage account. + :type access_key: str + :param mount_path: Path to mount the storage within the site's runtime + environment. + :type mount_path: str + :ivar state: State of the storage account. Possible values include: 'Ok', + 'InvalidCredentials', 'InvalidShare' + :vartype state: str or ~azure.mgmt.web.models.AzureStorageState + """ + + _validation = { + 'state': {'readonly': True}, + } + + _attribute_map = { + 'type': {'key': 'type', 'type': 'AzureStorageType'}, + 'account_name': {'key': 'accountName', 'type': 'str'}, + 'share_name': {'key': 'shareName', 'type': 'str'}, + 'access_key': {'key': 'accessKey', 'type': 'str'}, + 'mount_path': {'key': 'mountPath', 'type': 'str'}, + 'state': {'key': 'state', 'type': 'AzureStorageState'}, + } + + def __init__(self, **kwargs): + super(AzureStorageInfoValue, self).__init__(**kwargs) + self.type = kwargs.get('type', None) + self.account_name = kwargs.get('account_name', None) + self.share_name = kwargs.get('share_name', None) + self.access_key = kwargs.get('access_key', None) + self.mount_path = kwargs.get('mount_path', None) + self.state = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/azure_storage_info_value_py3.py b/azure-mgmt-web/azure/mgmt/web/models/azure_storage_info_value_py3.py new file mode 100644 index 000000000000..dfe58a7bbf0e --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/azure_storage_info_value_py3.py @@ -0,0 +1,60 @@ +# 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 AzureStorageInfoValue(Model): + """Azure Files or Blob Storage access information value for dictionary + storage. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :param type: Type of storage. Possible values include: 'AzureFiles', + 'AzureBlob' + :type type: str or ~azure.mgmt.web.models.AzureStorageType + :param account_name: Name of the storage account. + :type account_name: str + :param share_name: Name of the file share (container name, for Blob + storage). + :type share_name: str + :param access_key: Access key for the storage account. + :type access_key: str + :param mount_path: Path to mount the storage within the site's runtime + environment. + :type mount_path: str + :ivar state: State of the storage account. Possible values include: 'Ok', + 'InvalidCredentials', 'InvalidShare' + :vartype state: str or ~azure.mgmt.web.models.AzureStorageState + """ + + _validation = { + 'state': {'readonly': True}, + } + + _attribute_map = { + 'type': {'key': 'type', 'type': 'AzureStorageType'}, + 'account_name': {'key': 'accountName', 'type': 'str'}, + 'share_name': {'key': 'shareName', 'type': 'str'}, + 'access_key': {'key': 'accessKey', 'type': 'str'}, + 'mount_path': {'key': 'mountPath', 'type': 'str'}, + 'state': {'key': 'state', 'type': 'AzureStorageState'}, + } + + def __init__(self, *, type=None, account_name: str=None, share_name: str=None, access_key: str=None, mount_path: str=None, **kwargs) -> None: + super(AzureStorageInfoValue, self).__init__(**kwargs) + self.type = type + self.account_name = account_name + self.share_name = share_name + self.access_key = access_key + self.mount_path = mount_path + self.state = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/azure_storage_property_dictionary_resource.py b/azure-mgmt-web/azure/mgmt/web/models/azure_storage_property_dictionary_resource.py new file mode 100644 index 000000000000..c3b0153b8d54 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/azure_storage_property_dictionary_resource.py @@ -0,0 +1,49 @@ +# 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 AzureStoragePropertyDictionaryResource(ProxyOnlyResource): + """AzureStorageInfo dictionary resource. + + 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 properties: Azure storage accounts. + :type properties: dict[str, ~azure.mgmt.web.models.AzureStorageInfoValue] + """ + + _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'}, + 'properties': {'key': 'properties', 'type': '{AzureStorageInfoValue}'}, + } + + def __init__(self, **kwargs): + super(AzureStoragePropertyDictionaryResource, self).__init__(**kwargs) + self.properties = kwargs.get('properties', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/azure_storage_property_dictionary_resource_py3.py b/azure-mgmt-web/azure/mgmt/web/models/azure_storage_property_dictionary_resource_py3.py new file mode 100644 index 000000000000..d00f95cb753f --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/azure_storage_property_dictionary_resource_py3.py @@ -0,0 +1,49 @@ +# 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_py3 import ProxyOnlyResource + + +class AzureStoragePropertyDictionaryResource(ProxyOnlyResource): + """AzureStorageInfo dictionary resource. + + 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 properties: Azure storage accounts. + :type properties: dict[str, ~azure.mgmt.web.models.AzureStorageInfoValue] + """ + + _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'}, + 'properties': {'key': 'properties', 'type': '{AzureStorageInfoValue}'}, + } + + def __init__(self, *, kind: str=None, properties=None, **kwargs) -> None: + super(AzureStoragePropertyDictionaryResource, self).__init__(kind=kind, **kwargs) + self.properties = properties diff --git a/azure-mgmt-web/azure/mgmt/web/models/csm_publishing_profile_options.py b/azure-mgmt-web/azure/mgmt/web/models/csm_publishing_profile_options.py index 65ab8e37e552..58bd445d5db2 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/csm_publishing_profile_options.py +++ b/azure-mgmt-web/azure/mgmt/web/models/csm_publishing_profile_options.py @@ -20,12 +20,17 @@ class CsmPublishingProfileOptions(Model): WebDeploy -- default Ftp. Possible values include: 'FileZilla3', 'WebDeploy', 'Ftp' :type format: str or ~azure.mgmt.web.models.PublishingProfileFormat + :param include_disaster_recovery_endpoints: Include the DisasterRecover + endpoint if true + :type include_disaster_recovery_endpoints: bool """ _attribute_map = { 'format': {'key': 'format', 'type': 'str'}, + 'include_disaster_recovery_endpoints': {'key': 'includeDisasterRecoveryEndpoints', 'type': 'bool'}, } def __init__(self, **kwargs): super(CsmPublishingProfileOptions, self).__init__(**kwargs) self.format = kwargs.get('format', None) + self.include_disaster_recovery_endpoints = kwargs.get('include_disaster_recovery_endpoints', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/csm_publishing_profile_options_py3.py b/azure-mgmt-web/azure/mgmt/web/models/csm_publishing_profile_options_py3.py index eee0a5e7c608..d6f1f6a64ae1 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/csm_publishing_profile_options_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/csm_publishing_profile_options_py3.py @@ -20,12 +20,17 @@ class CsmPublishingProfileOptions(Model): WebDeploy -- default Ftp. Possible values include: 'FileZilla3', 'WebDeploy', 'Ftp' :type format: str or ~azure.mgmt.web.models.PublishingProfileFormat + :param include_disaster_recovery_endpoints: Include the DisasterRecover + endpoint if true + :type include_disaster_recovery_endpoints: bool """ _attribute_map = { 'format': {'key': 'format', 'type': 'str'}, + 'include_disaster_recovery_endpoints': {'key': 'includeDisasterRecoveryEndpoints', 'type': 'bool'}, } - def __init__(self, *, format=None, **kwargs) -> None: + def __init__(self, *, format=None, include_disaster_recovery_endpoints: bool=None, **kwargs) -> None: super(CsmPublishingProfileOptions, self).__init__(**kwargs) self.format = format + self.include_disaster_recovery_endpoints = include_disaster_recovery_endpoints 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 34156a60e078..759ff0876aaa 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/site_config.py +++ b/azure-mgmt-web/azure/mgmt/web/models/site_config.py @@ -57,6 +57,9 @@ class SiteConfig(Model): :type publishing_username: str :param app_settings: Application settings. :type app_settings: list[~azure.mgmt.web.models.NameValuePair] + :param azure_storage_accounts: User-provided Azure storage accounts. + :type azure_storage_accounts: dict[str, + ~azure.mgmt.web.models.AzureStorageInfoValue] :param connection_strings: Connection strings. :type connection_strings: list[~azure.mgmt.web.models.ConnStringInfo] :ivar machine_key: Site MachineKey. @@ -167,6 +170,7 @@ class SiteConfig(Model): 'detailed_error_logging_enabled': {'key': 'detailedErrorLoggingEnabled', 'type': 'bool'}, 'publishing_username': {'key': 'publishingUsername', 'type': 'str'}, 'app_settings': {'key': 'appSettings', 'type': '[NameValuePair]'}, + 'azure_storage_accounts': {'key': 'azureStorageAccounts', 'type': '{AzureStorageInfoValue}'}, 'connection_strings': {'key': 'connectionStrings', 'type': '[ConnStringInfo]'}, 'machine_key': {'key': 'machineKey', 'type': 'SiteMachineKey'}, 'handler_mappings': {'key': 'handlerMappings', 'type': '[HandlerMapping]'}, @@ -221,6 +225,7 @@ def __init__(self, **kwargs): self.detailed_error_logging_enabled = kwargs.get('detailed_error_logging_enabled', None) self.publishing_username = kwargs.get('publishing_username', None) self.app_settings = kwargs.get('app_settings', None) + self.azure_storage_accounts = kwargs.get('azure_storage_accounts', None) self.connection_strings = kwargs.get('connection_strings', None) self.machine_key = None self.handler_mappings = kwargs.get('handler_mappings', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_config_py3.py b/azure-mgmt-web/azure/mgmt/web/models/site_config_py3.py index 85f59f15a970..a8534e4686b4 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/site_config_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/site_config_py3.py @@ -57,6 +57,9 @@ class SiteConfig(Model): :type publishing_username: str :param app_settings: Application settings. :type app_settings: list[~azure.mgmt.web.models.NameValuePair] + :param azure_storage_accounts: User-provided Azure storage accounts. + :type azure_storage_accounts: dict[str, + ~azure.mgmt.web.models.AzureStorageInfoValue] :param connection_strings: Connection strings. :type connection_strings: list[~azure.mgmt.web.models.ConnStringInfo] :ivar machine_key: Site MachineKey. @@ -167,6 +170,7 @@ class SiteConfig(Model): 'detailed_error_logging_enabled': {'key': 'detailedErrorLoggingEnabled', 'type': 'bool'}, 'publishing_username': {'key': 'publishingUsername', 'type': 'str'}, 'app_settings': {'key': 'appSettings', 'type': '[NameValuePair]'}, + 'azure_storage_accounts': {'key': 'azureStorageAccounts', 'type': '{AzureStorageInfoValue}'}, 'connection_strings': {'key': 'connectionStrings', 'type': '[ConnStringInfo]'}, 'machine_key': {'key': 'machineKey', 'type': 'SiteMachineKey'}, 'handler_mappings': {'key': 'handlerMappings', 'type': '[HandlerMapping]'}, @@ -202,7 +206,7 @@ class SiteConfig(Model): 'reserved_instance_count': {'key': 'reservedInstanceCount', 'type': 'int'}, } - def __init__(self, *, number_of_workers: int=None, default_documents=None, net_framework_version: str="v4.6", php_version: str=None, python_version: str=None, node_version: str=None, linux_fx_version: str=None, windows_fx_version: str=None, request_tracing_enabled: bool=None, request_tracing_expiration_time=None, remote_debugging_enabled: bool=None, remote_debugging_version: str=None, http_logging_enabled: bool=None, logs_directory_size_limit: int=None, detailed_error_logging_enabled: bool=None, publishing_username: str=None, app_settings=None, connection_strings=None, handler_mappings=None, document_root: str=None, scm_type=None, use32_bit_worker_process: bool=None, web_sockets_enabled: bool=None, always_on: bool=None, java_version: str=None, java_container: str=None, java_container_version: str=None, app_command_line: str=None, managed_pipeline_mode=None, virtual_applications=None, load_balancing=None, experiments=None, limits=None, auto_heal_enabled: bool=None, auto_heal_rules=None, tracing_options: str=None, vnet_name: str=None, cors=None, push=None, api_definition=None, auto_swap_slot_name: str=None, local_my_sql_enabled: bool=False, managed_service_identity_id: int=None, x_managed_service_identity_id: int=None, ip_security_restrictions=None, http20_enabled: bool=True, min_tls_version=None, ftps_state=None, reserved_instance_count: int=None, **kwargs) -> None: + def __init__(self, *, number_of_workers: int=None, default_documents=None, net_framework_version: str="v4.6", php_version: str=None, python_version: str=None, node_version: str=None, linux_fx_version: str=None, windows_fx_version: str=None, request_tracing_enabled: bool=None, request_tracing_expiration_time=None, remote_debugging_enabled: bool=None, remote_debugging_version: str=None, http_logging_enabled: bool=None, logs_directory_size_limit: int=None, detailed_error_logging_enabled: bool=None, publishing_username: str=None, app_settings=None, azure_storage_accounts=None, connection_strings=None, handler_mappings=None, document_root: str=None, scm_type=None, use32_bit_worker_process: bool=None, web_sockets_enabled: bool=None, always_on: bool=None, java_version: str=None, java_container: str=None, java_container_version: str=None, app_command_line: str=None, managed_pipeline_mode=None, virtual_applications=None, load_balancing=None, experiments=None, limits=None, auto_heal_enabled: bool=None, auto_heal_rules=None, tracing_options: str=None, vnet_name: str=None, cors=None, push=None, api_definition=None, auto_swap_slot_name: str=None, local_my_sql_enabled: bool=False, managed_service_identity_id: int=None, x_managed_service_identity_id: int=None, ip_security_restrictions=None, http20_enabled: bool=True, min_tls_version=None, ftps_state=None, reserved_instance_count: int=None, **kwargs) -> None: super(SiteConfig, self).__init__(**kwargs) self.number_of_workers = number_of_workers self.default_documents = default_documents @@ -221,6 +225,7 @@ def __init__(self, *, number_of_workers: int=None, default_documents=None, net_f self.detailed_error_logging_enabled = detailed_error_logging_enabled self.publishing_username = publishing_username self.app_settings = app_settings + self.azure_storage_accounts = azure_storage_accounts self.connection_strings = connection_strings self.machine_key = None self.handler_mappings = handler_mappings 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 bf1b5fd08b4e..1c4b3bc66086 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 @@ -65,6 +65,9 @@ class SiteConfigResource(ProxyOnlyResource): :type publishing_username: str :param app_settings: Application settings. :type app_settings: list[~azure.mgmt.web.models.NameValuePair] + :param azure_storage_accounts: User-provided Azure storage accounts. + :type azure_storage_accounts: dict[str, + ~azure.mgmt.web.models.AzureStorageInfoValue] :param connection_strings: Connection strings. :type connection_strings: list[~azure.mgmt.web.models.ConnStringInfo] :ivar machine_key: Site MachineKey. @@ -182,6 +185,7 @@ class SiteConfigResource(ProxyOnlyResource): 'detailed_error_logging_enabled': {'key': 'properties.detailedErrorLoggingEnabled', 'type': 'bool'}, 'publishing_username': {'key': 'properties.publishingUsername', 'type': 'str'}, 'app_settings': {'key': 'properties.appSettings', 'type': '[NameValuePair]'}, + 'azure_storage_accounts': {'key': 'properties.azureStorageAccounts', 'type': '{AzureStorageInfoValue}'}, 'connection_strings': {'key': 'properties.connectionStrings', 'type': '[ConnStringInfo]'}, 'machine_key': {'key': 'properties.machineKey', 'type': 'SiteMachineKey'}, 'handler_mappings': {'key': 'properties.handlerMappings', 'type': '[HandlerMapping]'}, @@ -236,6 +240,7 @@ def __init__(self, **kwargs): self.detailed_error_logging_enabled = kwargs.get('detailed_error_logging_enabled', None) self.publishing_username = kwargs.get('publishing_username', None) self.app_settings = kwargs.get('app_settings', None) + self.azure_storage_accounts = kwargs.get('azure_storage_accounts', None) self.connection_strings = kwargs.get('connection_strings', None) self.machine_key = None self.handler_mappings = kwargs.get('handler_mappings', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_config_resource_py3.py b/azure-mgmt-web/azure/mgmt/web/models/site_config_resource_py3.py index 6d9e30ad6f7c..e766a1a891b2 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/site_config_resource_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/site_config_resource_py3.py @@ -65,6 +65,9 @@ class SiteConfigResource(ProxyOnlyResource): :type publishing_username: str :param app_settings: Application settings. :type app_settings: list[~azure.mgmt.web.models.NameValuePair] + :param azure_storage_accounts: User-provided Azure storage accounts. + :type azure_storage_accounts: dict[str, + ~azure.mgmt.web.models.AzureStorageInfoValue] :param connection_strings: Connection strings. :type connection_strings: list[~azure.mgmt.web.models.ConnStringInfo] :ivar machine_key: Site MachineKey. @@ -182,6 +185,7 @@ class SiteConfigResource(ProxyOnlyResource): 'detailed_error_logging_enabled': {'key': 'properties.detailedErrorLoggingEnabled', 'type': 'bool'}, 'publishing_username': {'key': 'properties.publishingUsername', 'type': 'str'}, 'app_settings': {'key': 'properties.appSettings', 'type': '[NameValuePair]'}, + 'azure_storage_accounts': {'key': 'properties.azureStorageAccounts', 'type': '{AzureStorageInfoValue}'}, 'connection_strings': {'key': 'properties.connectionStrings', 'type': '[ConnStringInfo]'}, 'machine_key': {'key': 'properties.machineKey', 'type': 'SiteMachineKey'}, 'handler_mappings': {'key': 'properties.handlerMappings', 'type': '[HandlerMapping]'}, @@ -217,7 +221,7 @@ class SiteConfigResource(ProxyOnlyResource): 'reserved_instance_count': {'key': 'properties.reservedInstanceCount', 'type': 'int'}, } - def __init__(self, *, kind: str=None, number_of_workers: int=None, default_documents=None, net_framework_version: str="v4.6", php_version: str=None, python_version: str=None, node_version: str=None, linux_fx_version: str=None, windows_fx_version: str=None, request_tracing_enabled: bool=None, request_tracing_expiration_time=None, remote_debugging_enabled: bool=None, remote_debugging_version: str=None, http_logging_enabled: bool=None, logs_directory_size_limit: int=None, detailed_error_logging_enabled: bool=None, publishing_username: str=None, app_settings=None, connection_strings=None, handler_mappings=None, document_root: str=None, scm_type=None, use32_bit_worker_process: bool=None, web_sockets_enabled: bool=None, always_on: bool=None, java_version: str=None, java_container: str=None, java_container_version: str=None, app_command_line: str=None, managed_pipeline_mode=None, virtual_applications=None, load_balancing=None, experiments=None, limits=None, auto_heal_enabled: bool=None, auto_heal_rules=None, tracing_options: str=None, vnet_name: str=None, cors=None, push=None, api_definition=None, auto_swap_slot_name: str=None, local_my_sql_enabled: bool=False, managed_service_identity_id: int=None, x_managed_service_identity_id: int=None, ip_security_restrictions=None, http20_enabled: bool=True, min_tls_version=None, ftps_state=None, reserved_instance_count: int=None, **kwargs) -> None: + def __init__(self, *, kind: str=None, number_of_workers: int=None, default_documents=None, net_framework_version: str="v4.6", php_version: str=None, python_version: str=None, node_version: str=None, linux_fx_version: str=None, windows_fx_version: str=None, request_tracing_enabled: bool=None, request_tracing_expiration_time=None, remote_debugging_enabled: bool=None, remote_debugging_version: str=None, http_logging_enabled: bool=None, logs_directory_size_limit: int=None, detailed_error_logging_enabled: bool=None, publishing_username: str=None, app_settings=None, azure_storage_accounts=None, connection_strings=None, handler_mappings=None, document_root: str=None, scm_type=None, use32_bit_worker_process: bool=None, web_sockets_enabled: bool=None, always_on: bool=None, java_version: str=None, java_container: str=None, java_container_version: str=None, app_command_line: str=None, managed_pipeline_mode=None, virtual_applications=None, load_balancing=None, experiments=None, limits=None, auto_heal_enabled: bool=None, auto_heal_rules=None, tracing_options: str=None, vnet_name: str=None, cors=None, push=None, api_definition=None, auto_swap_slot_name: str=None, local_my_sql_enabled: bool=False, managed_service_identity_id: int=None, x_managed_service_identity_id: int=None, ip_security_restrictions=None, http20_enabled: bool=True, min_tls_version=None, ftps_state=None, reserved_instance_count: int=None, **kwargs) -> None: super(SiteConfigResource, self).__init__(kind=kind, **kwargs) self.number_of_workers = number_of_workers self.default_documents = default_documents @@ -236,6 +240,7 @@ def __init__(self, *, kind: str=None, number_of_workers: int=None, default_docum self.detailed_error_logging_enabled = detailed_error_logging_enabled self.publishing_username = publishing_username self.app_settings = app_settings + self.azure_storage_accounts = azure_storage_accounts self.connection_strings = connection_strings self.machine_key = None self.handler_mappings = handler_mappings diff --git a/azure-mgmt-web/azure/mgmt/web/models/slot_config_names_resource.py b/azure-mgmt-web/azure/mgmt/web/models/slot_config_names_resource.py index 6c21dc922423..072c2237aa45 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/slot_config_names_resource.py +++ b/azure-mgmt-web/azure/mgmt/web/models/slot_config_names_resource.py @@ -30,6 +30,9 @@ class SlotConfigNamesResource(ProxyOnlyResource): :type connection_string_names: list[str] :param app_setting_names: List of application settings names. :type app_setting_names: list[str] + :param azure_storage_config_names: List of external Azure storage account + identifiers. + :type azure_storage_config_names: list[str] """ _validation = { @@ -45,9 +48,11 @@ class SlotConfigNamesResource(ProxyOnlyResource): 'type': {'key': 'type', 'type': 'str'}, 'connection_string_names': {'key': 'properties.connectionStringNames', 'type': '[str]'}, 'app_setting_names': {'key': 'properties.appSettingNames', 'type': '[str]'}, + 'azure_storage_config_names': {'key': 'properties.azureStorageConfigNames', 'type': '[str]'}, } def __init__(self, **kwargs): super(SlotConfigNamesResource, self).__init__(**kwargs) self.connection_string_names = kwargs.get('connection_string_names', None) self.app_setting_names = kwargs.get('app_setting_names', None) + self.azure_storage_config_names = kwargs.get('azure_storage_config_names', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/slot_config_names_resource_py3.py b/azure-mgmt-web/azure/mgmt/web/models/slot_config_names_resource_py3.py index adfc50723e23..44e1587a66f7 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/slot_config_names_resource_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/slot_config_names_resource_py3.py @@ -30,6 +30,9 @@ class SlotConfigNamesResource(ProxyOnlyResource): :type connection_string_names: list[str] :param app_setting_names: List of application settings names. :type app_setting_names: list[str] + :param azure_storage_config_names: List of external Azure storage account + identifiers. + :type azure_storage_config_names: list[str] """ _validation = { @@ -45,9 +48,11 @@ class SlotConfigNamesResource(ProxyOnlyResource): 'type': {'key': 'type', 'type': 'str'}, 'connection_string_names': {'key': 'properties.connectionStringNames', 'type': '[str]'}, 'app_setting_names': {'key': 'properties.appSettingNames', 'type': '[str]'}, + 'azure_storage_config_names': {'key': 'properties.azureStorageConfigNames', 'type': '[str]'}, } - def __init__(self, *, kind: str=None, connection_string_names=None, app_setting_names=None, **kwargs) -> None: + def __init__(self, *, kind: str=None, connection_string_names=None, app_setting_names=None, azure_storage_config_names=None, **kwargs) -> None: super(SlotConfigNamesResource, self).__init__(kind=kind, **kwargs) self.connection_string_names = connection_string_names self.app_setting_names = app_setting_names + self.azure_storage_config_names = azure_storage_config_names 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 087cf3dfcdd2..ab38e3030187 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 @@ -115,6 +115,19 @@ class ConnectionStringType(str, Enum): postgre_sql = "PostgreSQL" +class AzureStorageType(str, Enum): + + azure_files = "AzureFiles" + azure_blob = "AzureBlob" + + +class AzureStorageState(str, Enum): + + ok = "Ok" + invalid_credentials = "InvalidCredentials" + invalid_share = "InvalidShare" + + class ScmType(str, Enum): none = "None" 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 24d43ce7eb3d..a9e97191b87f 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 @@ -76,7 +76,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -85,9 +85,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -149,9 +148,8 @@ def validate_purchase_information( body_content = self._serialize.body(app_service_certificate_order, 'AppServiceCertificateOrder') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [204]: exp = CloudError(response) @@ -204,7 +202,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -213,9 +211,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -270,7 +267,7 @@ def get( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -279,8 +276,8 @@ def get( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -315,6 +312,7 @@ def _create_or_update_initial( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -327,9 +325,8 @@ def _create_or_update_initial( body_content = self._serialize.body(certificate_distinguished_name, 'AppServiceCertificateOrder') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 201]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -439,7 +436,6 @@ def delete( # 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: @@ -448,8 +444,8 @@ def delete( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 204]: exp = CloudError(response) @@ -502,6 +498,7 @@ def update( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -514,9 +511,8 @@ def update( body_content = self._serialize.body(certificate_distinguished_name, 'AppServiceCertificateOrderPatchResource') # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 201]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -579,7 +575,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -588,9 +584,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -649,7 +644,7 @@ def get_certificate( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -658,8 +653,8 @@ def get_certificate( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -695,6 +690,7 @@ def _create_or_update_certificate_initial( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -707,9 +703,8 @@ def _create_or_update_certificate_initial( body_content = self._serialize.body(key_vault_certificate, 'AppServiceCertificateResource') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 201]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -824,7 +819,6 @@ def delete_certificate( # 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: @@ -833,8 +827,8 @@ def delete_certificate( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 204]: exp = CloudError(response) @@ -890,6 +884,7 @@ def update_certificate( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -902,9 +897,8 @@ def update_certificate( body_content = self._serialize.body(key_vault_certificate, 'AppServiceCertificatePatchResource') # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 201]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -973,9 +967,8 @@ def reissue( body_content = self._serialize.body(reissue_certificate_order_request, 'ReissueCertificateOrderRequest') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [204]: exp = CloudError(response) @@ -1037,9 +1030,8 @@ def renew( body_content = self._serialize.body(renew_certificate_order_request, 'RenewCertificateOrderRequest') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [204]: exp = CloudError(response) @@ -1086,7 +1078,6 @@ def resend_email( # 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: @@ -1095,8 +1086,8 @@ def resend_email( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [204]: exp = CloudError(response) @@ -1159,9 +1150,8 @@ def resend_request_emails( body_content = self._serialize.body(name_identifier, 'NameIdentifier') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [204]: exp = CloudError(response) @@ -1217,6 +1207,7 @@ def retrieve_site_seal( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -1229,9 +1220,8 @@ def retrieve_site_seal( body_content = self._serialize.body(site_seal_request, 'SiteSealRequest') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1283,7 +1273,6 @@ def verify_domain_ownership( # 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: @@ -1292,8 +1281,8 @@ def verify_domain_ownership( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [204]: exp = CloudError(response) @@ -1342,7 +1331,7 @@ def retrieve_certificate_actions( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1351,8 +1340,8 @@ def retrieve_certificate_actions( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1406,7 +1395,7 @@ def retrieve_certificate_email_history( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1415,8 +1404,8 @@ def retrieve_certificate_email_history( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) 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 a4a86229d471..5b1752bf432a 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 @@ -76,7 +76,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -85,9 +85,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -146,7 +145,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -155,9 +154,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -213,7 +211,7 @@ def get( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -222,8 +220,8 @@ def get( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -258,6 +256,7 @@ def _create_or_update_initial( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -270,9 +269,8 @@ def _create_or_update_initial( body_content = self._serialize.body(hosting_environment_envelope, 'AppServiceEnvironmentResource') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202, 400, 404, 409]: exp = CloudError(response) @@ -368,7 +366,6 @@ def _delete_initial( # 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: @@ -377,8 +374,8 @@ def _delete_initial( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [202, 204, 400, 404, 409]: exp = CloudError(response) @@ -479,6 +476,7 @@ def update( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -491,9 +489,8 @@ def update( body_content = self._serialize.body(hosting_environment_envelope, 'AppServiceEnvironmentPatchResource') # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202, 400, 404, 409]: exp = CloudError(response) @@ -560,7 +557,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -569,9 +566,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -626,7 +622,7 @@ def list_vips( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -635,8 +631,8 @@ def list_vips( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -673,6 +669,7 @@ def _change_vnet_initial( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -685,9 +682,8 @@ def _change_vnet_initial( 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) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -799,7 +795,7 @@ def list_diagnostics( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -808,8 +804,8 @@ def list_diagnostics( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -867,7 +863,7 @@ def get_diagnostics_item( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -876,8 +872,8 @@ def get_diagnostics_item( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -931,7 +927,7 @@ def list_metric_definitions( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -940,8 +936,8 @@ def list_metric_definitions( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1015,7 +1011,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1024,9 +1020,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1088,7 +1083,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1097,9 +1092,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1154,7 +1148,7 @@ def get_multi_role_pool( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1163,8 +1157,8 @@ def get_multi_role_pool( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1199,6 +1193,7 @@ def _create_or_update_multi_role_pool_initial( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -1211,9 +1206,8 @@ def _create_or_update_multi_role_pool_initial( body_content = self._serialize.body(multi_role_pool_envelope, 'WorkerPoolResource') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202, 400, 404, 409]: exp = CloudError(response) @@ -1326,6 +1320,7 @@ def update_multi_role_pool( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -1338,9 +1333,8 @@ def update_multi_role_pool( body_content = self._serialize.body(multi_role_pool_envelope, 'WorkerPoolResource') # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202, 400, 404, 409]: exp = CloudError(response) @@ -1410,7 +1404,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1419,9 +1413,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1493,7 +1486,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1502,9 +1495,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1568,7 +1560,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1577,9 +1569,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1666,7 +1657,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1675,9 +1666,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1739,7 +1729,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1748,9 +1738,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1812,7 +1801,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1821,9 +1810,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1878,7 +1866,7 @@ def list_operations( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1887,8 +1875,8 @@ def list_operations( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1940,7 +1928,6 @@ def reboot( # 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: @@ -1949,8 +1936,8 @@ def reboot( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [202, 400, 404, 409]: exp = CloudError(response) @@ -1980,7 +1967,7 @@ def _resume_initial( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1989,8 +1976,8 @@ def _resume_initial( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -2103,7 +2090,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -2112,9 +2099,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -2180,7 +2166,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -2189,9 +2175,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -2227,7 +2212,7 @@ def _suspend_initial( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -2236,8 +2221,8 @@ def _suspend_initial( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -2358,7 +2343,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -2367,9 +2352,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -2431,7 +2415,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -2440,9 +2424,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -2500,7 +2483,7 @@ def get_worker_pool( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -2509,8 +2492,8 @@ def get_worker_pool( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -2546,6 +2529,7 @@ def _create_or_update_worker_pool_initial( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -2558,9 +2542,8 @@ def _create_or_update_worker_pool_initial( body_content = self._serialize.body(worker_pool_envelope, 'WorkerPoolResource') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202, 400, 404, 409]: exp = CloudError(response) @@ -2677,6 +2660,7 @@ def update_worker_pool( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -2689,9 +2673,8 @@ def update_worker_pool( body_content = self._serialize.body(worker_pool_envelope, 'WorkerPoolResource') # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202, 400, 404, 409]: exp = CloudError(response) @@ -2764,7 +2747,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -2773,9 +2756,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -2858,7 +2840,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -2867,9 +2849,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -2934,7 +2915,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -2943,9 +2924,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -3025,7 +3005,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -3034,9 +3014,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -3101,7 +3080,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -3110,9 +3089,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -3177,7 +3155,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -3186,9 +3164,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, 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 c9e74abcd1e9..e9089ba1c008 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 @@ -83,7 +83,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -92,9 +92,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -153,7 +152,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -162,9 +161,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -218,7 +216,7 @@ def get( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -227,8 +225,8 @@ def get( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -265,6 +263,7 @@ def _create_or_update_initial( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -277,9 +276,8 @@ def _create_or_update_initial( body_content = self._serialize.body(app_service_plan, 'AppServicePlan') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -386,7 +384,6 @@ def delete( # 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: @@ -395,8 +392,8 @@ def delete( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 204]: exp = CloudError(response) @@ -448,6 +445,7 @@ def update( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -460,9 +458,8 @@ def update( body_content = self._serialize.body(app_service_plan, 'AppServicePlanPatchResource') # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -518,7 +515,7 @@ def list_capabilities( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -527,8 +524,8 @@ def list_capabilities( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -588,7 +585,7 @@ def get_hybrid_connection( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -597,8 +594,8 @@ def get_hybrid_connection( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -656,7 +653,6 @@ def delete_hybrid_connection( # 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: @@ -665,8 +661,8 @@ def delete_hybrid_connection( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 204]: exp = CloudError(response) @@ -721,7 +717,7 @@ def list_hybrid_connection_keys( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -730,8 +726,8 @@ def list_hybrid_connection_keys( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -797,7 +793,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -806,9 +802,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -865,7 +860,7 @@ def get_hybrid_connection_plan_limit( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -874,8 +869,8 @@ def get_hybrid_connection_plan_limit( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -936,7 +931,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -945,9 +940,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1011,7 +1005,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1020,9 +1014,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1097,7 +1090,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1106,9 +1099,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1168,7 +1160,6 @@ def restart_web_apps( # 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: @@ -1177,8 +1168,8 @@ def restart_web_apps( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [204]: exp = CloudError(response) @@ -1249,7 +1240,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1258,9 +1249,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1314,7 +1304,7 @@ def get_server_farm_skus( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1323,8 +1313,8 @@ def get_server_farm_skus( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1391,7 +1381,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1400,9 +1390,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1457,7 +1446,7 @@ def list_vnets( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1466,8 +1455,8 @@ def list_vnets( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1523,7 +1512,7 @@ def get_vnet_from_server_farm( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1532,8 +1521,8 @@ def get_vnet_from_server_farm( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -1596,7 +1585,7 @@ def get_vnet_gateway( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1605,8 +1594,8 @@ def get_vnet_gateway( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1669,6 +1658,7 @@ def update_vnet_gateway( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -1681,9 +1671,8 @@ def update_vnet_gateway( body_content = self._serialize.body(connection_envelope, 'VnetGateway') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1742,7 +1731,7 @@ def list_routes_for_vnet( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1751,8 +1740,8 @@ def list_routes_for_vnet( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1811,7 +1800,7 @@ def get_route_for_vnet( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1820,8 +1809,8 @@ def get_route_for_vnet( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -1884,6 +1873,7 @@ def create_or_update_vnet_route( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -1896,9 +1886,8 @@ def create_or_update_vnet_route( body_content = self._serialize.body(route, 'VnetRoute') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 400, 404]: exp = CloudError(response) @@ -1958,7 +1947,6 @@ def delete_vnet_route( # 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: @@ -1967,8 +1955,8 @@ def delete_vnet_route( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -2024,6 +2012,7 @@ def update_vnet_route( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -2036,9 +2025,8 @@ def update_vnet_route( body_content = self._serialize.body(route, 'VnetRoute') # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 400, 404]: exp = CloudError(response) @@ -2096,7 +2084,6 @@ def reboot_worker( # 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: @@ -2105,8 +2092,8 @@ def reboot_worker( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [204]: exp = CloudError(response) 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 6fe72e405f80..4e8e3626ecfb 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 @@ -71,7 +71,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -80,9 +80,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, 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 d228ffb21026..8784295f79b5 100644 --- a/azure-mgmt-web/azure/mgmt/web/operations/certificates_operations.py +++ b/azure-mgmt-web/azure/mgmt/web/operations/certificates_operations.py @@ -74,7 +74,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -83,9 +83,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -144,7 +143,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -153,9 +152,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -210,7 +208,7 @@ def get( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -219,8 +217,8 @@ def get( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -277,6 +275,7 @@ def create_or_update( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -289,9 +288,8 @@ def create_or_update( body_content = self._serialize.body(certificate_envelope, 'Certificate') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -343,7 +341,6 @@ def delete( # 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: @@ -352,8 +349,8 @@ def delete( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 204]: exp = CloudError(response) @@ -406,6 +403,7 @@ def update( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -418,9 +416,8 @@ def update( body_content = self._serialize.body(certificate_envelope, 'CertificatePatchResource') # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) 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 267973006f96..f0dc46979898 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 @@ -73,7 +73,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -82,9 +82,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, 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 4ea0569b1ad7..f7a952870293 100644 --- a/azure-mgmt-web/azure/mgmt/web/operations/diagnostics_operations.py +++ b/azure-mgmt-web/azure/mgmt/web/operations/diagnostics_operations.py @@ -80,7 +80,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -89,9 +89,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -161,7 +160,7 @@ def get_hosting_environment_detector_response( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -170,8 +169,8 @@ def get_hosting_environment_detector_response( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -232,7 +231,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -241,9 +240,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -313,7 +311,7 @@ def get_site_detector_response( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -322,8 +320,8 @@ def get_site_detector_response( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -384,7 +382,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -393,9 +391,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -453,7 +450,7 @@ def get_site_diagnostic_category( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -462,8 +459,8 @@ def get_site_diagnostic_category( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -527,7 +524,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -536,9 +533,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -599,7 +595,7 @@ def get_site_analysis( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -608,8 +604,8 @@ def get_site_analysis( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -681,7 +677,7 @@ def execute_site_analysis( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -690,8 +686,8 @@ def execute_site_analysis( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -755,7 +751,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -764,9 +760,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -834,7 +829,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -843,9 +838,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -918,7 +912,7 @@ def execute_site_detector( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -927,8 +921,8 @@ def execute_site_detector( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -992,7 +986,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1001,9 +995,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1076,7 +1069,7 @@ def get_site_detector_response_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1085,8 +1078,8 @@ def get_site_detector_response_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1150,7 +1143,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1159,9 +1152,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1222,7 +1214,7 @@ def get_site_diagnostic_category_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1231,8 +1223,8 @@ def get_site_diagnostic_category_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1299,7 +1291,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1308,9 +1300,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1374,7 +1365,7 @@ def get_site_analysis_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1383,8 +1374,8 @@ def get_site_analysis_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1459,7 +1450,7 @@ def execute_site_analysis_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1468,8 +1459,8 @@ def execute_site_analysis_slot( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1536,7 +1527,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1545,9 +1536,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1618,7 +1608,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1627,9 +1617,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1705,7 +1694,7 @@ def execute_site_detector_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1714,8 +1703,8 @@ def execute_site_detector_slot( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) 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 70c15a6bb903..c8e9a1ae3147 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 @@ -71,7 +71,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -80,9 +80,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, 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 f414a9d997b3..cc1a1664e313 100644 --- a/azure-mgmt-web/azure/mgmt/web/operations/domains_operations.py +++ b/azure-mgmt-web/azure/mgmt/web/operations/domains_operations.py @@ -74,6 +74,7 @@ def check_availability( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -86,9 +87,8 @@ def check_availability( body_content = self._serialize.body(identifier, 'NameIdentifier') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -142,7 +142,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -151,9 +151,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -202,7 +201,7 @@ def get_control_center_sso_request( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -211,8 +210,8 @@ def get_control_center_sso_request( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -273,6 +272,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -285,9 +285,8 @@ def internal_paging(next_link=None, raw=False): body_content = self._serialize.body(parameters, 'DomainRecommendationSearchParameters') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -346,7 +345,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -355,9 +354,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -412,7 +410,7 @@ def get( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -421,8 +419,8 @@ def get( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -457,6 +455,7 @@ def _create_or_update_initial( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -469,9 +468,8 @@ def _create_or_update_initial( body_content = self._serialize.body(domain, 'Domain') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -584,7 +582,6 @@ def delete( # 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: @@ -593,8 +590,8 @@ def delete( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 204]: exp = CloudError(response) @@ -645,6 +642,7 @@ def update( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -657,9 +655,8 @@ def update( body_content = self._serialize.body(domain, 'DomainPatchResource') # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -722,7 +719,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -731,9 +728,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -791,7 +787,7 @@ def get_ownership_identifier( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -800,8 +796,8 @@ def get_ownership_identifier( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -866,6 +862,7 @@ def create_or_update_ownership_identifier( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -878,9 +875,8 @@ def create_or_update_ownership_identifier( body_content = self._serialize.body(domain_ownership_identifier, 'DomainOwnershipIdentifier') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -935,7 +931,6 @@ def delete_ownership_identifier( # 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: @@ -944,8 +939,8 @@ def delete_ownership_identifier( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 204]: exp = CloudError(response) @@ -1005,6 +1000,7 @@ def update_ownership_identifier( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -1017,9 +1013,8 @@ def update_ownership_identifier( body_content = self._serialize.body(domain_ownership_identifier, 'DomainOwnershipIdentifier') # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1071,7 +1066,6 @@ def renew( # 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: @@ -1080,8 +1074,8 @@ def renew( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202, 204, 400, 500]: exp = CloudError(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 d30181ee2b50..19430e11b82f 100644 --- a/azure-mgmt-web/azure/mgmt/web/operations/provider_operations.py +++ b/azure-mgmt-web/azure/mgmt/web/operations/provider_operations.py @@ -73,7 +73,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -82,9 +82,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -137,7 +136,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -146,9 +145,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -207,7 +205,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -216,9 +214,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, 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 8e210137f019..b9a3f4e147d2 100644 --- a/azure-mgmt-web/azure/mgmt/web/operations/recommendations_operations.py +++ b/azure-mgmt-web/azure/mgmt/web/operations/recommendations_operations.py @@ -87,7 +87,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -96,9 +96,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -144,7 +143,6 @@ def reset_all_filters( # 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: @@ -153,8 +151,8 @@ def reset_all_filters( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [204]: exp = CloudError(response) @@ -199,7 +197,6 @@ def disable_recommendation_for_subscription( # 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: @@ -208,8 +205,8 @@ def disable_recommendation_for_subscription( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) @@ -280,7 +277,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -289,9 +286,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -365,7 +361,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -374,9 +370,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -429,7 +424,6 @@ def disable_all_for_web_app( # 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: @@ -438,8 +432,8 @@ def disable_all_for_web_app( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [204]: exp = CloudError(response) @@ -486,7 +480,6 @@ def reset_all_filters_for_web_app( # 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: @@ -495,8 +488,8 @@ def reset_all_filters_for_web_app( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [204]: exp = CloudError(response) @@ -559,7 +552,7 @@ def get_rule_details_by_web_app( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -568,8 +561,8 @@ def get_rule_details_by_web_app( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -624,7 +617,6 @@ def disable_recommendation_for_site( # 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: @@ -633,8 +625,8 @@ def disable_recommendation_for_site( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) 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 83cf978b7f06..a6c561eadc91 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 @@ -73,7 +73,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -82,9 +82,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -135,7 +134,7 @@ def get( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -144,8 +143,8 @@ def get( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -214,6 +213,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -226,9 +226,8 @@ def internal_paging(next_link=None, raw=False): body_content = self._serialize.body(agreement_option, 'TopLevelDomainAgreementOption') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, 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 79090ac97919..16fba6036b43 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 @@ -75,7 +75,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -84,9 +84,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -150,7 +149,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -159,9 +158,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -215,7 +213,7 @@ def get( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -224,8 +222,8 @@ def get( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -262,6 +260,7 @@ def _create_or_update_initial( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -274,9 +273,8 @@ def _create_or_update_initial( body_content = self._serialize.body(site_envelope, 'Site') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -397,7 +395,6 @@ def delete( # 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: @@ -406,8 +403,8 @@ def delete( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 204, 404]: exp = CloudError(response) @@ -462,6 +459,7 @@ def update( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -474,9 +472,8 @@ def update( body_content = self._serialize.body(site_envelope, 'SitePatchResource') # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -536,7 +533,7 @@ def analyze_custom_hostname( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -545,8 +542,8 @@ def analyze_custom_hostname( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -619,9 +616,8 @@ def apply_slot_config_to_production( body_content = self._serialize.body(slot_swap_entity, 'CsmSlotEntity') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) @@ -673,6 +669,7 @@ def backup( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -685,9 +682,8 @@ def backup( body_content = self._serialize.body(request, 'BackupRequest') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -748,7 +744,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -757,9 +753,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -817,7 +812,7 @@ def get_backup_status( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -826,8 +821,8 @@ def get_backup_status( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -882,7 +877,6 @@ def delete_backup( # 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: @@ -891,8 +885,8 @@ def delete_backup( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -952,6 +946,7 @@ def list_backup_status_secrets( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -964,9 +959,8 @@ def list_backup_status_secrets( body_content = self._serialize.body(request, 'BackupRequest') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1014,9 +1008,8 @@ def _restore_initial( body_content = self._serialize.body(request, 'RestoreRequest') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202]: exp = CloudError(response) @@ -1123,7 +1116,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1132,9 +1125,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1195,6 +1187,7 @@ def update_application_settings( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -1207,9 +1200,8 @@ def update_application_settings( body_content = self._serialize.body(app_settings, 'StringDictionary') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1263,7 +1255,7 @@ def list_application_settings( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1272,8 +1264,8 @@ def list_application_settings( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1331,6 +1323,7 @@ def update_auth_settings( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -1343,9 +1336,8 @@ def update_auth_settings( body_content = self._serialize.body(site_auth_settings, 'SiteAuthSettings') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1399,7 +1391,7 @@ def get_auth_settings( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1408,8 +1400,8 @@ def get_auth_settings( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1426,6 +1418,147 @@ def get_auth_settings( return deserialized get_auth_settings.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/authsettings/list'} + def update_azure_storage_accounts( + self, resource_group_name, name, kind=None, properties=None, custom_headers=None, raw=False, **operation_config): + """Updates the Azure storage account configurations of an app. + + Updates the Azure storage account configurations of an app. + + :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. + :type name: str + :param kind: Kind of resource. + :type kind: str + :param properties: Azure storage accounts. + :type properties: dict[str, + ~azure.mgmt.web.models.AzureStorageInfoValue] + :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: AzureStoragePropertyDictionaryResource or ClientRawResponse + if raw=true + :rtype: ~azure.mgmt.web.models.AzureStoragePropertyDictionaryResource + or ~msrest.pipeline.ClientRawResponse + :raises: + :class:`DefaultErrorResponseException` + """ + azure_storage_accounts = models.AzureStoragePropertyDictionaryResource(kind=kind, properties=properties) + + # Construct URL + url = self.update_azure_storage_accounts.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['Accept'] = 'application/json' + 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(azure_storage_accounts, 'AzureStoragePropertyDictionaryResource') + + # Construct and send request + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + raise models.DefaultErrorResponseException(self._deserialize, response) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('AzureStoragePropertyDictionaryResource', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + update_azure_storage_accounts.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/azurestorageaccounts'} + + def list_azure_storage_accounts( + self, resource_group_name, name, custom_headers=None, raw=False, **operation_config): + """Gets the Azure storage account configurations of an app. + + Gets the Azure storage account configurations of an app. + + :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. + :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: AzureStoragePropertyDictionaryResource or ClientRawResponse + if raw=true + :rtype: ~azure.mgmt.web.models.AzureStoragePropertyDictionaryResource + or ~msrest.pipeline.ClientRawResponse + :raises: + :class:`DefaultErrorResponseException` + """ + # Construct URL + url = self.list_azure_storage_accounts.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['Accept'] = 'application/json' + 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, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + raise models.DefaultErrorResponseException(self._deserialize, response) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('AzureStoragePropertyDictionaryResource', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + list_azure_storage_accounts.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/azurestorageaccounts/list'} + def update_backup_configuration( self, resource_group_name, name, request, custom_headers=None, raw=False, **operation_config): """Updates the backup configuration of an app. @@ -1465,6 +1598,7 @@ def update_backup_configuration( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -1477,9 +1611,8 @@ def update_backup_configuration( body_content = self._serialize.body(request, 'BackupRequest') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1531,7 +1664,6 @@ def delete_backup_configuration( # 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: @@ -1540,8 +1672,8 @@ def delete_backup_configuration( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) @@ -1590,7 +1722,7 @@ def get_backup_configuration( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1599,8 +1731,8 @@ def get_backup_configuration( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1661,6 +1793,7 @@ def update_connection_strings( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -1673,9 +1806,8 @@ def update_connection_strings( body_content = self._serialize.body(connection_strings, 'ConnectionStringDictionary') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1729,7 +1861,7 @@ def list_connection_strings( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1738,8 +1870,8 @@ def list_connection_strings( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1793,7 +1925,7 @@ def get_diagnostic_logs_configuration( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1802,8 +1934,8 @@ def get_diagnostic_logs_configuration( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1860,6 +1992,7 @@ def update_diagnostic_logs_config( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -1872,9 +2005,8 @@ def update_diagnostic_logs_config( body_content = self._serialize.body(site_logs_config, 'SiteLogsConfig') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1934,6 +2066,7 @@ def update_metadata( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -1946,9 +2079,8 @@ def update_metadata( body_content = self._serialize.body(metadata, 'StringDictionary') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -2002,7 +2134,7 @@ def list_metadata( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -2011,8 +2143,8 @@ def list_metadata( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -2047,7 +2179,7 @@ def _list_publishing_credentials_initial( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -2056,8 +2188,8 @@ def _list_publishing_credentials_initial( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -2163,6 +2295,7 @@ def update_site_push_settings( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -2175,9 +2308,8 @@ def update_site_push_settings( body_content = self._serialize.body(push_settings, 'PushSettings') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -2231,7 +2363,7 @@ def list_site_push_settings( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -2240,8 +2372,8 @@ def list_site_push_settings( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -2297,7 +2429,7 @@ def list_slot_configuration_names( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -2306,8 +2438,8 @@ def list_slot_configuration_names( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -2367,6 +2499,7 @@ def update_slot_configuration_names( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -2379,9 +2512,8 @@ def update_slot_configuration_names( body_content = self._serialize.body(slot_config_names, 'SlotConfigNamesResource') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -2435,7 +2567,7 @@ def get_swift_virtual_network_connection( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -2444,8 +2576,8 @@ def get_swift_virtual_network_connection( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -2508,6 +2640,7 @@ def create_or_update_swift_virtual_network_connection( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -2520,9 +2653,8 @@ def create_or_update_swift_virtual_network_connection( body_content = self._serialize.body(connection_envelope, 'SwiftVirtualNetwork') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -2576,7 +2708,6 @@ def delete_swift_virtual_network( # 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: @@ -2585,8 +2716,8 @@ def delete_swift_virtual_network( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -2644,6 +2775,7 @@ def update_swift_virtual_network_connection( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -2656,9 +2788,8 @@ def update_swift_virtual_network_connection( body_content = self._serialize.body(connection_envelope, 'SwiftVirtualNetwork') # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -2714,7 +2845,7 @@ def get_configuration( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -2723,8 +2854,8 @@ def get_configuration( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -2781,6 +2912,7 @@ def create_or_update_configuration( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -2793,9 +2925,8 @@ def create_or_update_configuration( body_content = self._serialize.body(site_config, 'SiteConfigResource') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -2852,6 +2983,7 @@ def update_configuration( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -2864,9 +2996,8 @@ def update_configuration( body_content = self._serialize.body(site_config, 'SiteConfigResource') # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -2929,7 +3060,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -2938,9 +3069,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -3000,7 +3130,7 @@ def get_configuration_snapshot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -3009,8 +3139,8 @@ def get_configuration_snapshot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -3065,7 +3195,6 @@ def recover_site_configuration_snapshot( # 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: @@ -3074,8 +3203,8 @@ def recover_site_configuration_snapshot( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [204]: exp = CloudError(response) @@ -3127,7 +3256,7 @@ def get_web_site_container_logs( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/octet-stream' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -3136,8 +3265,8 @@ def get_web_site_container_logs( 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=True, **operation_config) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=True, **operation_config) if response.status_code not in [200, 204]: exp = CloudError(response) @@ -3196,7 +3325,7 @@ def get_container_logs_zip( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/zip' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -3205,8 +3334,8 @@ def get_container_logs_zip( 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=True, **operation_config) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=True, **operation_config) if response.status_code not in [200, 204]: exp = CloudError(response) @@ -3269,7 +3398,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -3278,9 +3407,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -3337,7 +3465,7 @@ def get_continuous_web_job( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -3346,8 +3474,8 @@ def get_continuous_web_job( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -3404,7 +3532,6 @@ def delete_continuous_web_job( # 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: @@ -3413,8 +3540,8 @@ def delete_continuous_web_job( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 204]: exp = CloudError(response) @@ -3464,7 +3591,6 @@ def start_continuous_web_job( # 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: @@ -3473,8 +3599,8 @@ def start_continuous_web_job( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -3524,7 +3650,6 @@ def stop_continuous_web_job( # 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: @@ -3533,8 +3658,8 @@ def stop_continuous_web_job( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -3590,7 +3715,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -3599,9 +3724,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -3659,7 +3783,7 @@ def get_deployment( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -3668,8 +3792,8 @@ def get_deployment( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -3728,6 +3852,7 @@ def create_deployment( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -3740,9 +3865,8 @@ def create_deployment( body_content = self._serialize.body(deployment, 'Deployment') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -3797,7 +3921,6 @@ def delete_deployment( # 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: @@ -3806,8 +3929,8 @@ def delete_deployment( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 204]: exp = CloudError(response) @@ -3863,7 +3986,7 @@ def list_deployment_log( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -3872,8 +3995,8 @@ def list_deployment_log( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -3934,6 +4057,7 @@ def discover_backup( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -3946,9 +4070,8 @@ def discover_backup( body_content = self._serialize.body(request, 'RestoreRequest') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -4009,7 +4132,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -4018,9 +4141,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -4079,7 +4201,7 @@ def get_domain_ownership_identifier( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -4088,8 +4210,8 @@ def get_domain_ownership_identifier( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -4155,6 +4277,7 @@ def create_or_update_domain_ownership_identifier( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -4167,9 +4290,8 @@ def create_or_update_domain_ownership_identifier( body_content = self._serialize.body(domain_ownership_identifier, 'Identifier') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -4225,7 +4347,6 @@ def delete_domain_ownership_identifier( # 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: @@ -4234,8 +4355,8 @@ def delete_domain_ownership_identifier( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 204]: exp = CloudError(response) @@ -4296,6 +4417,7 @@ def update_domain_ownership_identifier( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -4308,9 +4430,8 @@ def update_domain_ownership_identifier( body_content = self._serialize.body(domain_ownership_identifier, 'Identifier') # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -4364,7 +4485,7 @@ def get_ms_deploy_status( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -4373,8 +4494,8 @@ def get_ms_deploy_status( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -4409,6 +4530,7 @@ def _create_ms_deploy_operation_initial( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -4421,9 +4543,8 @@ def _create_ms_deploy_operation_initial( body_content = self._serialize.body(ms_deploy, 'MSDeploy') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [201, 409]: exp = CloudError(response) @@ -4530,7 +4651,7 @@ def get_ms_deploy_log( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -4539,8 +4660,8 @@ def get_ms_deploy_log( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -4602,7 +4723,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -4611,9 +4732,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -4669,7 +4789,7 @@ def get_functions_admin_token( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -4678,8 +4798,8 @@ def get_functions_admin_token( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -4735,7 +4855,7 @@ def get_function( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -4744,8 +4864,8 @@ def get_function( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -4783,6 +4903,7 @@ def _create_function_initial( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -4795,9 +4916,8 @@ def _create_function_initial( body_content = self._serialize.body(function_envelope, 'FunctionEnvelope') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [201]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -4908,7 +5028,6 @@ def delete_function( # 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: @@ -4917,8 +5036,8 @@ def delete_function( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [204, 404]: exp = CloudError(response) @@ -4972,7 +5091,7 @@ def list_function_secrets( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -4981,8 +5100,8 @@ def list_function_secrets( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -5043,7 +5162,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -5052,9 +5171,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -5114,7 +5232,7 @@ def get_host_name_binding( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -5123,8 +5241,8 @@ def get_host_name_binding( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -5184,6 +5302,7 @@ def create_or_update_host_name_binding( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -5196,9 +5315,8 @@ def create_or_update_host_name_binding( body_content = self._serialize.body(host_name_binding, 'HostNameBinding') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -5253,7 +5371,6 @@ def delete_host_name_binding( # 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: @@ -5262,8 +5379,8 @@ def delete_host_name_binding( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 204]: exp = CloudError(response) @@ -5320,7 +5437,7 @@ def get_hybrid_connection( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -5329,8 +5446,8 @@ def get_hybrid_connection( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -5392,6 +5509,7 @@ def create_or_update_hybrid_connection( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -5404,9 +5522,8 @@ def create_or_update_hybrid_connection( body_content = self._serialize.body(connection_envelope, 'HybridConnection') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -5464,7 +5581,6 @@ def delete_hybrid_connection( # 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: @@ -5473,8 +5589,8 @@ def delete_hybrid_connection( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -5531,6 +5647,7 @@ def update_hybrid_connection( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -5543,9 +5660,8 @@ def update_hybrid_connection( body_content = self._serialize.body(connection_envelope, 'HybridConnection') # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -5605,7 +5721,7 @@ def list_hybrid_connection_keys( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -5614,8 +5730,8 @@ def list_hybrid_connection_keys( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -5669,7 +5785,7 @@ def list_hybrid_connections( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -5678,8 +5794,8 @@ def list_hybrid_connections( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -5735,7 +5851,7 @@ def list_relay_service_connections( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -5744,8 +5860,8 @@ def list_relay_service_connections( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -5802,7 +5918,7 @@ def get_relay_service_connection( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -5811,8 +5927,8 @@ def get_relay_service_connection( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -5875,6 +5991,7 @@ def create_or_update_relay_service_connection( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -5887,9 +6004,8 @@ def create_or_update_relay_service_connection( body_content = self._serialize.body(connection_envelope, 'RelayServiceConnectionEntity') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -5944,7 +6060,6 @@ def delete_relay_service_connection( # 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: @@ -5953,8 +6068,8 @@ def delete_relay_service_connection( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -6012,6 +6127,7 @@ def update_relay_service_connection( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -6024,9 +6140,8 @@ def update_relay_service_connection( body_content = self._serialize.body(connection_envelope, 'RelayServiceConnectionEntity') # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -6087,7 +6202,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -6096,9 +6211,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -6156,7 +6270,7 @@ def get_instance_ms_deploy_status( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -6165,8 +6279,8 @@ def get_instance_ms_deploy_status( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -6202,6 +6316,7 @@ def _create_instance_ms_deploy_operation_initial( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -6214,9 +6329,8 @@ def _create_instance_ms_deploy_operation_initial( body_content = self._serialize.body(ms_deploy, 'MSDeploy') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [201, 409]: exp = CloudError(response) @@ -6329,7 +6443,7 @@ def get_instance_ms_deploy_log( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -6338,8 +6452,8 @@ def get_instance_ms_deploy_log( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -6408,7 +6522,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -6417,9 +6531,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -6485,7 +6598,7 @@ def get_instance_process( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -6494,8 +6607,8 @@ def get_instance_process( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -6559,7 +6672,6 @@ def delete_instance_process( # 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: @@ -6568,8 +6680,8 @@ def delete_instance_process( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [204, 404]: exp = CloudError(response) @@ -6631,7 +6743,7 @@ def get_instance_process_dump( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -6640,8 +6752,8 @@ def get_instance_process_dump( 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=True, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=True, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -6713,7 +6825,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -6722,9 +6834,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -6793,7 +6904,7 @@ def get_instance_process_module( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -6802,8 +6913,8 @@ def get_instance_process_module( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -6875,7 +6986,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -6884,9 +6995,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -6955,7 +7065,7 @@ def get_instance_process_thread( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -6964,8 +7074,8 @@ def get_instance_process_thread( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -7023,7 +7133,7 @@ def is_cloneable( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -7032,8 +7142,8 @@ def is_cloneable( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -7087,7 +7197,7 @@ def list_sync_function_triggers( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -7096,8 +7206,8 @@ def list_sync_function_triggers( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -7160,7 +7270,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -7169,9 +7279,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -7246,7 +7355,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -7255,9 +7364,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -7294,6 +7402,7 @@ def _migrate_storage_initial( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -7306,9 +7415,8 @@ def _migrate_storage_initial( body_content = self._serialize.body(migration_options, 'StorageMigrationOptions') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -7401,6 +7509,7 @@ def _migrate_my_sql_initial( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -7413,9 +7522,8 @@ def _migrate_my_sql_initial( body_content = self._serialize.body(migration_request_envelope, 'MigrateMySqlRequest') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -7525,7 +7633,7 @@ def get_migrate_my_sql_status( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -7534,8 +7642,8 @@ def get_migrate_my_sql_status( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -7594,7 +7702,7 @@ def list_network_features( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -7603,8 +7711,8 @@ def list_network_features( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -7671,7 +7779,7 @@ def start_web_site_network_trace( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -7680,8 +7788,8 @@ def start_web_site_network_trace( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -7734,7 +7842,7 @@ def stop_web_site_network_trace( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -7743,8 +7851,8 @@ def stop_web_site_network_trace( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -7798,7 +7906,6 @@ def generate_new_site_publishing_password( # 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: @@ -7807,8 +7914,8 @@ def generate_new_site_publishing_password( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 204]: exp = CloudError(response) @@ -7871,7 +7978,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -7880,9 +7987,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -7937,7 +8043,7 @@ def get_site_php_error_log_flag( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -7946,8 +8052,8 @@ def get_site_php_error_log_flag( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -8001,7 +8107,7 @@ def list_premier_add_ons( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -8010,8 +8116,8 @@ def list_premier_add_ons( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -8068,7 +8174,7 @@ def get_premier_add_on( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -8077,8 +8183,8 @@ def get_premier_add_on( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -8138,6 +8244,7 @@ def add_premier_add_on( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -8150,9 +8257,8 @@ def add_premier_add_on( body_content = self._serialize.body(premier_add_on, 'PremierAddOn') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -8207,7 +8313,6 @@ def delete_premier_add_on( # 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: @@ -8216,8 +8321,8 @@ def delete_premier_add_on( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) @@ -8272,6 +8377,7 @@ def update_premier_add_on( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -8284,9 +8390,8 @@ def update_premier_add_on( body_content = self._serialize.body(premier_add_on, 'PremierAddOnPatchResource') # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -8342,7 +8447,7 @@ def get_private_access( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -8351,8 +8456,8 @@ def get_private_access( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -8410,6 +8515,7 @@ def put_private_access_vnet( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -8422,9 +8528,8 @@ def put_private_access_vnet( body_content = self._serialize.body(access, 'PrivateAccess') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -8486,7 +8591,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -8495,9 +8600,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -8558,7 +8662,7 @@ def get_process( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -8567,8 +8671,8 @@ def get_process( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -8627,7 +8731,6 @@ def delete_process( # 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: @@ -8636,8 +8739,8 @@ def delete_process( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [204, 404]: exp = CloudError(response) @@ -8694,7 +8797,7 @@ def get_process_dump( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -8703,8 +8806,8 @@ def get_process_dump( 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=True, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=True, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -8771,7 +8874,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -8780,9 +8883,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -8846,7 +8948,7 @@ def get_process_module( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -8855,8 +8957,8 @@ def get_process_module( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -8923,7 +9025,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -8932,9 +9034,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -8998,7 +9099,7 @@ def get_process_thread( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -9007,8 +9108,8 @@ def get_process_thread( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -9071,7 +9172,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -9080,9 +9181,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -9142,7 +9242,7 @@ def get_public_certificate( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -9151,8 +9251,8 @@ def get_public_certificate( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -9212,6 +9312,7 @@ def create_or_update_public_certificate( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -9224,9 +9325,8 @@ def create_or_update_public_certificate( body_content = self._serialize.body(public_certificate, 'PublicCertificate') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -9281,7 +9381,6 @@ def delete_public_certificate( # 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: @@ -9290,8 +9389,8 @@ def delete_public_certificate( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 204]: exp = CloudError(response) @@ -9304,7 +9403,7 @@ def delete_public_certificate( delete_public_certificate.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/publicCertificates/{publicCertificateName}'} def list_publishing_profile_xml_with_secrets( - self, resource_group_name, name, format=None, custom_headers=None, raw=False, callback=None, **operation_config): + self, resource_group_name, name, format=None, include_disaster_recovery_endpoints=None, custom_headers=None, raw=False, callback=None, **operation_config): """Gets the publishing profile for an app (or deployment slot, if specified). @@ -9321,6 +9420,9 @@ def list_publishing_profile_xml_with_secrets( WebDeploy -- default Ftp. Possible values include: 'FileZilla3', 'WebDeploy', 'Ftp' :type format: str or ~azure.mgmt.web.models.PublishingProfileFormat + :param include_disaster_recovery_endpoints: Include the + DisasterRecover endpoint if true + :type include_disaster_recovery_endpoints: bool :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -9336,7 +9438,7 @@ def list_publishing_profile_xml_with_secrets( :raises: :class:`DefaultErrorResponseException` """ - publishing_profile_options = models.CsmPublishingProfileOptions(format=format) + publishing_profile_options = models.CsmPublishingProfileOptions(format=format, include_disaster_recovery_endpoints=include_disaster_recovery_endpoints) # Construct URL url = self.list_publishing_profile_xml_with_secrets.metadata['url'] @@ -9353,6 +9455,7 @@ def list_publishing_profile_xml_with_secrets( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/xml' 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()) @@ -9365,9 +9468,8 @@ def list_publishing_profile_xml_with_secrets( body_content = self._serialize.body(publishing_profile_options, 'CsmPublishingProfileOptions') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=True, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=True, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -9421,7 +9523,6 @@ def reset_production_slot_config( # 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: @@ -9430,8 +9531,8 @@ def reset_production_slot_config( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) @@ -9490,7 +9591,6 @@ def restart( # 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: @@ -9499,8 +9599,8 @@ def restart( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) @@ -9542,9 +9642,8 @@ def _restore_from_backup_blob_initial( body_content = self._serialize.body(request, 'RestoreRequest') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202]: exp = CloudError(response) @@ -9632,9 +9731,8 @@ def _restore_from_deleted_app_initial( body_content = self._serialize.body(restore_request, 'DeletedAppRestoreRequest') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202]: exp = CloudError(response) @@ -9722,9 +9820,8 @@ def _restore_snapshot_initial( body_content = self._serialize.body(restore_request, 'SnapshotRestoreRequest') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202]: exp = CloudError(response) @@ -9827,7 +9924,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -9836,9 +9933,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -9899,7 +9995,7 @@ def get_site_extension( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -9908,8 +10004,8 @@ def get_site_extension( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -9947,7 +10043,7 @@ def _install_site_extension_initial( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -9956,8 +10052,8 @@ def _install_site_extension_initial( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 201, 429]: exp = CloudError(response) @@ -10068,7 +10164,6 @@ def delete_site_extension( # 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: @@ -10077,8 +10172,8 @@ def delete_site_extension( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [204, 404]: exp = CloudError(response) @@ -10133,7 +10228,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -10142,9 +10237,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -10202,7 +10296,7 @@ def get_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -10211,8 +10305,8 @@ def get_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -10250,6 +10344,7 @@ def _create_or_update_slot_initial( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -10262,9 +10357,8 @@ def _create_or_update_slot_initial( body_content = self._serialize.body(site_envelope, 'Site') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -10393,7 +10487,6 @@ def delete_slot( # 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: @@ -10402,8 +10495,8 @@ def delete_slot( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 204, 404]: exp = CloudError(response) @@ -10462,6 +10555,7 @@ def update_slot( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -10474,9 +10568,8 @@ def update_slot( body_content = self._serialize.body(site_envelope, 'SitePatchResource') # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -10540,7 +10633,7 @@ def analyze_custom_hostname_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -10549,8 +10642,8 @@ def analyze_custom_hostname_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -10627,9 +10720,8 @@ def apply_slot_configuration_slot( body_content = self._serialize.body(slot_swap_entity, 'CsmSlotEntity') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) @@ -10685,6 +10777,7 @@ def backup_slot( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -10697,9 +10790,8 @@ def backup_slot( body_content = self._serialize.body(request, 'BackupRequest') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -10764,7 +10856,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -10773,9 +10865,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -10837,7 +10928,7 @@ def get_backup_status_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -10846,8 +10937,8 @@ def get_backup_status_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -10906,7 +10997,6 @@ def delete_backup_slot( # 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: @@ -10915,8 +11005,8 @@ def delete_backup_slot( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -10980,6 +11070,7 @@ def list_backup_status_secrets_slot( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -10992,9 +11083,8 @@ def list_backup_status_secrets_slot( body_content = self._serialize.body(request, 'BackupRequest') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -11043,9 +11133,8 @@ def _restore_slot_initial( body_content = self._serialize.body(request, 'RestoreRequest') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202]: exp = CloudError(response) @@ -11160,7 +11249,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -11169,9 +11258,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -11236,6 +11324,7 @@ def update_application_settings_slot( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -11248,9 +11337,8 @@ def update_application_settings_slot( body_content = self._serialize.body(app_settings, 'StringDictionary') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -11308,7 +11396,7 @@ def list_application_settings_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -11317,8 +11405,8 @@ def list_application_settings_slot( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -11380,6 +11468,7 @@ def update_auth_settings_slot( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -11392,9 +11481,8 @@ def update_auth_settings_slot( body_content = self._serialize.body(site_auth_settings, 'SiteAuthSettings') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -11452,7 +11540,7 @@ def get_auth_settings_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -11461,8 +11549,8 @@ def get_auth_settings_slot( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -11479,6 +11567,157 @@ def get_auth_settings_slot( return deserialized get_auth_settings_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/authsettings/list'} + def update_azure_storage_accounts_slot( + self, resource_group_name, name, slot, kind=None, properties=None, custom_headers=None, raw=False, **operation_config): + """Updates the Azure storage account configurations of an app. + + Updates the Azure storage account configurations of an app. + + :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. + :type name: str + :param slot: Name of the deployment slot. If a slot is not specified, + the API will update the Azure storage account configurations for the + production slot. + :type slot: str + :param kind: Kind of resource. + :type kind: str + :param properties: Azure storage accounts. + :type properties: dict[str, + ~azure.mgmt.web.models.AzureStorageInfoValue] + :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: AzureStoragePropertyDictionaryResource or ClientRawResponse + if raw=true + :rtype: ~azure.mgmt.web.models.AzureStoragePropertyDictionaryResource + or ~msrest.pipeline.ClientRawResponse + :raises: + :class:`DefaultErrorResponseException` + """ + azure_storage_accounts = models.AzureStoragePropertyDictionaryResource(kind=kind, properties=properties) + + # Construct URL + url = self.update_azure_storage_accounts_slot.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'), + 'slot': self._serialize.url("slot", slot, '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['Accept'] = 'application/json' + 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(azure_storage_accounts, 'AzureStoragePropertyDictionaryResource') + + # Construct and send request + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + raise models.DefaultErrorResponseException(self._deserialize, response) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('AzureStoragePropertyDictionaryResource', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + update_azure_storage_accounts_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/azurestorageaccounts'} + + def list_azure_storage_accounts_slot( + self, resource_group_name, name, slot, custom_headers=None, raw=False, **operation_config): + """Gets the Azure storage account configurations of an app. + + Gets the Azure storage account configurations of an app. + + :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. + :type name: str + :param slot: Name of the deployment slot. If a slot is not specified, + the API will update the Azure storage account configurations for the + production slot. + :type slot: 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: AzureStoragePropertyDictionaryResource or ClientRawResponse + if raw=true + :rtype: ~azure.mgmt.web.models.AzureStoragePropertyDictionaryResource + or ~msrest.pipeline.ClientRawResponse + :raises: + :class:`DefaultErrorResponseException` + """ + # Construct URL + url = self.list_azure_storage_accounts_slot.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'), + 'slot': self._serialize.url("slot", slot, '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['Accept'] = 'application/json' + 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, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + raise models.DefaultErrorResponseException(self._deserialize, response) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('AzureStoragePropertyDictionaryResource', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + list_azure_storage_accounts_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/azurestorageaccounts/list'} + def update_backup_configuration_slot( self, resource_group_name, name, request, slot, custom_headers=None, raw=False, **operation_config): """Updates the backup configuration of an app. @@ -11522,6 +11761,7 @@ def update_backup_configuration_slot( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -11534,9 +11774,8 @@ def update_backup_configuration_slot( body_content = self._serialize.body(request, 'BackupRequest') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -11592,7 +11831,6 @@ def delete_backup_configuration_slot( # 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: @@ -11601,8 +11839,8 @@ def delete_backup_configuration_slot( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) @@ -11655,7 +11893,7 @@ def get_backup_configuration_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -11664,8 +11902,8 @@ def get_backup_configuration_slot( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -11730,6 +11968,7 @@ def update_connection_strings_slot( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -11742,9 +11981,8 @@ def update_connection_strings_slot( body_content = self._serialize.body(connection_strings, 'ConnectionStringDictionary') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -11802,7 +12040,7 @@ def list_connection_strings_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -11811,8 +12049,8 @@ def list_connection_strings_slot( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -11870,7 +12108,7 @@ def get_diagnostic_logs_configuration_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -11879,8 +12117,8 @@ def get_diagnostic_logs_configuration_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -11941,6 +12179,7 @@ def update_diagnostic_logs_config_slot( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -11953,9 +12192,8 @@ def update_diagnostic_logs_config_slot( body_content = self._serialize.body(site_logs_config, 'SiteLogsConfig') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -12019,6 +12257,7 @@ def update_metadata_slot( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -12031,9 +12270,8 @@ def update_metadata_slot( body_content = self._serialize.body(metadata, 'StringDictionary') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -12091,7 +12329,7 @@ def list_metadata_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -12100,8 +12338,8 @@ def list_metadata_slot( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -12137,7 +12375,7 @@ def _list_publishing_credentials_slot_initial( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -12146,8 +12384,8 @@ def _list_publishing_credentials_slot_initial( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -12261,6 +12499,7 @@ def update_site_push_settings_slot( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -12273,9 +12512,8 @@ def update_site_push_settings_slot( body_content = self._serialize.body(push_settings, 'PushSettings') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -12333,7 +12571,7 @@ def list_site_push_settings_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -12342,8 +12580,8 @@ def list_site_push_settings_slot( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -12401,7 +12639,7 @@ def get_swift_virtual_network_connection_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -12410,8 +12648,8 @@ def get_swift_virtual_network_connection_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -12478,6 +12716,7 @@ def create_or_update_swift_virtual_network_connection_slot( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -12490,9 +12729,8 @@ def create_or_update_swift_virtual_network_connection_slot( body_content = self._serialize.body(connection_envelope, 'SwiftVirtualNetwork') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -12550,7 +12788,6 @@ def delete_swift_virtual_network_slot( # 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: @@ -12559,8 +12796,8 @@ def delete_swift_virtual_network_slot( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -12622,6 +12859,7 @@ def update_swift_virtual_network_connection_slot( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -12634,9 +12872,8 @@ def update_swift_virtual_network_connection_slot( body_content = self._serialize.body(connection_envelope, 'SwiftVirtualNetwork') # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -12696,7 +12933,7 @@ def get_configuration_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -12705,8 +12942,8 @@ def get_configuration_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -12767,6 +13004,7 @@ def create_or_update_configuration_slot( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -12779,9 +13017,8 @@ def create_or_update_configuration_slot( body_content = self._serialize.body(site_config, 'SiteConfigResource') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -12842,6 +13079,7 @@ def update_configuration_slot( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -12854,9 +13092,8 @@ def update_configuration_slot( body_content = self._serialize.body(site_config, 'SiteConfigResource') # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -12923,7 +13160,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -12932,9 +13169,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -12998,7 +13234,7 @@ def get_configuration_snapshot_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -13007,8 +13243,8 @@ def get_configuration_snapshot_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -13067,7 +13303,6 @@ def recover_site_configuration_snapshot_slot( # 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: @@ -13076,8 +13311,8 @@ def recover_site_configuration_snapshot_slot( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [204]: exp = CloudError(response) @@ -13133,7 +13368,7 @@ def get_web_site_container_logs_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/octet-stream' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -13142,8 +13377,8 @@ def get_web_site_container_logs_slot( 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=True, **operation_config) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=True, **operation_config) if response.status_code not in [200, 204]: exp = CloudError(response) @@ -13206,7 +13441,7 @@ def get_container_logs_zip_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/zip' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -13215,8 +13450,8 @@ def get_container_logs_zip_slot( 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=True, **operation_config) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=True, **operation_config) if response.status_code not in [200, 204]: exp = CloudError(response) @@ -13283,7 +13518,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -13292,9 +13527,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -13355,7 +13589,7 @@ def get_continuous_web_job_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -13364,8 +13598,8 @@ def get_continuous_web_job_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -13426,7 +13660,6 @@ def delete_continuous_web_job_slot( # 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: @@ -13435,8 +13668,8 @@ def delete_continuous_web_job_slot( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 204]: exp = CloudError(response) @@ -13490,7 +13723,6 @@ def start_continuous_web_job_slot( # 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: @@ -13499,8 +13731,8 @@ def start_continuous_web_job_slot( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -13554,7 +13786,6 @@ def stop_continuous_web_job_slot( # 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: @@ -13563,8 +13794,8 @@ def stop_continuous_web_job_slot( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -13624,7 +13855,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -13633,9 +13864,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -13697,7 +13927,7 @@ def get_deployment_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -13706,8 +13936,8 @@ def get_deployment_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -13770,6 +14000,7 @@ def create_deployment_slot( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -13782,9 +14013,8 @@ def create_deployment_slot( body_content = self._serialize.body(deployment, 'Deployment') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -13843,7 +14073,6 @@ def delete_deployment_slot( # 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: @@ -13852,8 +14081,8 @@ def delete_deployment_slot( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 204]: exp = CloudError(response) @@ -13913,7 +14142,7 @@ def list_deployment_log_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -13922,8 +14151,8 @@ def list_deployment_log_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -13988,6 +14217,7 @@ def discover_backup_slot( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -14000,9 +14230,8 @@ def discover_backup_slot( body_content = self._serialize.body(request, 'RestoreRequest') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -14067,7 +14296,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -14076,9 +14305,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -14141,7 +14369,7 @@ def get_domain_ownership_identifier_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -14150,8 +14378,8 @@ def get_domain_ownership_identifier_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -14221,6 +14449,7 @@ def create_or_update_domain_ownership_identifier_slot( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -14233,9 +14462,8 @@ def create_or_update_domain_ownership_identifier_slot( body_content = self._serialize.body(domain_ownership_identifier, 'Identifier') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -14295,7 +14523,6 @@ def delete_domain_ownership_identifier_slot( # 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: @@ -14304,8 +14531,8 @@ def delete_domain_ownership_identifier_slot( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 204]: exp = CloudError(response) @@ -14370,6 +14597,7 @@ def update_domain_ownership_identifier_slot( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -14382,9 +14610,8 @@ def update_domain_ownership_identifier_slot( body_content = self._serialize.body(domain_ownership_identifier, 'Identifier') # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -14442,7 +14669,7 @@ def get_ms_deploy_status_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -14451,8 +14678,8 @@ def get_ms_deploy_status_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -14488,6 +14715,7 @@ def _create_ms_deploy_operation_slot_initial( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -14500,9 +14728,8 @@ def _create_ms_deploy_operation_slot_initial( body_content = self._serialize.body(ms_deploy, 'MSDeploy') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [201, 409]: exp = CloudError(response) @@ -14617,7 +14844,7 @@ def get_ms_deploy_log_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -14626,8 +14853,8 @@ def get_ms_deploy_log_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -14693,7 +14920,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -14702,9 +14929,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -14764,7 +14990,7 @@ def get_functions_admin_token_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -14773,8 +14999,8 @@ def get_functions_admin_token_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -14834,7 +15060,7 @@ def get_instance_function_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -14843,8 +15069,8 @@ def get_instance_function_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -14883,6 +15109,7 @@ def _create_instance_function_slot_initial( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -14895,9 +15122,8 @@ def _create_instance_function_slot_initial( body_content = self._serialize.body(function_envelope, 'FunctionEnvelope') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [201]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -15016,7 +15242,6 @@ def delete_instance_function_slot( # 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: @@ -15025,8 +15250,8 @@ def delete_instance_function_slot( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [204, 404]: exp = CloudError(response) @@ -15084,7 +15309,7 @@ def list_function_secrets_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -15093,8 +15318,8 @@ def list_function_secrets_slot( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -15159,7 +15384,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -15168,9 +15393,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -15234,7 +15458,7 @@ def get_host_name_binding_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -15243,8 +15467,8 @@ def get_host_name_binding_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -15308,6 +15532,7 @@ def create_or_update_host_name_binding_slot( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -15320,9 +15545,8 @@ def create_or_update_host_name_binding_slot( body_content = self._serialize.body(host_name_binding, 'HostNameBinding') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -15381,7 +15605,6 @@ def delete_host_name_binding_slot( # 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: @@ -15390,8 +15613,8 @@ def delete_host_name_binding_slot( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 204]: exp = CloudError(response) @@ -15451,7 +15674,7 @@ def get_hybrid_connection_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -15460,8 +15683,8 @@ def get_hybrid_connection_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -15526,6 +15749,7 @@ def create_or_update_hybrid_connection_slot( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -15538,9 +15762,8 @@ def create_or_update_hybrid_connection_slot( body_content = self._serialize.body(connection_envelope, 'HybridConnection') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -15601,7 +15824,6 @@ def delete_hybrid_connection_slot( # 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: @@ -15610,8 +15832,8 @@ def delete_hybrid_connection_slot( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -15671,6 +15893,7 @@ def update_hybrid_connection_slot( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -15683,9 +15906,8 @@ def update_hybrid_connection_slot( body_content = self._serialize.body(connection_envelope, 'HybridConnection') # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -15748,7 +15970,7 @@ def list_hybrid_connection_keys_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -15757,8 +15979,8 @@ def list_hybrid_connection_keys_slot( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -15815,7 +16037,7 @@ def list_hybrid_connections_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -15824,8 +16046,8 @@ def list_hybrid_connections_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -15885,7 +16107,7 @@ def list_relay_service_connections_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -15894,8 +16116,8 @@ def list_relay_service_connections_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -15956,7 +16178,7 @@ def get_relay_service_connection_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -15965,8 +16187,8 @@ def get_relay_service_connection_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -16034,6 +16256,7 @@ def create_or_update_relay_service_connection_slot( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -16046,9 +16269,8 @@ def create_or_update_relay_service_connection_slot( body_content = self._serialize.body(connection_envelope, 'RelayServiceConnectionEntity') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -16107,7 +16329,6 @@ def delete_relay_service_connection_slot( # 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: @@ -16116,8 +16337,8 @@ def delete_relay_service_connection_slot( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -16180,6 +16401,7 @@ def update_relay_service_connection_slot( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -16192,9 +16414,8 @@ def update_relay_service_connection_slot( body_content = self._serialize.body(connection_envelope, 'RelayServiceConnectionEntity') # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -16259,7 +16480,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -16268,9 +16489,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -16332,7 +16552,7 @@ def get_instance_ms_deploy_status_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -16341,8 +16561,8 @@ def get_instance_ms_deploy_status_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -16379,6 +16599,7 @@ def _create_instance_ms_deploy_operation_slot_initial( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -16391,9 +16612,8 @@ def _create_instance_ms_deploy_operation_slot_initial( body_content = self._serialize.body(ms_deploy, 'MSDeploy') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [201, 409]: exp = CloudError(response) @@ -16514,7 +16734,7 @@ def get_instance_ms_deploy_log_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -16523,8 +16743,8 @@ def get_instance_ms_deploy_log_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -16597,7 +16817,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -16606,9 +16826,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -16678,7 +16897,7 @@ def get_instance_process_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -16687,8 +16906,8 @@ def get_instance_process_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -16756,7 +16975,6 @@ def delete_instance_process_slot( # 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: @@ -16765,8 +16983,8 @@ def delete_instance_process_slot( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [204, 404]: exp = CloudError(response) @@ -16832,7 +17050,7 @@ def get_instance_process_dump_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -16841,8 +17059,8 @@ def get_instance_process_dump_slot( 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=True, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=True, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -16918,7 +17136,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -16927,9 +17145,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -17002,7 +17219,7 @@ def get_instance_process_module_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -17011,8 +17228,8 @@ def get_instance_process_module_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -17088,7 +17305,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -17097,9 +17314,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -17172,7 +17388,7 @@ def get_instance_process_thread_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -17181,8 +17397,8 @@ def get_instance_process_thread_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -17244,7 +17460,7 @@ def is_cloneable_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -17253,8 +17469,8 @@ def is_cloneable_slot( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -17312,7 +17528,7 @@ def list_sync_function_triggers_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -17321,8 +17537,8 @@ def list_sync_function_triggers_slot( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -17389,7 +17605,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -17398,9 +17614,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -17479,7 +17694,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -17488,9 +17703,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -17550,7 +17764,7 @@ def get_migrate_my_sql_status_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -17559,8 +17773,8 @@ def get_migrate_my_sql_status_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -17623,7 +17837,7 @@ def list_network_features_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -17632,8 +17846,8 @@ def list_network_features_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -17703,7 +17917,7 @@ def start_web_site_network_trace_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -17712,8 +17926,8 @@ def start_web_site_network_trace_slot( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -17769,7 +17983,7 @@ def stop_web_site_network_trace_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -17778,8 +17992,8 @@ def stop_web_site_network_trace_slot( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -17837,7 +18051,6 @@ def generate_new_site_publishing_password_slot( # 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: @@ -17846,8 +18059,8 @@ def generate_new_site_publishing_password_slot( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 204]: exp = CloudError(response) @@ -17914,7 +18127,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -17923,9 +18136,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -17984,7 +18196,7 @@ def get_site_php_error_log_flag_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -17993,8 +18205,8 @@ def get_site_php_error_log_flag_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -18052,7 +18264,7 @@ def list_premier_add_ons_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -18061,8 +18273,8 @@ def list_premier_add_ons_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -18123,7 +18335,7 @@ def get_premier_add_on_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -18132,8 +18344,8 @@ def get_premier_add_on_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -18197,6 +18409,7 @@ def add_premier_add_on_slot( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -18209,9 +18422,8 @@ def add_premier_add_on_slot( body_content = self._serialize.body(premier_add_on, 'PremierAddOn') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -18270,7 +18482,6 @@ def delete_premier_add_on_slot( # 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: @@ -18279,8 +18490,8 @@ def delete_premier_add_on_slot( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) @@ -18339,6 +18550,7 @@ def update_premier_add_on_slot( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -18351,9 +18563,8 @@ def update_premier_add_on_slot( body_content = self._serialize.body(premier_add_on, 'PremierAddOnPatchResource') # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -18412,7 +18623,7 @@ def get_private_access_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -18421,8 +18632,8 @@ def get_private_access_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -18483,6 +18694,7 @@ def put_private_access_vnet_slot( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -18495,9 +18707,8 @@ def put_private_access_vnet_slot( body_content = self._serialize.body(access, 'PrivateAccess') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -18563,7 +18774,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -18572,9 +18783,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -18639,7 +18849,7 @@ def get_process_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -18648,8 +18858,8 @@ def get_process_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -18712,7 +18922,6 @@ def delete_process_slot( # 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: @@ -18721,8 +18930,8 @@ def delete_process_slot( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [204, 404]: exp = CloudError(response) @@ -18783,7 +18992,7 @@ def get_process_dump_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -18792,8 +19001,8 @@ def get_process_dump_slot( 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=True, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=True, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -18864,7 +19073,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -18873,9 +19082,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -18943,7 +19151,7 @@ def get_process_module_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -18952,8 +19160,8 @@ def get_process_module_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -19024,7 +19232,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -19033,9 +19241,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -19103,7 +19310,7 @@ def get_process_thread_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -19112,8 +19319,8 @@ def get_process_thread_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -19180,7 +19387,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -19189,9 +19396,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -19255,7 +19461,7 @@ def get_public_certificate_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -19264,8 +19470,8 @@ def get_public_certificate_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -19329,6 +19535,7 @@ def create_or_update_public_certificate_slot( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -19341,9 +19548,8 @@ def create_or_update_public_certificate_slot( body_content = self._serialize.body(public_certificate, 'PublicCertificate') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -19402,7 +19608,6 @@ def delete_public_certificate_slot( # 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: @@ -19411,8 +19616,8 @@ def delete_public_certificate_slot( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 204]: exp = CloudError(response) @@ -19425,7 +19630,7 @@ def delete_public_certificate_slot( delete_public_certificate_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/publicCertificates/{publicCertificateName}'} def list_publishing_profile_xml_with_secrets_slot( - self, resource_group_name, name, slot, format=None, custom_headers=None, raw=False, callback=None, **operation_config): + self, resource_group_name, name, slot, format=None, include_disaster_recovery_endpoints=None, custom_headers=None, raw=False, callback=None, **operation_config): """Gets the publishing profile for an app (or deployment slot, if specified). @@ -19445,6 +19650,9 @@ def list_publishing_profile_xml_with_secrets_slot( WebDeploy -- default Ftp. Possible values include: 'FileZilla3', 'WebDeploy', 'Ftp' :type format: str or ~azure.mgmt.web.models.PublishingProfileFormat + :param include_disaster_recovery_endpoints: Include the + DisasterRecover endpoint if true + :type include_disaster_recovery_endpoints: bool :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -19460,7 +19668,7 @@ def list_publishing_profile_xml_with_secrets_slot( :raises: :class:`DefaultErrorResponseException` """ - publishing_profile_options = models.CsmPublishingProfileOptions(format=format) + publishing_profile_options = models.CsmPublishingProfileOptions(format=format, include_disaster_recovery_endpoints=include_disaster_recovery_endpoints) # Construct URL url = self.list_publishing_profile_xml_with_secrets_slot.metadata['url'] @@ -19478,6 +19686,7 @@ def list_publishing_profile_xml_with_secrets_slot( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/xml' 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()) @@ -19490,9 +19699,8 @@ def list_publishing_profile_xml_with_secrets_slot( body_content = self._serialize.body(publishing_profile_options, 'CsmPublishingProfileOptions') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=True, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=True, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -19550,7 +19758,6 @@ def reset_slot_configuration_slot( # 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: @@ -19559,8 +19766,8 @@ def reset_slot_configuration_slot( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) @@ -19623,7 +19830,6 @@ def restart_slot( # 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: @@ -19632,8 +19838,8 @@ def restart_slot( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) @@ -19676,9 +19882,8 @@ def _restore_from_backup_blob_slot_initial( body_content = self._serialize.body(request, 'RestoreRequest') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202]: exp = CloudError(response) @@ -19771,9 +19976,8 @@ def _restore_from_deleted_app_slot_initial( body_content = self._serialize.body(restore_request, 'DeletedAppRestoreRequest') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202]: exp = CloudError(response) @@ -19866,9 +20070,8 @@ def _restore_snapshot_slot_initial( body_content = self._serialize.body(restore_request, 'SnapshotRestoreRequest') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202]: exp = CloudError(response) @@ -19979,7 +20182,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -19988,9 +20191,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -20055,7 +20257,7 @@ def get_site_extension_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -20064,8 +20266,8 @@ def get_site_extension_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -20104,7 +20306,7 @@ def _install_site_extension_slot_initial( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -20113,8 +20315,8 @@ def _install_site_extension_slot_initial( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 201, 429]: exp = CloudError(response) @@ -20233,7 +20435,6 @@ def delete_site_extension_slot( # 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: @@ -20242,8 +20443,8 @@ def delete_site_extension_slot( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [204, 404]: exp = CloudError(response) @@ -20310,6 +20511,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -20322,9 +20524,8 @@ def internal_paging(next_link=None, raw=False): body_content = self._serialize.body(slot_swap_entity, 'CsmSlotEntity') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -20375,9 +20576,8 @@ def _swap_slot_slot_initial( body_content = self._serialize.body(slot_swap_entity, 'CsmSlotEntity') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202]: exp = CloudError(response) @@ -20490,7 +20690,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -20499,9 +20699,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -20561,7 +20760,7 @@ def get_source_control_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -20570,8 +20769,8 @@ def get_source_control_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 201, 202]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -20611,6 +20810,7 @@ def _create_or_update_source_control_slot_initial( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -20623,9 +20823,8 @@ def _create_or_update_source_control_slot_initial( body_content = self._serialize.body(site_source_control, 'SiteSourceControl') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 201, 202]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -20745,7 +20944,6 @@ def delete_source_control_slot( # 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: @@ -20754,8 +20952,8 @@ def delete_source_control_slot( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202, 404]: exp = CloudError(response) @@ -20812,6 +21010,7 @@ def update_source_control_slot( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -20824,9 +21023,8 @@ def update_source_control_slot( body_content = self._serialize.body(site_source_control, 'SiteSourceControl') # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 201, 202]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -20886,7 +21084,6 @@ def start_slot( # 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: @@ -20895,8 +21092,8 @@ def start_slot( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) @@ -20947,7 +21144,6 @@ def stop_slot( # 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: @@ -20956,8 +21152,8 @@ def stop_slot( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) @@ -21008,7 +21204,6 @@ def sync_repository_slot( # 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: @@ -21017,8 +21212,8 @@ def sync_repository_slot( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) @@ -21069,7 +21264,6 @@ def sync_function_triggers_slot( # 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: @@ -21078,8 +21272,8 @@ def sync_function_triggers_slot( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [204]: exp = CloudError(response) @@ -21139,7 +21333,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -21148,9 +21342,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -21211,7 +21404,7 @@ def get_triggered_web_job_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -21220,8 +21413,8 @@ def get_triggered_web_job_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -21282,7 +21475,6 @@ def delete_triggered_web_job_slot( # 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: @@ -21291,8 +21483,8 @@ def delete_triggered_web_job_slot( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 204]: exp = CloudError(response) @@ -21354,7 +21546,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -21363,9 +21555,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -21433,7 +21624,7 @@ def get_triggered_web_job_history_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -21442,8 +21633,8 @@ def get_triggered_web_job_history_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -21504,7 +21695,6 @@ def run_triggered_web_job_slot( # 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: @@ -21513,8 +21703,8 @@ def run_triggered_web_job_slot( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -21584,7 +21774,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -21593,9 +21783,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -21654,7 +21843,7 @@ def list_vnet_connections_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -21663,8 +21852,8 @@ def list_vnet_connections_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -21727,7 +21916,7 @@ def get_vnet_connection_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -21736,8 +21925,8 @@ def get_vnet_connection_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -21803,6 +21992,7 @@ def create_or_update_vnet_connection_slot( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -21815,9 +22005,8 @@ def create_or_update_vnet_connection_slot( body_content = self._serialize.body(connection_envelope, 'VnetInfo') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -21878,7 +22067,6 @@ def delete_vnet_connection_slot( # 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: @@ -21887,8 +22075,8 @@ def delete_vnet_connection_slot( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -21949,6 +22137,7 @@ def update_vnet_connection_slot( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -21961,9 +22150,8 @@ def update_vnet_connection_slot( body_content = self._serialize.body(connection_envelope, 'VnetInfo') # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -22027,7 +22215,7 @@ def get_vnet_connection_gateway_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -22036,8 +22224,8 @@ def get_vnet_connection_gateway_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -22110,6 +22298,7 @@ def create_or_update_vnet_connection_gateway_slot( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -22122,9 +22311,8 @@ def create_or_update_vnet_connection_gateway_slot( body_content = self._serialize.body(connection_envelope, 'VnetGateway') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -22195,6 +22383,7 @@ def update_vnet_connection_gateway_slot( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -22207,9 +22396,8 @@ def update_vnet_connection_gateway_slot( body_content = self._serialize.body(connection_envelope, 'VnetGateway') # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -22274,7 +22462,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -22283,9 +22471,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -22347,7 +22534,7 @@ def get_web_job_slot( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -22356,8 +22543,8 @@ def get_web_job_slot( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -22425,6 +22612,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -22437,9 +22625,8 @@ def internal_paging(next_link=None, raw=False): body_content = self._serialize.body(slot_swap_entity, 'CsmSlotEntity') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -22489,9 +22676,8 @@ def _swap_slot_with_production_initial( body_content = self._serialize.body(slot_swap_entity, 'CsmSlotEntity') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202]: exp = CloudError(response) @@ -22597,7 +22783,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -22606,9 +22792,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -22663,7 +22848,7 @@ def get_source_control( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -22672,8 +22857,8 @@ def get_source_control( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 201, 202]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -22712,6 +22897,7 @@ def _create_or_update_source_control_initial( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -22724,9 +22910,8 @@ def _create_or_update_source_control_initial( body_content = self._serialize.body(site_source_control, 'SiteSourceControl') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 201, 202]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -22836,7 +23021,6 @@ def delete_source_control( # 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: @@ -22845,8 +23029,8 @@ def delete_source_control( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202, 404]: exp = CloudError(response) @@ -22898,6 +23082,7 @@ def update_source_control( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -22910,9 +23095,8 @@ def update_source_control( body_content = self._serialize.body(site_source_control, 'SiteSourceControl') # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 201, 202]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -22968,7 +23152,6 @@ def start( # 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: @@ -22977,8 +23160,8 @@ def start( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) @@ -23025,7 +23208,6 @@ def stop( # 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: @@ -23034,8 +23216,8 @@ def stop( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) @@ -23082,7 +23264,6 @@ def sync_repository( # 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: @@ -23091,8 +23272,8 @@ def sync_repository( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) @@ -23139,7 +23320,6 @@ def sync_function_triggers( # 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: @@ -23148,8 +23328,8 @@ def sync_function_triggers( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [204]: exp = CloudError(response) @@ -23205,7 +23385,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -23214,9 +23394,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -23273,7 +23452,7 @@ def get_triggered_web_job( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -23282,8 +23461,8 @@ def get_triggered_web_job( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -23340,7 +23519,6 @@ def delete_triggered_web_job( # 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: @@ -23349,8 +23527,8 @@ def delete_triggered_web_job( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 204]: exp = CloudError(response) @@ -23408,7 +23586,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -23417,9 +23595,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -23483,7 +23660,7 @@ def get_triggered_web_job_history( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -23492,8 +23669,8 @@ def get_triggered_web_job_history( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -23550,7 +23727,6 @@ def run_triggered_web_job( # 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: @@ -23559,8 +23735,8 @@ def run_triggered_web_job( 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) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -23626,7 +23802,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -23635,9 +23811,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -23692,7 +23867,7 @@ def list_vnet_connections( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -23701,8 +23876,8 @@ def list_vnet_connections( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -23761,7 +23936,7 @@ def get_vnet_connection( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -23770,8 +23945,8 @@ def get_vnet_connection( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -23833,6 +24008,7 @@ def create_or_update_vnet_connection( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -23845,9 +24021,8 @@ def create_or_update_vnet_connection( body_content = self._serialize.body(connection_envelope, 'VnetInfo') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -23904,7 +24079,6 @@ def delete_vnet_connection( # 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: @@ -23913,8 +24087,8 @@ def delete_vnet_connection( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -23971,6 +24145,7 @@ def update_vnet_connection( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -23983,9 +24158,8 @@ def update_vnet_connection( body_content = self._serialize.body(connection_envelope, 'VnetInfo') # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -24045,7 +24219,7 @@ def get_vnet_connection_gateway( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -24054,8 +24228,8 @@ def get_vnet_connection_gateway( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: exp = CloudError(response) @@ -24123,6 +24297,7 @@ def create_or_update_vnet_connection_gateway( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -24135,9 +24310,8 @@ def create_or_update_vnet_connection_gateway( body_content = self._serialize.body(connection_envelope, 'VnetGateway') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -24203,6 +24377,7 @@ def update_vnet_connection_gateway( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -24215,9 +24390,8 @@ def update_vnet_connection_gateway( body_content = self._serialize.body(connection_envelope, 'VnetGateway') # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -24278,7 +24452,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -24287,9 +24461,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -24347,7 +24520,7 @@ def get_web_job( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -24356,8 +24529,8 @@ def get_web_job( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) diff --git a/azure-mgmt-web/azure/mgmt/web/web_site_management_client.py b/azure-mgmt-web/azure/mgmt/web/web_site_management_client.py index 6cce23de18b9..f8f6dd1416e1 100644 --- a/azure-mgmt-web/azure/mgmt/web/web_site_management_client.py +++ b/azure-mgmt-web/azure/mgmt/web/web_site_management_client.py @@ -173,7 +173,7 @@ def get_publishing_user( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -182,8 +182,8 @@ def get_publishing_user( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -228,6 +228,7 @@ def update_publishing_user( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -240,9 +241,8 @@ def update_publishing_user( body_content = self._serialize.body(user_details, 'User') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -292,7 +292,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -301,9 +301,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -353,7 +352,7 @@ def get_source_control( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -362,8 +361,8 @@ def get_source_control( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -414,6 +413,7 @@ def update_source_control( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -426,9 +426,8 @@ def update_source_control( body_content = self._serialize.body(request_message, 'SourceControl') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -490,7 +489,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -499,9 +498,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -560,6 +558,7 @@ def check_name_availability( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -572,9 +571,8 @@ def check_name_availability( body_content = self._serialize.body(request, 'ResourceNameAvailabilityRequest') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -621,7 +619,7 @@ def get_subscription_deployment_locations( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -630,8 +628,8 @@ def get_subscription_deployment_locations( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -701,7 +699,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -710,9 +708,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -771,6 +768,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -783,9 +781,8 @@ def internal_paging(next_link=None, raw=False): body_content = self._serialize.body(name_identifier, 'NameIdentifier') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -840,7 +837,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -849,9 +846,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -899,7 +895,7 @@ def list_skus( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -908,8 +904,8 @@ def list_skus( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -960,6 +956,7 @@ def verify_hosting_environment_vnet( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -972,9 +969,8 @@ def verify_hosting_environment_vnet( body_content = self._serialize.body(parameters, 'VnetParameters') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1041,9 +1037,8 @@ def move( body_content = self._serialize.body(move_resource_envelope, 'CsmMoveResourceEnvelope') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [204]: exp = CloudError(response) @@ -1091,6 +1086,7 @@ def validate( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -1103,9 +1099,8 @@ def validate( body_content = self._serialize.body(validate_request, 'ValidateRequest') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.DefaultErrorResponseException(self._deserialize, response) @@ -1172,9 +1167,8 @@ def validate_move( body_content = self._serialize.body(move_resource_envelope, 'CsmMoveResourceEnvelope') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [204]: exp = CloudError(response) From 7f6cf489f92ffb05768486cda236650eacb39765 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Mon, 20 Aug 2018 10:12:43 -0700 Subject: [PATCH 15/19] [AutoPR web/resource-manager] WebApps - Add BackupName to backup API models (#3058) * Generated from 6162973ef0993464a1806f8db5ca913f0fa5d6c8 WebApps - Add BackupName to replace non-ARM-compliant Name property on Backup API models * Generated from c8664a06cff19844eb381ad410872b34cba23b27 Revert breaking change to BackupItem. BackupItemName property will be fine in place of BackupName for now. --- azure-mgmt-web/azure/mgmt/web/models/backup_request.py | 4 ++++ azure-mgmt-web/azure/mgmt/web/models/backup_request_py3.py | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) 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 8d7f6e58cbb3..496fc5bd9251 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/backup_request.py +++ b/azure-mgmt-web/azure/mgmt/web/models/backup_request.py @@ -28,6 +28,8 @@ class BackupRequest(ProxyOnlyResource): :type kind: str :ivar type: Resource type. :vartype type: str + :param backup_name: Name of the backup. + :type backup_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 @@ -52,6 +54,7 @@ class BackupRequest(ProxyOnlyResource): 'name': {'key': 'name', 'type': 'str'}, 'kind': {'key': 'kind', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, + 'backup_name': {'key': 'properties.backupName', 'type': 'str'}, 'enabled': {'key': 'properties.enabled', 'type': 'bool'}, 'storage_account_url': {'key': 'properties.storageAccountUrl', 'type': 'str'}, 'backup_schedule': {'key': 'properties.backupSchedule', 'type': 'BackupSchedule'}, @@ -60,6 +63,7 @@ class BackupRequest(ProxyOnlyResource): def __init__(self, **kwargs): super(BackupRequest, self).__init__(**kwargs) + self.backup_name = kwargs.get('backup_name', None) self.enabled = kwargs.get('enabled', None) self.storage_account_url = kwargs.get('storage_account_url', None) self.backup_schedule = kwargs.get('backup_schedule', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/backup_request_py3.py b/azure-mgmt-web/azure/mgmt/web/models/backup_request_py3.py index ce7a46fe117f..9eaad232bb94 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/backup_request_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/backup_request_py3.py @@ -28,6 +28,8 @@ class BackupRequest(ProxyOnlyResource): :type kind: str :ivar type: Resource type. :vartype type: str + :param backup_name: Name of the backup. + :type backup_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 @@ -52,14 +54,16 @@ class BackupRequest(ProxyOnlyResource): 'name': {'key': 'name', 'type': 'str'}, 'kind': {'key': 'kind', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, + 'backup_name': {'key': 'properties.backupName', '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]'}, } - def __init__(self, *, storage_account_url: str, kind: str=None, enabled: bool=None, backup_schedule=None, databases=None, **kwargs) -> None: + def __init__(self, *, storage_account_url: str, kind: str=None, backup_name: str=None, enabled: bool=None, backup_schedule=None, databases=None, **kwargs) -> None: super(BackupRequest, self).__init__(kind=kind, **kwargs) + self.backup_name = backup_name self.enabled = enabled self.storage_account_url = storage_account_url self.backup_schedule = backup_schedule From 204f4e401954e78cadafb67b66d6a2fcfc77751b Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Thu, 23 Aug 2018 11:01:31 -0700 Subject: [PATCH 16/19] =?UTF-8?q?[AutoPR=20web/resource-manager]=20Add=20H?= =?UTF-8?q?yperV=20property=20for=20AppServicePlan=20and=20Site=20model=20?= =?UTF-8?q?and=20deprecating=E2=80=A6=20(#3169)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Generated from 45a695f12bca8bf8b3532a4d1c8f02571f83bf51 Add HyperV property for AppServicePlan and Site model and deprecating IsXenon property * Generated from 5a76ead1e9a3559ab3bce148ec8f282f068d18d1 Merge remote-tracking branch 'upstream/master' --- .../azure/mgmt/web/models/app_service_plan.py | 9 +++++++-- .../web/models/app_service_plan_patch_resource.py | 9 +++++++-- .../web/models/app_service_plan_patch_resource_py3.py | 11 ++++++++--- .../azure/mgmt/web/models/app_service_plan_py3.py | 11 ++++++++--- azure-mgmt-web/azure/mgmt/web/models/site.py | 6 +++++- .../azure/mgmt/web/models/site_patch_resource.py | 6 +++++- .../azure/mgmt/web/models/site_patch_resource_py3.py | 8 ++++++-- azure-mgmt-web/azure/mgmt/web/models/site_py3.py | 8 ++++++-- 8 files changed, 52 insertions(+), 16 deletions(-) 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 964fa959409c..c34010da2706 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 @@ -72,9 +72,12 @@ 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 . + :param is_xenon: Obsolete: If Hyper-V container app service plan + true, false otherwise. Default value: False . :type is_xenon: bool + :param hyper_v: If Hyper-V container app service plan true, + false otherwise. Default value: False . + :type hyper_v: bool :param target_worker_count: Scaling worker count. :type target_worker_count: int :param target_worker_size_id: Scaling worker size ID. @@ -124,6 +127,7 @@ class AppServicePlan(Resource): 'resource_group': {'key': 'properties.resourceGroup', 'type': 'str'}, 'reserved': {'key': 'properties.reserved', 'type': 'bool'}, 'is_xenon': {'key': 'properties.isXenon', 'type': 'bool'}, + 'hyper_v': {'key': 'properties.hyperV', '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'}, @@ -147,6 +151,7 @@ def __init__(self, **kwargs): self.resource_group = None self.reserved = kwargs.get('reserved', False) self.is_xenon = kwargs.get('is_xenon', False) + self.hyper_v = kwargs.get('hyper_v', False) self.target_worker_count = kwargs.get('target_worker_count', None) self.target_worker_size_id = kwargs.get('target_worker_size_id', None) self.provisioning_state = None 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 f1ee1e51c04c..fe641394a178 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 @@ -66,9 +66,12 @@ 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 . + :param is_xenon: Obsolete: If Hyper-V container app service plan + true, false otherwise. Default value: False . :type is_xenon: bool + :param hyper_v: If Hyper-V container app service plan true, + false otherwise. Default value: False . + :type hyper_v: bool :param target_worker_count: Scaling worker count. :type target_worker_count: int :param target_worker_size_id: Scaling worker size ID. @@ -113,6 +116,7 @@ class AppServicePlanPatchResource(ProxyOnlyResource): 'resource_group': {'key': 'properties.resourceGroup', 'type': 'str'}, 'reserved': {'key': 'properties.reserved', 'type': 'bool'}, 'is_xenon': {'key': 'properties.isXenon', 'type': 'bool'}, + 'hyper_v': {'key': 'properties.hyperV', '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'}, @@ -135,6 +139,7 @@ def __init__(self, **kwargs): self.resource_group = None self.reserved = kwargs.get('reserved', False) self.is_xenon = kwargs.get('is_xenon', False) + self.hyper_v = kwargs.get('hyper_v', False) self.target_worker_count = kwargs.get('target_worker_count', None) self.target_worker_size_id = kwargs.get('target_worker_size_id', None) self.provisioning_state = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/app_service_plan_patch_resource_py3.py b/azure-mgmt-web/azure/mgmt/web/models/app_service_plan_patch_resource_py3.py index 10d555ee877c..0d04154d0093 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/app_service_plan_patch_resource_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/app_service_plan_patch_resource_py3.py @@ -66,9 +66,12 @@ 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 . + :param is_xenon: Obsolete: If Hyper-V container app service plan + true, false otherwise. Default value: False . :type is_xenon: bool + :param hyper_v: If Hyper-V container app service plan true, + false otherwise. Default value: False . + :type hyper_v: bool :param target_worker_count: Scaling worker count. :type target_worker_count: int :param target_worker_size_id: Scaling worker size ID. @@ -113,12 +116,13 @@ class AppServicePlanPatchResource(ProxyOnlyResource): 'resource_group': {'key': 'properties.resourceGroup', 'type': 'str'}, 'reserved': {'key': 'properties.reserved', 'type': 'bool'}, 'is_xenon': {'key': 'properties.isXenon', 'type': 'bool'}, + 'hyper_v': {'key': 'properties.hyperV', '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, *, kind: str=None, worker_tier_name: str=None, admin_site_name: str=None, hosting_environment_profile=None, per_site_scaling: bool=False, is_spot: bool=None, spot_expiration_time=None, free_offer_expiration_time=None, reserved: bool=False, is_xenon: bool=False, target_worker_count: int=None, target_worker_size_id: int=None, **kwargs) -> None: + def __init__(self, *, kind: str=None, worker_tier_name: str=None, admin_site_name: str=None, hosting_environment_profile=None, per_site_scaling: bool=False, is_spot: bool=None, spot_expiration_time=None, free_offer_expiration_time=None, reserved: bool=False, is_xenon: bool=False, hyper_v: bool=False, target_worker_count: int=None, target_worker_size_id: int=None, **kwargs) -> None: super(AppServicePlanPatchResource, self).__init__(kind=kind, **kwargs) self.worker_tier_name = worker_tier_name self.status = None @@ -135,6 +139,7 @@ def __init__(self, *, kind: str=None, worker_tier_name: str=None, admin_site_nam self.resource_group = None self.reserved = reserved self.is_xenon = is_xenon + self.hyper_v = hyper_v 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_py3.py b/azure-mgmt-web/azure/mgmt/web/models/app_service_plan_py3.py index 5ce4203df04f..3a8d6e22c267 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/app_service_plan_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/app_service_plan_py3.py @@ -72,9 +72,12 @@ 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 . + :param is_xenon: Obsolete: If Hyper-V container app service plan + true, false otherwise. Default value: False . :type is_xenon: bool + :param hyper_v: If Hyper-V container app service plan true, + false otherwise. Default value: False . + :type hyper_v: bool :param target_worker_count: Scaling worker count. :type target_worker_count: int :param target_worker_size_id: Scaling worker size ID. @@ -124,13 +127,14 @@ class AppServicePlan(Resource): 'resource_group': {'key': 'properties.resourceGroup', 'type': 'str'}, 'reserved': {'key': 'properties.reserved', 'type': 'bool'}, 'is_xenon': {'key': 'properties.isXenon', 'type': 'bool'}, + 'hyper_v': {'key': 'properties.hyperV', '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: str, kind: str=None, tags=None, worker_tier_name: str=None, admin_site_name: str=None, hosting_environment_profile=None, per_site_scaling: bool=False, is_spot: bool=None, spot_expiration_time=None, free_offer_expiration_time=None, reserved: bool=False, is_xenon: bool=False, target_worker_count: int=None, target_worker_size_id: int=None, sku=None, **kwargs) -> None: + def __init__(self, *, location: str, kind: str=None, tags=None, worker_tier_name: str=None, admin_site_name: str=None, hosting_environment_profile=None, per_site_scaling: bool=False, is_spot: bool=None, spot_expiration_time=None, free_offer_expiration_time=None, reserved: bool=False, is_xenon: bool=False, hyper_v: bool=False, target_worker_count: int=None, target_worker_size_id: int=None, sku=None, **kwargs) -> None: super(AppServicePlan, self).__init__(kind=kind, location=location, tags=tags, **kwargs) self.worker_tier_name = worker_tier_name self.status = None @@ -147,6 +151,7 @@ def __init__(self, *, location: str, kind: str=None, tags=None, worker_tier_name self.resource_group = None self.reserved = reserved self.is_xenon = is_xenon + self.hyper_v = hyper_v 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/site.py b/azure-mgmt-web/azure/mgmt/web/models/site.py index f244ac523067..0bf04d727a18 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/site.py +++ b/azure-mgmt-web/azure/mgmt/web/models/site.py @@ -64,8 +64,10 @@ 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 . + :param is_xenon: Obsolete: Hyper-V sandbox. Default value: False . :type is_xenon: bool + :param hyper_v: Hyper-V sandbox. Default value: False . + :type hyper_v: bool :ivar last_modified_time_utc: Last time the app was modified, in UTC. Read-only. :vartype last_modified_time_utc: datetime @@ -181,6 +183,7 @@ class Site(Resource): 'server_farm_id': {'key': 'properties.serverFarmId', 'type': 'str'}, 'reserved': {'key': 'properties.reserved', 'type': 'bool'}, 'is_xenon': {'key': 'properties.isXenon', 'type': 'bool'}, + 'hyper_v': {'key': 'properties.hyperV', '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]'}, @@ -218,6 +221,7 @@ def __init__(self, **kwargs): self.server_farm_id = kwargs.get('server_farm_id', None) self.reserved = kwargs.get('reserved', False) self.is_xenon = kwargs.get('is_xenon', False) + self.hyper_v = kwargs.get('hyper_v', False) self.last_modified_time_utc = None self.site_config = kwargs.get('site_config', None) self.traffic_manager_host_names = 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 291bbff47844..392b54229183 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,8 +58,10 @@ 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 . + :param is_xenon: Obsolete: Hyper-V sandbox. Default value: False . :type is_xenon: bool + :param hyper_v: Hyper-V sandbox. Default value: False . + :type hyper_v: 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): 'server_farm_id': {'key': 'properties.serverFarmId', 'type': 'str'}, 'reserved': {'key': 'properties.reserved', 'type': 'bool'}, 'is_xenon': {'key': 'properties.isXenon', 'type': 'bool'}, + 'hyper_v': {'key': 'properties.hyperV', '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]'}, @@ -206,6 +209,7 @@ def __init__(self, **kwargs): self.server_farm_id = kwargs.get('server_farm_id', None) self.reserved = kwargs.get('reserved', False) self.is_xenon = kwargs.get('is_xenon', False) + self.hyper_v = kwargs.get('hyper_v', False) self.last_modified_time_utc = None self.site_config = kwargs.get('site_config', None) self.traffic_manager_host_names = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_patch_resource_py3.py b/azure-mgmt-web/azure/mgmt/web/models/site_patch_resource_py3.py index f3e23f94d291..e459e6d70bbd 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/site_patch_resource_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/site_patch_resource_py3.py @@ -58,8 +58,10 @@ 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 . + :param is_xenon: Obsolete: Hyper-V sandbox. Default value: False . :type is_xenon: bool + :param hyper_v: Hyper-V sandbox. Default value: False . + :type hyper_v: 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): 'server_farm_id': {'key': 'properties.serverFarmId', 'type': 'str'}, 'reserved': {'key': 'properties.reserved', 'type': 'bool'}, 'is_xenon': {'key': 'properties.isXenon', 'type': 'bool'}, + 'hyper_v': {'key': 'properties.hyperV', '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]'}, @@ -193,7 +196,7 @@ class SitePatchResource(ProxyOnlyResource): 'https_only': {'key': 'properties.httpsOnly', 'type': 'bool'}, } - def __init__(self, *, kind: str=None, enabled: bool=None, host_name_ssl_states=None, server_farm_id: str=None, reserved: bool=False, is_xenon: bool=False, site_config=None, scm_site_also_stopped: bool=False, hosting_environment_profile=None, client_affinity_enabled: bool=None, client_cert_enabled: bool=None, host_names_disabled: bool=None, container_size: int=None, daily_memory_time_quota: int=None, cloning_info=None, https_only: bool=None, **kwargs) -> None: + def __init__(self, *, kind: str=None, enabled: bool=None, host_name_ssl_states=None, server_farm_id: str=None, reserved: bool=False, is_xenon: bool=False, hyper_v: bool=False, site_config=None, scm_site_also_stopped: bool=False, hosting_environment_profile=None, client_affinity_enabled: bool=None, client_cert_enabled: bool=None, host_names_disabled: bool=None, container_size: int=None, daily_memory_time_quota: int=None, cloning_info=None, https_only: bool=None, **kwargs) -> None: super(SitePatchResource, self).__init__(kind=kind, **kwargs) self.state = None self.host_names = None @@ -206,6 +209,7 @@ def __init__(self, *, kind: str=None, enabled: bool=None, host_name_ssl_states=N self.server_farm_id = server_farm_id self.reserved = reserved self.is_xenon = is_xenon + self.hyper_v = hyper_v 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_py3.py b/azure-mgmt-web/azure/mgmt/web/models/site_py3.py index 3fb9e61bdede..d4ec907a9c06 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/site_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/site_py3.py @@ -64,8 +64,10 @@ 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 . + :param is_xenon: Obsolete: Hyper-V sandbox. Default value: False . :type is_xenon: bool + :param hyper_v: Hyper-V sandbox. Default value: False . + :type hyper_v: bool :ivar last_modified_time_utc: Last time the app was modified, in UTC. Read-only. :vartype last_modified_time_utc: datetime @@ -181,6 +183,7 @@ class Site(Resource): 'server_farm_id': {'key': 'properties.serverFarmId', 'type': 'str'}, 'reserved': {'key': 'properties.reserved', 'type': 'bool'}, 'is_xenon': {'key': 'properties.isXenon', 'type': 'bool'}, + 'hyper_v': {'key': 'properties.hyperV', '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]'}, @@ -205,7 +208,7 @@ class Site(Resource): 'identity': {'key': 'identity', 'type': 'ManagedServiceIdentity'}, } - def __init__(self, *, location: str, kind: str=None, tags=None, enabled: bool=None, host_name_ssl_states=None, server_farm_id: str=None, reserved: bool=False, is_xenon: bool=False, site_config=None, scm_site_also_stopped: bool=False, hosting_environment_profile=None, client_affinity_enabled: bool=None, client_cert_enabled: bool=None, host_names_disabled: bool=None, container_size: int=None, daily_memory_time_quota: int=None, cloning_info=None, https_only: bool=None, identity=None, **kwargs) -> None: + def __init__(self, *, location: str, kind: str=None, tags=None, enabled: bool=None, host_name_ssl_states=None, server_farm_id: str=None, reserved: bool=False, is_xenon: bool=False, hyper_v: bool=False, site_config=None, scm_site_also_stopped: bool=False, hosting_environment_profile=None, client_affinity_enabled: bool=None, client_cert_enabled: bool=None, host_names_disabled: bool=None, container_size: int=None, daily_memory_time_quota: int=None, cloning_info=None, https_only: bool=None, identity=None, **kwargs) -> None: super(Site, self).__init__(kind=kind, location=location, tags=tags, **kwargs) self.state = None self.host_names = None @@ -218,6 +221,7 @@ def __init__(self, *, location: str, kind: str=None, tags=None, enabled: bool=No self.server_farm_id = server_farm_id self.reserved = reserved self.is_xenon = is_xenon + self.hyper_v = hyper_v self.last_modified_time_utc = None self.site_config = site_config self.traffic_manager_host_names = None From 155a4c45cd4b73e5b368fbe960c2a6e264f08d9f Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Tue, 28 Aug 2018 08:37:11 -0700 Subject: [PATCH 17/19] [AutoPR web/resource-manager] WebApps - Add ResourceHealthMetadata.json to readme.md for SDK generation (#3178) * Generated from 1c9e1028cea9b1119b0fb396906d412c6d228c8e WebApps - Add ResourceHealthMetadata.json to readme.md for SDK generation * Generated from 4038e1418fea2b1092005a07b4ff72442d0038a1 Change deleted site model to be proxy only resource --- .../azure/mgmt/web/models/__init__.py | 11 +- .../azure/mgmt/web/models/deleted_site.py | 36 +- .../azure/mgmt/web/models/deleted_site_py3.py | 40 +- .../web/models/resource_health_metadata.py | 54 +++ .../models/resource_health_metadata_paged.py | 27 ++ .../models/resource_health_metadata_py3.py | 54 +++ .../azure/mgmt/web/operations/__init__.py | 2 + .../resource_health_metadata_operations.py | 457 ++++++++++++++++++ .../mgmt/web/web_site_management_client.py | 5 + 9 files changed, 665 insertions(+), 21 deletions(-) create mode 100644 azure-mgmt-web/azure/mgmt/web/models/resource_health_metadata.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/resource_health_metadata_paged.py create mode 100644 azure-mgmt-web/azure/mgmt/web/models/resource_health_metadata_py3.py create mode 100644 azure-mgmt-web/azure/mgmt/web/operations/resource_health_metadata_operations.py diff --git a/azure-mgmt-web/azure/mgmt/web/models/__init__.py b/azure-mgmt-web/azure/mgmt/web/models/__init__.py index bd1762cc5238..25af3a3d7bbe 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/__init__.py +++ b/azure-mgmt-web/azure/mgmt/web/models/__init__.py @@ -33,6 +33,7 @@ from .identifier_py3 import Identifier from .hybrid_connection_key_py3 import HybridConnectionKey from .hybrid_connection_py3 import HybridConnection + from .deleted_site_py3 import DeletedSite from .proxy_only_resource_py3 import ProxyOnlyResource from .managed_service_identity_py3 import ManagedServiceIdentity from .slot_swap_status_py3 import SlotSwapStatus @@ -101,7 +102,6 @@ from .app_service_environment_py3 import AppServiceEnvironment from .localizable_string_py3 import LocalizableString from .csm_usage_quota_py3 import CsmUsageQuota - from .deleted_site_py3 import DeletedSite from .error_entity_py3 import ErrorEntity from .operation_py3 import Operation from .resource_metric_name_py3 import ResourceMetricName @@ -229,6 +229,7 @@ from .worker_pool_resource_py3 import WorkerPoolResource from .app_service_plan_patch_resource_py3 import AppServicePlanPatchResource from .hybrid_connection_limits_py3 import HybridConnectionLimits + from .resource_health_metadata_py3 import ResourceHealthMetadata except (SyntaxError, ImportError): from .app_service_certificate import AppServiceCertificate from .app_service_certificate_resource import AppServiceCertificateResource @@ -253,6 +254,7 @@ from .identifier import Identifier from .hybrid_connection_key import HybridConnectionKey from .hybrid_connection import HybridConnection + from .deleted_site import DeletedSite from .proxy_only_resource import ProxyOnlyResource from .managed_service_identity import ManagedServiceIdentity from .slot_swap_status import SlotSwapStatus @@ -321,7 +323,6 @@ from .app_service_environment import AppServiceEnvironment from .localizable_string import LocalizableString from .csm_usage_quota import CsmUsageQuota - from .deleted_site import DeletedSite from .error_entity import ErrorEntity from .operation import Operation from .resource_metric_name import ResourceMetricName @@ -449,6 +450,7 @@ from .worker_pool_resource import WorkerPoolResource from .app_service_plan_patch_resource import AppServicePlanPatchResource from .hybrid_connection_limits import HybridConnectionLimits + from .resource_health_metadata import ResourceHealthMetadata from .app_service_certificate_order_paged import AppServiceCertificateOrderPaged from .app_service_certificate_resource_paged import AppServiceCertificateResourcePaged from .csm_operation_description_paged import CsmOperationDescriptionPaged @@ -501,6 +503,7 @@ from .app_service_plan_paged import AppServicePlanPaged from .str_paged import StrPaged from .hybrid_connection_paged import HybridConnectionPaged +from .resource_health_metadata_paged import ResourceHealthMetadataPaged from .web_site_management_client_enums import ( KeyVaultSecretStatus, CertificateProductType, @@ -591,6 +594,7 @@ 'Identifier', 'HybridConnectionKey', 'HybridConnection', + 'DeletedSite', 'ProxyOnlyResource', 'ManagedServiceIdentity', 'SlotSwapStatus', @@ -659,7 +663,6 @@ 'AppServiceEnvironment', 'LocalizableString', 'CsmUsageQuota', - 'DeletedSite', 'ErrorEntity', 'Operation', 'ResourceMetricName', @@ -787,6 +790,7 @@ 'WorkerPoolResource', 'AppServicePlanPatchResource', 'HybridConnectionLimits', + 'ResourceHealthMetadata', 'AppServiceCertificateOrderPaged', 'AppServiceCertificateResourcePaged', 'CsmOperationDescriptionPaged', @@ -839,6 +843,7 @@ 'AppServicePlanPaged', 'StrPaged', 'HybridConnectionPaged', + 'ResourceHealthMetadataPaged', 'KeyVaultSecretStatus', 'CertificateProductType', 'ProvisioningState', 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 b93573234957..cab4d170ab91 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/deleted_site.py +++ b/azure-mgmt-web/azure/mgmt/web/models/deleted_site.py @@ -9,15 +9,23 @@ # regenerated. # -------------------------------------------------------------------------- -from msrest.serialization import Model +from .proxy_only_resource import ProxyOnlyResource -class DeletedSite(Model): +class DeletedSite(ProxyOnlyResource): """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 :ivar deleted_site_id: Numeric id for the deleted site :vartype deleted_site_id: int :ivar deleted_timestamp: Time in UTC when the app was deleted. @@ -30,24 +38,35 @@ class DeletedSite(Model): :vartype deleted_site_name: str :ivar slot: Slot of the deleted site :vartype slot: str + :ivar deleted_site_kind: Kind of site that was deleted + :vartype deleted_site_kind: str """ _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, 'deleted_site_id': {'readonly': True}, 'deleted_timestamp': {'readonly': True}, 'subscription': {'readonly': True}, 'resource_group': {'readonly': True}, 'deleted_site_name': {'readonly': True}, 'slot': {'readonly': True}, + 'deleted_site_kind': {'readonly': True}, } _attribute_map = { - 'deleted_site_id': {'key': 'deletedSiteId', 'type': 'int'}, - 'deleted_timestamp': {'key': 'deletedTimestamp', 'type': 'str'}, - 'subscription': {'key': 'subscription', 'type': 'str'}, - 'resource_group': {'key': 'resourceGroup', 'type': 'str'}, - 'deleted_site_name': {'key': 'deletedSiteName', 'type': 'str'}, - 'slot': {'key': 'slot', 'type': 'str'}, + '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': 'int'}, + 'deleted_timestamp': {'key': 'properties.deletedTimestamp', 'type': 'str'}, + 'subscription': {'key': 'properties.subscription', 'type': 'str'}, + 'resource_group': {'key': 'properties.resourceGroup', 'type': 'str'}, + 'deleted_site_name': {'key': 'properties.deletedSiteName', 'type': 'str'}, + 'slot': {'key': 'properties.slot', 'type': 'str'}, + 'deleted_site_kind': {'key': 'properties.kind', 'type': 'str'}, } def __init__(self, **kwargs): @@ -58,3 +77,4 @@ def __init__(self, **kwargs): self.resource_group = None self.deleted_site_name = None self.slot = None + self.deleted_site_kind = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/deleted_site_py3.py b/azure-mgmt-web/azure/mgmt/web/models/deleted_site_py3.py index f014d769c5dc..85152fdd18f8 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/deleted_site_py3.py +++ b/azure-mgmt-web/azure/mgmt/web/models/deleted_site_py3.py @@ -9,15 +9,23 @@ # regenerated. # -------------------------------------------------------------------------- -from msrest.serialization import Model +from .proxy_only_resource_py3 import ProxyOnlyResource -class DeletedSite(Model): +class DeletedSite(ProxyOnlyResource): """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 :ivar deleted_site_id: Numeric id for the deleted site :vartype deleted_site_id: int :ivar deleted_timestamp: Time in UTC when the app was deleted. @@ -30,31 +38,43 @@ class DeletedSite(Model): :vartype deleted_site_name: str :ivar slot: Slot of the deleted site :vartype slot: str + :ivar deleted_site_kind: Kind of site that was deleted + :vartype deleted_site_kind: str """ _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, 'deleted_site_id': {'readonly': True}, 'deleted_timestamp': {'readonly': True}, 'subscription': {'readonly': True}, 'resource_group': {'readonly': True}, 'deleted_site_name': {'readonly': True}, 'slot': {'readonly': True}, + 'deleted_site_kind': {'readonly': True}, } _attribute_map = { - 'deleted_site_id': {'key': 'deletedSiteId', 'type': 'int'}, - 'deleted_timestamp': {'key': 'deletedTimestamp', 'type': 'str'}, - 'subscription': {'key': 'subscription', 'type': 'str'}, - 'resource_group': {'key': 'resourceGroup', 'type': 'str'}, - 'deleted_site_name': {'key': 'deletedSiteName', 'type': 'str'}, - 'slot': {'key': 'slot', 'type': 'str'}, + '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': 'int'}, + 'deleted_timestamp': {'key': 'properties.deletedTimestamp', 'type': 'str'}, + 'subscription': {'key': 'properties.subscription', 'type': 'str'}, + 'resource_group': {'key': 'properties.resourceGroup', 'type': 'str'}, + 'deleted_site_name': {'key': 'properties.deletedSiteName', 'type': 'str'}, + 'slot': {'key': 'properties.slot', 'type': 'str'}, + 'deleted_site_kind': {'key': 'properties.kind', 'type': 'str'}, } - def __init__(self, **kwargs) -> None: - super(DeletedSite, self).__init__(**kwargs) + def __init__(self, *, kind: str=None, **kwargs) -> None: + super(DeletedSite, self).__init__(kind=kind, **kwargs) self.deleted_site_id = None self.deleted_timestamp = None self.subscription = None self.resource_group = None self.deleted_site_name = None self.slot = None + self.deleted_site_kind = None diff --git a/azure-mgmt-web/azure/mgmt/web/models/resource_health_metadata.py b/azure-mgmt-web/azure/mgmt/web/models/resource_health_metadata.py new file mode 100644 index 000000000000..0c6c14f68dc4 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/resource_health_metadata.py @@ -0,0 +1,54 @@ +# 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 ResourceHealthMetadata(ProxyOnlyResource): + """Used for getting ResourceHealthCheck settings. + + 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 category: The category that the resource matches in the RHC Policy + File + :type category: str + :param signal_availability: Is there a health signal for the resource + :type signal_availability: bool + """ + + _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'}, + 'category': {'key': 'properties.category', 'type': 'str'}, + 'signal_availability': {'key': 'properties.signalAvailability', 'type': 'bool'}, + } + + def __init__(self, **kwargs): + super(ResourceHealthMetadata, self).__init__(**kwargs) + self.category = kwargs.get('category', None) + self.signal_availability = kwargs.get('signal_availability', None) diff --git a/azure-mgmt-web/azure/mgmt/web/models/resource_health_metadata_paged.py b/azure-mgmt-web/azure/mgmt/web/models/resource_health_metadata_paged.py new file mode 100644 index 000000000000..45c9b8c4945b --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/resource_health_metadata_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 ResourceHealthMetadataPaged(Paged): + """ + A paging container for iterating over a list of :class:`ResourceHealthMetadata ` object + """ + + _attribute_map = { + 'next_link': {'key': 'nextLink', 'type': 'str'}, + 'current_page': {'key': 'value', 'type': '[ResourceHealthMetadata]'} + } + + def __init__(self, *args, **kwargs): + + super(ResourceHealthMetadataPaged, self).__init__(*args, **kwargs) diff --git a/azure-mgmt-web/azure/mgmt/web/models/resource_health_metadata_py3.py b/azure-mgmt-web/azure/mgmt/web/models/resource_health_metadata_py3.py new file mode 100644 index 000000000000..1e151f270086 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/resource_health_metadata_py3.py @@ -0,0 +1,54 @@ +# 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_py3 import ProxyOnlyResource + + +class ResourceHealthMetadata(ProxyOnlyResource): + """Used for getting ResourceHealthCheck settings. + + 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 category: The category that the resource matches in the RHC Policy + File + :type category: str + :param signal_availability: Is there a health signal for the resource + :type signal_availability: bool + """ + + _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'}, + 'category': {'key': 'properties.category', 'type': 'str'}, + 'signal_availability': {'key': 'properties.signalAvailability', 'type': 'bool'}, + } + + def __init__(self, *, kind: str=None, category: str=None, signal_availability: bool=None, **kwargs) -> None: + super(ResourceHealthMetadata, self).__init__(kind=kind, **kwargs) + self.category = category + self.signal_availability = signal_availability diff --git a/azure-mgmt-web/azure/mgmt/web/operations/__init__.py b/azure-mgmt-web/azure/mgmt/web/operations/__init__.py index 93d9712f46bd..20bb873098b3 100644 --- a/azure-mgmt-web/azure/mgmt/web/operations/__init__.py +++ b/azure-mgmt-web/azure/mgmt/web/operations/__init__.py @@ -22,6 +22,7 @@ from .web_apps_operations import WebAppsOperations from .app_service_environments_operations import AppServiceEnvironmentsOperations from .app_service_plans_operations import AppServicePlansOperations +from .resource_health_metadata_operations import ResourceHealthMetadataOperations __all__ = [ 'AppServiceCertificateOrdersOperations', @@ -37,4 +38,5 @@ 'WebAppsOperations', 'AppServiceEnvironmentsOperations', 'AppServicePlansOperations', + 'ResourceHealthMetadataOperations', ] diff --git a/azure-mgmt-web/azure/mgmt/web/operations/resource_health_metadata_operations.py b/azure-mgmt-web/azure/mgmt/web/operations/resource_health_metadata_operations.py new file mode 100644 index 000000000000..65648c293f07 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/operations/resource_health_metadata_operations.py @@ -0,0 +1,457 @@ +# 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. +# -------------------------------------------------------------------------- + +import uuid +from msrest.pipeline import ClientRawResponse + +from .. import models + + +class ResourceHealthMetadataOperations(object): + """ResourceHealthMetadataOperations operations. + + :param client: Client for service requests. + :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: "2018-02-01". + """ + + models = models + + def __init__(self, client, config, serializer, deserializer): + + self._client = client + self._serialize = serializer + self._deserialize = deserializer + self.api_version = "2018-02-01" + + self.config = config + + def list( + self, custom_headers=None, raw=False, **operation_config): + """List all ResourceHealthMetadata for all sites in the subscription. + + List all ResourceHealthMetadata for all sites in the 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: An iterator like instance of ResourceHealthMetadata + :rtype: + ~azure.mgmt.web.models.ResourceHealthMetadataPaged[~azure.mgmt.web.models.ResourceHealthMetadata] + :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 = {} + 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['Accept'] = 'application/json' + 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, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + raise models.DefaultErrorResponseException(self._deserialize, response) + + return response + + # Deserialize response + deserialized = models.ResourceHealthMetadataPaged(internal_paging, self._deserialize.dependencies) + + if raw: + header_dict = {} + client_raw_response = models.ResourceHealthMetadataPaged(internal_paging, self._deserialize.dependencies, header_dict) + return client_raw_response + + return deserialized + list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Web/resourceHealthMetadata'} + + def list_by_resource_group( + self, resource_group_name, custom_headers=None, raw=False, **operation_config): + """List all ResourceHealthMetadata for all sites in the resource group in + the subscription. + + List all ResourceHealthMetadata for all sites in the resource group in + the subscription. + + :param resource_group_name: Name of the resource group to which the + resource belongs. + :type resource_group_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: An iterator like instance of ResourceHealthMetadata + :rtype: + ~azure.mgmt.web.models.ResourceHealthMetadataPaged[~azure.mgmt.web.models.ResourceHealthMetadata] + :raises: + :class:`DefaultErrorResponseException` + """ + def internal_paging(next_link=None, raw=False): + + if not next_link: + # Construct URL + url = self.list_by_resource_group.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\._\(\)]+[^\.]$'), + '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') + + else: + url = next_link + query_parameters = {} + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + 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, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + raise models.DefaultErrorResponseException(self._deserialize, response) + + return response + + # Deserialize response + deserialized = models.ResourceHealthMetadataPaged(internal_paging, self._deserialize.dependencies) + + if raw: + header_dict = {} + client_raw_response = models.ResourceHealthMetadataPaged(internal_paging, self._deserialize.dependencies, header_dict) + return client_raw_response + + return deserialized + list_by_resource_group.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/resourceHealthMetadata'} + + def list_by_site( + self, resource_group_name, name, custom_headers=None, raw=False, **operation_config): + """Gets the category of ResourceHealthMetadata to use for the given site + as a collection. + + Gets the category of ResourceHealthMetadata to use for the given site + as a collection. + + :param resource_group_name: Name of the resource group to which the + resource belongs. + :type resource_group_name: str + :param name: Name of web app. + :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: An iterator like instance of ResourceHealthMetadata + :rtype: + ~azure.mgmt.web.models.ResourceHealthMetadataPaged[~azure.mgmt.web.models.ResourceHealthMetadata] + :raises: + :class:`DefaultErrorResponseException` + """ + def internal_paging(next_link=None, raw=False): + + if not next_link: + # Construct URL + url = self.list_by_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\._\(\)]+[^\.]$'), + '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') + + else: + url = next_link + query_parameters = {} + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + 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, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + raise models.DefaultErrorResponseException(self._deserialize, response) + + return response + + # Deserialize response + deserialized = models.ResourceHealthMetadataPaged(internal_paging, self._deserialize.dependencies) + + if raw: + header_dict = {} + client_raw_response = models.ResourceHealthMetadataPaged(internal_paging, self._deserialize.dependencies, header_dict) + return client_raw_response + + return deserialized + list_by_site.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/resourceHealthMetadata'} + + def get_by_site( + self, resource_group_name, name, custom_headers=None, raw=False, **operation_config): + """Gets the category of ResourceHealthMetadata to use for the given site. + + Gets the category of ResourceHealthMetadata to use for the given site. + + :param resource_group_name: Name of the resource group to which the + resource belongs. + :type resource_group_name: str + :param name: Name of web app + :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: ResourceHealthMetadata or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.ResourceHealthMetadata or + ~msrest.pipeline.ClientRawResponse + :raises: + :class:`DefaultErrorResponseException` + """ + # Construct URL + url = self.get_by_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\._\(\)]+[^\.]$'), + '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['Accept'] = 'application/json' + 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, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + raise models.DefaultErrorResponseException(self._deserialize, response) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('ResourceHealthMetadata', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + get_by_site.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/resourceHealthMetadata/default'} + + def list_by_site_slot( + self, resource_group_name, name, slot, custom_headers=None, raw=False, **operation_config): + """Gets the category of ResourceHealthMetadata to use for the given site + as a collection. + + Gets the category of ResourceHealthMetadata to use for the given site + as a collection. + + :param resource_group_name: Name of the resource group to which the + resource belongs. + :type resource_group_name: str + :param name: Name of web app. + :type name: str + :param slot: Name of web app slot. If not specified then will default + to production slot. + :type slot: 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: An iterator like instance of ResourceHealthMetadata + :rtype: + ~azure.mgmt.web.models.ResourceHealthMetadataPaged[~azure.mgmt.web.models.ResourceHealthMetadata] + :raises: + :class:`DefaultErrorResponseException` + """ + def internal_paging(next_link=None, raw=False): + + if not next_link: + # Construct URL + url = self.list_by_site_slot.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'), + 'slot': self._serialize.url("slot", slot, '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') + + else: + url = next_link + query_parameters = {} + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + 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, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + raise models.DefaultErrorResponseException(self._deserialize, response) + + return response + + # Deserialize response + deserialized = models.ResourceHealthMetadataPaged(internal_paging, self._deserialize.dependencies) + + if raw: + header_dict = {} + client_raw_response = models.ResourceHealthMetadataPaged(internal_paging, self._deserialize.dependencies, header_dict) + return client_raw_response + + return deserialized + list_by_site_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/resourceHealthMetadata'} + + def get_by_site_slot( + self, resource_group_name, name, slot, custom_headers=None, raw=False, **operation_config): + """Gets the category of ResourceHealthMetadata to use for the given site. + + Gets the category of ResourceHealthMetadata to use for the given site. + + :param resource_group_name: Name of the resource group to which the + resource belongs. + :type resource_group_name: str + :param name: Name of web app + :type name: str + :param slot: Name of web app slot. If not specified then will default + to production slot. + :type slot: 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: ResourceHealthMetadata or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.ResourceHealthMetadata or + ~msrest.pipeline.ClientRawResponse + :raises: + :class:`DefaultErrorResponseException` + """ + # Construct URL + url = self.get_by_site_slot.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'), + 'slot': self._serialize.url("slot", slot, '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['Accept'] = 'application/json' + 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, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + raise models.DefaultErrorResponseException(self._deserialize, response) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('ResourceHealthMetadata', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + get_by_site_slot.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/resourceHealthMetadata/default'} diff --git a/azure-mgmt-web/azure/mgmt/web/web_site_management_client.py b/azure-mgmt-web/azure/mgmt/web/web_site_management_client.py index f8f6dd1416e1..5574e1ff74b6 100644 --- a/azure-mgmt-web/azure/mgmt/web/web_site_management_client.py +++ b/azure-mgmt-web/azure/mgmt/web/web_site_management_client.py @@ -31,6 +31,7 @@ from .operations.web_apps_operations import WebAppsOperations from .operations.app_service_environments_operations import AppServiceEnvironmentsOperations from .operations.app_service_plans_operations import AppServicePlansOperations +from .operations.resource_health_metadata_operations import ResourceHealthMetadataOperations from . import models @@ -99,6 +100,8 @@ class WebSiteManagementClient(SDKClient): :vartype app_service_environments: azure.mgmt.web.operations.AppServiceEnvironmentsOperations :ivar app_service_plans: AppServicePlans operations :vartype app_service_plans: azure.mgmt.web.operations.AppServicePlansOperations + :ivar resource_health_metadata: ResourceHealthMetadata operations + :vartype resource_health_metadata: azure.mgmt.web.operations.ResourceHealthMetadataOperations :param credentials: Credentials needed for the client to connect to Azure. :type credentials: :mod:`A msrestazure Credentials @@ -146,6 +149,8 @@ def __init__( self._client, self.config, self._serialize, self._deserialize) self.app_service_plans = AppServicePlansOperations( self._client, self.config, self._serialize, self._deserialize) + self.resource_health_metadata = ResourceHealthMetadataOperations( + self._client, self.config, self._serialize, self._deserialize) def get_publishing_user( self, custom_headers=None, raw=False, **operation_config): From 9934436a7fd240646d8ae97227376605b34ddee8 Mon Sep 17 00:00:00 2001 From: Laurent Mazuel Date: Tue, 28 Aug 2018 09:21:12 -0700 Subject: [PATCH 18/19] WebApp packaging --- azure-mgmt-web/README.rst | 4 +- azure-mgmt-web/build.json | 225 ------------------------------ azure-mgmt-web/sdk_packaging.toml | 6 + azure-mgmt-web/setup.py | 4 +- 4 files changed, 11 insertions(+), 228 deletions(-) delete mode 100644 azure-mgmt-web/build.json create mode 100644 azure-mgmt-web/sdk_packaging.toml diff --git a/azure-mgmt-web/README.rst b/azure-mgmt-web/README.rst index b4665a2dfaae..68611479f5c6 100644 --- a/azure-mgmt-web/README.rst +++ b/azure-mgmt-web/README.rst @@ -6,7 +6,7 @@ This is the Microsoft Azure Web Apps Management Client Library. Azure Resource Manager (ARM) is the next generation of management APIs that replace the old Azure Service Management (ASM). -This package has been tested with Python 2.7, 3.4, 3.5 and 3.6. +This package has been tested with Python 2.7, 3.4, 3.5, 3.6 and 3.7. For the older Azure Service Management (ASM) libraries, see `azure-servicemanagement-legacy `__ library. @@ -37,7 +37,7 @@ Usage ===== For code examples, see `Web Apps Management -`__ +`__ on docs.microsoft.com. diff --git a/azure-mgmt-web/build.json b/azure-mgmt-web/build.json deleted file mode 100644 index d5356f60b700..000000000000 --- a/azure-mgmt-web/build.json +++ /dev/null @@ -1,225 +0,0 @@ -{ - "autorest": [ - { - "resolvedInfo": null, - "packageMetadata": { - "name": "@microsoft.azure/autorest-core", - "version": "2.0.4168", - "engines": { - "node": ">=7.10.0" - }, - "dependencies": {}, - "optionalDependencies": {}, - "devDependencies": { - "@microsoft.azure/async-io": "~1.0.22", - "@microsoft.azure/extension": "~1.2.12", - "@types/commonmark": "^0.27.0", - "@types/jsonpath": "^0.1.29", - "@types/node": "^8.0.28", - "@types/pify": "0.0.28", - "@types/source-map": "^0.5.0", - "@types/yargs": "^8.0.2", - "commonmark": "^0.27.0", - "file-url": "^2.0.2", - "get-uri": "^2.0.0", - "jsonpath": "^0.2.11", - "linq-es2015": "^2.4.25", - "mocha": "3.4.2", - "mocha-typescript": "1.1.5", - "pify": "^3.0.0", - "safe-eval": "^0.3.0", - "shx": "^0.2.2", - "source-map": "^0.5.6", - "source-map-support": "^0.4.15", - "strip-bom": "^3.0.0", - "typescript": "2.5.3", - "untildify": "^3.0.2", - "urijs": "^1.18.10", - "vscode-jsonrpc": "^3.3.1", - "yaml-ast-parser": "https://github.com/olydis/yaml-ast-parser/releases/download/0.0.34/yaml-ast-parser-0.0.34.tgz", - "yargs": "^8.0.2" - }, - "bundleDependencies": false, - "peerDependencies": {}, - "deprecated": false, - "_resolved": "/root/.autorest/@microsoft.azure_autorest-core@2.0.4168/node_modules/@microsoft.azure/autorest-core", - "_shasum": "33813111fc9bfa488bd600fbba48bc53cc9182c7", - "_shrinkwrap": null, - "bin": null, - "_id": "@microsoft.azure/autorest-core@2.0.4168", - "_from": "file:/root/.autorest/@microsoft.azure_autorest-core@2.0.4168/node_modules/@microsoft.azure/autorest-core", - "_requested": { - "type": "directory", - "where": "/git-restapi", - "raw": "/root/.autorest/@microsoft.azure_autorest-core@2.0.4168/node_modules/@microsoft.azure/autorest-core", - "rawSpec": "/root/.autorest/@microsoft.azure_autorest-core@2.0.4168/node_modules/@microsoft.azure/autorest-core", - "saveSpec": "file:/root/.autorest/@microsoft.azure_autorest-core@2.0.4168/node_modules/@microsoft.azure/autorest-core", - "fetchSpec": "/root/.autorest/@microsoft.azure_autorest-core@2.0.4168/node_modules/@microsoft.azure/autorest-core" - }, - "_spec": "/root/.autorest/@microsoft.azure_autorest-core@2.0.4168/node_modules/@microsoft.azure/autorest-core", - "_where": "/root/.autorest/@microsoft.azure_autorest-core@2.0.4168/node_modules/@microsoft.azure/autorest-core" - }, - "extensionManager": { - "installationPath": "/root/.autorest", - "dotnetPath": "/root/.dotnet" - }, - "installationPath": "/root/.autorest" - }, - { - "resolvedInfo": null, - "packageMetadata": { - "name": "@microsoft.azure/autorest.modeler", - "version": "2.0.21", - "dependencies": { - "dotnet-2.0.0": "^1.3.2" - }, - "optionalDependencies": {}, - "devDependencies": { - "coffee-script": "^1.11.1", - "dotnet-sdk-2.0.0": "^1.1.1", - "gulp": "^3.9.1", - "gulp-filter": "^5.0.0", - "gulp-line-ending-corrector": "^1.0.1", - "iced-coffee-script": "^108.0.11", - "marked": "^0.3.6", - "marked-terminal": "^2.0.0", - "moment": "^2.17.1", - "run-sequence": "*", - "shx": "^0.2.2", - "through2-parallel": "^0.1.3", - "yargs": "^8.0.2", - "yarn": "^1.0.2" - }, - "bundleDependencies": false, - "peerDependencies": {}, - "deprecated": false, - "_resolved": "/root/.autorest/@microsoft.azure_autorest.modeler@2.0.21/node_modules/@microsoft.azure/autorest.modeler", - "_shasum": "3ce7d3939124b31830be15e5de99b9b7768afb90", - "_shrinkwrap": null, - "bin": null, - "_id": "@microsoft.azure/autorest.modeler@2.0.21", - "_from": "file:/root/.autorest/@microsoft.azure_autorest.modeler@2.0.21/node_modules/@microsoft.azure/autorest.modeler", - "_requested": { - "type": "directory", - "where": "/git-restapi", - "raw": "/root/.autorest/@microsoft.azure_autorest.modeler@2.0.21/node_modules/@microsoft.azure/autorest.modeler", - "rawSpec": "/root/.autorest/@microsoft.azure_autorest.modeler@2.0.21/node_modules/@microsoft.azure/autorest.modeler", - "saveSpec": "file:/root/.autorest/@microsoft.azure_autorest.modeler@2.0.21/node_modules/@microsoft.azure/autorest.modeler", - "fetchSpec": "/root/.autorest/@microsoft.azure_autorest.modeler@2.0.21/node_modules/@microsoft.azure/autorest.modeler" - }, - "_spec": "/root/.autorest/@microsoft.azure_autorest.modeler@2.0.21/node_modules/@microsoft.azure/autorest.modeler", - "_where": "/root/.autorest/@microsoft.azure_autorest.modeler@2.0.21/node_modules/@microsoft.azure/autorest.modeler" - }, - "extensionManager": { - "installationPath": "/root/.autorest", - "dotnetPath": "/root/.dotnet" - }, - "installationPath": "/root/.autorest" - }, - { - "resolvedInfo": null, - "packageMetadata": { - "name": "@microsoft.azure/autorest.modeler", - "version": "2.1.22", - "dependencies": { - "dotnet-2.0.0": "^1.4.4" - }, - "optionalDependencies": {}, - "devDependencies": { - "coffee-script": "^1.11.1", - "dotnet-sdk-2.0.0": "^1.4.4", - "gulp": "^3.9.1", - "gulp-filter": "^5.0.0", - "gulp-line-ending-corrector": "^1.0.1", - "iced-coffee-script": "^108.0.11", - "marked": "^0.3.6", - "marked-terminal": "^2.0.0", - "moment": "^2.17.1", - "run-sequence": "*", - "shx": "^0.2.2", - "through2-parallel": "^0.1.3", - "yargs": "^8.0.2", - "yarn": "^1.0.2" - }, - "bundleDependencies": false, - "peerDependencies": {}, - "deprecated": false, - "_resolved": "/root/.autorest/@microsoft.azure_autorest.modeler@2.1.22/node_modules/@microsoft.azure/autorest.modeler", - "_shasum": "ca425289fa38a210d279729048a4a91673f09c67", - "_shrinkwrap": null, - "bin": null, - "_id": "@microsoft.azure/autorest.modeler@2.1.22", - "_from": "file:/root/.autorest/@microsoft.azure_autorest.modeler@2.1.22/node_modules/@microsoft.azure/autorest.modeler", - "_requested": { - "type": "directory", - "where": "/git-restapi", - "raw": "/root/.autorest/@microsoft.azure_autorest.modeler@2.1.22/node_modules/@microsoft.azure/autorest.modeler", - "rawSpec": "/root/.autorest/@microsoft.azure_autorest.modeler@2.1.22/node_modules/@microsoft.azure/autorest.modeler", - "saveSpec": "file:/root/.autorest/@microsoft.azure_autorest.modeler@2.1.22/node_modules/@microsoft.azure/autorest.modeler", - "fetchSpec": "/root/.autorest/@microsoft.azure_autorest.modeler@2.1.22/node_modules/@microsoft.azure/autorest.modeler" - }, - "_spec": "/root/.autorest/@microsoft.azure_autorest.modeler@2.1.22/node_modules/@microsoft.azure/autorest.modeler", - "_where": "/root/.autorest/@microsoft.azure_autorest.modeler@2.1.22/node_modules/@microsoft.azure/autorest.modeler" - }, - "extensionManager": { - "installationPath": "/root/.autorest", - "dotnetPath": "/root/.dotnet" - }, - "installationPath": "/root/.autorest" - }, - { - "resolvedInfo": null, - "packageMetadata": { - "name": "@microsoft.azure/autorest.python", - "version": "2.0.19", - "dependencies": { - "dotnet-2.0.0": "^1.4.4" - }, - "optionalDependencies": {}, - "devDependencies": { - "@microsoft.azure/autorest.testserver": "^1.9.0", - "autorest": "^2.0.0", - "coffee-script": "^1.11.1", - "dotnet-sdk-2.0.0": "^1.4.4", - "gulp": "^3.9.1", - "gulp-filter": "^5.0.0", - "gulp-line-ending-corrector": "^1.0.1", - "iced-coffee-script": "^108.0.11", - "marked": "^0.3.6", - "marked-terminal": "^2.0.0", - "moment": "^2.17.1", - "run-sequence": "*", - "shx": "^0.2.2", - "through2-parallel": "^0.1.3", - "yargs": "^8.0.2", - "yarn": "^1.0.2" - }, - "bundleDependencies": false, - "peerDependencies": {}, - "deprecated": false, - "_resolved": "/root/.autorest/@microsoft.azure_autorest.python@2.0.19/node_modules/@microsoft.azure/autorest.python", - "_shasum": "e069166c16fd903c8e1fdf9395b433f3043cb6e3", - "_shrinkwrap": null, - "bin": null, - "_id": "@microsoft.azure/autorest.python@2.0.19", - "_from": "file:/root/.autorest/@microsoft.azure_autorest.python@2.0.19/node_modules/@microsoft.azure/autorest.python", - "_requested": { - "type": "directory", - "where": "/git-restapi", - "raw": "/root/.autorest/@microsoft.azure_autorest.python@2.0.19/node_modules/@microsoft.azure/autorest.python", - "rawSpec": "/root/.autorest/@microsoft.azure_autorest.python@2.0.19/node_modules/@microsoft.azure/autorest.python", - "saveSpec": "file:/root/.autorest/@microsoft.azure_autorest.python@2.0.19/node_modules/@microsoft.azure/autorest.python", - "fetchSpec": "/root/.autorest/@microsoft.azure_autorest.python@2.0.19/node_modules/@microsoft.azure/autorest.python" - }, - "_spec": "/root/.autorest/@microsoft.azure_autorest.python@2.0.19/node_modules/@microsoft.azure/autorest.python", - "_where": "/root/.autorest/@microsoft.azure_autorest.python@2.0.19/node_modules/@microsoft.azure/autorest.python" - }, - "extensionManager": { - "installationPath": "/root/.autorest", - "dotnetPath": "/root/.dotnet" - }, - "installationPath": "/root/.autorest" - } - ], - "autorest_bootstrap": {} -} \ No newline at end of file diff --git a/azure-mgmt-web/sdk_packaging.toml b/azure-mgmt-web/sdk_packaging.toml new file mode 100644 index 000000000000..a7fd66d6fcb9 --- /dev/null +++ b/azure-mgmt-web/sdk_packaging.toml @@ -0,0 +1,6 @@ +[packaging] +package_name = "azure-mgmt-web" +package_pprint_name = "Web Apps Management" +package_doc_id = "webapps" +is_stable = false +is_arm = true diff --git a/azure-mgmt-web/setup.py b/azure-mgmt-web/setup.py index f47af623f2af..03617fe25f5b 100644 --- a/azure-mgmt-web/setup.py +++ b/azure-mgmt-web/setup.py @@ -72,12 +72,14 @@ 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', 'License :: OSI Approved :: MIT License', ], zip_safe=False, packages=find_packages(exclude=["tests"]), install_requires=[ - 'msrestazure>=0.4.20,<2.0.0', + 'msrest>=0.5.0', + 'msrestazure>=0.4.32,<2.0.0', 'azure-common~=1.1', ], cmdclass=cmdclass From be6e90c49a91b505ed94ad5f5d61ef9165f3709c Mon Sep 17 00:00:00 2001 From: Laurent Mazuel Date: Tue, 28 Aug 2018 09:56:31 -0700 Subject: [PATCH 19/19] Web 0.40.0 --- azure-mgmt-web/HISTORY.rst | 239 +++++++++++++++++++++++ azure-mgmt-web/azure/mgmt/web/version.py | 2 +- 2 files changed, 240 insertions(+), 1 deletion(-) diff --git a/azure-mgmt-web/HISTORY.rst b/azure-mgmt-web/HISTORY.rst index 77bd5a76ce86..481f24e65132 100644 --- a/azure-mgmt-web/HISTORY.rst +++ b/azure-mgmt-web/HISTORY.rst @@ -3,6 +3,245 @@ Release History =============== +0.40.0 (2018-08-28) ++++++++++++++++++++ + +**General Breaking changes** + +This version uses a next-generation code generator that *might* introduce breaking changes. + +- Model signatures now use only keyword-argument syntax. All positional arguments must be re-written as keyword-arguments. + To keep auto-completion in most cases, models are now generated for Python 2 and Python 3. Python 3 uses the "*" syntax for keyword-only arguments. +- Enum types now use the "str" mixin (class AzureEnum(str, Enum)) to improve the behavior when unrecognized enum values are encountered. + While this is not a breaking change, the distinctions are important, and are documented here: + https://docs.python.org/3/library/enum.html#others + At a glance: + + - "is" should not be used at all. + - "format" will return the string value, where "%s" string formatting will return `NameOfEnum.stringvalue`. Format syntax should be prefered. + +- New Long Running Operation: + + - Return type changes from `msrestazure.azure_operation.AzureOperationPoller` to `msrest.polling.LROPoller`. External API is the same. + - Return type is now **always** a `msrest.polling.LROPoller`, regardless of the optional parameters used. + - The behavior has changed when using `raw=True`. Instead of returning the initial call result as `ClientRawResponse`, + without polling, now this returns an LROPoller. After polling, the final resource will be returned as a `ClientRawResponse`. + - New `polling` parameter. The default behavior is `Polling=True` which will poll using ARM algorithm. When `Polling=False`, + the response of the initial call will be returned without polling. + - `polling` parameter accepts instances of subclasses of `msrest.polling.PollingMethod`. + - `add_done_callback` will no longer raise if called after polling is finished, but will instead execute the callback right away. + + +**General Features** + +- Client class can be used as a context manager to keep the underlying HTTP session open for performance + +**Features** + +- Model ValidateRequest has a new parameter is_xenon +- Model SiteConfigResource has a new parameter reserved_instance_count +- Model SiteConfigResource has a new parameter windows_fx_version +- Model SiteConfigResource has a new parameter azure_storage_accounts +- Model SiteConfigResource has a new parameter x_managed_service_identity_id +- Model SiteConfigResource has a new parameter managed_service_identity_id +- Model SiteConfigResource has a new parameter ftps_state +- Model TriggeredWebJob has a new parameter web_job_type +- Model CsmPublishingProfileOptions has a new parameter include_disaster_recovery_endpoints +- Model SitePatchResource has a new parameter hyper_v +- Model SitePatchResource has a new parameter is_xenon +- Model StampCapacity has a new parameter is_linux +- Model User has a new parameter scm_uri +- Model SiteConfigurationSnapshotInfo has a new parameter snapshot_id +- Model AppServiceEnvironmentPatchResource has a new parameter ssl_cert_key_vault_secret_name +- Model AppServiceEnvironmentPatchResource has a new parameter has_linux_workers +- Model AppServiceEnvironmentPatchResource has a new parameter ssl_cert_key_vault_id +- Model BackupRequest has a new parameter backup_name +- Model RecommendationRule has a new parameter id +- Model RecommendationRule has a new parameter recommendation_name +- Model RecommendationRule has a new parameter kind +- Model RecommendationRule has a new parameter type +- Model RecommendationRule has a new parameter category_tags +- Model Site has a new parameter hyper_v +- Model Site has a new parameter is_xenon +- Model TriggeredJobRun has a new parameter web_job_id +- Model TriggeredJobRun has a new parameter web_job_name +- Model CertificateOrderAction has a new parameter action_type +- Model SiteExtensionInfo has a new parameter installer_command_line_params +- Model SiteExtensionInfo has a new parameter extension_id +- Model SiteExtensionInfo has a new parameter extension_type +- Model SiteAuthSettings has a new parameter validate_issuer +- Model TriggeredJobHistory has a new parameter runs +- Model ProcessInfo has a new parameter minidump +- Model ProcessInfo has a new parameter total_cpu_time +- Model ProcessInfo has a new parameter non_paged_system_memory +- Model ProcessInfo has a new parameter working_set +- Model ProcessInfo has a new parameter paged_memory +- Model ProcessInfo has a new parameter private_memory +- Model ProcessInfo has a new parameter user_cpu_time +- Model ProcessInfo has a new parameter deployment_name +- Model ProcessInfo has a new parameter peak_paged_memory +- Model ProcessInfo has a new parameter peak_working_set +- Model ProcessInfo has a new parameter peak_virtual_memory +- Model ProcessInfo has a new parameter is_webjob +- Model ProcessInfo has a new parameter privileged_cpu_time +- Model ProcessInfo has a new parameter identifier +- Model ProcessInfo has a new parameter paged_system_memory +- Model ProcessInfo has a new parameter virtual_memory +- Model ServiceSpecification has a new parameter log_specifications +- Model ProcessThreadInfo has a new parameter identifier +- Model ManagedServiceIdentity has a new parameter identity_ids +- Model AppServicePlan has a new parameter free_offer_expiration_time +- Model AppServicePlan has a new parameter hyper_v +- Model AppServicePlan has a new parameter is_xenon +- Model SiteConfig has a new parameter reserved_instance_count +- Model SiteConfig has a new parameter windows_fx_version +- Model SiteConfig has a new parameter azure_storage_accounts +- Model SiteConfig has a new parameter x_managed_service_identity_id +- Model SiteConfig has a new parameter managed_service_identity_id +- Model SiteConfig has a new parameter ftps_state +- Model WebJob has a new parameter web_job_type +- Model Recommendation has a new parameter name +- Model Recommendation has a new parameter id +- Model Recommendation has a new parameter kind +- Model Recommendation has a new parameter enabled +- Model Recommendation has a new parameter type +- Model Recommendation has a new parameter states +- Model Recommendation has a new parameter category_tags +- Model SlotConfigNamesResource has a new parameter azure_storage_config_names +- Model SlotDifference has a new parameter level +- Model AppServiceEnvironment has a new parameter ssl_cert_key_vault_secret_name +- Model AppServiceEnvironment has a new parameter has_linux_workers +- Model AppServiceEnvironment has a new parameter ssl_cert_key_vault_id +- Model ContinuousWebJob has a new parameter web_job_type +- Model AppServiceEnvironmentResource has a new parameter ssl_cert_key_vault_secret_name +- Model AppServiceEnvironmentResource has a new parameter has_linux_workers +- Model AppServiceEnvironmentResource has a new parameter ssl_cert_key_vault_id +- Model AppServicePlanPatchResource has a new parameter free_offer_expiration_time +- Model AppServicePlanPatchResource has a new parameter hyper_v +- Model AppServicePlanPatchResource has a new parameter is_xenon +- Model DeletedSite has a new parameter deleted_site_name +- Model DeletedSite has a new parameter deleted_site_kind +- Model DeletedSite has a new parameter kind +- Model DeletedSite has a new parameter type +- Model DeletedSite has a new parameter deleted_site_id +- Added operation WebAppsOperations.put_private_access_vnet +- Added operation WebAppsOperations.create_or_update_swift_virtual_network_connection +- Added operation WebAppsOperations.update_azure_storage_accounts +- Added operation WebAppsOperations.update_premier_add_on_slot +- Added operation WebAppsOperations.get_container_logs_zip_slot +- Added operation WebAppsOperations.discover_backup_slot +- Added operation WebAppsOperations.update_swift_virtual_network_connection_slot +- Added operation WebAppsOperations.get_private_access +- Added operation WebAppsOperations.discover_backup +- Added operation WebAppsOperations.create_or_update_swift_virtual_network_connection_slot +- Added operation WebAppsOperations.delete_swift_virtual_network +- Added operation WebAppsOperations.put_private_access_vnet_slot +- Added operation WebAppsOperations.restore_from_deleted_app +- Added operation WebAppsOperations.restore_from_backup_blob +- Added operation WebAppsOperations.delete_swift_virtual_network_slot +- Added operation WebAppsOperations.list_azure_storage_accounts +- Added operation WebAppsOperations.list_azure_storage_accounts_slot +- Added operation WebAppsOperations.restore_from_backup_blob_slot +- Added operation WebAppsOperations.get_swift_virtual_network_connection +- Added operation WebAppsOperations.get_swift_virtual_network_connection_slot +- Added operation WebAppsOperations.get_container_logs_zip +- Added operation WebAppsOperations.restore_snapshot +- Added operation WebAppsOperations.update_swift_virtual_network_connection +- Added operation WebAppsOperations.restore_snapshot_slot +- Added operation WebAppsOperations.restore_from_deleted_app_slot +- Added operation WebAppsOperations.update_azure_storage_accounts_slot +- Added operation WebAppsOperations.get_private_access_slot +- Added operation WebAppsOperations.update_premier_add_on +- Added operation AppServiceEnvironmentsOperations.change_vnet +- Added operation DiagnosticsOperations.list_site_detector_responses_slot +- Added operation DiagnosticsOperations.get_site_detector_response_slot +- Added operation DiagnosticsOperations.get_site_detector_response +- Added operation DiagnosticsOperations.get_hosting_environment_detector_response +- Added operation DiagnosticsOperations.list_site_detector_responses +- Added operation DiagnosticsOperations.list_hosting_environment_detector_responses +- Added operation RecommendationsOperations.disable_recommendation_for_subscription +- Added operation RecommendationsOperations.disable_recommendation_for_site +- Added operation group ResourceHealthMetadataOperations + +**Breaking changes** + +- Operation RecommendationsOperations.get_rule_details_by_web_app has a new signature +- Operation WebAppsOperations.list_publishing_profile_xml_with_secrets has a new signature +- Operation WebAppsOperations.list_publishing_profile_xml_with_secrets_slot has a new signature +- Operation WebAppsOperations.delete_slot has a new signature +- Operation WebAppsOperations.delete has a new signature +- Operation RecommendationsOperations.list_history_for_web_app has a new signature +- Operation WebAppsOperations.update_slot has a new signature +- Operation WebAppsOperations.create_or_update_slot has a new signature +- Operation WebAppsOperations.create_or_update has a new signature +- Operation WebAppsOperations.update has a new signature +- Model TriggeredWebJob no longer has parameter triggered_web_job_name +- Model TriggeredWebJob no longer has parameter job_type +- Model SitePatchResource no longer has parameter snapshot_info +- Model User no longer has parameter user_name +- Model SiteConfigurationSnapshotInfo no longer has parameter site_configuration_snapshot_info_id +- Model BackupRequest no longer has parameter backup_request_name +- Model BackupRequest no longer has parameter backup_request_type +- Model ResourceMetricDefinition no longer has parameter resource_metric_definition_id +- Model ResourceMetricDefinition no longer has parameter resource_metric_definition_name +- Model RecommendationRule no longer has parameter tags +- Model SourceControl no longer has parameter source_control_name +- Model Site no longer has parameter snapshot_info +- Model VnetRoute no longer has parameter vnet_route_name +- Model Certificate no longer has parameter geo_region +- Model TriggeredJobRun no longer has parameter triggered_job_run_id +- Model TriggeredJobRun no longer has parameter triggered_job_run_name +- Model CertificateOrderAction no longer has parameter certificate_order_action_type +- Model SiteExtensionInfo no longer has parameter site_extension_info_id +- Model SiteExtensionInfo no longer has parameter installation_args +- Model SiteExtensionInfo no longer has parameter site_extension_info_type +- Model PremierAddOnOffer no longer has parameter premier_add_on_offer_name +- Model TriggeredJobHistory no longer has parameter triggered_job_runs +- Model ProcessInfo no longer has parameter total_processor_time +- Model ProcessInfo no longer has parameter user_processor_time +- Model ProcessInfo no longer has parameter peak_paged_memory_size64 +- Model ProcessInfo no longer has parameter privileged_processor_time +- Model ProcessInfo no longer has parameter paged_system_memory_size64 +- Model ProcessInfo no longer has parameter process_info_name +- Model ProcessInfo no longer has parameter peak_working_set64 +- Model ProcessInfo no longer has parameter virtual_memory_size64 +- Model ProcessInfo no longer has parameter mini_dump +- Model ProcessInfo no longer has parameter is_web_job +- Model ProcessInfo no longer has parameter private_memory_size64 +- Model ProcessInfo no longer has parameter nonpaged_system_memory_size64 +- Model ProcessInfo no longer has parameter working_set64 +- Model ProcessInfo no longer has parameter process_info_id +- Model ProcessInfo no longer has parameter paged_memory_size64 +- Model ProcessInfo no longer has parameter peak_virtual_memory_size64 +- Model GeoRegion no longer has parameter geo_region_name +- Model FunctionEnvelope no longer has parameter function_envelope_name +- Model ProcessThreadInfo no longer has parameter process_thread_info_id +- Model CloningInfo no longer has parameter ignore_quotas +- Model AppServicePlan no longer has parameter app_service_plan_name +- Model CertificatePatchResource no longer has parameter geo_region +- Model WebJob no longer has parameter job_type +- Model WebJob no longer has parameter web_job_name +- Model Usage no longer has parameter usage_name +- Model Deployment no longer has parameter deployment_id +- Model Recommendation no longer has parameter tags +- Model PremierAddOn no longer has parameter premier_add_on_tags +- Model PremierAddOn no longer has parameter premier_add_on_location +- Model PremierAddOn no longer has parameter premier_add_on_name +- Model SlotDifference no longer has parameter slot_difference_type +- Model ContinuousWebJob no longer has parameter continuous_web_job_name +- Model ContinuousWebJob no longer has parameter job_type +- Model TopLevelDomain no longer has parameter domain_name +- Model AppServicePlanPatchResource no longer has parameter app_service_plan_patch_resource_name +- Model MetricDefinition no longer has parameter metric_definition_name +- Model PerfMonSample no longer has parameter core_count +- Removed operation WebAppsOperations.recover +- Removed operation WebAppsOperations.recover_slot +- Removed operation WebAppsOperations.get_web_site_container_logs_zip +- Removed operation WebAppsOperations.get_web_site_container_logs_zip_slot +- Removed operation WebAppsOperations.discover_restore +- Removed operation WebAppsOperations.discover_restore_slot +- Model IpSecurityRestriction has a new signature + 0.35.0 (2018-02-20) +++++++++++++++++++ diff --git a/azure-mgmt-web/azure/mgmt/web/version.py b/azure-mgmt-web/azure/mgmt/web/version.py index 8ae395630e43..57866fdf17d0 100644 --- a/azure-mgmt-web/azure/mgmt/web/version.py +++ b/azure-mgmt-web/azure/mgmt/web/version.py @@ -9,5 +9,5 @@ # regenerated. # -------------------------------------------------------------------------- -VERSION = "0.36.0" +VERSION = "0.40.0"