diff --git a/azure-mgmt-web/azure/mgmt/web/models/__init__.py b/azure-mgmt-web/azure/mgmt/web/models/__init__.py index f8864c9a872c..162303c91095 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/__init__.py +++ b/azure-mgmt-web/azure/mgmt/web/models/__init__.py @@ -13,16 +13,59 @@ 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 .name_identifier import NameIdentifier -from .proxy_only_resource import ProxyOnlyResource from .reissue_certificate_order_request import ReissueCertificateOrderRequest from .renew_certificate_order_request import RenewCertificateOrderRequest -from .resource_identity import ResourceIdentity -from .resource import Resource from .site_seal import SiteSeal from .site_seal_request import SiteSealRequest +from .managed_service_identity import ManagedServiceIdentity +from .slot_swap_status import SlotSwapStatus +from .snapshot_recovery_target import SnapshotRecoveryTarget +from .vnet_route import VnetRoute +from .vnet_info import VnetInfo +from .vnet_gateway import VnetGateway +from .user import User +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 .hybrid_connection_key import HybridConnectionKey +from .hybrid_connection import HybridConnection +from .proxy_only_resource import ProxyOnlyResource +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 .address import Address from .contact import Contact from .host_name import HostName @@ -31,12 +74,27 @@ 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 .tld_legal_agreement import TldLegalAgreement from .top_level_domain import TopLevelDomain from .top_level_domain_agreement_option import TopLevelDomainAgreementOption -from .hosting_environment_profile import HostingEnvironmentProfile 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 .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 .csm_operation_display import CsmOperationDisplay from .dimension import Dimension @@ -47,79 +105,53 @@ from .csm_operation_description import CsmOperationDescription from .recommendation import Recommendation from .recommendation_rule import RecommendationRule -from .capability import Capability from .csm_move_resource_envelope import CsmMoveResourceEnvelope from .geo_region import GeoRegion -from .sku_capacity import SkuCapacity +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 .user import User 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 .api_definition_info import ApiDefinitionInfo 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 .auto_heal_custom_action import AutoHealCustomAction -from .auto_heal_actions import AutoHealActions -from .requests_based_trigger import RequestsBasedTrigger -from .status_codes_based_trigger import StatusCodesBasedTrigger -from .slow_requests_based_trigger import SlowRequestsBasedTrigger -from .auto_heal_triggers import AutoHealTriggers -from .auto_heal_rules import AutoHealRules 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 .cloning_info import CloningInfo -from .conn_string_info import ConnStringInfo from .conn_string_value_type_pair import ConnStringValueTypePair from .connection_string_dictionary import ConnectionStringDictionary from .continuous_web_job import ContinuousWebJob -from .cors_settings import CorsSettings from .csm_publishing_profile_options import CsmPublishingProfileOptions from .csm_slot_entity import CsmSlotEntity -from .localizable_string import LocalizableString -from .csm_usage_quota import CsmUsageQuota -from .error_entity import ErrorEntity from .custom_hostname_analysis_result import CustomHostnameAnalysisResult from .deployment import Deployment from .enabled_config import EnabledConfig -from .ramp_up_rule import RampUpRule -from .experiments import Experiments from .file_system_http_logs_config import FileSystemHttpLogsConfig from .function_envelope import FunctionEnvelope from .function_secrets import FunctionSecrets -from .handler_mapping import HandlerMapping from .host_name_binding import HostNameBinding -from .host_name_ssl_state import HostNameSslState from .http_logs_config import HttpLogsConfig -from .hybrid_connection import HybridConnection -from .hybrid_connection_key import HybridConnectionKey from .identifier import Identifier -from .ip_security_restriction import IpSecurityRestriction 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 .name_value_pair import NameValuePair -from .vnet_route import VnetRoute -from .vnet_info import VnetInfo from .relay_service_connection_entity import RelayServiceConnectionEntity from .network_features import NetworkFeatures -from .operation import Operation from .perf_mon_sample import PerfMonSample from .perf_mon_set import PerfMonSet from .perf_mon_response import PerfMonResponse @@ -128,24 +160,8 @@ from .process_module_info import ProcessModuleInfo from .process_info import ProcessInfo from .public_certificate import PublicCertificate -from .push_settings import PushSettings -from .resource_metric_name import ResourceMetricName -from .resource_metric_property import ResourceMetricProperty -from .resource_metric_value import ResourceMetricValue -from .resource_metric import ResourceMetric -from .resource_metric_availability import ResourceMetricAvailability -from .resource_metric_definition import ResourceMetricDefinition from .restore_request import RestoreRequest from .restore_response import RestoreResponse -from .site_machine_key import SiteMachineKey -from .virtual_directory import VirtualDirectory -from .virtual_application import VirtualApplication -from .site_limits import SiteLimits -from .site_config import SiteConfig -from .snapshot_recovery_target import SnapshotRecoveryTarget -from .snapshot_recovery_request import SnapshotRecoveryRequest -from .slot_swap_status import SlotSwapStatus -from .site import Site from .site_auth_settings import SiteAuthSettings from .site_cloneability_criterion import SiteCloneabilityCriterion from .site_cloneability import SiteCloneability @@ -154,6 +170,7 @@ 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 @@ -165,25 +182,17 @@ from .triggered_job_run import TriggeredJobRun from .triggered_job_history import TriggeredJobHistory from .triggered_web_job import TriggeredWebJob -from .vnet_gateway import VnetGateway -from .web_app_collection import WebAppCollection from .web_job import WebJob -from .virtual_ip_mapping import VirtualIPMapping from .address_response import AddressResponse -from .virtual_network_profile import VirtualNetworkProfile -from .worker_pool import WorkerPool -from .stamp_capacity import StampCapacity -from .network_access_control_entry import NetworkAccessControlEntry -from .app_service_environment import AppServiceEnvironment from .app_service_environment_resource import AppServiceEnvironmentResource -from .sku_description import SkuDescription -from .app_service_plan import AppServicePlan +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 @@ -201,6 +210,7 @@ from .site_paged import SitePaged from .backup_item_paged import BackupItemPaged from .site_config_resource_paged import SiteConfigResourcePaged +from .site_configuration_snapshot_info_paged import SiteConfigurationSnapshotInfoPaged from .continuous_web_job_paged import ContinuousWebJobPaged from .deployment_paged import DeploymentPaged from .identifier_paged import IdentifierPaged @@ -221,7 +231,7 @@ from .triggered_job_history_paged import TriggeredJobHistoryPaged from .csm_usage_quota_paged import CsmUsageQuotaPaged from .web_job_paged import WebJobPaged -from .app_service_environment_paged import AppServiceEnvironmentPaged +from .app_service_environment_resource_paged import AppServiceEnvironmentResourcePaged from .stamp_capacity_paged import StampCapacityPaged from .worker_pool_resource_paged import WorkerPoolResourcePaged from .sku_info_paged import SkuInfoPaged @@ -235,13 +245,29 @@ ProvisioningState, CertificateOrderStatus, CertificateOrderActionType, - ManagedServiceIdentityType, + RouteType, + AutoHealActionType, + ConnectionStringType, + ScmType, + ManagedPipelineMode, + SiteLoadBalancing, + SslState, + HostType, + UsageState, + SiteAvailabilityState, + StatusOptions, DomainStatus, AzureResourceType, CustomHostNameDnsRecordType, HostNameType, DnsType, DomainType, + HostingEnvironmentStatus, + InternalLoadBalancingMode, + ComputeModeOptions, + WorkerSizeOptions, + AccessControlEntryAction, + OperationStatus, ResourceScopeType, NotificationLevel, Channels, @@ -250,40 +276,23 @@ CheckNameResourceTypes, ValidateResourceTypes, LogLevel, - AutoHealActionType, BackupItemStatus, DatabaseType, FrequencyUnit, BackupRestoreOperationType, - ConnectionStringType, ContinuousWebJobStatus, WebJobType, PublishingProfileFormat, DnsVerificationTestResult, - SslState, - HostType, MSDeployLogEntryType, MSDeployProvisioningState, MySqlMigrationType, - OperationStatus, - RouteType, PublicCertificateLocation, - UsageState, - SiteAvailabilityState, - ScmType, - ManagedPipelineMode, - SiteLoadBalancing, UnauthenticatedClientAction, BuiltInAuthenticationProvider, CloneAbilityResult, SiteExtensionType, TriggeredWebJobStatus, - HostingEnvironmentStatus, - InternalLoadBalancingMode, - ComputeModeOptions, - WorkerSizeOptions, - AccessControlEntryAction, - StatusOptions, SkuName, ) @@ -292,16 +301,59 @@ 'AppServiceCertificateResource', 'CertificateDetails', 'AppServiceCertificateOrder', + 'AppServiceCertificateOrderPatchResource', + 'AppServiceCertificatePatchResource', 'CertificateEmail', 'CertificateOrderAction', - 'NameIdentifier', - 'ProxyOnlyResource', 'ReissueCertificateOrderRequest', 'RenewCertificateOrderRequest', - 'ResourceIdentity', - 'Resource', 'SiteSeal', 'SiteSealRequest', + 'ManagedServiceIdentity', + 'SlotSwapStatus', + 'SnapshotRecoveryTarget', + 'VnetRoute', + 'VnetInfo', + 'VnetGateway', + 'User', + 'SnapshotRecoveryRequest', + 'ResourceMetricAvailability', + 'ResourceMetricName', + 'ResourceMetricDefinition', + 'PushSettings', + 'HybridConnectionKey', + 'HybridConnection', + 'ProxyOnlyResource', + 'CloningInfo', + 'HostingEnvironmentProfile', + 'IpSecurityRestriction', + 'ApiDefinitionInfo', + 'CorsSettings', + 'AutoHealCustomAction', + 'AutoHealActions', + 'SlowRequestsBasedTrigger', + 'StatusCodesBasedTrigger', + 'RequestsBasedTrigger', + 'AutoHealTriggers', + 'AutoHealRules', + 'SiteLimits', + 'RampUpRule', + 'Experiments', + 'VirtualDirectory', + 'VirtualApplication', + 'HandlerMapping', + 'SiteMachineKey', + 'ConnStringInfo', + 'NameValuePair', + 'SiteConfig', + 'HostNameSslState', + 'Site', + 'Capability', + 'SkuCapacity', + 'SkuDescription', + 'AppServicePlan', + 'Resource', + 'NameIdentifier', 'Address', 'Contact', 'HostName', @@ -310,12 +362,27 @@ 'DomainAvailablilityCheckResult', 'DomainControlCenterSsoRequest', 'DomainOwnershipIdentifier', + 'DomainPatchResource', 'DomainRecommendationSearchParameters', 'TldLegalAgreement', 'TopLevelDomain', 'TopLevelDomainAgreementOption', - 'HostingEnvironmentProfile', 'Certificate', + 'CertificatePatchResource', + 'VirtualNetworkProfile', + 'WorkerPool', + 'VirtualIPMapping', + 'StampCapacity', + 'NetworkAccessControlEntry', + 'AppServiceEnvironment', + 'LocalizableString', + 'CsmUsageQuota', + 'ErrorEntity', + 'Operation', + 'ResourceMetricProperty', + 'ResourceMetricValue', + 'ResourceMetric', + 'WebAppCollection', 'DeletedSite', 'CsmOperationDisplay', 'Dimension', @@ -326,79 +393,53 @@ 'CsmOperationDescription', 'Recommendation', 'RecommendationRule', - 'Capability', 'CsmMoveResourceEnvelope', 'GeoRegion', - 'SkuCapacity', + 'HostingEnvironmentDeploymentInfo', + 'DeploymentLocations', 'GlobalCsmSkuDescription', 'PremierAddOnOffer', 'ResourceNameAvailability', 'ResourceNameAvailabilityRequest', 'SkuInfos', 'SourceControl', - 'User', 'ValidateRequest', 'ValidateResponseError', 'ValidateResponse', 'VnetParameters', 'VnetValidationTestFailure', 'VnetValidationFailureDetails', - 'ApiDefinitionInfo', 'FileSystemApplicationLogsConfig', 'AzureTableStorageApplicationLogsConfig', 'AzureBlobStorageApplicationLogsConfig', 'ApplicationLogsConfig', - 'AutoHealCustomAction', - 'AutoHealActions', - 'RequestsBasedTrigger', - 'StatusCodesBasedTrigger', - 'SlowRequestsBasedTrigger', - 'AutoHealTriggers', - 'AutoHealRules', 'AzureBlobStorageHttpLogsConfig', 'DatabaseBackupSetting', 'BackupItem', 'BackupSchedule', 'BackupRequest', - 'CloningInfo', - 'ConnStringInfo', 'ConnStringValueTypePair', 'ConnectionStringDictionary', 'ContinuousWebJob', - 'CorsSettings', 'CsmPublishingProfileOptions', 'CsmSlotEntity', - 'LocalizableString', - 'CsmUsageQuota', - 'ErrorEntity', 'CustomHostnameAnalysisResult', 'Deployment', 'EnabledConfig', - 'RampUpRule', - 'Experiments', 'FileSystemHttpLogsConfig', 'FunctionEnvelope', 'FunctionSecrets', - 'HandlerMapping', 'HostNameBinding', - 'HostNameSslState', 'HttpLogsConfig', - 'HybridConnection', - 'HybridConnectionKey', 'Identifier', - 'IpSecurityRestriction', 'MSDeploy', 'MSDeployLogEntry', 'MSDeployLog', 'MSDeployStatus', 'MigrateMySqlRequest', 'MigrateMySqlStatus', - 'NameValuePair', - 'VnetRoute', - 'VnetInfo', 'RelayServiceConnectionEntity', 'NetworkFeatures', - 'Operation', 'PerfMonSample', 'PerfMonSet', 'PerfMonResponse', @@ -407,24 +448,8 @@ 'ProcessModuleInfo', 'ProcessInfo', 'PublicCertificate', - 'PushSettings', - 'ResourceMetricName', - 'ResourceMetricProperty', - 'ResourceMetricValue', - 'ResourceMetric', - 'ResourceMetricAvailability', - 'ResourceMetricDefinition', 'RestoreRequest', 'RestoreResponse', - 'SiteMachineKey', - 'VirtualDirectory', - 'VirtualApplication', - 'SiteLimits', - 'SiteConfig', - 'SnapshotRecoveryTarget', - 'SnapshotRecoveryRequest', - 'SlotSwapStatus', - 'Site', 'SiteAuthSettings', 'SiteCloneabilityCriterion', 'SiteCloneability', @@ -433,6 +458,7 @@ 'SiteExtensionInfo', 'SiteInstance', 'SiteLogsConfig', + 'SitePatchResource', 'SitePhpErrorLogFlag', 'SiteSourceControl', 'SlotConfigNamesResource', @@ -444,25 +470,17 @@ 'TriggeredJobRun', 'TriggeredJobHistory', 'TriggeredWebJob', - 'VnetGateway', - 'WebAppCollection', 'WebJob', - 'VirtualIPMapping', 'AddressResponse', - 'VirtualNetworkProfile', - 'WorkerPool', - 'StampCapacity', - 'NetworkAccessControlEntry', - 'AppServiceEnvironment', 'AppServiceEnvironmentResource', - 'SkuDescription', - 'AppServicePlan', + 'AppServiceEnvironmentPatchResource', 'HostingEnvironmentDiagnostics', 'MetricAvailabilily', 'MetricDefinition', 'SkuInfo', 'Usage', 'WorkerPoolResource', + 'AppServicePlanPatchResource', 'HybridConnectionLimits', 'AppServiceCertificateOrderPaged', 'AppServiceCertificateResourcePaged', @@ -480,6 +498,7 @@ 'SitePaged', 'BackupItemPaged', 'SiteConfigResourcePaged', + 'SiteConfigurationSnapshotInfoPaged', 'ContinuousWebJobPaged', 'DeploymentPaged', 'IdentifierPaged', @@ -500,7 +519,7 @@ 'TriggeredJobHistoryPaged', 'CsmUsageQuotaPaged', 'WebJobPaged', - 'AppServiceEnvironmentPaged', + 'AppServiceEnvironmentResourcePaged', 'StampCapacityPaged', 'WorkerPoolResourcePaged', 'SkuInfoPaged', @@ -513,13 +532,29 @@ 'ProvisioningState', 'CertificateOrderStatus', 'CertificateOrderActionType', - 'ManagedServiceIdentityType', + 'RouteType', + 'AutoHealActionType', + 'ConnectionStringType', + 'ScmType', + 'ManagedPipelineMode', + 'SiteLoadBalancing', + 'SslState', + 'HostType', + 'UsageState', + 'SiteAvailabilityState', + 'StatusOptions', 'DomainStatus', 'AzureResourceType', 'CustomHostNameDnsRecordType', 'HostNameType', 'DnsType', 'DomainType', + 'HostingEnvironmentStatus', + 'InternalLoadBalancingMode', + 'ComputeModeOptions', + 'WorkerSizeOptions', + 'AccessControlEntryAction', + 'OperationStatus', 'ResourceScopeType', 'NotificationLevel', 'Channels', @@ -528,39 +563,22 @@ 'CheckNameResourceTypes', 'ValidateResourceTypes', 'LogLevel', - 'AutoHealActionType', 'BackupItemStatus', 'DatabaseType', 'FrequencyUnit', 'BackupRestoreOperationType', - 'ConnectionStringType', 'ContinuousWebJobStatus', 'WebJobType', 'PublishingProfileFormat', 'DnsVerificationTestResult', - 'SslState', - 'HostType', 'MSDeployLogEntryType', 'MSDeployProvisioningState', 'MySqlMigrationType', - 'OperationStatus', - 'RouteType', 'PublicCertificateLocation', - 'UsageState', - 'SiteAvailabilityState', - 'ScmType', - 'ManagedPipelineMode', - 'SiteLoadBalancing', 'UnauthenticatedClientAction', 'BuiltInAuthenticationProvider', 'CloneAbilityResult', 'SiteExtensionType', 'TriggeredWebJobStatus', - 'HostingEnvironmentStatus', - 'InternalLoadBalancingMode', - 'ComputeModeOptions', - 'WorkerSizeOptions', - 'AccessControlEntryAction', - 'StatusOptions', 'SkuName', ] diff --git a/azure-mgmt-web/azure/mgmt/web/models/address.py b/azure-mgmt-web/azure/mgmt/web/models/address.py index 4161661ad337..7e82b188bc08 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/address.py +++ b/azure-mgmt-web/azure/mgmt/web/models/address.py @@ -15,17 +15,17 @@ class Address(Model): """Address information for domain registration. - :param address1: Address 1. + :param address1: First line of an Address. :type address1: str - :param address2: Address 2. + :param address2: The second line of the Address. Optional. :type address2: str - :param city: City. + :param city: The city for the address. :type city: str - :param country: Country. + :param country: The country for the address. :type country: str - :param postal_code: Postal code. + :param postal_code: The postal code for the address. :type postal_code: str - :param state: State. + :param state: The state or province for the address. :type state: str """ 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 ef1d3bd83347..e221b3e6579a 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 @@ -30,8 +30,6 @@ class AppServiceCertificateOrder(Resource): :vartype type: str :param tags: Resource tags. :type tags: dict[str, str] - :param identity: Identity for the resource. - :type identity: ~azure.mgmt.web.models.ResourceIdentity :param certificates: State of the Key Vault secret. :type certificates: dict[str, ~azure.mgmt.web.models.AppServiceCertificate] @@ -111,7 +109,6 @@ class AppServiceCertificateOrder(Resource): 'location': {'key': 'location', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, - 'identity': {'key': 'identity', 'type': 'ResourceIdentity'}, 'certificates': {'key': 'properties.certificates', 'type': '{AppServiceCertificate}'}, 'distinguished_name': {'key': 'properties.distinguishedName', 'type': 'str'}, 'domain_verification_token': {'key': 'properties.domainVerificationToken', 'type': 'str'}, @@ -133,8 +130,8 @@ class AppServiceCertificateOrder(Resource): 'next_auto_renewal_time_stamp': {'key': 'properties.nextAutoRenewalTimeStamp', 'type': 'iso-8601'}, } - def __init__(self, location, kind=None, tags=None, identity=None, certificates=None, distinguished_name=None, validity_in_years=1, key_size=2048, product_type=None, auto_renew=True, csr=None): - super(AppServiceCertificateOrder, self).__init__(kind=kind, location=location, tags=tags, identity=identity) + def __init__(self, location, kind=None, tags=None, certificates=None, distinguished_name=None, validity_in_years=1, key_size=2048, product_type=None, auto_renew=True, csr=None): + super(AppServiceCertificateOrder, self).__init__(kind=kind, location=location, tags=tags) self.certificates = certificates self.distinguished_name = distinguished_name self.domain_verification_token = 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 new file mode 100644 index 000000000000..eed987d7c916 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_order_patch_resource.py @@ -0,0 +1,146 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license 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 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. + + :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: 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}, + '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, kind=None, certificates=None, distinguished_name=None, validity_in_years=1, key_size=2048, product_type=None, auto_renew=True, csr=None): + super(AppServiceCertificateOrderPatchResource, self).__init__(kind=kind) + 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 new file mode 100644 index 000000000000..396fb0c5a54b --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/app_service_certificate_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 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=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 + 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 9c2728c3984b..b326f42f3a47 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 @@ -31,8 +31,6 @@ class AppServiceCertificateResource(Resource): :vartype type: str :param tags: Resource tags. :type tags: dict[str, str] - :param identity: Identity for the resource. - :type identity: ~azure.mgmt.web.models.ResourceIdentity :param key_vault_id: Key Vault resource Id. :type key_vault_id: str :param key_vault_secret_name: Key Vault secret name. @@ -62,14 +60,13 @@ class AppServiceCertificateResource(Resource): 'location': {'key': 'location', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, - 'identity': {'key': 'identity', 'type': 'ResourceIdentity'}, '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, kind=None, tags=None, identity=None, key_vault_id=None, key_vault_secret_name=None): - super(AppServiceCertificateResource, self).__init__(kind=kind, location=location, tags=tags, identity=identity) + 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 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 bc080b0144f8..a06cca0bfdb3 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 @@ -120,6 +120,9 @@ class AppServiceEnvironment(Model): :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 = { @@ -182,9 +185,10 @@ class AppServiceEnvironment(Model): '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, 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): + 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): self.name = name self.location = location self.provisioning_state = None @@ -220,3 +224,4 @@ def __init__(self, name, location, virtual_network, worker_pools, vnet_name=None 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_patch_resource.py b/azure-mgmt-web/azure/mgmt/web/models/app_service_environment_patch_resource.py new file mode 100644 index 000000000000..fc92893eb4f4 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/app_service_environment_patch_resource.py @@ -0,0 +1,244 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license 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 AppServiceEnvironmentPatchResource(ProxyOnlyResource): + """ARM resource for a app service enviroment. + + 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 app_service_environment_patch_resource_name: 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". + :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: 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: 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, 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 + 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 d236fee51761..58ebede0b657 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 @@ -30,8 +30,6 @@ class AppServiceEnvironmentResource(Resource): :vartype type: str :param tags: Resource tags. :type tags: dict[str, str] - :param identity: Identity for the resource. - :type identity: ~azure.mgmt.web.models.ResourceIdentity :param app_service_environment_resource_name: Name of the App Service Environment. :type app_service_environment_resource_name: str @@ -136,6 +134,9 @@ class AppServiceEnvironmentResource(Resource): :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 = { @@ -173,7 +174,6 @@ class AppServiceEnvironmentResource(Resource): 'location': {'key': 'location', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, - 'identity': {'key': 'identity', 'type': 'ResourceIdentity'}, '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'}, @@ -209,10 +209,11 @@ class AppServiceEnvironmentResource(Resource): '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, app_service_environment_resource_name, app_service_environment_resource_location, virtual_network, worker_pools, kind=None, tags=None, identity=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): - super(AppServiceEnvironmentResource, self).__init__(kind=kind, location=location, tags=tags, identity=identity) + 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 self.provisioning_state = None @@ -248,3 +249,4 @@ def __init__(self, location, app_service_environment_resource_name, app_service_ 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_paged.py b/azure-mgmt-web/azure/mgmt/web/models/app_service_environment_resource_paged.py similarity index 76% rename from azure-mgmt-web/azure/mgmt/web/models/app_service_environment_paged.py rename to azure-mgmt-web/azure/mgmt/web/models/app_service_environment_resource_paged.py index ccdb75515459..def144a4dd23 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/app_service_environment_paged.py +++ b/azure-mgmt-web/azure/mgmt/web/models/app_service_environment_resource_paged.py @@ -12,16 +12,16 @@ from msrest.paging import Paged -class AppServiceEnvironmentPaged(Paged): +class AppServiceEnvironmentResourcePaged(Paged): """ - A paging container for iterating over a list of :class:`AppServiceEnvironment ` object + A paging container for iterating over a list of :class:`AppServiceEnvironmentResource ` object """ _attribute_map = { 'next_link': {'key': 'nextLink', 'type': 'str'}, - 'current_page': {'key': 'value', 'type': '[AppServiceEnvironment]'} + 'current_page': {'key': 'value', 'type': '[AppServiceEnvironmentResource]'} } def __init__(self, *args, **kwargs): - super(AppServiceEnvironmentPaged, self).__init__(*args, **kwargs) + super(AppServiceEnvironmentResourcePaged, self).__init__(*args, **kwargs) 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 49cd10e9b061..3215659d3043 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/app_service_plan.py +++ b/azure-mgmt-web/azure/mgmt/web/models/app_service_plan.py @@ -30,15 +30,13 @@ class AppServicePlan(Resource): :vartype type: str :param tags: Resource tags. :type tags: dict[str, str] - :param identity: Identity for the resource. - :type identity: ~azure.mgmt.web.models.ResourceIdentity :param app_service_plan_name: Name for the App Service plan. :type app_service_plan_name: str :param worker_tier_name: Target worker tier assigned to the App Service plan. :type worker_tier_name: str :ivar status: App Service plan status. Possible values include: 'Ready', - 'Pending' + 'Pending', 'Creating' :vartype status: str or ~azure.mgmt.web.models.StatusOptions :ivar subscription: App Service plan subscription. :vartype subscription: str @@ -60,6 +58,12 @@ class AppServicePlan(Resource): :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: Reserved. Default value: False . @@ -98,7 +102,6 @@ class AppServicePlan(Resource): 'location': {'key': 'location', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, - 'identity': {'key': 'identity', 'type': 'ResourceIdentity'}, 'app_service_plan_name': {'key': 'properties.name', 'type': 'str'}, 'worker_tier_name': {'key': 'properties.workerTierName', 'type': 'str'}, 'status': {'key': 'properties.status', 'type': 'StatusOptions'}, @@ -109,6 +112,8 @@ class AppServicePlan(Resource): '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'}, @@ -117,8 +122,8 @@ class AppServicePlan(Resource): 'sku': {'key': 'sku', 'type': 'SkuDescription'}, } - def __init__(self, location, kind=None, tags=None, identity=None, app_service_plan_name=None, worker_tier_name=None, admin_site_name=None, hosting_environment_profile=None, per_site_scaling=False, reserved=False, target_worker_count=None, target_worker_size_id=None, sku=None): - super(AppServicePlan, self).__init__(kind=kind, location=location, tags=tags, identity=identity) + def __init__(self, location, kind=None, tags=None, app_service_plan_name=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 self.status = None @@ -129,6 +134,8 @@ def __init__(self, location, kind=None, tags=None, identity=None, app_service_pl 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 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 new file mode 100644 index 000000000000..7991d1f75a1e --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/app_service_plan_patch_resource.py @@ -0,0 +1,134 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license 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 AppServicePlanPatchResource(ProxyOnlyResource): + """ARM resource for a app service plan. + + 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 app_service_plan_patch_resource_name: Name for the App Service + plan. + :type app_service_plan_patch_resource_name: str + :param worker_tier_name: Target worker tier assigned to the App Service + plan. + :type worker_tier_name: str + :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: Reserved. 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}, + '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, kind=None, app_service_plan_patch_resource_name=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 + 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/certificate.py b/azure-mgmt-web/azure/mgmt/web/models/certificate.py index da2123628f5a..9e72eaa7b9b8 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/certificate.py +++ b/azure-mgmt-web/azure/mgmt/web/models/certificate.py @@ -30,8 +30,6 @@ class Certificate(Resource): :vartype type: str :param tags: Resource tags. :type tags: dict[str, str] - :param identity: Identity for the resource. - :type identity: ~azure.mgmt.web.models.ResourceIdentity :ivar friendly_name: Friendly name of the certificate. :vartype friendly_name: str :ivar subject_name: Subject name of the certificate. @@ -57,7 +55,7 @@ class Certificate(Resource): :ivar valid: Is the certificate valid?. :vartype valid: bool :ivar cer_blob: Raw bytes of .cer file - :vartype cer_blob: str + :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 @@ -78,8 +76,6 @@ class Certificate(Resource): ~azure.mgmt.web.models.KeyVaultSecretStatus :ivar geo_region: Region of the certificate. :vartype geo_region: str - :ivar certificate_name: Resource name of the certificate. - :vartype certificate_name: str :param server_farm_id: Resource ID of the associated App Service plan, formatted as: "/subscriptions/{subscriptionID}/resourceGroups/{groupName}/providers/Microsoft.Web/serverfarms/{appServicePlanName}". @@ -105,7 +101,6 @@ class Certificate(Resource): 'hosting_environment_profile': {'readonly': True}, 'key_vault_secret_status': {'readonly': True}, 'geo_region': {'readonly': True}, - 'certificate_name': {'readonly': True}, } _attribute_map = { @@ -115,7 +110,6 @@ class Certificate(Resource): 'location': {'key': 'location', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, - 'identity': {'key': 'identity', 'type': 'ResourceIdentity'}, 'friendly_name': {'key': 'properties.friendlyName', 'type': 'str'}, 'subject_name': {'key': 'properties.subjectName', 'type': 'str'}, 'host_names': {'key': 'properties.hostNames', 'type': '[str]'}, @@ -128,19 +122,18 @@ class Certificate(Resource): 'password': {'key': 'properties.password', 'type': 'str'}, 'thumbprint': {'key': 'properties.thumbprint', 'type': 'str'}, 'valid': {'key': 'properties.valid', 'type': 'bool'}, - 'cer_blob': {'key': 'properties.cerBlob', 'type': 'str'}, + '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'}, - 'certificate_name': {'key': 'properties.name', 'type': 'str'}, 'server_farm_id': {'key': 'properties.serverFarmId', 'type': 'str'}, } - def __init__(self, location, kind=None, tags=None, identity=None, host_names=None, pfx_blob=None, password=None, key_vault_id=None, key_vault_secret_name=None, server_farm_id=None): - super(Certificate, self).__init__(kind=kind, location=location, tags=tags, identity=identity) + def __init__(self, location, kind=None, tags=None, host_names=None, pfx_blob=None, password=None, key_vault_id=None, key_vault_secret_name=None, server_farm_id=None): + super(Certificate, self).__init__(kind=kind, location=location, tags=tags) self.friendly_name = None self.subject_name = None self.host_names = host_names @@ -160,5 +153,4 @@ def __init__(self, location, kind=None, tags=None, identity=None, host_names=Non self.key_vault_secret_name = key_vault_secret_name self.key_vault_secret_status = None self.geo_region = None - self.certificate_name = None self.server_farm_id = server_farm_id 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 dcaa0286a4d4..16cb48875e5c 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/certificate_details.py +++ b/azure-mgmt-web/azure/mgmt/web/models/certificate_details.py @@ -18,21 +18,21 @@ class CertificateDetails(Model): Variables are only populated by the server, and will be ignored when sending a request. - :ivar version: Version. + :ivar version: Certificate Version. :vartype version: int - :ivar serial_number: Serial Number. + :ivar serial_number: Certificate Serial Number. :vartype serial_number: str - :ivar thumbprint: Thumbprint. + :ivar thumbprint: Certificate Thumbprint. :vartype thumbprint: str - :ivar subject: Subject. + :ivar subject: Certificate Subject. :vartype subject: str - :ivar not_before: Valid from. + :ivar not_before: Date Certificate is valid from. :vartype not_before: datetime - :ivar not_after: Valid to. + :ivar not_after: Date Certificate is valid to. :vartype not_after: datetime - :ivar signature_algorithm: Signature algorithm. + :ivar signature_algorithm: Certificate Signature algorithm. :vartype signature_algorithm: str - :ivar issuer: Issuer. + :ivar issuer: Certificate Issuer. :vartype issuer: str :ivar raw_data: Raw certificate data. :vartype raw_data: str 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 364b11666f0c..aad5ce3401e4 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 @@ -30,8 +30,6 @@ class CertificateOrderAction(Resource): :vartype type: str :param tags: Resource tags. :type tags: dict[str, str] - :param identity: Identity for the resource. - :type identity: ~azure.mgmt.web.models.ResourceIdentity :param certificate_order_action_type: Action type. Possible values include: 'CertificateIssued', 'CertificateOrderCanceled', 'CertificateOrderCreated', 'CertificateRevoked', @@ -58,12 +56,11 @@ class CertificateOrderAction(Resource): 'location': {'key': 'location', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, - 'identity': {'key': 'identity', 'type': 'ResourceIdentity'}, 'certificate_order_action_type': {'key': 'properties.type', 'type': 'CertificateOrderActionType'}, 'created_at': {'key': 'properties.createdAt', 'type': 'iso-8601'}, } - def __init__(self, location, kind=None, tags=None, identity=None, certificate_order_action_type=None, created_at=None): - super(CertificateOrderAction, self).__init__(kind=kind, location=location, tags=tags, identity=identity) + def __init__(self, location, kind=None, tags=None, certificate_order_action_type=None, created_at=None): + super(CertificateOrderAction, self).__init__(kind=kind, location=location, tags=tags) 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 new file mode 100644 index 000000000000..f6c996e997e4 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/certificate_patch_resource.py @@ -0,0 +1,149 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license 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 CertificatePatchResource(ProxyOnlyResource): + """ARM resource for a certificate. + + 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 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: 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}, + '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, kind=None, host_names=None, pfx_blob=None, password=None, key_vault_id=None, key_vault_secret_name=None, server_farm_id=None): + super(CertificatePatchResource, self).__init__(kind=kind) + 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/continuous_web_job.py b/azure-mgmt-web/azure/mgmt/web/models/continuous_web_job.py index d1bb3f1ab21a..d8df3ee5ea9a 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 @@ -50,7 +50,7 @@ class ContinuousWebJob(ProxyOnlyResource): :param using_sdk: Using SDK? :type using_sdk: bool :param settings: Job settings. - :type settings: object + :type settings: dict[str, object] """ _validation = { @@ -75,7 +75,7 @@ class ContinuousWebJob(ProxyOnlyResource): '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'}, + '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): 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 d7498efc3ab4..8745265b7999 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 @@ -13,7 +13,7 @@ class CsmOperationDescription(Model): - """CsmOperationDescription. + """Description of an operation available for Microsoft.Web resource provider. :param name: :type name: str 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 ec1eee825962..77593ee5c89c 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 @@ -13,7 +13,7 @@ class CsmOperationDescriptionProperties(Model): - """CsmOperationDescriptionProperties. + """Properties available for a Microsoft.Web resource provider operation. :param service_specification: :type service_specification: ~azure.mgmt.web.models.ServiceSpecification 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 95e6923af121..55b6e3c17408 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 @@ -13,7 +13,7 @@ class CsmOperationDisplay(Model): - """CsmOperationDisplay. + """Meta data about operation used for display in portal. :param provider: :type provider: str 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 6859ec5c1895..248ee6e939e7 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/deleted_site.py +++ b/azure-mgmt-web/azure/mgmt/web/models/deleted_site.py @@ -28,6 +28,8 @@ class DeletedSite(Model): :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 = { @@ -35,6 +37,7 @@ class DeletedSite(Model): 'subscription': {'readonly': True}, 'resource_group': {'readonly': True}, 'name': {'readonly': True}, + 'slot': {'readonly': True}, } _attribute_map = { @@ -43,6 +46,7 @@ class DeletedSite(Model): '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=None): @@ -51,3 +55,4 @@ def __init__(self, id=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_locations.py b/azure-mgmt-web/azure/mgmt/web/models/deployment_locations.py new file mode 100644 index 000000000000..1988f14da67e --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/deployment_locations.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 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): + 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/dimension.py b/azure-mgmt-web/azure/mgmt/web/models/dimension.py index 8294d2b456ce..319fd4924269 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/dimension.py +++ b/azure-mgmt-web/azure/mgmt/web/models/dimension.py @@ -13,7 +13,9 @@ class Dimension(Model): - """Dimension. + """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 diff --git a/azure-mgmt-web/azure/mgmt/web/models/domain.py b/azure-mgmt-web/azure/mgmt/web/models/domain.py index 08d98c72817b..401215a96bd7 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/domain.py +++ b/azure-mgmt-web/azure/mgmt/web/models/domain.py @@ -30,8 +30,6 @@ class Domain(Resource): :vartype type: str :param tags: Resource tags. :type tags: dict[str, str] - :param identity: Identity for the resource. - :type identity: ~azure.mgmt.web.models.ResourceIdentity :param contact_admin: Administrative contact. :type contact_admin: ~azure.mgmt.web.models.Contact :param contact_billing: Billing contact. @@ -85,8 +83,8 @@ class Domain(Resource): :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 - :ivar auth_code: - :vartype auth_code: str + :param auth_code: + :type auth_code: str """ _validation = { @@ -103,7 +101,6 @@ class Domain(Resource): 'ready_for_dns_record_management': {'readonly': True}, 'managed_host_names': {'readonly': True}, 'domain_not_renewable_reasons': {'readonly': True}, - 'auth_code': {'readonly': True}, } _attribute_map = { @@ -113,7 +110,6 @@ class Domain(Resource): 'location': {'key': 'location', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, - 'identity': {'key': 'identity', 'type': 'ResourceIdentity'}, 'contact_admin': {'key': 'properties.contactAdmin', 'type': 'Contact'}, 'contact_billing': {'key': 'properties.contactBilling', 'type': 'Contact'}, 'contact_registrant': {'key': 'properties.contactRegistrant', 'type': 'Contact'}, @@ -136,8 +132,8 @@ class Domain(Resource): 'auth_code': {'key': 'properties.authCode', 'type': 'str'}, } - def __init__(self, location, kind=None, tags=None, identity=None, contact_admin=None, contact_billing=None, contact_registrant=None, contact_tech=None, privacy=None, auto_renew=True, consent=None, dns_type=None, dns_zone_id=None, target_dns_type=None): - super(Domain, self).__init__(kind=kind, location=location, tags=tags, identity=identity) + def __init__(self, location, kind=None, tags=None, contact_admin=None, contact_billing=None, contact_registrant=None, contact_tech=None, privacy=None, auto_renew=True, consent=None, 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 @@ -157,4 +153,4 @@ def __init__(self, location, kind=None, tags=None, identity=None, contact_admin= self.dns_type = dns_type self.dns_zone_id = dns_zone_id self.target_dns_type = target_dns_type - self.auth_code = None + self.auth_code = auth_code 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 c4c3b5a8df94..14df644e0911 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 @@ -9,10 +9,10 @@ # regenerated. # -------------------------------------------------------------------------- -from .resource import Resource +from .proxy_only_resource import ProxyOnlyResource -class DomainOwnershipIdentifier(Resource): +class DomainOwnershipIdentifier(ProxyOnlyResource): """Domain ownership Identifier. Variables are only populated by the server, and will be ignored when @@ -24,14 +24,8 @@ class DomainOwnershipIdentifier(Resource): :vartype name: str :param kind: Kind of resource. :type kind: str - :param location: Resource Location. - :type location: str :ivar type: Resource type. :vartype type: str - :param tags: Resource tags. - :type tags: dict[str, str] - :param identity: Identity for the resource. - :type identity: ~azure.mgmt.web.models.ResourceIdentity :param ownership_id: Ownership Id. :type ownership_id: str """ @@ -39,7 +33,6 @@ class DomainOwnershipIdentifier(Resource): _validation = { 'id': {'readonly': True}, 'name': {'readonly': True}, - 'location': {'required': True}, 'type': {'readonly': True}, } @@ -47,13 +40,10 @@ class DomainOwnershipIdentifier(Resource): '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}'}, - 'identity': {'key': 'identity', 'type': 'ResourceIdentity'}, 'ownership_id': {'key': 'properties.ownershipId', 'type': 'str'}, } - def __init__(self, location, kind=None, tags=None, identity=None, ownership_id=None): - super(DomainOwnershipIdentifier, self).__init__(kind=kind, location=location, tags=tags, identity=identity) + def __init__(self, kind=None, ownership_id=None): + super(DomainOwnershipIdentifier, self).__init__(kind=kind) 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 new file mode 100644 index 000000000000..48c0ffbe0e31 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/domain_patch_resource.py @@ -0,0 +1,149 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license 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 DomainPatchResource(ProxyOnlyResource): + """ARM resource for a domain. + + 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 contact_admin: Administrative contact. + :type contact_admin: ~azure.mgmt.web.models.Contact + :param contact_billing: Billing contact. + :type contact_billing: ~azure.mgmt.web.models.Contact + :param contact_registrant: Registrant contact. + :type contact_registrant: ~azure.mgmt.web.models.Contact + :param contact_tech: 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: 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}, + '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}, + '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, kind=None, contact_admin=None, contact_billing=None, contact_registrant=None, contact_tech=None, privacy=None, auto_renew=True, consent=None, 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 + 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/error_entity.py b/azure-mgmt-web/azure/mgmt/web/models/error_entity.py index 39fe471523a1..6132fc0b9266 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/error_entity.py +++ b/azure-mgmt-web/azure/mgmt/web/models/error_entity.py @@ -15,10 +15,6 @@ class ErrorEntity(Model): """Body of the error response returned from the API. - :param code: Basic error code. - :type code: str - :param message: Any details of the error. - :type message: str :param extended_code: Type of error. :type extended_code: str :param message_template: Message template. @@ -27,21 +23,25 @@ class ErrorEntity(Model): :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 = { - 'code': {'key': 'code', 'type': 'str'}, - 'message': {'key': 'message', 'type': 'str'}, '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, code=None, message=None, extended_code=None, message_template=None, parameters=None, inner_errors=None): - self.code = code - self.message = message + def __init__(self, extended_code=None, message_template=None, parameters=None, inner_errors=None, code=None, message=None): 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/global_csm_sku_description.py b/azure-mgmt-web/azure/mgmt/web/models/global_csm_sku_description.py index bd502b355d23..e7eac0615257 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 @@ -19,6 +19,10 @@ class GlobalCsmSkuDescription(Model): :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. @@ -31,14 +35,18 @@ class GlobalCsmSkuDescription(Model): _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=None, tier=None, capacity=None, locations=None, capabilities=None): + def __init__(self, name=None, tier=None, size=None, family=None, capacity=None, locations=None, capabilities=None): 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/host_name_binding.py b/azure-mgmt-web/azure/mgmt/web/models/host_name_binding.py index e2011afed495..a494c196dbe6 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 @@ -26,8 +26,6 @@ class HostNameBinding(ProxyOnlyResource): :type kind: str :ivar type: Resource type. :vartype type: str - :param host_name_binding_name: Hostname. - :type host_name_binding_name: str :param site_name: App Service app name. :type site_name: str :param domain_id: Fully qualified ARM domain resource URI. @@ -66,7 +64,6 @@ class HostNameBinding(ProxyOnlyResource): 'name': {'key': 'name', 'type': 'str'}, 'kind': {'key': 'kind', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, - 'host_name_binding_name': {'key': 'properties.name', 'type': 'str'}, 'site_name': {'key': 'properties.siteName', 'type': 'str'}, 'domain_id': {'key': 'properties.domainId', 'type': 'str'}, 'azure_resource_name': {'key': 'properties.azureResourceName', 'type': 'str'}, @@ -78,9 +75,8 @@ class HostNameBinding(ProxyOnlyResource): 'virtual_ip': {'key': 'properties.virtualIP', 'type': 'str'}, } - def __init__(self, kind=None, host_name_binding_name=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): + 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.host_name_binding_name = host_name_binding_name self.site_name = site_name self.domain_id = domain_id self.azure_resource_name = azure_resource_name 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 new file mode 100644 index 000000000000..94877394a9dd --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/hosting_environment_deployment_info.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 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=None, location=None): + self.name = name + self.location = location diff --git a/azure-mgmt-web/azure/mgmt/web/models/resource_identity.py b/azure-mgmt-web/azure/mgmt/web/models/managed_service_identity.py similarity index 72% rename from azure-mgmt-web/azure/mgmt/web/models/resource_identity.py rename to azure-mgmt-web/azure/mgmt/web/models/managed_service_identity.py index ea93a7c0fafd..dabb346359ae 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/resource_identity.py +++ b/azure-mgmt-web/azure/mgmt/web/models/managed_service_identity.py @@ -12,32 +12,32 @@ from msrest.serialization import Model -class ResourceIdentity(Model): - """Identity for the resource. +class ManagedServiceIdentity(Model): + """Managed service identity. Variables are only populated by the server, and will be ignored when sending a request. - :ivar principal_id: The principal ID of resource identity. - :vartype principal_id: str - :ivar tenant_id: The tenant ID of resource. + :param type: Type of managed service identity. + :type type: object + :ivar tenant_id: Tenant of managed service identity. :vartype tenant_id: str - :param type: The identity type. Possible values include: 'SystemAssigned' - :type type: str or ~azure.mgmt.web.models.ManagedServiceIdentityType + :ivar principal_id: Principal Id of managed service identity. + :vartype principal_id: str """ _validation = { - 'principal_id': {'readonly': True}, 'tenant_id': {'readonly': True}, + 'principal_id': {'readonly': True}, } _attribute_map = { - 'principal_id': {'key': 'principalId', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'object'}, 'tenant_id': {'key': 'tenantId', 'type': 'str'}, - 'type': {'key': 'type', 'type': 'ManagedServiceIdentityType'}, + 'principal_id': {'key': 'principalId', 'type': 'str'}, } def __init__(self, type=None): - self.principal_id = None - self.tenant_id = None self.type = type + self.tenant_id = None + self.principal_id = None 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 0141039bc1c6..1b0ea0ff6e86 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/metric_availability.py +++ b/azure-mgmt-web/azure/mgmt/web/models/metric_availability.py @@ -13,7 +13,7 @@ class MetricAvailability(Model): - """MetricAvailability. + """Retention policy of a resource metric. :param time_grain: :type time_grain: str 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 a963c9f93442..c7a305800154 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/metric_specification.py +++ b/azure-mgmt-web/azure/mgmt/web/models/metric_specification.py @@ -13,7 +13,7 @@ class MetricSpecification(Model): - """MetricSpecification. + """Definition of a single resource metric. :param name: :type name: str 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 9eb680adb66e..9e963f1b9b82 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 @@ -30,8 +30,6 @@ class PremierAddOn(Resource): :vartype type: str :param tags: Resource tags. :type tags: dict[str, str] - :param identity: Identity for the resource. - :type identity: ~azure.mgmt.web.models.ResourceIdentity :param sku: SKU. :type sku: str :param product: Product. @@ -64,7 +62,6 @@ class PremierAddOn(Resource): 'location': {'key': 'location', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, - 'identity': {'key': 'identity', 'type': 'ResourceIdentity'}, 'sku': {'key': 'properties.sku', 'type': 'str'}, 'product': {'key': 'properties.product', 'type': 'str'}, 'vendor': {'key': 'properties.vendor', 'type': 'str'}, @@ -75,8 +72,8 @@ class PremierAddOn(Resource): 'marketplace_offer': {'key': 'properties.marketplaceOffer', 'type': 'str'}, } - def __init__(self, location, kind=None, tags=None, identity=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, identity=identity) + 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 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 5d1e38da2dd0..d58a48285391 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/public_certificate.py +++ b/azure-mgmt-web/azure/mgmt/web/models/public_certificate.py @@ -27,7 +27,7 @@ class PublicCertificate(ProxyOnlyResource): :ivar type: Resource type. :vartype type: str :param blob: Public Certificate byte array - :type blob: str + :type blob: bytearray :param public_certificate_location: Public Certificate Location. Possible values include: 'CurrentUserMy', 'LocalMachineMy', 'Unknown' :type public_certificate_location: str or @@ -48,7 +48,7 @@ class PublicCertificate(ProxyOnlyResource): 'name': {'key': 'name', 'type': 'str'}, 'kind': {'key': 'kind', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, - 'blob': {'key': 'properties.blob', 'type': 'str'}, + 'blob': {'key': 'properties.blob', 'type': 'bytearray'}, 'public_certificate_location': {'key': 'properties.publicCertificateLocation', 'type': 'PublicCertificateLocation'}, 'thumbprint': {'key': 'properties.thumbprint', 'type': 'str'}, } 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 64b8574b8521..e1b23a6e6c82 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 @@ -30,8 +30,6 @@ class ReissueCertificateOrderRequest(Resource): :vartype type: str :param tags: Resource tags. :type tags: dict[str, str] - :param identity: Identity for the resource. - :type identity: ~azure.mgmt.web.models.ResourceIdentity :param key_size: Certificate Key Size. :type key_size: int :param delay_existing_revoke_in_hours: Delay in hours to revoke existing @@ -58,15 +56,14 @@ class ReissueCertificateOrderRequest(Resource): 'location': {'key': 'location', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, - 'identity': {'key': 'identity', 'type': 'ResourceIdentity'}, '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, location, kind=None, tags=None, identity=None, key_size=None, delay_existing_revoke_in_hours=None, csr=None, is_private_key_external=None): - super(ReissueCertificateOrderRequest, self).__init__(kind=kind, location=location, tags=tags, identity=identity) + def __init__(self, location, kind=None, tags=None, key_size=None, delay_existing_revoke_in_hours=None, csr=None, is_private_key_external=None): + super(ReissueCertificateOrderRequest, self).__init__(kind=kind, location=location, tags=tags) self.key_size = key_size self.delay_existing_revoke_in_hours = delay_existing_revoke_in_hours self.csr = csr 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 c7fe60990711..f90b73c1f50e 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 @@ -30,8 +30,6 @@ class RenewCertificateOrderRequest(Resource): :vartype type: str :param tags: Resource tags. :type tags: dict[str, str] - :param identity: Identity for the resource. - :type identity: ~azure.mgmt.web.models.ResourceIdentity :param key_size: Certificate Key Size. :type key_size: int :param csr: Csr to be used for re-key operation. @@ -55,14 +53,13 @@ class RenewCertificateOrderRequest(Resource): 'location': {'key': 'location', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, - 'identity': {'key': 'identity', 'type': 'ResourceIdentity'}, '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, location, kind=None, tags=None, identity=None, key_size=None, csr=None, is_private_key_external=None): - super(RenewCertificateOrderRequest, self).__init__(kind=kind, location=location, tags=tags, identity=identity) + def __init__(self, location, kind=None, tags=None, key_size=None, csr=None, is_private_key_external=None): + super(RenewCertificateOrderRequest, self).__init__(kind=kind, location=location, tags=tags) 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/resource.py b/azure-mgmt-web/azure/mgmt/web/models/resource.py index ad2b34229586..4e864c0e3c98 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/resource.py +++ b/azure-mgmt-web/azure/mgmt/web/models/resource.py @@ -30,8 +30,6 @@ class Resource(Model): :vartype type: str :param tags: Resource tags. :type tags: dict[str, str] - :param identity: Identity for the resource. - :type identity: ~azure.mgmt.web.models.ResourceIdentity """ _validation = { @@ -48,14 +46,12 @@ class Resource(Model): 'location': {'key': 'location', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, - 'identity': {'key': 'identity', 'type': 'ResourceIdentity'}, } - def __init__(self, location, kind=None, tags=None, identity=None): + def __init__(self, location, kind=None, tags=None): self.id = None self.name = None self.kind = kind self.location = location self.type = None self.tags = tags - self.identity = identity 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 1080b23a1230..929e7357105d 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/service_specification.py +++ b/azure-mgmt-web/azure/mgmt/web/models/service_specification.py @@ -13,7 +13,7 @@ class ServiceSpecification(Model): - """ServiceSpecification. + """Resource metrics service provided by Microsoft.Insights resource provider. :param metric_specifications: :type 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 c0fb035d0385..44ddd0d3ff08 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/site.py +++ b/azure-mgmt-web/azure/mgmt/web/models/site.py @@ -30,8 +30,6 @@ class Site(Resource): :vartype type: str :param tags: Resource tags. :type tags: dict[str, str] - :param identity: Identity for the resource. - :type identity: ~azure.mgmt.web.models.ResourceIdentity :ivar state: Current state of the app. :vartype state: str :ivar host_names: Hostnames associated with the app. @@ -98,8 +96,13 @@ class Site(Resource): 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). Read-only. + 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 @@ -127,14 +130,12 @@ class Site(Resource): :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 - :ivar premium_app_deployed: Indicates whether app is deployed as a premium - app. - :vartype premium_app_deployed: bool - :param micro_service: Micro services like apps, logic apps. Default value: - "WebSites" . - :type micro_service: str - :param gateway_site_name: Name of gateway app associated with the app. - :type gateway_site_name: str + :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 = { @@ -152,13 +153,13 @@ class Site(Resource): '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}, - 'premium_app_deployed': {'readonly': True}, } _attribute_map = { @@ -168,7 +169,6 @@ class Site(Resource): 'location': {'key': 'location', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, - 'identity': {'key': 'identity', 'type': 'ResourceIdentity'}, 'state': {'key': 'properties.state', 'type': 'str'}, 'host_names': {'key': 'properties.hostNames', 'type': '[str]'}, 'repository_site_name': {'key': 'properties.repositorySiteName', 'type': 'str'}, @@ -189,6 +189,7 @@ class Site(Resource): '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'}, @@ -199,13 +200,12 @@ class Site(Resource): 'is_default_container': {'key': 'properties.isDefaultContainer', 'type': 'bool'}, 'default_host_name': {'key': 'properties.defaultHostName', 'type': 'str'}, 'slot_swap_status': {'key': 'properties.slotSwapStatus', 'type': 'SlotSwapStatus'}, - 'premium_app_deployed': {'key': 'properties.premiumAppDeployed', 'type': 'bool'}, - 'micro_service': {'key': 'properties.microService', 'type': 'str'}, - 'gateway_site_name': {'key': 'properties.gatewaySiteName', 'type': 'str'}, + 'https_only': {'key': 'properties.httpsOnly', 'type': 'bool'}, + 'identity': {'key': 'identity', 'type': 'ManagedServiceIdentity'}, } - def __init__(self, location, kind=None, tags=None, identity=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, micro_service="WebSites", gateway_site_name=None): - super(Site, self).__init__(kind=kind, location=location, tags=tags, identity=identity) + 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) self.state = None self.host_names = None self.repository_site_name = None @@ -226,6 +226,7 @@ def __init__(self, location, kind=None, tags=None, identity=None, enabled=None, 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 @@ -236,6 +237,5 @@ def __init__(self, location, kind=None, tags=None, identity=None, enabled=None, self.is_default_container = None self.default_host_name = None self.slot_swap_status = None - self.premium_app_deployed = None - self.micro_service = micro_service - self.gateway_site_name = gateway_site_name + self.https_only = https_only + self.identity = identity diff --git a/azure-mgmt-web/azure/mgmt/web/models/site_configuration_snapshot_info_paged.py b/azure-mgmt-web/azure/mgmt/web/models/site_configuration_snapshot_info_paged.py new file mode 100644 index 000000000000..5fec65f8e11c --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/site_configuration_snapshot_info_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 SiteConfigurationSnapshotInfoPaged(Paged): + """ + A paging container for iterating over a list of :class:`SiteConfigurationSnapshotInfo ` object + """ + + _attribute_map = { + 'next_link': {'key': 'nextLink', 'type': 'str'}, + 'current_page': {'key': 'value', 'type': '[SiteConfigurationSnapshotInfo]'} + } + + def __init__(self, *args, **kwargs): + + super(SiteConfigurationSnapshotInfoPaged, self).__init__(*args, **kwargs) 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 new file mode 100644 index 000000000000..02d64d06af90 --- /dev/null +++ b/azure-mgmt-web/azure/mgmt/web/models/site_patch_resource.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 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=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) + 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_seal_request.py b/azure-mgmt-web/azure/mgmt/web/models/site_seal_request.py index dff37b18118d..17ced88847e2 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 @@ -15,9 +15,10 @@ class SiteSealRequest(Model): """Site seal request. - :param light_theme: Theme + :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 + :param locale: Locale of site seal. :type locale: str """ 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 f8cdbe2bd273..b733721970de 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' + '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 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 a02e213995ab..a64ffb9c9bb9 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 @@ -49,7 +49,7 @@ class TriggeredWebJob(ProxyOnlyResource): :param using_sdk: Using SDK? :type using_sdk: bool :param settings: Job settings. - :type settings: object + :type settings: dict[str, object] """ _validation = { @@ -74,7 +74,7 @@ class TriggeredWebJob(ProxyOnlyResource): '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'}, + '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): 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 272be0032866..c3003e326064 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/validate_request.py +++ b/azure-mgmt-web/azure/mgmt/web/models/validate_request.py @@ -30,6 +30,9 @@ class ValidateRequest(Model): :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 @@ -51,16 +54,18 @@ class ValidateRequest(Model): '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, type, location, server_farm_id=None, sku_name=None, need_linux_workers=None, capacity=None, hosting_environment=None): + 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): 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/vnet_info.py b/azure-mgmt-web/azure/mgmt/web/models/vnet_info.py index 866e2d090e7b..14915ba9a7fd 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/vnet_info.py +++ b/azure-mgmt-web/azure/mgmt/web/models/vnet_info.py @@ -33,7 +33,7 @@ class VnetInfo(ProxyOnlyResource): :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: str + :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; @@ -60,7 +60,7 @@ class VnetInfo(ProxyOnlyResource): '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': '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'}, 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 d0062e56986a..5a3caa921631 100644 --- a/azure-mgmt-web/azure/mgmt/web/models/web_job.py +++ b/azure-mgmt-web/azure/mgmt/web/models/web_job.py @@ -42,7 +42,7 @@ class WebJob(ProxyOnlyResource): :param using_sdk: Using SDK? :type using_sdk: bool :param settings: Job settings. - :type settings: object + :type settings: dict[str, object] """ _validation = { @@ -64,7 +64,7 @@ class WebJob(ProxyOnlyResource): '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'}, + '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): 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 11c4dbe85226..a8565f29b331 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 @@ -74,9 +74,98 @@ class CertificateOrderActionType(Enum): unknown = "Unknown" -class ManagedServiceIdentityType(Enum): +class RouteType(Enum): + + default = "DEFAULT" + inherited = "INHERITED" + static = "STATIC" + + +class AutoHealActionType(Enum): + + recycle = "Recycle" + log_event = "LogEvent" + custom_action = "CustomAction" - system_assigned = "SystemAssigned" + +class ConnectionStringType(Enum): + + my_sql = "MySql" + sql_server = "SQLServer" + sql_azure = "SQLAzure" + custom = "Custom" + notification_hub = "NotificationHub" + service_bus = "ServiceBus" + event_hub = "EventHub" + api_hub = "ApiHub" + doc_db = "DocDb" + redis_cache = "RedisCache" + postgre_sql = "PostgreSQL" + + +class ScmType(Enum): + + none = "None" + dropbox = "Dropbox" + tfs = "Tfs" + local_git = "LocalGit" + git_hub = "GitHub" + code_plex_git = "CodePlexGit" + code_plex_hg = "CodePlexHg" + bitbucket_git = "BitbucketGit" + bitbucket_hg = "BitbucketHg" + external_git = "ExternalGit" + external_hg = "ExternalHg" + one_drive = "OneDrive" + vso = "VSO" + + +class ManagedPipelineMode(Enum): + + integrated = "Integrated" + classic = "Classic" + + +class SiteLoadBalancing(Enum): + + weighted_round_robin = "WeightedRoundRobin" + least_requests = "LeastRequests" + least_response_time = "LeastResponseTime" + weighted_total_traffic = "WeightedTotalTraffic" + request_hash = "RequestHash" + + +class SslState(Enum): + + disabled = "Disabled" + sni_enabled = "SniEnabled" + ip_based_enabled = "IpBasedEnabled" + + +class HostType(Enum): + + standard = "Standard" + repository = "Repository" + + +class UsageState(Enum): + + normal = "Normal" + exceeded = "Exceeded" + + +class SiteAvailabilityState(Enum): + + normal = "Normal" + limited = "Limited" + disaster_recovery_mode = "DisasterRecoveryMode" + + +class StatusOptions(Enum): + + ready = "Ready" + pending = "Pending" + creating = "Creating" class DomainStatus(Enum): @@ -134,6 +223,54 @@ class DomainType(Enum): soft_deleted = "SoftDeleted" +class HostingEnvironmentStatus(Enum): + + preparing = "Preparing" + ready = "Ready" + scaling = "Scaling" + deleting = "Deleting" + + +class InternalLoadBalancingMode(Enum): + + none = "None" + web = "Web" + publishing = "Publishing" + + +class ComputeModeOptions(Enum): + + shared = "Shared" + dedicated = "Dedicated" + dynamic = "Dynamic" + + +class WorkerSizeOptions(Enum): + + default = "Default" + small = "Small" + medium = "Medium" + large = "Large" + d1 = "D1" + d2 = "D2" + d3 = "D3" + + +class AccessControlEntryAction(Enum): + + permit = "Permit" + deny = "Deny" + + +class OperationStatus(Enum): + + in_progress = "InProgress" + failed = "Failed" + succeeded = "Succeeded" + timed_out = "TimedOut" + created = "Created" + + class ResourceScopeType(Enum): server_farm = "ServerFarm" @@ -196,13 +333,6 @@ class LogLevel(Enum): error = "Error" -class AutoHealActionType(Enum): - - recycle = "Recycle" - log_event = "LogEvent" - custom_action = "CustomAction" - - class BackupItemStatus(Enum): in_progress = "InProgress" @@ -239,21 +369,6 @@ class BackupRestoreOperationType(Enum): snapshot = "Snapshot" -class ConnectionStringType(Enum): - - my_sql = "MySql" - sql_server = "SQLServer" - sql_azure = "SQLAzure" - custom = "Custom" - notification_hub = "NotificationHub" - service_bus = "ServiceBus" - event_hub = "EventHub" - api_hub = "ApiHub" - doc_db = "DocDb" - redis_cache = "RedisCache" - postgre_sql = "PostgreSQL" - - class ContinuousWebJobStatus(Enum): initializing = "Initializing" @@ -283,19 +398,6 @@ class DnsVerificationTestResult(Enum): skipped = "Skipped" -class SslState(Enum): - - disabled = "Disabled" - sni_enabled = "SniEnabled" - ip_based_enabled = "IpBasedEnabled" - - -class HostType(Enum): - - standard = "Standard" - repository = "Repository" - - class MSDeployLogEntryType(Enum): message = "Message" @@ -318,22 +420,6 @@ class MySqlMigrationType(Enum): remote_to_local = "RemoteToLocal" -class OperationStatus(Enum): - - in_progress = "InProgress" - failed = "Failed" - succeeded = "Succeeded" - timed_out = "TimedOut" - created = "Created" - - -class RouteType(Enum): - - default = "DEFAULT" - inherited = "INHERITED" - static = "STATIC" - - class PublicCertificateLocation(Enum): current_user_my = "CurrentUserMy" @@ -341,51 +427,6 @@ class PublicCertificateLocation(Enum): unknown = "Unknown" -class UsageState(Enum): - - normal = "Normal" - exceeded = "Exceeded" - - -class SiteAvailabilityState(Enum): - - normal = "Normal" - limited = "Limited" - disaster_recovery_mode = "DisasterRecoveryMode" - - -class ScmType(Enum): - - none = "None" - dropbox = "Dropbox" - tfs = "Tfs" - local_git = "LocalGit" - git_hub = "GitHub" - code_plex_git = "CodePlexGit" - code_plex_hg = "CodePlexHg" - bitbucket_git = "BitbucketGit" - bitbucket_hg = "BitbucketHg" - external_git = "ExternalGit" - external_hg = "ExternalHg" - one_drive = "OneDrive" - vso = "VSO" - - -class ManagedPipelineMode(Enum): - - integrated = "Integrated" - classic = "Classic" - - -class SiteLoadBalancing(Enum): - - weighted_round_robin = "WeightedRoundRobin" - least_requests = "LeastRequests" - least_response_time = "LeastResponseTime" - weighted_total_traffic = "WeightedTotalTraffic" - request_hash = "RequestHash" - - class UnauthenticatedClientAction(Enum): redirect_to_login_page = "RedirectToLoginPage" @@ -421,48 +462,6 @@ class TriggeredWebJobStatus(Enum): error = "Error" -class HostingEnvironmentStatus(Enum): - - preparing = "Preparing" - ready = "Ready" - scaling = "Scaling" - deleting = "Deleting" - - -class InternalLoadBalancingMode(Enum): - - none = "None" - web = "Web" - publishing = "Publishing" - - -class ComputeModeOptions(Enum): - - shared = "Shared" - dedicated = "Dedicated" - dynamic = "Dynamic" - - -class WorkerSizeOptions(Enum): - - default = "Default" - small = "Small" - medium = "Medium" - large = "Large" - - -class AccessControlEntryAction(Enum): - - permit = "Permit" - deny = "Deny" - - -class StatusOptions(Enum): - - ready = "Ready" - pending = "Pending" - - class SkuName(Enum): free = "Free" 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 c62e91940241..45fad7700391 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 @@ -446,6 +446,80 @@ def delete( client_raw_response = ClientRawResponse(None, response) return client_raw_response + def update( + self, resource_group_name, certificate_order_name, certificate_distinguished_name, custom_headers=None, raw=False, **operation_config): + """Create or update a certificate purchase order. + + Create or update a certificate purchase order. + + :param resource_group_name: Name of the resource group to which the + resource belongs. + :type resource_group_name: str + :param certificate_order_name: Name of the certificate order. + :type certificate_order_name: str + :param certificate_distinguished_name: Distinguished name to to use + for the certificate order. + :type certificate_distinguished_name: + ~azure.mgmt.web.models.AppServiceCertificateOrderPatchResource + :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: AppServiceCertificateOrder or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.AppServiceCertificateOrder or + ~msrest.pipeline.ClientRawResponse + :raises: :class:`CloudError` + """ + # Construct URL + url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CertificateRegistration/certificateOrders/{certificateOrderName}' + path_format_arguments = { + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+[^\.]$'), + 'certificateOrderName': self._serialize.url("certificate_order_name", certificate_order_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(certificate_distinguished_name, 'AppServiceCertificateOrderPatchResource') + + # Construct and send request + request = self._client.patch(url, query_parameters) + response = self._client.send( + request, header_parameters, body_content, **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 + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('AppServiceCertificateOrder', response) + if response.status_code == 201: + deserialized = self._deserialize('AppServiceCertificateOrder', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + def list_certificates( self, resource_group_name, certificate_order_name, custom_headers=None, raw=False, **operation_config): """List all certificates associated with a certificate order. @@ -745,6 +819,83 @@ def delete_certificate( client_raw_response = ClientRawResponse(None, response) return client_raw_response + def update_certificate( + self, resource_group_name, certificate_order_name, name, key_vault_certificate, custom_headers=None, raw=False, **operation_config): + """Creates or updates a certificate and associates with key vault secret. + + Creates or updates a certificate and associates with key vault secret. + + :param resource_group_name: Name of the resource group to which the + resource belongs. + :type resource_group_name: str + :param certificate_order_name: Name of the certificate order. + :type certificate_order_name: str + :param name: Name of the certificate. + :type name: str + :param key_vault_certificate: Key vault certificate resource Id. + :type key_vault_certificate: + ~azure.mgmt.web.models.AppServiceCertificatePatchResource + :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: AppServiceCertificateResource or ClientRawResponse if + raw=true + :rtype: ~azure.mgmt.web.models.AppServiceCertificateResource or + ~msrest.pipeline.ClientRawResponse + :raises: :class:`CloudError` + """ + # Construct URL + url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CertificateRegistration/certificateOrders/{certificateOrderName}/certificates/{name}' + path_format_arguments = { + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+[^\.]$'), + 'certificateOrderName': self._serialize.url("certificate_order_name", certificate_order_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 body + 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, **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 + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('AppServiceCertificateResource', response) + if response.status_code == 201: + deserialized = self._deserialize('AppServiceCertificateResource', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + def reissue( self, resource_group_name, certificate_order_name, reissue_certificate_order_request, custom_headers=None, raw=False, **operation_config): """Reissue an existing certificate order. @@ -1002,9 +1153,10 @@ def retrieve_site_seal( :type resource_group_name: str :param certificate_order_name: Name of the certificate order. :type certificate_order_name: str - :param light_theme: Theme + :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 + :param locale: Locale of site seal. :type locale: 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_environments_operations.py b/azure-mgmt-web/azure/mgmt/web/operations/app_service_environments_operations.py index b1cd760389c2..6c6c29334dc7 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 @@ -47,9 +47,9 @@ def list( deserialized response :param operation_config: :ref:`Operation configuration overrides`. - :return: An iterator like instance of AppServiceEnvironment + :return: An iterator like instance of AppServiceEnvironmentResource :rtype: - ~azure.mgmt.web.models.AppServiceEnvironmentPaged[~azure.mgmt.web.models.AppServiceEnvironment] + ~azure.mgmt.web.models.AppServiceEnvironmentResourcePaged[~azure.mgmt.web.models.AppServiceEnvironmentResource] :raises: :class:`CloudError` """ def internal_paging(next_link=None, raw=False): @@ -93,11 +93,11 @@ def internal_paging(next_link=None, raw=False): return response # Deserialize response - deserialized = models.AppServiceEnvironmentPaged(internal_paging, self._deserialize.dependencies) + deserialized = models.AppServiceEnvironmentResourcePaged(internal_paging, self._deserialize.dependencies) if raw: header_dict = {} - client_raw_response = models.AppServiceEnvironmentPaged(internal_paging, self._deserialize.dependencies, header_dict) + client_raw_response = models.AppServiceEnvironmentResourcePaged(internal_paging, self._deserialize.dependencies, header_dict) return client_raw_response return deserialized @@ -116,9 +116,9 @@ def list_by_resource_group( deserialized response :param operation_config: :ref:`Operation configuration overrides`. - :return: An iterator like instance of AppServiceEnvironment + :return: An iterator like instance of AppServiceEnvironmentResource :rtype: - ~azure.mgmt.web.models.AppServiceEnvironmentPaged[~azure.mgmt.web.models.AppServiceEnvironment] + ~azure.mgmt.web.models.AppServiceEnvironmentResourcePaged[~azure.mgmt.web.models.AppServiceEnvironmentResource] :raises: :class:`CloudError` """ def internal_paging(next_link=None, raw=False): @@ -163,11 +163,11 @@ def internal_paging(next_link=None, raw=False): return response # Deserialize response - deserialized = models.AppServiceEnvironmentPaged(internal_paging, self._deserialize.dependencies) + deserialized = models.AppServiceEnvironmentResourcePaged(internal_paging, self._deserialize.dependencies) if raw: header_dict = {} - client_raw_response = models.AppServiceEnvironmentPaged(internal_paging, self._deserialize.dependencies, header_dict) + client_raw_response = models.AppServiceEnvironmentResourcePaged(internal_paging, self._deserialize.dependencies, header_dict) return client_raw_response return deserialized @@ -419,6 +419,81 @@ def get_long_running_output(response): long_running_send, get_long_running_output, get_long_running_status, long_running_operation_timeout) + def update( + self, resource_group_name, name, hosting_environment_envelope, custom_headers=None, raw=False, **operation_config): + """Create or update an App Service Environment. + + Create or update an App Service Environment. + + :param resource_group_name: Name of the resource group to which the + resource belongs. + :type resource_group_name: str + :param name: Name of the App Service Environment. + :type name: str + :param hosting_environment_envelope: Configuration details of the App + Service Environment. + :type hosting_environment_envelope: + ~azure.mgmt.web.models.AppServiceEnvironmentPatchResource + :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: AppServiceEnvironmentResource or ClientRawResponse if + raw=true + :rtype: ~azure.mgmt.web.models.AppServiceEnvironmentResource or + ~msrest.pipeline.ClientRawResponse + :raises: :class:`CloudError` + """ + # Construct URL + url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}' + 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(hosting_environment_envelope, 'AppServiceEnvironmentPatchResource') + + # Construct and send request + request = self._client.patch(url, query_parameters) + response = self._client.send( + request, header_parameters, body_content, **operation_config) + + 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 = None + + if response.status_code == 200: + deserialized = self._deserialize('AppServiceEnvironmentResource', response) + if response.status_code == 202: + deserialized = self._deserialize('AppServiceEnvironmentResource', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + def list_capacities( self, resource_group_name, name, custom_headers=None, raw=False, **operation_config): """Get the used, available, and total worker capacity an App Service @@ -1073,6 +1148,79 @@ def get_long_running_output(response): long_running_send, get_long_running_output, get_long_running_status, long_running_operation_timeout) + def update_multi_role_pool( + self, resource_group_name, name, multi_role_pool_envelope, custom_headers=None, raw=False, **operation_config): + """Create or update a multi-role pool. + + Create or update a multi-role pool. + + :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 multi_role_pool_envelope: Properties of the 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 + :param operation_config: :ref:`Operation configuration + overrides`. + :return: WorkerPoolResource or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.WorkerPoolResource or + ~msrest.pipeline.ClientRawResponse + :raises: :class:`CloudError` + """ + # Construct URL + url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools/default' + 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(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, **operation_config) + + 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 = None + + if response.status_code == 200: + deserialized = self._deserialize('WorkerPoolResource', response) + if response.status_code == 202: + deserialized = self._deserialize('WorkerPoolResource', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + def list_multi_role_pool_instance_metric_definitions( self, resource_group_name, name, instance, custom_headers=None, raw=False, **operation_config): """Get metric definitions for a specific instance of a multi-role pool of @@ -2320,6 +2468,81 @@ def get_long_running_output(response): long_running_send, get_long_running_output, get_long_running_status, long_running_operation_timeout) + def update_worker_pool( + self, resource_group_name, name, worker_pool_name, worker_pool_envelope, custom_headers=None, raw=False, **operation_config): + """Create or update a worker pool. + + Create or update a worker pool. + + :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 worker_pool_name: Name of the worker pool. + :type worker_pool_name: str + :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 + :param operation_config: :ref:`Operation configuration + overrides`. + :return: WorkerPoolResource or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.WorkerPoolResource or + ~msrest.pipeline.ClientRawResponse + :raises: :class:`CloudError` + """ + # Construct URL + url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools/{workerPoolName}' + 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'), + 'workerPoolName': self._serialize.url("worker_pool_name", worker_pool_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(worker_pool_envelope, 'WorkerPoolResource') + + # Construct and send request + request = self._client.patch(url, query_parameters) + response = self._client.send( + request, header_parameters, body_content, **operation_config) + + 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 = None + + if response.status_code == 200: + deserialized = self._deserialize('WorkerPoolResource', response) + if response.status_code == 202: + deserialized = self._deserialize('WorkerPoolResource', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + def list_worker_pool_instance_metric_definitions( self, resource_group_name, name, worker_pool_name, instance, custom_headers=None, raw=False, **operation_config): """Get metric definitions for a specific instance of a worker pool of an 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 02c947bb4f9d..427bf02c5d9a 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 @@ -227,7 +227,7 @@ def get( request = self._client.get(url, query_parameters) response = self._client.send(request, header_parameters, **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 @@ -385,7 +385,7 @@ def delete( request = self._client.delete(url, query_parameters) response = self._client.send(request, header_parameters, **operation_config) - if response.status_code not in [200]: + if response.status_code not in [200, 204]: exp = CloudError(response) exp.request_id = response.headers.get('x-ms-request-id') raise exp @@ -394,6 +394,79 @@ def delete( client_raw_response = ClientRawResponse(None, response) return client_raw_response + def update( + self, resource_group_name, name, app_service_plan, custom_headers=None, raw=False, **operation_config): + """Creates or updates an App Service Plan. + + Creates or updates an App Service Plan. + + :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 plan. + :type name: str + :param app_service_plan: Details of the App Service plan. + :type app_service_plan: + ~azure.mgmt.web.models.AppServicePlanPatchResource + :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: AppServicePlan or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.AppServicePlan or + ~msrest.pipeline.ClientRawResponse + :raises: :class:`CloudError` + """ + # Construct URL + url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}' + 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(app_service_plan, 'AppServicePlanPatchResource') + + # Construct and send request + request = self._client.patch(url, query_parameters) + response = self._client.send( + request, header_parameters, body_content, **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 + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('AppServicePlan', response) + if response.status_code == 202: + deserialized = self._deserialize('AppServicePlan', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + def list_capabilities( self, resource_group_name, name, custom_headers=None, raw=False, **operation_config): """List all capabilities of an App Service plan. @@ -1189,6 +1262,148 @@ def internal_paging(next_link=None, raw=False): return deserialized + def get_server_farm_skus( + self, resource_group_name, name, custom_headers=None, raw=False, **operation_config): + """Gets all selectable sku's for a given App Service Plan. + + Gets all selectable sku's for a given App Service Plan. + + :param resource_group_name: Name of the resource group to which the + resource belongs. + :type resource_group_name: str + :param name: Name of App Service Plan + :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: object or ClientRawResponse if raw=true + :rtype: object or ~msrest.pipeline.ClientRawResponse + :raises: :class:`CloudError` + """ + # Construct URL + url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/skus' + 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, **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('object', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + + def list_usages( + self, resource_group_name, name, filter=None, custom_headers=None, raw=False, **operation_config): + """Gets server farm usage information. + + Gets server farm usage information. + + :param resource_group_name: Name of the resource group to which the + resource belongs. + :type resource_group_name: str + :param name: Name of App Service Plan + :type name: str + :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'). + :type filter: 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 CsmUsageQuota + :rtype: + ~azure.mgmt.web.models.CsmUsageQuotaPaged[~azure.mgmt.web.models.CsmUsageQuota] + :raises: :class:`CloudError` + """ + def internal_paging(next_link=None, raw=False): + + if not next_link: + # Construct URL + url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/usages' + 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 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, **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.CsmUsageQuotaPaged(internal_paging, self._deserialize.dependencies) + + if raw: + header_dict = {} + client_raw_response = models.CsmUsageQuotaPaged(internal_paging, self._deserialize.dependencies, header_dict) + return client_raw_response + + return deserialized + def list_vnets( self, resource_group_name, name, custom_headers=None, raw=False, **operation_config): """Get all Virtual Networks associated with an App Service plan. 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 f098b5d749ca..f5d2281e74f9 100644 --- a/azure-mgmt-web/azure/mgmt/web/operations/certificates_operations.py +++ b/azure-mgmt-web/azure/mgmt/web/operations/certificates_operations.py @@ -375,7 +375,8 @@ def update( :type name: str :param certificate_envelope: Details of certificate, if it exists already. - :type certificate_envelope: ~azure.mgmt.web.models.Certificate + :type certificate_envelope: + ~azure.mgmt.web.models.CertificatePatchResource :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -410,7 +411,7 @@ def update( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct body - body_content = self._serialize.body(certificate_envelope, 'Certificate') + body_content = self._serialize.body(certificate_envelope, 'CertificatePatchResource') # Construct and send request request = self._client.patch(url, query_parameters) 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 33aa3d3a589c..b9ee95a10b0f 100644 --- a/azure-mgmt-web/azure/mgmt/web/operations/domains_operations.py +++ b/azure-mgmt-web/azure/mgmt/web/operations/domains_operations.py @@ -593,6 +593,78 @@ def delete( client_raw_response = ClientRawResponse(None, response) return client_raw_response + def update( + self, resource_group_name, domain_name, domain, custom_headers=None, raw=False, **operation_config): + """Creates or updates a domain. + + Creates or updates a domain. + + :param resource_group_name: Name of the resource group to which the + resource belongs. + :type resource_group_name: str + :param domain_name: Name of the domain. + :type domain_name: str + :param domain: Domain registration information. + :type domain: ~azure.mgmt.web.models.DomainPatchResource + :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: Domain or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.Domain or + ~msrest.pipeline.ClientRawResponse + :raises: :class:`CloudError` + """ + # Construct URL + url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DomainRegistration/domains/{domainName}' + path_format_arguments = { + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+[^\.]$'), + 'domainName': self._serialize.url("domain_name", domain_name, 'str', pattern=r'[a-zA-Z0-9][a-zA-Z0-9\.-]+'), + '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(domain, 'DomainPatchResource') + + # Construct and send request + request = self._client.patch(url, query_parameters) + response = self._client.send( + request, header_parameters, body_content, **operation_config) + + if response.status_code not in [202, 200]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp + + deserialized = None + + if response.status_code == 202: + deserialized = self._deserialize('Domain', response) + if response.status_code == 200: + deserialized = self._deserialize('Domain', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + def list_ownership_identifiers( self, resource_group_name, domain_name, custom_headers=None, raw=False, **operation_config): """Lists domain ownership identifiers. @@ -734,7 +806,7 @@ def get_ownership_identifier( return deserialized def create_or_update_ownership_identifier( - self, resource_group_name, domain_name, name, domain_ownership_identifier, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, domain_name, name, kind=None, ownership_id=None, custom_headers=None, raw=False, **operation_config): """Creates an ownership identifier for a domain or updates identifier details for an existing identifer. @@ -748,10 +820,10 @@ def create_or_update_ownership_identifier( :type domain_name: str :param name: Name of identifier. :type name: str - :param domain_ownership_identifier: A JSON representation of the - domain ownership properties. - :type domain_ownership_identifier: - ~azure.mgmt.web.models.DomainOwnershipIdentifier + :param kind: Kind of resource. + :type kind: str + :param ownership_id: Ownership Id. + :type ownership_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 @@ -762,6 +834,8 @@ def create_or_update_ownership_identifier( ~msrest.pipeline.ClientRawResponse :raises: :class:`CloudError` """ + domain_ownership_identifier = models.DomainOwnershipIdentifier(kind=kind, ownership_id=ownership_id) + # Construct URL url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DomainRegistration/domains/{domainName}/domainOwnershipIdentifiers/{name}' path_format_arguments = { @@ -870,7 +944,7 @@ def delete_ownership_identifier( return client_raw_response def update_ownership_identifier( - self, resource_group_name, domain_name, name, domain_ownership_identifier, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, domain_name, name, kind=None, ownership_id=None, custom_headers=None, raw=False, **operation_config): """Creates an ownership identifier for a domain or updates identifier details for an existing identifer. @@ -884,10 +958,10 @@ def update_ownership_identifier( :type domain_name: str :param name: Name of identifier. :type name: str - :param domain_ownership_identifier: A JSON representation of the - domain ownership properties. - :type domain_ownership_identifier: - ~azure.mgmt.web.models.DomainOwnershipIdentifier + :param kind: Kind of resource. + :type kind: str + :param ownership_id: Ownership Id. + :type ownership_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 @@ -898,6 +972,8 @@ def update_ownership_identifier( ~msrest.pipeline.ClientRawResponse :raises: :class:`CloudError` """ + domain_ownership_identifier = models.DomainOwnershipIdentifier(kind=kind, ownership_id=ownership_id) + # Construct URL url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DomainRegistration/domains/{domainName}/domainOwnershipIdentifiers/{name}' path_format_arguments = { 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 7cd8f167c33c..2c10eca08a11 100644 --- a/azure-mgmt-web/azure/mgmt/web/operations/provider_operations.py +++ b/azure-mgmt-web/azure/mgmt/web/operations/provider_operations.py @@ -89,7 +89,11 @@ def get_available_stacks( def list_operations( self, custom_headers=None, raw=False, **operation_config): - """ + """Gets all available operations for the Microsoft.Web resource provider. + Also exposes resource metric definitions. + + Gets all available operations for the Microsoft.Web resource provider. + Also exposes resource metric definitions. :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/web_apps_operations.py b/azure-mgmt-web/azure/mgmt/web/operations/web_apps_operations.py index 1d170befdf82..65ecd2d0ee7f 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 @@ -224,7 +224,7 @@ def get( request = self._client.get(url, query_parameters) response = self._client.send(request, header_parameters, **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 @@ -421,7 +421,7 @@ def delete( request = self._client.delete(url, query_parameters) response = self._client.send(request, header_parameters, **operation_config) - if response.status_code not in [200, 404]: + if response.status_code not in [200, 204, 404]: exp = CloudError(response) exp.request_id = response.headers.get('x-ms-request-id') raise exp @@ -430,6 +430,103 @@ def delete( client_raw_response = ClientRawResponse(None, response) return client_raw_response + 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): + """Creates a new web, mobile, or API app in an existing resource group, or + updates an existing app. + + Creates a new web, mobile, or API app in an existing resource group, or + updates an existing app. + + :param resource_group_name: Name of the resource group to which the + resource belongs. + :type resource_group_name: str + :param name: Unique name of the app to create or update. To create or + update a deployment slot, use the {slot} parameter. + :type name: str + :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 + :param operation_config: :ref:`Operation configuration + overrides`. + :return: Site or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.Site or + ~msrest.pipeline.ClientRawResponse + :raises: :class:`CloudError` + """ + # Construct URL + url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}' + 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 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 + 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_envelope, 'SitePatchResource') + + # Construct and send request + request = self._client.patch(url, query_parameters) + response = self._client.send( + request, header_parameters, body_content, **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 + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('Site', response) + if response.status_code == 202: + deserialized = self._deserialize('Site', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + def analyze_custom_hostname( self, resource_group_name, name, host_name=None, custom_headers=None, raw=False, **operation_config): """Analyze a custom hostname. @@ -2623,16 +2720,94 @@ def list_configuration_snapshot_info( deserialized response :param operation_config: :ref:`Operation configuration overrides`. - :return: list or ClientRawResponse if raw=true - :rtype: list[~azure.mgmt.web.models.SiteConfigurationSnapshotInfo] or + :return: An iterator like instance of SiteConfigurationSnapshotInfo + :rtype: + ~azure.mgmt.web.models.SiteConfigurationSnapshotInfoPaged[~azure.mgmt.web.models.SiteConfigurationSnapshotInfo] + :raises: :class:`CloudError` + """ + def internal_paging(next_link=None, raw=False): + + if not next_link: + # Construct URL + url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/web/snapshots' + 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, **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.SiteConfigurationSnapshotInfoPaged(internal_paging, self._deserialize.dependencies) + + if raw: + header_dict = {} + client_raw_response = models.SiteConfigurationSnapshotInfoPaged(internal_paging, self._deserialize.dependencies, header_dict) + return client_raw_response + + return deserialized + + def get_configuration_snapshot( + self, resource_group_name, name, snapshot_id, custom_headers=None, raw=False, **operation_config): + """Gets a snapshot of the configuration of an app at a previous point in + time. + + Gets a snapshot of the configuration of an app at a previous point in + time. + + :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 snapshot_id: The ID of the snapshot to read. + :type snapshot_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 + :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:`CloudError` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/web/snapshots' + url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/web/snapshots/{snapshotId}' 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'), + 'snapshotId': self._serialize.url("snapshot_id", snapshot_id, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') } url = self._client.format_url(url, **path_format_arguments) @@ -2663,7 +2838,7 @@ def list_configuration_snapshot_info( deserialized = None if response.status_code == 200: - deserialized = self._deserialize('[SiteConfigurationSnapshotInfo]', response) + deserialized = self._deserialize('SiteConfigResource', response) if raw: client_raw_response = ClientRawResponse(deserialized, response) @@ -2671,13 +2846,11 @@ def list_configuration_snapshot_info( return deserialized - def get_configuration_snapshot( + def recover_site_configuration_snapshot( self, resource_group_name, name, snapshot_id, custom_headers=None, raw=False, **operation_config): - """Gets a snapshot of the configuration of an app at a previous point in - time. + """Reverts the configuration of an app to a previous snapshot. - Gets a snapshot of the configuration of an app at a previous point in - time. + Reverts the configuration of an app to a previous snapshot. :param resource_group_name: Name of the resource group to which the resource belongs. @@ -2691,13 +2864,12 @@ def get_configuration_snapshot( 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 = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/web/snapshots/{snapshotId}' + url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/web/snapshots/{snapshotId}/recover' 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'), @@ -2721,10 +2893,71 @@ 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) + request = self._client.post(url, query_parameters) response = self._client.send(request, header_parameters, **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 + + if raw: + client_raw_response = ClientRawResponse(None, response) + return client_raw_response + + def get_web_site_container_logs( + self, resource_group_name, name, custom_headers=None, raw=False, callback=None, **operation_config): + """Gets the last lines of docker logs for the given site. + + Gets the last lines of docker logs 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 callback: When specified, will be called with each chunk of + data that is streamed. The callback should take two arguments, the + bytes of the current chunk of data and the response object. If the + data is uploading, response will be None. + :type callback: Callable[Bytes, response=None] + :param operation_config: :ref:`Operation configuration + overrides`. + :return: object or ClientRawResponse if raw=true + :rtype: Generator or ~msrest.pipeline.ClientRawResponse + :raises: :class:`CloudError` + """ + # Construct URL + url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/containerlogs' + 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, **operation_config) + + if response.status_code not in [204, 200]: exp = CloudError(response) exp.request_id = response.headers.get('x-ms-request-id') raise exp @@ -2732,7 +2965,7 @@ def get_configuration_snapshot( deserialized = None if response.status_code == 200: - deserialized = self._deserialize('SiteConfigResource', response) + deserialized = self._client.stream_download(response, callback) if raw: client_raw_response = ClientRawResponse(deserialized, response) @@ -2740,34 +2973,36 @@ def get_configuration_snapshot( return deserialized - def recover_site_configuration_snapshot( - self, resource_group_name, name, snapshot_id, custom_headers=None, raw=False, **operation_config): - """Reverts the configuration of an app to a previous snapshot. + 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. - Reverts the configuration of an app to a previous snapshot. + Gets the ZIP archived docker log files 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 the app. + :param name: Name of web app. :type name: str - :param snapshot_id: The ID of the snapshot to read. - :type snapshot_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 + :param callback: When specified, will be called with each chunk of + data that is streamed. The callback should take two arguments, the + bytes of the current chunk of data and the response object. If the + data is uploading, response will be None. + :type callback: Callable[Bytes, response=None] :param operation_config: :ref:`Operation configuration overrides`. - :return: None or ClientRawResponse if raw=true - :rtype: None or ~msrest.pipeline.ClientRawResponse + :return: object or ClientRawResponse if raw=true + :rtype: Generator or ~msrest.pipeline.ClientRawResponse :raises: :class:`CloudError` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/web/snapshots/{snapshotId}/recover' + url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/containerlogs/zip/download' 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'), - 'snapshotId': self._serialize.url("snapshot_id", snapshot_id, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') } url = self._client.format_url(url, **path_format_arguments) @@ -2790,15 +3025,22 @@ def recover_site_configuration_snapshot( request = self._client.post(url, query_parameters) response = self._client.send(request, header_parameters, **operation_config) - if response.status_code not in [204]: + if response.status_code not in [204, 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._client.stream_download(response, callback) + if raw: - client_raw_response = ClientRawResponse(None, response) + client_raw_response = ClientRawResponse(deserialized, response) return client_raw_response + return deserialized + def list_continuous_web_jobs( self, resource_group_name, name, custom_headers=None, raw=False, **operation_config): """List continuous web jobs for an app, or a deployment slot. @@ -2873,7 +3115,7 @@ def internal_paging(next_link=None, raw=False): return deserialized def get_continuous_web_job( - self, resource_group_name, name, web_job_id, web_job_name, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, web_job_name, custom_headers=None, raw=False, **operation_config): """Gets a continuous web job by its ID for an app, or a deployment slot. Gets a continuous web job by its ID for an app, or a deployment slot. @@ -2883,9 +3125,7 @@ def get_continuous_web_job( :type resource_group_name: str :param name: Site name. :type name: str - :param web_job_id: Web job ID. - :type web_job_id: str - :param web_job_name: + :param web_job_name: Name of Web Job. :type web_job_name: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the @@ -2909,7 +3149,6 @@ def get_continuous_web_job( # Construct parameters query_parameters = {} - query_parameters['webJobId'] = self._serialize.query("web_job_id", web_job_id, 'str') query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') # Construct headers @@ -2943,7 +3182,7 @@ def get_continuous_web_job( return deserialized def delete_continuous_web_job( - self, resource_group_name, name, web_job_id, web_job_name, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, web_job_name, custom_headers=None, raw=False, **operation_config): """Delete a continuous web job by its ID for an app, or a deployment slot. Delete a continuous web job by its ID for an app, or a deployment slot. @@ -2953,9 +3192,7 @@ def delete_continuous_web_job( :type resource_group_name: str :param name: Site name. :type name: str - :param web_job_id: Web job ID. - :type web_job_id: str - :param web_job_name: + :param web_job_name: Name of Web Job. :type web_job_name: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the @@ -2978,7 +3215,6 @@ def delete_continuous_web_job( # Construct parameters query_parameters = {} - query_parameters['webJobId'] = self._serialize.query("web_job_id", web_job_id, 'str') query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') # Construct headers @@ -3005,7 +3241,7 @@ def delete_continuous_web_job( return client_raw_response def start_continuous_web_job( - self, resource_group_name, name, web_job_id, web_job_name, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, web_job_name, custom_headers=None, raw=False, **operation_config): """Start a continuous web job for an app, or a deployment slot. Start a continuous web job for an app, or a deployment slot. @@ -3015,9 +3251,7 @@ def start_continuous_web_job( :type resource_group_name: str :param name: Site name. :type name: str - :param web_job_id: Web job ID. - :type web_job_id: str - :param web_job_name: + :param web_job_name: Name of Web Job. :type web_job_name: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the @@ -3040,7 +3274,6 @@ def start_continuous_web_job( # Construct parameters query_parameters = {} - query_parameters['webJobId'] = self._serialize.query("web_job_id", web_job_id, 'str') query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') # Construct headers @@ -3067,7 +3300,7 @@ def start_continuous_web_job( return client_raw_response def stop_continuous_web_job( - self, resource_group_name, name, web_job_id, web_job_name, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, web_job_name, custom_headers=None, raw=False, **operation_config): """Stop a continuous web job for an app, or a deployment slot. Stop a continuous web job for an app, or a deployment slot. @@ -3077,9 +3310,7 @@ def stop_continuous_web_job( :type resource_group_name: str :param name: Site name. :type name: str - :param web_job_id: Web job ID. - :type web_job_id: str - :param web_job_name: + :param web_job_name: Name of Web Job. :type web_job_name: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the @@ -3102,7 +3333,6 @@ def stop_continuous_web_job( # Construct parameters query_parameters = {} - query_parameters['webJobId'] = self._serialize.query("web_job_id", web_job_id, 'str') query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') # Construct headers @@ -6045,7 +6275,7 @@ def delete_instance_process( return client_raw_response def get_instance_process_dump( - self, resource_group_name, name, process_id, instance_id, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, process_id, instance_id, custom_headers=None, raw=False, callback=None, **operation_config): """Get a memory dump of a process by its ID for a specific scaled-out instance in a web site. @@ -6066,10 +6296,15 @@ def get_instance_process_dump( :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response + :param callback: When specified, will be called with each chunk of + data that is streamed. The callback should take two arguments, the + bytes of the current chunk of data and the response object. If the + data is uploading, response will be None. + :type callback: Callable[Bytes, response=None] :param operation_config: :ref:`Operation configuration overrides`. :return: object or ClientRawResponse if raw=true - :rtype: object or ~msrest.pipeline.ClientRawResponse + :rtype: Generator or ~msrest.pipeline.ClientRawResponse :raises: :class:`CloudError` """ # Construct URL @@ -6109,7 +6344,7 @@ def get_instance_process_dump( deserialized = None if response.status_code == 200: - deserialized = self._deserialize('object', response) + deserialized = self._client.stream_download(response, callback) if raw: client_raw_response = ClientRawResponse(deserialized, response) @@ -6201,7 +6436,7 @@ def internal_paging(next_link=None, raw=False): return deserialized def get_instance_process_module( - self, resource_group_name, name, process_id, base_address, instance_id, base_address1, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, process_id, base_address, instance_id, custom_headers=None, raw=False, **operation_config): """Get process information by its ID for a specific scaled-out instance in a web site. @@ -6221,8 +6456,6 @@ def get_instance_process_module( value of the name property in the JSON response from "GET api/sites/{siteName}/instances". :type instance_id: str - :param base_address1: - :type base_address1: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -6234,20 +6467,19 @@ def get_instance_process_module( :raises: :class:`CloudError` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/instances/{instanceId}/processes/{processId}/modules/{base_address}' + url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/instances/{instanceId}/processes/{processId}/modules/{baseAddress}' 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'), 'processId': self._serialize.url("process_id", process_id, 'str'), + 'baseAddress': self._serialize.url("base_address", base_address, 'str'), 'instanceId': self._serialize.url("instance_id", instance_id, 'str'), - 'base_address': self._serialize.url("base_address1", base_address1, '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['baseAddress'] = self._serialize.query("base_address", base_address, 'str') query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') # Construct headers @@ -7245,7 +7477,7 @@ def generate_new_site_publishing_password( request = self._client.post(url, query_parameters) response = self._client.send(request, header_parameters, **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 @@ -7868,7 +8100,7 @@ def delete_process( return client_raw_response def get_process_dump( - self, resource_group_name, name, process_id, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, process_id, custom_headers=None, raw=False, callback=None, **operation_config): """Get a memory dump of a process by its ID for a specific scaled-out instance in a web site. @@ -7885,10 +8117,15 @@ def get_process_dump( :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response + :param callback: When specified, will be called with each chunk of + data that is streamed. The callback should take two arguments, the + bytes of the current chunk of data and the response object. If the + data is uploading, response will be None. + :type callback: Callable[Bytes, response=None] :param operation_config: :ref:`Operation configuration overrides`. :return: object or ClientRawResponse if raw=true - :rtype: object or ~msrest.pipeline.ClientRawResponse + :rtype: Generator or ~msrest.pipeline.ClientRawResponse :raises: :class:`CloudError` """ # Construct URL @@ -7927,7 +8164,7 @@ def get_process_dump( deserialized = None if response.status_code == 200: - deserialized = self._deserialize('object', response) + deserialized = self._client.stream_download(response, callback) if raw: client_raw_response = ClientRawResponse(deserialized, response) @@ -8014,7 +8251,7 @@ def internal_paging(next_link=None, raw=False): return deserialized def get_process_module( - self, resource_group_name, name, process_id, base_address, base_address1, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, process_id, base_address, custom_headers=None, raw=False, **operation_config): """Get process information by its ID for a specific scaled-out instance in a web site. @@ -8030,8 +8267,6 @@ def get_process_module( :type process_id: str :param base_address: Module base address. :type base_address: str - :param base_address1: - :type base_address1: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -8043,19 +8278,18 @@ def get_process_module( :raises: :class:`CloudError` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/processes/{processId}/modules/{base_address}' + url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/processes/{processId}/modules/{baseAddress}' 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'), 'processId': self._serialize.url("process_id", process_id, 'str'), - 'base_address': self._serialize.url("base_address1", base_address1, 'str'), + 'baseAddress': self._serialize.url("base_address", base_address, '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['baseAddress'] = self._serialize.query("base_address", base_address, 'str') query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') # Construct headers @@ -8881,7 +9115,7 @@ def internal_paging(next_link=None, raw=False): return deserialized def get_site_extension( - self, resource_group_name, name, site_extension_id, extension_name, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, site_extension_id, custom_headers=None, raw=False, **operation_config): """Get site extension information by its ID for a web site, or a deployment slot. @@ -8895,8 +9129,6 @@ def get_site_extension( :type name: str :param site_extension_id: Site extension name. :type site_extension_id: str - :param extension_name: - :type extension_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 @@ -8908,18 +9140,17 @@ def get_site_extension( :raises: :class:`CloudError` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/siteextensions/{extensionName}' + url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/siteextensions/{siteExtensionId}' 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'), - 'extensionName': self._serialize.url("extension_name", extension_name, 'str'), + 'siteExtensionId': self._serialize.url("site_extension_id", site_extension_id, '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['siteExtensionId'] = self._serialize.query("site_extension_id", site_extension_id, 'str') query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') # Construct headers @@ -8953,7 +9184,7 @@ def get_site_extension( return deserialized def install_site_extension( - self, resource_group_name, name, site_extension_id, extension_name, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, site_extension_id, custom_headers=None, raw=False, **operation_config): """Install site extension on a web site, or a deployment slot. Install site extension on a web site, or a deployment slot. @@ -8965,8 +9196,6 @@ def install_site_extension( :type name: str :param site_extension_id: Site extension name. :type site_extension_id: str - :param extension_name: - :type extension_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 @@ -8978,18 +9207,17 @@ def install_site_extension( :raises: :class:`CloudError` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/siteextensions/{extensionName}' + url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/siteextensions/{siteExtensionId}' 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'), - 'extensionName': self._serialize.url("extension_name", extension_name, 'str'), + 'siteExtensionId': self._serialize.url("site_extension_id", site_extension_id, '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['siteExtensionId'] = self._serialize.query("site_extension_id", site_extension_id, 'str') query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') # Construct headers @@ -9048,7 +9276,7 @@ def get_long_running_output(response): get_long_running_status, long_running_operation_timeout) def delete_site_extension( - self, resource_group_name, name, site_extension_id, extension_name, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, site_extension_id, custom_headers=None, raw=False, **operation_config): """Remove a site extension from a web site, or a deployment slot. Remove a site extension from a web site, or a deployment slot. @@ -9060,8 +9288,6 @@ def delete_site_extension( :type name: str :param site_extension_id: Site extension name. :type site_extension_id: str - :param extension_name: - :type extension_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 @@ -9072,18 +9298,17 @@ def delete_site_extension( :raises: :class:`CloudError` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/siteextensions/{extensionName}' + url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/siteextensions/{siteExtensionId}' 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'), - 'extensionName': self._serialize.url("extension_name", extension_name, 'str'), + 'siteExtensionId': self._serialize.url("site_extension_id", site_extension_id, '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['siteExtensionId'] = self._serialize.query("site_extension_id", site_extension_id, 'str') query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') # Construct headers @@ -9233,7 +9458,7 @@ def get_slot( request = self._client.get(url, query_parameters) response = self._client.send(request, header_parameters, **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 @@ -9438,7 +9663,7 @@ def delete_slot( request = self._client.delete(url, query_parameters) response = self._client.send(request, header_parameters, **operation_config) - if response.status_code not in [200, 404]: + if response.status_code not in [200, 204, 404]: exp = CloudError(response) exp.request_id = response.headers.get('x-ms-request-id') raise exp @@ -9447,6 +9672,107 @@ def delete_slot( client_raw_response = ClientRawResponse(None, response) return client_raw_response + 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): + """Creates a new web, mobile, or API app in an existing resource group, or + updates an existing app. + + Creates a new web, mobile, or API app in an existing resource group, or + updates an existing app. + + :param resource_group_name: Name of the resource group to which the + resource belongs. + :type resource_group_name: str + :param name: Unique name of the app to create or update. To create or + update a deployment slot, use the {slot} parameter. + :type name: str + :param site_envelope: A JSON representation of the app properties. See + example. + :type site_envelope: ~azure.mgmt.web.models.SitePatchResource + :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 + :param operation_config: :ref:`Operation configuration + overrides`. + :return: Site or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.Site or + ~msrest.pipeline.ClientRawResponse + :raises: :class:`CloudError` + """ + # Construct URL + url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}' + 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 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 + 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_envelope, 'SitePatchResource') + + # Construct and send request + request = self._client.patch(url, query_parameters) + response = self._client.send( + request, header_parameters, body_content, **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 + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('Site', response) + if response.status_code == 202: + deserialized = self._deserialize('Site', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + def analyze_custom_hostname_slot( self, resource_group_name, name, slot, host_name=None, custom_headers=None, raw=False, **operation_config): """Analyze a custom hostname. @@ -11619,16 +11945,98 @@ def list_configuration_snapshot_info_slot( deserialized response :param operation_config: :ref:`Operation configuration overrides`. - :return: list or ClientRawResponse if raw=true - :rtype: list[~azure.mgmt.web.models.SiteConfigurationSnapshotInfo] or + :return: An iterator like instance of SiteConfigurationSnapshotInfo + :rtype: + ~azure.mgmt.web.models.SiteConfigurationSnapshotInfoPaged[~azure.mgmt.web.models.SiteConfigurationSnapshotInfo] + :raises: :class:`CloudError` + """ + def internal_paging(next_link=None, raw=False): + + if not next_link: + # Construct URL + url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/web/snapshots' + 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, **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.SiteConfigurationSnapshotInfoPaged(internal_paging, self._deserialize.dependencies) + + if raw: + header_dict = {} + client_raw_response = models.SiteConfigurationSnapshotInfoPaged(internal_paging, self._deserialize.dependencies, header_dict) + return client_raw_response + + return deserialized + + def get_configuration_snapshot_slot( + self, resource_group_name, name, snapshot_id, slot, custom_headers=None, raw=False, **operation_config): + """Gets a snapshot of the configuration of an app at a previous point in + time. + + Gets a snapshot of the configuration of an app at a previous point in + time. + + :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 snapshot_id: The ID of the snapshot to read. + :type snapshot_id: str + :param slot: Name of the deployment slot. If a slot is not specified, + the API will return configuration 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: SiteConfigResource or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.SiteConfigResource or ~msrest.pipeline.ClientRawResponse :raises: :class:`CloudError` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/web/snapshots' + url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/web/snapshots/{snapshotId}' 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'), + 'snapshotId': self._serialize.url("snapshot_id", snapshot_id, 'str'), 'slot': self._serialize.url("slot", slot, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') } @@ -11660,7 +12068,7 @@ def list_configuration_snapshot_info_slot( deserialized = None if response.status_code == 200: - deserialized = self._deserialize('[SiteConfigurationSnapshotInfo]', response) + deserialized = self._deserialize('SiteConfigResource', response) if raw: client_raw_response = ClientRawResponse(deserialized, response) @@ -11668,13 +12076,11 @@ def list_configuration_snapshot_info_slot( return deserialized - def get_configuration_snapshot_slot( + def recover_site_configuration_snapshot_slot( self, resource_group_name, name, snapshot_id, slot, custom_headers=None, raw=False, **operation_config): - """Gets a snapshot of the configuration of an app at a previous point in - time. + """Reverts the configuration of an app to a previous snapshot. - Gets a snapshot of the configuration of an app at a previous point in - time. + Reverts the configuration of an app to a previous snapshot. :param resource_group_name: Name of the resource group to which the resource belongs. @@ -11691,17 +12097,81 @@ def get_configuration_snapshot_slot( 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 = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/web/snapshots/{snapshotId}/recover' + 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'), + 'snapshotId': self._serialize.url("snapshot_id", snapshot_id, '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, **operation_config) + + if response.status_code not in [204]: + 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 get_web_site_container_logs_slot( + self, resource_group_name, name, slot, custom_headers=None, raw=False, callback=None, **operation_config): + """Gets the last lines of docker logs for the given site. + + Gets the last lines of docker logs 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 callback: When specified, will be called with each chunk of + data that is streamed. The callback should take two arguments, the + bytes of the current chunk of data and the response object. If the + data is uploading, response will be None. + :type callback: Callable[Bytes, response=None] + :param operation_config: :ref:`Operation configuration + overrides`. + :return: object or ClientRawResponse if raw=true + :rtype: Generator or ~msrest.pipeline.ClientRawResponse :raises: :class:`CloudError` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/web/snapshots/{snapshotId}' + url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/containerlogs' 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'), - 'snapshotId': self._serialize.url("snapshot_id", snapshot_id, 'str'), 'slot': self._serialize.url("slot", slot, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') } @@ -11722,10 +12192,10 @@ 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) + request = self._client.post(url, query_parameters) response = self._client.send(request, header_parameters, **operation_config) - if response.status_code not in [200]: + if response.status_code not in [204, 200]: exp = CloudError(response) exp.request_id = response.headers.get('x-ms-request-id') raise exp @@ -11733,7 +12203,7 @@ def get_configuration_snapshot_slot( deserialized = None if response.status_code == 200: - deserialized = self._deserialize('SiteConfigResource', response) + deserialized = self._client.stream_download(response, callback) if raw: client_raw_response = ClientRawResponse(deserialized, response) @@ -11741,37 +12211,39 @@ def get_configuration_snapshot_slot( return deserialized - def recover_site_configuration_snapshot_slot( - self, resource_group_name, name, snapshot_id, slot, custom_headers=None, raw=False, **operation_config): - """Reverts the configuration of an app to a previous snapshot. + 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. - Reverts the configuration of an app to a previous snapshot. + Gets the ZIP archived docker log files 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 the app. + :param name: Name of web app. :type name: str - :param snapshot_id: The ID of the snapshot to read. - :type snapshot_id: str - :param slot: Name of the deployment slot. If a slot is not specified, - the API will return configuration for the production slot. + :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 callback: When specified, will be called with each chunk of + data that is streamed. The callback should take two arguments, the + bytes of the current chunk of data and the response object. If the + data is uploading, response will be None. + :type callback: Callable[Bytes, response=None] :param operation_config: :ref:`Operation configuration overrides`. - :return: None or ClientRawResponse if raw=true - :rtype: None or ~msrest.pipeline.ClientRawResponse + :return: object or ClientRawResponse if raw=true + :rtype: Generator or ~msrest.pipeline.ClientRawResponse :raises: :class:`CloudError` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/web/snapshots/{snapshotId}/recover' + url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/containerlogs/zip/download' 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'), - 'snapshotId': self._serialize.url("snapshot_id", snapshot_id, 'str'), 'slot': self._serialize.url("slot", slot, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') } @@ -11795,15 +12267,22 @@ def recover_site_configuration_snapshot_slot( request = self._client.post(url, query_parameters) response = self._client.send(request, header_parameters, **operation_config) - if response.status_code not in [204]: + if response.status_code not in [204, 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._client.stream_download(response, callback) + if raw: - client_raw_response = ClientRawResponse(None, response) + client_raw_response = ClientRawResponse(deserialized, response) return client_raw_response + return deserialized + def list_continuous_web_jobs_slot( self, resource_group_name, name, slot, custom_headers=None, raw=False, **operation_config): """List continuous web jobs for an app, or a deployment slot. @@ -11882,7 +12361,7 @@ def internal_paging(next_link=None, raw=False): return deserialized def get_continuous_web_job_slot( - self, resource_group_name, name, web_job_id, slot, web_job_name, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, web_job_name, slot, custom_headers=None, raw=False, **operation_config): """Gets a continuous web job by its ID for an app, or a deployment slot. Gets a continuous web job by its ID for an app, or a deployment slot. @@ -11892,13 +12371,11 @@ def get_continuous_web_job_slot( :type resource_group_name: str :param name: Site name. :type name: str - :param web_job_id: Web job ID. - :type web_job_id: str + :param web_job_name: Name of Web Job. + :type web_job_name: str :param slot: Name of the deployment slot. If a slot is not specified, the API deletes a deployment for the production slot. :type slot: str - :param web_job_name: - :type web_job_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 @@ -11914,15 +12391,14 @@ def get_continuous_web_job_slot( 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'), 'webJobName': self._serialize.url("web_job_name", web_job_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['webJobId'] = self._serialize.query("web_job_id", web_job_id, 'str') query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') # Construct headers @@ -11956,7 +12432,7 @@ def get_continuous_web_job_slot( return deserialized def delete_continuous_web_job_slot( - self, resource_group_name, name, web_job_id, slot, web_job_name, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, web_job_name, slot, custom_headers=None, raw=False, **operation_config): """Delete a continuous web job by its ID for an app, or a deployment slot. Delete a continuous web job by its ID for an app, or a deployment slot. @@ -11966,13 +12442,11 @@ def delete_continuous_web_job_slot( :type resource_group_name: str :param name: Site name. :type name: str - :param web_job_id: Web job ID. - :type web_job_id: str + :param web_job_name: Name of Web Job. + :type web_job_name: str :param slot: Name of the deployment slot. If a slot is not specified, the API deletes a deployment for the production slot. :type slot: str - :param web_job_name: - :type web_job_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 @@ -11987,15 +12461,14 @@ def delete_continuous_web_job_slot( 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'), 'webJobName': self._serialize.url("web_job_name", web_job_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['webJobId'] = self._serialize.query("web_job_id", web_job_id, 'str') query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') # Construct headers @@ -12022,7 +12495,7 @@ def delete_continuous_web_job_slot( return client_raw_response def start_continuous_web_job_slot( - self, resource_group_name, name, web_job_id, slot, web_job_name, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, web_job_name, slot, custom_headers=None, raw=False, **operation_config): """Start a continuous web job for an app, or a deployment slot. Start a continuous web job for an app, or a deployment slot. @@ -12032,13 +12505,11 @@ def start_continuous_web_job_slot( :type resource_group_name: str :param name: Site name. :type name: str - :param web_job_id: Web job ID. - :type web_job_id: str + :param web_job_name: Name of Web Job. + :type web_job_name: str :param slot: Name of the deployment slot. If a slot is not specified, the API deletes a deployment for the production slot. :type slot: str - :param web_job_name: - :type web_job_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 @@ -12053,15 +12524,14 @@ def start_continuous_web_job_slot( 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'), 'webJobName': self._serialize.url("web_job_name", web_job_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['webJobId'] = self._serialize.query("web_job_id", web_job_id, 'str') query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') # Construct headers @@ -12088,7 +12558,7 @@ def start_continuous_web_job_slot( return client_raw_response def stop_continuous_web_job_slot( - self, resource_group_name, name, web_job_id, slot, web_job_name, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, web_job_name, slot, custom_headers=None, raw=False, **operation_config): """Stop a continuous web job for an app, or a deployment slot. Stop a continuous web job for an app, or a deployment slot. @@ -12098,13 +12568,11 @@ def stop_continuous_web_job_slot( :type resource_group_name: str :param name: Site name. :type name: str - :param web_job_id: Web job ID. - :type web_job_id: str + :param web_job_name: Name of Web Job. + :type web_job_name: str :param slot: Name of the deployment slot. If a slot is not specified, the API deletes a deployment for the production slot. :type slot: str - :param web_job_name: - :type web_job_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 @@ -12119,15 +12587,14 @@ def stop_continuous_web_job_slot( 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'), 'webJobName': self._serialize.url("web_job_name", web_job_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['webJobId'] = self._serialize.query("web_job_id", web_job_id, 'str') query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') # Construct headers @@ -15230,7 +15697,7 @@ def delete_instance_process_slot( return client_raw_response def get_instance_process_dump_slot( - self, resource_group_name, name, process_id, slot, instance_id, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, process_id, slot, instance_id, custom_headers=None, raw=False, callback=None, **operation_config): """Get a memory dump of a process by its ID for a specific scaled-out instance in a web site. @@ -15254,10 +15721,15 @@ def get_instance_process_dump_slot( :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response + :param callback: When specified, will be called with each chunk of + data that is streamed. The callback should take two arguments, the + bytes of the current chunk of data and the response object. If the + data is uploading, response will be None. + :type callback: Callable[Bytes, response=None] :param operation_config: :ref:`Operation configuration overrides`. :return: object or ClientRawResponse if raw=true - :rtype: object or ~msrest.pipeline.ClientRawResponse + :rtype: Generator or ~msrest.pipeline.ClientRawResponse :raises: :class:`CloudError` """ # Construct URL @@ -15298,7 +15770,7 @@ def get_instance_process_dump_slot( deserialized = None if response.status_code == 200: - deserialized = self._deserialize('object', response) + deserialized = self._client.stream_download(response, callback) if raw: client_raw_response = ClientRawResponse(deserialized, response) @@ -15394,7 +15866,7 @@ def internal_paging(next_link=None, raw=False): return deserialized def get_instance_process_module_slot( - self, resource_group_name, name, process_id, base_address, slot, instance_id, base_address1, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, process_id, base_address, slot, instance_id, custom_headers=None, raw=False, **operation_config): """Get process information by its ID for a specific scaled-out instance in a web site. @@ -15417,8 +15889,6 @@ def get_instance_process_module_slot( value of the name property in the JSON response from "GET api/sites/{siteName}/instances". :type instance_id: str - :param base_address1: - :type base_address1: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -15430,21 +15900,20 @@ def get_instance_process_module_slot( :raises: :class:`CloudError` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/instances/{instanceId}/processes/{processId}/modules/{base_address}' + url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/instances/{instanceId}/processes/{processId}/modules/{baseAddress}' 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'), 'processId': self._serialize.url("process_id", process_id, 'str'), + 'baseAddress': self._serialize.url("base_address", base_address, 'str'), 'slot': self._serialize.url("slot", slot, 'str'), 'instanceId': self._serialize.url("instance_id", instance_id, 'str'), - 'base_address': self._serialize.url("base_address1", base_address1, '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['baseAddress'] = self._serialize.query("base_address", base_address, 'str') query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') # Construct headers @@ -16292,7 +16761,7 @@ def generate_new_site_publishing_password_slot( request = self._client.post(url, query_parameters) response = self._client.send(request, header_parameters, **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 @@ -16951,7 +17420,7 @@ def delete_process_slot( return client_raw_response def get_process_dump_slot( - self, resource_group_name, name, process_id, slot, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, process_id, slot, custom_headers=None, raw=False, callback=None, **operation_config): """Get a memory dump of a process by its ID for a specific scaled-out instance in a web site. @@ -16971,10 +17440,15 @@ def get_process_dump_slot( :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response + :param callback: When specified, will be called with each chunk of + data that is streamed. The callback should take two arguments, the + bytes of the current chunk of data and the response object. If the + data is uploading, response will be None. + :type callback: Callable[Bytes, response=None] :param operation_config: :ref:`Operation configuration overrides`. :return: object or ClientRawResponse if raw=true - :rtype: object or ~msrest.pipeline.ClientRawResponse + :rtype: Generator or ~msrest.pipeline.ClientRawResponse :raises: :class:`CloudError` """ # Construct URL @@ -17014,7 +17488,7 @@ def get_process_dump_slot( deserialized = None if response.status_code == 200: - deserialized = self._deserialize('object', response) + deserialized = self._client.stream_download(response, callback) if raw: client_raw_response = ClientRawResponse(deserialized, response) @@ -17105,7 +17579,7 @@ def internal_paging(next_link=None, raw=False): return deserialized def get_process_module_slot( - self, resource_group_name, name, process_id, base_address, slot, base_address1, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, process_id, base_address, slot, custom_headers=None, raw=False, **operation_config): """Get process information by its ID for a specific scaled-out instance in a web site. @@ -17124,8 +17598,6 @@ def get_process_module_slot( :param slot: Name of the deployment slot. If a slot is not specified, the API returns deployments for the production slot. :type slot: str - :param base_address1: - :type base_address1: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -17137,20 +17609,19 @@ def get_process_module_slot( :raises: :class:`CloudError` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/processes/{processId}/modules/{base_address}' + url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/processes/{processId}/modules/{baseAddress}' 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'), 'processId': self._serialize.url("process_id", process_id, 'str'), + 'baseAddress': self._serialize.url("base_address", base_address, 'str'), 'slot': self._serialize.url("slot", slot, 'str'), - 'base_address': self._serialize.url("base_address1", base_address1, '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['baseAddress'] = self._serialize.query("base_address", base_address, 'str') query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') # Construct headers @@ -18020,7 +18491,7 @@ def internal_paging(next_link=None, raw=False): return deserialized def get_site_extension_slot( - self, resource_group_name, name, site_extension_id, slot, extension_name, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, site_extension_id, slot, custom_headers=None, raw=False, **operation_config): """Get site extension information by its ID for a web site, or a deployment slot. @@ -18037,8 +18508,6 @@ def get_site_extension_slot( :param slot: Name of the deployment slot. If a slot is not specified, the API deletes a deployment for the production slot. :type slot: str - :param extension_name: - :type extension_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 @@ -18050,19 +18519,18 @@ def get_site_extension_slot( :raises: :class:`CloudError` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/siteextensions/{extensionName}' + url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/siteextensions/{siteExtensionId}' 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'), + 'siteExtensionId': self._serialize.url("site_extension_id", site_extension_id, 'str'), 'slot': self._serialize.url("slot", slot, 'str'), - 'extensionName': self._serialize.url("extension_name", extension_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['siteExtensionId'] = self._serialize.query("site_extension_id", site_extension_id, 'str') query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') # Construct headers @@ -18096,7 +18564,7 @@ def get_site_extension_slot( return deserialized def install_site_extension_slot( - self, resource_group_name, name, site_extension_id, slot, extension_name, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, site_extension_id, slot, custom_headers=None, raw=False, **operation_config): """Install site extension on a web site, or a deployment slot. Install site extension on a web site, or a deployment slot. @@ -18111,8 +18579,6 @@ def install_site_extension_slot( :param slot: Name of the deployment slot. If a slot is not specified, the API deletes a deployment for the production slot. :type slot: str - :param extension_name: - :type extension_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 @@ -18124,19 +18590,18 @@ def install_site_extension_slot( :raises: :class:`CloudError` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/siteextensions/{extensionName}' + url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/siteextensions/{siteExtensionId}' 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'), + 'siteExtensionId': self._serialize.url("site_extension_id", site_extension_id, 'str'), 'slot': self._serialize.url("slot", slot, 'str'), - 'extensionName': self._serialize.url("extension_name", extension_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['siteExtensionId'] = self._serialize.query("site_extension_id", site_extension_id, 'str') query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') # Construct headers @@ -18195,7 +18660,7 @@ def get_long_running_output(response): get_long_running_status, long_running_operation_timeout) def delete_site_extension_slot( - self, resource_group_name, name, site_extension_id, slot, extension_name, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, site_extension_id, slot, custom_headers=None, raw=False, **operation_config): """Remove a site extension from a web site, or a deployment slot. Remove a site extension from a web site, or a deployment slot. @@ -18210,8 +18675,6 @@ def delete_site_extension_slot( :param slot: Name of the deployment slot. If a slot is not specified, the API deletes a deployment for the production slot. :type slot: str - :param extension_name: - :type extension_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 @@ -18222,19 +18685,18 @@ def delete_site_extension_slot( :raises: :class:`CloudError` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/siteextensions/{extensionName}' + url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/siteextensions/{siteExtensionId}' 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'), + 'siteExtensionId': self._serialize.url("site_extension_id", site_extension_id, 'str'), 'slot': self._serialize.url("slot", slot, 'str'), - 'extensionName': self._serialize.url("extension_name", extension_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['siteExtensionId'] = self._serialize.query("site_extension_id", site_extension_id, 'str') query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') # Construct headers @@ -18748,6 +19210,84 @@ def delete_source_control_slot( client_raw_response = ClientRawResponse(None, response) return client_raw_response + def update_source_control_slot( + self, resource_group_name, name, site_source_control, slot, custom_headers=None, raw=False, **operation_config): + """Updates the source control configuration of an app. + + Updates the source control 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_source_control: JSON representation of a SiteSourceControl + object. See example. + :type site_source_control: ~azure.mgmt.web.models.SiteSourceControl + :param slot: Name of the deployment slot. If a slot is not specified, + the API will update the source control configuration 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: SiteSourceControl or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.SiteSourceControl or + ~msrest.pipeline.ClientRawResponse + :raises: :class:`CloudError` + """ + # Construct URL + url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/sourcecontrols/web' + 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(site_source_control, 'SiteSourceControl') + + # Construct and send request + request = self._client.patch(url, query_parameters) + response = self._client.send( + request, header_parameters, body_content, **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 + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('SiteSourceControl', response) + if response.status_code == 201: + deserialized = self._deserialize('SiteSourceControl', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + def start_slot( self, resource_group_name, name, slot, custom_headers=None, raw=False, **operation_config): """Starts an app (or deployment slot, if specified). @@ -19066,7 +19606,7 @@ def internal_paging(next_link=None, raw=False): return deserialized def get_triggered_web_job_slot( - self, resource_group_name, name, web_job_id, slot, web_job_name, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, web_job_name, slot, custom_headers=None, raw=False, **operation_config): """Gets a triggered web job by its ID for an app, or a deployment slot. Gets a triggered web job by its ID for an app, or a deployment slot. @@ -19076,13 +19616,11 @@ def get_triggered_web_job_slot( :type resource_group_name: str :param name: Site name. :type name: str - :param web_job_id: Web job ID. - :type web_job_id: str + :param web_job_name: Name of Web Job. + :type web_job_name: str :param slot: Name of the deployment slot. If a slot is not specified, the API deletes a deployment for the production slot. :type slot: str - :param web_job_name: - :type web_job_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 @@ -19098,15 +19636,14 @@ def get_triggered_web_job_slot( 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'), 'webJobName': self._serialize.url("web_job_name", web_job_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['webJobId'] = self._serialize.query("web_job_id", web_job_id, 'str') query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') # Construct headers @@ -19140,7 +19677,7 @@ def get_triggered_web_job_slot( return deserialized def delete_triggered_web_job_slot( - self, resource_group_name, name, web_job_id, slot, web_job_name, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, web_job_name, slot, custom_headers=None, raw=False, **operation_config): """Delete a triggered web job by its ID for an app, or a deployment slot. Delete a triggered web job by its ID for an app, or a deployment slot. @@ -19150,13 +19687,11 @@ def delete_triggered_web_job_slot( :type resource_group_name: str :param name: Site name. :type name: str - :param web_job_id: Web job ID. - :type web_job_id: str + :param web_job_name: Name of Web Job. + :type web_job_name: str :param slot: Name of the deployment slot. If a slot is not specified, the API deletes a deployment for the production slot. :type slot: str - :param web_job_name: - :type web_job_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 @@ -19171,15 +19706,14 @@ def delete_triggered_web_job_slot( 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'), 'webJobName': self._serialize.url("web_job_name", web_job_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['webJobId'] = self._serialize.query("web_job_id", web_job_id, 'str') query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') # Construct headers @@ -19206,7 +19740,7 @@ def delete_triggered_web_job_slot( return client_raw_response def list_triggered_web_job_history_slot( - self, resource_group_name, name, web_job_id, slot, web_job_name, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, web_job_name, slot, custom_headers=None, raw=False, **operation_config): """List a triggered web job's history for an app, or a deployment slot. List a triggered web job's history for an app, or a deployment slot. @@ -19216,13 +19750,11 @@ def list_triggered_web_job_history_slot( :type resource_group_name: str :param name: Site name. :type name: str - :param web_job_id: Web job ID. - :type web_job_id: str + :param web_job_name: Name of Web Job. + :type web_job_name: str :param slot: Name of the deployment slot. If a slot is not specified, the API deletes a deployment for the production slot. :type slot: str - :param web_job_name: - :type web_job_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 @@ -19241,15 +19773,14 @@ def internal_paging(next_link=None, raw=False): 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'), 'webJobName': self._serialize.url("web_job_name", web_job_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['webJobId'] = self._serialize.query("web_job_id", web_job_id, 'str') query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') else: @@ -19289,7 +19820,7 @@ def internal_paging(next_link=None, raw=False): return deserialized def get_triggered_web_job_history_slot( - self, resource_group_name, name, web_job_id, id, slot, web_job_name, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, web_job_name, id, slot, custom_headers=None, raw=False, **operation_config): """Gets a triggered web job's history by its ID for an app, , or a deployment slot. @@ -19301,15 +19832,13 @@ def get_triggered_web_job_history_slot( :type resource_group_name: str :param name: Site name. :type name: str - :param web_job_id: Web job ID. - :type web_job_id: str + :param web_job_name: Name of Web Job. + :type web_job_name: str :param id: History ID. :type id: str :param slot: Name of the deployment slot. If a slot is not specified, the API deletes a deployment for the production slot. :type slot: str - :param web_job_name: - :type web_job_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 @@ -19325,16 +19854,15 @@ def get_triggered_web_job_history_slot( 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'), + 'webJobName': self._serialize.url("web_job_name", web_job_name, 'str'), 'id': self._serialize.url("id", id, 'str'), 'slot': self._serialize.url("slot", slot, 'str'), - 'webJobName': self._serialize.url("web_job_name", web_job_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['webJobId'] = self._serialize.query("web_job_id", web_job_id, 'str') query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') # Construct headers @@ -19368,7 +19896,7 @@ def get_triggered_web_job_history_slot( return deserialized def run_triggered_web_job_slot( - self, resource_group_name, name, web_job_id, slot, web_job_name, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, web_job_name, slot, custom_headers=None, raw=False, **operation_config): """Run a triggered web job for an app, or a deployment slot. Run a triggered web job for an app, or a deployment slot. @@ -19378,13 +19906,11 @@ def run_triggered_web_job_slot( :type resource_group_name: str :param name: Site name. :type name: str - :param web_job_id: Web job ID. - :type web_job_id: str + :param web_job_name: Name of Web Job. + :type web_job_name: str :param slot: Name of the deployment slot. If a slot is not specified, the API deletes a deployment for the production slot. :type slot: str - :param web_job_name: - :type web_job_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 @@ -19399,15 +19925,14 @@ def run_triggered_web_job_slot( 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'), 'webJobName': self._serialize.url("web_job_name", web_job_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['webJobId'] = self._serialize.query("web_job_id", web_job_id, 'str') query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') # Construct headers @@ -20741,6 +21266,79 @@ def delete_source_control( client_raw_response = ClientRawResponse(None, response) return client_raw_response + def update_source_control( + self, resource_group_name, name, site_source_control, custom_headers=None, raw=False, **operation_config): + """Updates the source control configuration of an app. + + Updates the source control 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_source_control: JSON representation of a SiteSourceControl + 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 + :param operation_config: :ref:`Operation configuration + overrides`. + :return: SiteSourceControl or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.SiteSourceControl or + ~msrest.pipeline.ClientRawResponse + :raises: :class:`CloudError` + """ + # Construct URL + url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/sourcecontrols/web' + 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_source_control, 'SiteSourceControl') + + # Construct and send request + request = self._client.patch(url, query_parameters) + response = self._client.send( + request, header_parameters, body_content, **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 + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('SiteSourceControl', response) + if response.status_code == 201: + deserialized = self._deserialize('SiteSourceControl', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + def start( self, resource_group_name, name, custom_headers=None, raw=False, **operation_config): """Starts an app (or deployment slot, if specified). @@ -21039,7 +21637,7 @@ def internal_paging(next_link=None, raw=False): return deserialized def get_triggered_web_job( - self, resource_group_name, name, web_job_id, web_job_name, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, web_job_name, custom_headers=None, raw=False, **operation_config): """Gets a triggered web job by its ID for an app, or a deployment slot. Gets a triggered web job by its ID for an app, or a deployment slot. @@ -21049,9 +21647,7 @@ def get_triggered_web_job( :type resource_group_name: str :param name: Site name. :type name: str - :param web_job_id: Web job ID. - :type web_job_id: str - :param web_job_name: + :param web_job_name: Name of Web Job. :type web_job_name: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the @@ -21075,7 +21671,6 @@ def get_triggered_web_job( # Construct parameters query_parameters = {} - query_parameters['webJobId'] = self._serialize.query("web_job_id", web_job_id, 'str') query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') # Construct headers @@ -21109,7 +21704,7 @@ def get_triggered_web_job( return deserialized def delete_triggered_web_job( - self, resource_group_name, name, web_job_id, web_job_name, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, web_job_name, custom_headers=None, raw=False, **operation_config): """Delete a triggered web job by its ID for an app, or a deployment slot. Delete a triggered web job by its ID for an app, or a deployment slot. @@ -21119,9 +21714,7 @@ def delete_triggered_web_job( :type resource_group_name: str :param name: Site name. :type name: str - :param web_job_id: Web job ID. - :type web_job_id: str - :param web_job_name: + :param web_job_name: Name of Web Job. :type web_job_name: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the @@ -21144,7 +21737,6 @@ def delete_triggered_web_job( # Construct parameters query_parameters = {} - query_parameters['webJobId'] = self._serialize.query("web_job_id", web_job_id, 'str') query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') # Construct headers @@ -21171,7 +21763,7 @@ def delete_triggered_web_job( return client_raw_response def list_triggered_web_job_history( - self, resource_group_name, name, web_job_id, web_job_name, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, web_job_name, custom_headers=None, raw=False, **operation_config): """List a triggered web job's history for an app, or a deployment slot. List a triggered web job's history for an app, or a deployment slot. @@ -21181,9 +21773,7 @@ def list_triggered_web_job_history( :type resource_group_name: str :param name: Site name. :type name: str - :param web_job_id: Web job ID. - :type web_job_id: str - :param web_job_name: + :param web_job_name: Name of Web Job. :type web_job_name: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the @@ -21210,7 +21800,6 @@ def internal_paging(next_link=None, raw=False): # Construct parameters query_parameters = {} - query_parameters['webJobId'] = self._serialize.query("web_job_id", web_job_id, 'str') query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') else: @@ -21250,7 +21839,7 @@ def internal_paging(next_link=None, raw=False): return deserialized def get_triggered_web_job_history( - self, resource_group_name, name, web_job_id, id, web_job_name, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, web_job_name, id, custom_headers=None, raw=False, **operation_config): """Gets a triggered web job's history by its ID for an app, , or a deployment slot. @@ -21262,12 +21851,10 @@ def get_triggered_web_job_history( :type resource_group_name: str :param name: Site name. :type name: str - :param web_job_id: Web job ID. - :type web_job_id: str + :param web_job_name: Name of Web Job. + :type web_job_name: str :param id: History ID. :type id: str - :param web_job_name: - :type web_job_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 @@ -21283,15 +21870,14 @@ def get_triggered_web_job_history( 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'), - 'id': self._serialize.url("id", id, 'str'), 'webJobName': self._serialize.url("web_job_name", web_job_name, 'str'), + 'id': self._serialize.url("id", id, '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['webJobId'] = self._serialize.query("web_job_id", web_job_id, 'str') query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') # Construct headers @@ -21325,7 +21911,7 @@ def get_triggered_web_job_history( return deserialized def run_triggered_web_job( - self, resource_group_name, name, web_job_id, web_job_name, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, web_job_name, custom_headers=None, raw=False, **operation_config): """Run a triggered web job for an app, or a deployment slot. Run a triggered web job for an app, or a deployment slot. @@ -21335,9 +21921,7 @@ def run_triggered_web_job( :type resource_group_name: str :param name: Site name. :type name: str - :param web_job_id: Web job ID. - :type web_job_id: str - :param web_job_name: + :param web_job_name: Name of Web Job. :type web_job_name: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the @@ -21360,7 +21944,6 @@ def run_triggered_web_job( # Construct parameters query_parameters = {} - query_parameters['webJobId'] = self._serialize.query("web_job_id", web_job_id, '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/version.py b/azure-mgmt-web/azure/mgmt/web/version.py index fa72ca5bb15a..b60b0c493035 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.34.0" +VERSION = "0.33.0" 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 209e2989daa3..05942f19e7c4 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 @@ -310,6 +310,67 @@ def internal_paging(next_link=None, raw=False): return deserialized + def get_source_control( + self, source_control_type, custom_headers=None, raw=False, **operation_config): + """Gets source control token. + + Gets source control token. + + :param source_control_type: Type of source control + :type source_control_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: SourceControl or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.SourceControl or + ~msrest.pipeline.ClientRawResponse + :raises: :class:`CloudError` + """ + api_version = "2016-03-01" + + # Construct URL + url = '/providers/Microsoft.Web/sourcecontrols/{sourceControlType}' + path_format_arguments = { + 'sourceControlType': self._serialize.url("source_control_type", source_control_type, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("api_version", 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, **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('SourceControl', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + def update_source_control( self, source_control_type, request_message, custom_headers=None, raw=False, **operation_config): """Updates source control token. @@ -449,6 +510,65 @@ def check_name_availability( return deserialized + def get_subscription_deployment_locations( + self, custom_headers=None, raw=False, **operation_config): + """Gets list of available geo regions plus ministamps. + + Gets list of available geo regions plus ministamps. + + :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: DeploymentLocations or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.web.models.DeploymentLocations or + ~msrest.pipeline.ClientRawResponse + :raises: :class:`CloudError` + """ + api_version = "2016-03-01" + + # Construct URL + url = '/subscriptions/{subscriptionId}/providers/Microsoft.Web/deploymentLocations' + 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("api_version", 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, **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('DeploymentLocations', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + def list_geo_regions( self, sku=None, linux_workers_enabled=None, custom_headers=None, raw=False, **operation_config): """Get a list of available geographical regions. @@ -657,7 +777,8 @@ def list_skus( def verify_hosting_environment_vnet( self, parameters, custom_headers=None, raw=False, **operation_config): - """Verifies if this VNET is compatible with an App Service Environment. + """Verifies if this VNET is compatible with an App Service Environment by + analyzing the Network Security Group rules. Verifies if this VNET is compatible with an App Service Environment by analyzing the Network Security Group rules. diff --git a/azure-mgmt-web/build.json b/azure-mgmt-web/build.json index 91de2c19c0e4..d5356f60b700 100644 --- a/azure-mgmt-web/build.json +++ b/azure-mgmt-web/build.json @@ -65,6 +65,57 @@ }, "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": { @@ -120,7 +171,7 @@ "resolvedInfo": null, "packageMetadata": { "name": "@microsoft.azure/autorest.python", - "version": "2.0.17", + "version": "2.0.19", "dependencies": { "dotnet-2.0.0": "^1.4.4" }, @@ -146,22 +197,22 @@ "bundleDependencies": false, "peerDependencies": {}, "deprecated": false, - "_resolved": "/root/.autorest/@microsoft.azure_autorest.python@2.0.17/node_modules/@microsoft.azure/autorest.python", - "_shasum": "84a951c19c502343726cfe33cf43cefa76219b39", + "_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.17", - "_from": "file:/root/.autorest/@microsoft.azure_autorest.python@2.0.17/node_modules/@microsoft.azure/autorest.python", + "_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.17/node_modules/@microsoft.azure/autorest.python", - "rawSpec": "/root/.autorest/@microsoft.azure_autorest.python@2.0.17/node_modules/@microsoft.azure/autorest.python", - "saveSpec": "file:/root/.autorest/@microsoft.azure_autorest.python@2.0.17/node_modules/@microsoft.azure/autorest.python", - "fetchSpec": "/root/.autorest/@microsoft.azure_autorest.python@2.0.17/node_modules/@microsoft.azure/autorest.python" + "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.17/node_modules/@microsoft.azure/autorest.python", - "_where": "/root/.autorest/@microsoft.azure_autorest.python@2.0.17/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", @@ -170,14 +221,5 @@ "installationPath": "/root/.autorest" } ], - "autorest_bootstrap": { - "dependencies": { - "autorest": { - "version": "2.0.4147", - "from": "autorest@latest", - "resolved": "https://registry.npmjs.org/autorest/-/autorest-2.0.4147.tgz" - } - } - }, - "date": "2017-10-16T19:12:56Z" + "autorest_bootstrap": {} } \ No newline at end of file