Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

[AutoPR] web/resource-manager #3312

Merged
merged 22 commits into from
Feb 15, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
afa007e
Generated from 5587dda892fa4eef5e99bdce8d426d7357f63197 (#3270)
AutorestCI Sep 10, 2018
d2652dd
[AutoPR web/resource-manager] Add networkTrace resource and APIs (#3274)
AutorestCI Sep 17, 2018
71dd7b7
[AutoPR web/resource-manager] Updated the AppService Swagger to inclu…
AutorestCI Sep 26, 2018
ed5006f
Generated from 903e68174fdd5f13ba438df543325289f0a4c37c (#3439)
AutorestCI Sep 26, 2018
4c5c164
[AutoPR web/resource-manager] Fix network trace API REST format (#3661)
AutorestCI Oct 25, 2018
59cf806
Merge branch 'master' into restapi_auto_web/resource-manager
lmazuel Oct 26, 2018
2457ea6
Packaging update of azure-mgmt-web
azuresdkci Oct 26, 2018
c5c6651
[AutoPR web/resource-manager] Fix network trace API bugs (Retake) (#3…
AutorestCI Nov 1, 2018
59e8aa9
Generated from 900b6c8ae4554a88ce344bd2fd77e81b39426d75 (#3784)
AutorestCI Nov 13, 2018
9f70931
Generated from ea6142485e60849209520c2c736b36f74f395a77 (#3830)
AutorestCI Nov 20, 2018
e9ed01a
Generated from b6d11c1299ea99c838603371c427e130a4326a10 (#3847)
AutorestCI Nov 21, 2018
690f01b
[AutoPR web/resource-manager] typo: Fix AppServiceCertificateOrders.j…
AutorestCI Nov 28, 2018
6e5876a
Generated from 44daf7f132856acd96b3c01f5ee2ca744b6ee897 (#4015)
AutorestCI Dec 10, 2018
16f52ea
[AutoPR web/resource-manager] typo: Fix web/resource-manager/Microsof…
AutorestCI Dec 13, 2018
fdd73b4
Generated from 0b6db23cb07bd170d9d26d2a338c526d4d9fc21e (#4075)
AutorestCI Dec 17, 2018
d96bec0
[AutoPR web/resource-manager] WebApps: Snapshots API for DR stamps (#…
AutorestCI Jan 4, 2019
b615873
Generated from 8c4e148ed99d994bf5edf99681be21e0964721da (#4208)
AutorestCI Jan 26, 2019
bf11551
[AutoPR web/resource-manager] [App Service] Update swagger spec for A…
AutorestCI Feb 13, 2019
836a842
Merge branch 'master' into restapi_auto_web/resource-manager
iscai-msft Feb 13, 2019
3dc776e
updated versioning and changelog
iscai-msft Feb 13, 2019
4102b54
Merge branch 'master' into restapi_auto_web/resource-manager
iscai-msft Feb 14, 2019
3181bea
Merge branch 'master' into restapi_auto_web/resource-manager
iscai-msft Feb 14, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 58 additions & 0 deletions azure-mgmt-web/HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,64 @@
Release History
===============

0.41.0 (2019-02-13)
+++++++++++++++++++

**Features**

- Model DeletedAppRestoreRequest has a new parameter use_dr_secondary
- Model StackMinorVersion has a new parameter is_remote_debugging_enabled
- Model IpSecurityRestriction has a new parameter subnet_traffic_tag
- Model IpSecurityRestriction has a new parameter vnet_traffic_tag
- Model IpSecurityRestriction has a new parameter vnet_subnet_resource_id
- Model DeletedSite has a new parameter geo_region_name
- Model SnapshotRestoreRequest has a new parameter use_dr_secondary
- Model SiteAuthSettings has a new parameter client_secret_certificate_thumbprint
- Model SiteConfig has a new parameter scm_ip_security_restrictions_use_main
- Model SiteConfig has a new parameter scm_ip_security_restrictions
- Model CorsSettings has a new parameter support_credentials
- Model SiteConfigResource has a new parameter scm_ip_security_restrictions_use_main
- Model SiteConfigResource has a new parameter scm_ip_security_restrictions
- Model StackMajorVersion has a new parameter application_insights
- Model AppServicePlanPatchResource has a new parameter maximum_elastic_worker_count
- Model AppServicePlan has a new parameter maximum_elastic_worker_count
- Model SitePatchResource has a new parameter geo_distributions
- Model SitePatchResource has a new parameter in_progress_operation_id
- Model SitePatchResource has a new parameter client_cert_exclusion_paths
- Model SitePatchResource has a new parameter redundancy_mode
- Model Site has a new parameter geo_distributions
- Model Site has a new parameter in_progress_operation_id
- Model Site has a new parameter client_cert_exclusion_paths
- Model Site has a new parameter redundancy_mode
- Model VnetInfo has a new parameter is_swift
- Added operation WebAppsOperations.get_network_traces_slot_v2
- Added operation WebAppsOperations.list_snapshots_from_dr_secondary_slot
- Added operation WebAppsOperations.get_network_traces_slot
- Added operation WebAppsOperations.start_web_site_network_trace_operation_slot
- Added operation WebAppsOperations.get_network_trace_operation_v2
- Added operation WebAppsOperations.start_web_site_network_trace_operation
- Added operation WebAppsOperations.get_network_traces_v2
- Added operation WebAppsOperations.stop_network_trace_slot
- Added operation WebAppsOperations.get_network_trace_operation_slot_v2
- Added operation WebAppsOperations.list_snapshots_from_dr_secondary
- Added operation WebAppsOperations.get_network_trace_operation_slot
- Added operation WebAppsOperations.stop_network_trace
- Added operation WebAppsOperations.start_network_trace_slot
- Added operation WebAppsOperations.get_network_trace_operation
- Added operation WebAppsOperations.start_network_trace
- Added operation WebAppsOperations.get_network_traces
- Added operation RecommendationsOperations.list_recommended_rules_for_hosting_environment
- Added operation RecommendationsOperations.list_history_for_hosting_environment
- Added operation RecommendationsOperations.disable_all_for_hosting_environment
- Added operation RecommendationsOperations.disable_recommendation_for_hosting_environment
- Added operation RecommendationsOperations.reset_all_filters_for_hosting_environment
- Added operation RecommendationsOperations.get_rule_details_by_hosting_environment

**Breaking changes**

- Model AppServicePlanPatchResource no longer has parameter admin_site_name
- Model AppServicePlan no longer has parameter admin_site_name

0.40.0 (2018-08-28)
+++++++++++++++++++

Expand Down
19 changes: 0 additions & 19 deletions azure-mgmt-web/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,6 @@ For the older Azure Service Management (ASM) libraries, see
For a more complete set of Azure libraries, see the `azure <https://pypi.python.org/pypi/azure>`__ bundle package.


Compatibility
=============

**IMPORTANT**: If you have an earlier version of the azure package
(version < 1.0), you should uninstall it before installing this package.

You can check the version using pip:

.. code:: shell

pip freeze

If you see azure==0.11.0 (or any version below 1.0), uninstall it first:

.. code:: shell

pip uninstall azure


Usage
=====

Expand Down
11 changes: 11 additions & 0 deletions azure-mgmt-web/azure/mgmt/web/models/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
from .deleted_site_py3 import DeletedSite
from .proxy_only_resource_py3 import ProxyOnlyResource
from .managed_service_identity_py3 import ManagedServiceIdentity
from .geo_distribution_py3 import GeoDistribution
from .slot_swap_status_py3 import SlotSwapStatus
from .cloning_info_py3 import CloningInfo
from .hosting_environment_profile_py3 import HostingEnvironmentProfile
Expand Down Expand Up @@ -144,6 +145,7 @@
from .resource_name_availability_request_py3 import ResourceNameAvailabilityRequest
from .sku_infos_py3 import SkuInfos
from .source_control_py3 import SourceControl
from .validate_container_settings_request_py3 import ValidateContainerSettingsRequest
from .validate_request_py3 import ValidateRequest
from .validate_response_error_py3 import ValidateResponseError
from .validate_response_py3 import ValidateResponse
Expand Down Expand Up @@ -182,6 +184,7 @@
from .migrate_my_sql_status_py3 import MigrateMySqlStatus
from .relay_service_connection_entity_py3 import RelayServiceConnectionEntity
from .network_features_py3 import NetworkFeatures
from .network_trace_py3 import NetworkTrace
from .perf_mon_sample_py3 import PerfMonSample
from .perf_mon_set_py3 import PerfMonSet
from .perf_mon_response_py3 import PerfMonResponse
Expand Down Expand Up @@ -257,6 +260,7 @@
from .deleted_site import DeletedSite
from .proxy_only_resource import ProxyOnlyResource
from .managed_service_identity import ManagedServiceIdentity
from .geo_distribution import GeoDistribution
from .slot_swap_status import SlotSwapStatus
from .cloning_info import CloningInfo
from .hosting_environment_profile import HostingEnvironmentProfile
Expand Down Expand Up @@ -365,6 +369,7 @@
from .resource_name_availability_request import ResourceNameAvailabilityRequest
from .sku_infos import SkuInfos
from .source_control import SourceControl
from .validate_container_settings_request import ValidateContainerSettingsRequest
from .validate_request import ValidateRequest
from .validate_response_error import ValidateResponseError
from .validate_response import ValidateResponse
Expand Down Expand Up @@ -403,6 +408,7 @@
from .migrate_my_sql_status import MigrateMySqlStatus
from .relay_service_connection_entity import RelayServiceConnectionEntity
from .network_features import NetworkFeatures
from .network_trace import NetworkTrace
from .perf_mon_sample import PerfMonSample
from .perf_mon_set import PerfMonSet
from .perf_mon_response import PerfMonResponse
Expand Down Expand Up @@ -526,6 +532,7 @@
HostType,
UsageState,
SiteAvailabilityState,
RedundancyMode,
StatusOptions,
DomainStatus,
AzureResourceType,
Expand Down Expand Up @@ -597,6 +604,7 @@
'DeletedSite',
'ProxyOnlyResource',
'ManagedServiceIdentity',
'GeoDistribution',
'SlotSwapStatus',
'CloningInfo',
'HostingEnvironmentProfile',
Expand Down Expand Up @@ -705,6 +713,7 @@
'ResourceNameAvailabilityRequest',
'SkuInfos',
'SourceControl',
'ValidateContainerSettingsRequest',
'ValidateRequest',
'ValidateResponseError',
'ValidateResponse',
Expand Down Expand Up @@ -743,6 +752,7 @@
'MigrateMySqlStatus',
'RelayServiceConnectionEntity',
'NetworkFeatures',
'NetworkTrace',
'PerfMonSample',
'PerfMonSet',
'PerfMonResponse',
Expand Down Expand Up @@ -865,6 +875,7 @@
'HostType',
'UsageState',
'SiteAvailabilityState',
'RedundancyMode',
'StatusOptions',
'DomainStatus',
'AzureResourceType',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@


class AppServiceEnvironmentPatchResource(ProxyOnlyResource):
"""ARM resource for a app service enviroment.
"""ARM resource for a app service environment.

Variables are only populated by the server, and will be ignored when
sending a request.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@


class AppServiceEnvironmentPatchResource(ProxyOnlyResource):
"""ARM resource for a app service enviroment.
"""ARM resource for a app service environment.

Variables are only populated by the server, and will be ignored when
sending a request.
Expand Down
9 changes: 5 additions & 4 deletions azure-mgmt-web/azure/mgmt/web/models/app_service_plan.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ class AppServicePlan(Resource):
: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:
Expand All @@ -56,6 +54,9 @@ class AppServicePlan(Resource):
If <code>false</code>, apps assigned to this App Service plan will scale
to all instances of the plan. Default value: False .
:type per_site_scaling: bool
:param maximum_elastic_worker_count: Maximum number of total workers
allowed for this ElasticScaleEnabled App Service Plan
:type maximum_elastic_worker_count: int
:ivar number_of_sites: Number of apps assigned to this App Service plan.
:vartype number_of_sites: int
:param is_spot: If <code>true</code>, this App Service Plan owns spot
Expand Down Expand Up @@ -115,11 +116,11 @@ class AppServicePlan(Resource):
'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'},

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Nking92 @panchagnula, assuming this is on purpose, when you update cli, please remove az appservice plan update --admin_site_name, tag it with a breaking change, and do call out the reason which users would understand.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes Yugang, will make sure to update this for CLI.

'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'},
'maximum_elastic_worker_count': {'key': 'properties.maximumElasticWorkerCount', 'type': 'int'},
'number_of_sites': {'key': 'properties.numberOfSites', 'type': 'int'},
'is_spot': {'key': 'properties.isSpot', 'type': 'bool'},
'spot_expiration_time': {'key': 'properties.spotExpirationTime', 'type': 'iso-8601'},
Expand All @@ -139,11 +140,11 @@ def __init__(self, **kwargs):
self.worker_tier_name = kwargs.get('worker_tier_name', None)
self.status = None
self.subscription = None
self.admin_site_name = kwargs.get('admin_site_name', None)
self.hosting_environment_profile = kwargs.get('hosting_environment_profile', None)
self.maximum_number_of_workers = None
self.geo_region = None
self.per_site_scaling = kwargs.get('per_site_scaling', False)
self.maximum_elastic_worker_count = kwargs.get('maximum_elastic_worker_count', None)
self.number_of_sites = None
self.is_spot = kwargs.get('is_spot', None)
self.spot_expiration_time = kwargs.get('spot_expiration_time', None)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ class AppServicePlanPatchResource(ProxyOnlyResource):
: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:
Expand All @@ -50,6 +48,9 @@ class AppServicePlanPatchResource(ProxyOnlyResource):
If <code>false</code>, apps assigned to this App Service plan will scale
to all instances of the plan. Default value: False .
:type per_site_scaling: bool
:param maximum_elastic_worker_count: Maximum number of total workers
allowed for this ElasticScaleEnabled App Service Plan
:type maximum_elastic_worker_count: int
:ivar number_of_sites: Number of apps assigned to this App Service plan.
:vartype number_of_sites: int
:param is_spot: If <code>true</code>, this App Service Plan owns spot
Expand Down Expand Up @@ -104,11 +105,11 @@ class AppServicePlanPatchResource(ProxyOnlyResource):
'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'},
'maximum_elastic_worker_count': {'key': 'properties.maximumElasticWorkerCount', 'type': 'int'},
'number_of_sites': {'key': 'properties.numberOfSites', 'type': 'int'},
'is_spot': {'key': 'properties.isSpot', 'type': 'bool'},
'spot_expiration_time': {'key': 'properties.spotExpirationTime', 'type': 'iso-8601'},
Expand All @@ -127,11 +128,11 @@ def __init__(self, **kwargs):
self.worker_tier_name = kwargs.get('worker_tier_name', None)
self.status = None
self.subscription = None
self.admin_site_name = kwargs.get('admin_site_name', None)
self.hosting_environment_profile = kwargs.get('hosting_environment_profile', None)
self.maximum_number_of_workers = None
self.geo_region = None
self.per_site_scaling = kwargs.get('per_site_scaling', False)
self.maximum_elastic_worker_count = kwargs.get('maximum_elastic_worker_count', None)
self.number_of_sites = None
self.is_spot = kwargs.get('is_spot', None)
self.spot_expiration_time = kwargs.get('spot_expiration_time', None)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ class AppServicePlanPatchResource(ProxyOnlyResource):
: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:
Expand All @@ -50,6 +48,9 @@ class AppServicePlanPatchResource(ProxyOnlyResource):
If <code>false</code>, apps assigned to this App Service plan will scale
to all instances of the plan. Default value: False .
:type per_site_scaling: bool
:param maximum_elastic_worker_count: Maximum number of total workers
allowed for this ElasticScaleEnabled App Service Plan
:type maximum_elastic_worker_count: int
:ivar number_of_sites: Number of apps assigned to this App Service plan.
:vartype number_of_sites: int
:param is_spot: If <code>true</code>, this App Service Plan owns spot
Expand Down Expand Up @@ -104,11 +105,11 @@ class AppServicePlanPatchResource(ProxyOnlyResource):
'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'},
'maximum_elastic_worker_count': {'key': 'properties.maximumElasticWorkerCount', 'type': 'int'},
'number_of_sites': {'key': 'properties.numberOfSites', 'type': 'int'},
'is_spot': {'key': 'properties.isSpot', 'type': 'bool'},
'spot_expiration_time': {'key': 'properties.spotExpirationTime', 'type': 'iso-8601'},
Expand All @@ -122,16 +123,16 @@ class AppServicePlanPatchResource(ProxyOnlyResource):
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'ProvisioningState'},
}

def __init__(self, *, kind: str=None, worker_tier_name: str=None, admin_site_name: str=None, hosting_environment_profile=None, per_site_scaling: bool=False, is_spot: bool=None, spot_expiration_time=None, free_offer_expiration_time=None, reserved: bool=False, is_xenon: bool=False, hyper_v: bool=False, target_worker_count: int=None, target_worker_size_id: int=None, **kwargs) -> None:
def __init__(self, *, kind: str=None, worker_tier_name: str=None, hosting_environment_profile=None, per_site_scaling: bool=False, maximum_elastic_worker_count: int=None, is_spot: bool=None, spot_expiration_time=None, free_offer_expiration_time=None, reserved: bool=False, is_xenon: bool=False, hyper_v: bool=False, target_worker_count: int=None, target_worker_size_id: int=None, **kwargs) -> None:
super(AppServicePlanPatchResource, self).__init__(kind=kind, **kwargs)
self.worker_tier_name = worker_tier_name
self.status = None
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.maximum_elastic_worker_count = maximum_elastic_worker_count
self.number_of_sites = None
self.is_spot = is_spot
self.spot_expiration_time = spot_expiration_time
Expand Down
Loading