Skip to content

Commit 167b501

Browse files
author
SDKAuto
committed
CodeGen from PR 18885 in Azure/azure-rest-api-specs
Merge 64818d96c4dcac2c51656cd2c1e27c75e577478a into fd4dd3abc8bf0cdaebdf74215d0dbe3ec705fe9c
1 parent 353743e commit 167b501

File tree

308 files changed

+12264
-6758
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

308 files changed

+12264
-6758
lines changed
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"autorest": "3.7.2",
33
"use": [
4-
"@autorest/python@5.12.0",
4+
"@autorest/python@5.13.0",
55
"@autorest/[email protected]"
66
],
7-
"commit": "8174b2fc60e288a9d7fcdff5f9414e43a6ad5989",
7+
"commit": "a5265c2e41b328d4b0cbf09d23e541b7987c7cf2",
88
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
9-
"autorest_command": "autorest specification/monitor/resource-manager/readme.md --multiapi --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --python3-only --track2 --use=@autorest/python@5.12.0 --use=@autorest/[email protected] --version=3.7.2",
9+
"autorest_command": "autorest specification/monitor/resource-manager/readme.md --multiapi --python --python-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-python/sdk --python3-only --use=@autorest/python@5.13.0 --use=@autorest/[email protected] --version=3.7.2",
1010
"readme": "specification/monitor/resource-manager/readme.md"
1111
}

sdk/monitor/azure-mgmt-monitor/azure/mgmt/monitor/_monitor_management_client.py

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@
1111

1212
from typing import TYPE_CHECKING
1313

14+
from msrest import Deserializer, Serializer
15+
1416
from azure.mgmt.core import ARMPipelineClient
1517
from azure.profiles import KnownProfiles, ProfileDefinition
1618
from azure.profiles.multiapiclient import MultiApiClientMixin
17-
from msrest import Deserializer, Serializer
1819

1920
from ._configuration import MonitorManagementClientConfiguration
2021

@@ -55,7 +56,7 @@ class MonitorManagementClient(MultiApiClientMixin, _SDKClient):
5556
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.
5657
"""
5758

58-
DEFAULT_API_VERSION = '2021-09-01'
59+
DEFAULT_API_VERSION = '2022-04-01'
5960
_PROFILE_TAG = "azure.mgmt.monitor.MonitorManagementClient"
6061
LATEST_PROFILE = ProfileDefinition({
6162
_PROFILE_TAG: {
@@ -65,7 +66,6 @@ class MonitorManagementClient(MultiApiClientMixin, _SDKClient):
6566
'alert_rule_incidents': '2016-03-01',
6667
'alert_rules': '2016-03-01',
6768
'autoscale_settings': '2015-04-01',
68-
'baseline': '2018-09-01',
6969
'baselines': '2019-03-01',
7070
'data_collection_endpoints': '2021-04-01',
7171
'data_collection_rule_associations': '2021-04-01',
@@ -79,7 +79,7 @@ class MonitorManagementClient(MultiApiClientMixin, _SDKClient):
7979
'management_group_diagnostic_settings': '2021-05-01-preview',
8080
'metric_alerts': '2018-03-01',
8181
'metric_alerts_status': '2018-03-01',
82-
'metric_baseline': '2018-09-01',
82+
'metric_baseline': '2017-11-01-preview',
8383
'metric_definitions': '2018-01-01',
8484
'metric_namespaces': '2017-12-01-preview',
8585
'metrics': '2018-01-01',
@@ -149,6 +149,7 @@ def models(cls, api_version=DEFAULT_API_VERSION):
149149
* 2021-05-01-preview: :mod:`v2021_05_01_preview.models<azure.mgmt.monitor.v2021_05_01_preview.models>`
150150
* 2021-09-01: :mod:`v2021_09_01.models<azure.mgmt.monitor.v2021_09_01.models>`
151151
* 2021-09-01-preview: :mod:`v2022_02_01_preview.models<azure.mgmt.monitor.v2022_02_01_preview.models>`
152+
* 2022-04-01: :mod:`v2022_04_01.models<azure.mgmt.monitor.v2022_04_01.models>`
152153
"""
153154
if api_version == '2015-04-01':
154155
from .v2015_04_01 import models
@@ -228,6 +229,9 @@ def models(cls, api_version=DEFAULT_API_VERSION):
228229
elif api_version == '2021-09-01-preview':
229230
from .v2022_02_01_preview import models
230231
return models
232+
elif api_version == '2022-04-01':
233+
from .v2022_04_01 import models
234+
return models
231235
raise ValueError("API version {} is not available".format(api_version))
232236

233237
@property
@@ -240,6 +244,7 @@ def action_groups(self):
240244
* 2019-03-01: :class:`ActionGroupsOperations<azure.mgmt.monitor.v2019_03_01.operations.ActionGroupsOperations>`
241245
* 2019-06-01: :class:`ActionGroupsOperations<azure.mgmt.monitor.v2019_06_01.operations.ActionGroupsOperations>`
242246
* 2021-09-01: :class:`ActionGroupsOperations<azure.mgmt.monitor.v2021_09_01.operations.ActionGroupsOperations>`
247+
* 2022-04-01: :class:`ActionGroupsOperations<azure.mgmt.monitor.v2022_04_01.operations.ActionGroupsOperations>`
243248
"""
244249
api_version = self._get_api_version('action_groups')
245250
if api_version == '2017-04-01':
@@ -254,6 +259,8 @@ def action_groups(self):
254259
from .v2019_06_01.operations import ActionGroupsOperations as OperationClass
255260
elif api_version == '2021-09-01':
256261
from .v2021_09_01.operations import ActionGroupsOperations as OperationClass
262+
elif api_version == '2022-04-01':
263+
from .v2022_04_01.operations import ActionGroupsOperations as OperationClass
257264
else:
258265
raise ValueError("API version {} does not have operation group 'action_groups'".format(api_version))
259266
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
@@ -338,19 +345,6 @@ def autoscale_settings(self):
338345
raise ValueError("API version {} does not have operation group 'autoscale_settings'".format(api_version))
339346
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
340347

341-
@property
342-
def baseline(self):
343-
"""Instance depends on the API version:
344-
345-
* 2018-09-01: :class:`BaselineOperations<azure.mgmt.monitor.v2018_09_01.operations.BaselineOperations>`
346-
"""
347-
api_version = self._get_api_version('baseline')
348-
if api_version == '2018-09-01':
349-
from .v2018_09_01.operations import BaselineOperations as OperationClass
350-
else:
351-
raise ValueError("API version {} does not have operation group 'baseline'".format(api_version))
352-
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
353-
354348
@property
355349
def baselines(self):
356350
"""Instance depends on the API version:
@@ -549,13 +543,10 @@ def metric_baseline(self):
549543
"""Instance depends on the API version:
550544
551545
* 2017-11-01-preview: :class:`MetricBaselineOperations<azure.mgmt.monitor.v2017_11_01_preview.operations.MetricBaselineOperations>`
552-
* 2018-09-01: :class:`MetricBaselineOperations<azure.mgmt.monitor.v2018_09_01.operations.MetricBaselineOperations>`
553546
"""
554547
api_version = self._get_api_version('metric_baseline')
555548
if api_version == '2017-11-01-preview':
556549
from .v2017_11_01_preview.operations import MetricBaselineOperations as OperationClass
557-
elif api_version == '2018-09-01':
558-
from .v2018_09_01.operations import MetricBaselineOperations as OperationClass
559550
else:
560551
raise ValueError("API version {} does not have operation group 'metric_baseline'".format(api_version))
561552
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))

sdk/monitor/azure-mgmt-monitor/azure/mgmt/monitor/aio/_monitor_management_client.py

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@
1111

1212
from typing import Any, Optional, TYPE_CHECKING
1313

14+
from msrest import Deserializer, Serializer
15+
1416
from azure.mgmt.core import AsyncARMPipelineClient
1517
from azure.profiles import KnownProfiles, ProfileDefinition
1618
from azure.profiles.multiapiclient import MultiApiClientMixin
17-
from msrest import Deserializer, Serializer
1819

1920
from ._configuration import MonitorManagementClientConfiguration
2021

@@ -54,7 +55,7 @@ class MonitorManagementClient(MultiApiClientMixin, _SDKClient):
5455
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.
5556
"""
5657

57-
DEFAULT_API_VERSION = '2021-09-01'
58+
DEFAULT_API_VERSION = '2022-04-01'
5859
_PROFILE_TAG = "azure.mgmt.monitor.MonitorManagementClient"
5960
LATEST_PROFILE = ProfileDefinition({
6061
_PROFILE_TAG: {
@@ -64,7 +65,6 @@ class MonitorManagementClient(MultiApiClientMixin, _SDKClient):
6465
'alert_rule_incidents': '2016-03-01',
6566
'alert_rules': '2016-03-01',
6667
'autoscale_settings': '2015-04-01',
67-
'baseline': '2018-09-01',
6868
'baselines': '2019-03-01',
6969
'data_collection_endpoints': '2021-04-01',
7070
'data_collection_rule_associations': '2021-04-01',
@@ -78,7 +78,7 @@ class MonitorManagementClient(MultiApiClientMixin, _SDKClient):
7878
'management_group_diagnostic_settings': '2021-05-01-preview',
7979
'metric_alerts': '2018-03-01',
8080
'metric_alerts_status': '2018-03-01',
81-
'metric_baseline': '2018-09-01',
81+
'metric_baseline': '2017-11-01-preview',
8282
'metric_definitions': '2018-01-01',
8383
'metric_namespaces': '2017-12-01-preview',
8484
'metrics': '2018-01-01',
@@ -148,6 +148,7 @@ def models(cls, api_version=DEFAULT_API_VERSION):
148148
* 2021-05-01-preview: :mod:`v2021_05_01_preview.models<azure.mgmt.monitor.v2021_05_01_preview.models>`
149149
* 2021-09-01: :mod:`v2021_09_01.models<azure.mgmt.monitor.v2021_09_01.models>`
150150
* 2021-09-01-preview: :mod:`v2022_02_01_preview.models<azure.mgmt.monitor.v2022_02_01_preview.models>`
151+
* 2022-04-01: :mod:`v2022_04_01.models<azure.mgmt.monitor.v2022_04_01.models>`
151152
"""
152153
if api_version == '2015-04-01':
153154
from ..v2015_04_01 import models
@@ -227,6 +228,9 @@ def models(cls, api_version=DEFAULT_API_VERSION):
227228
elif api_version == '2021-09-01-preview':
228229
from ..v2022_02_01_preview import models
229230
return models
231+
elif api_version == '2022-04-01':
232+
from ..v2022_04_01 import models
233+
return models
230234
raise ValueError("API version {} is not available".format(api_version))
231235

232236
@property
@@ -239,6 +243,7 @@ def action_groups(self):
239243
* 2019-03-01: :class:`ActionGroupsOperations<azure.mgmt.monitor.v2019_03_01.aio.operations.ActionGroupsOperations>`
240244
* 2019-06-01: :class:`ActionGroupsOperations<azure.mgmt.monitor.v2019_06_01.aio.operations.ActionGroupsOperations>`
241245
* 2021-09-01: :class:`ActionGroupsOperations<azure.mgmt.monitor.v2021_09_01.aio.operations.ActionGroupsOperations>`
246+
* 2022-04-01: :class:`ActionGroupsOperations<azure.mgmt.monitor.v2022_04_01.aio.operations.ActionGroupsOperations>`
242247
"""
243248
api_version = self._get_api_version('action_groups')
244249
if api_version == '2017-04-01':
@@ -253,6 +258,8 @@ def action_groups(self):
253258
from ..v2019_06_01.aio.operations import ActionGroupsOperations as OperationClass
254259
elif api_version == '2021-09-01':
255260
from ..v2021_09_01.aio.operations import ActionGroupsOperations as OperationClass
261+
elif api_version == '2022-04-01':
262+
from ..v2022_04_01.aio.operations import ActionGroupsOperations as OperationClass
256263
else:
257264
raise ValueError("API version {} does not have operation group 'action_groups'".format(api_version))
258265
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
@@ -337,19 +344,6 @@ def autoscale_settings(self):
337344
raise ValueError("API version {} does not have operation group 'autoscale_settings'".format(api_version))
338345
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
339346

340-
@property
341-
def baseline(self):
342-
"""Instance depends on the API version:
343-
344-
* 2018-09-01: :class:`BaselineOperations<azure.mgmt.monitor.v2018_09_01.aio.operations.BaselineOperations>`
345-
"""
346-
api_version = self._get_api_version('baseline')
347-
if api_version == '2018-09-01':
348-
from ..v2018_09_01.aio.operations import BaselineOperations as OperationClass
349-
else:
350-
raise ValueError("API version {} does not have operation group 'baseline'".format(api_version))
351-
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
352-
353347
@property
354348
def baselines(self):
355349
"""Instance depends on the API version:
@@ -548,13 +542,10 @@ def metric_baseline(self):
548542
"""Instance depends on the API version:
549543
550544
* 2017-11-01-preview: :class:`MetricBaselineOperations<azure.mgmt.monitor.v2017_11_01_preview.aio.operations.MetricBaselineOperations>`
551-
* 2018-09-01: :class:`MetricBaselineOperations<azure.mgmt.monitor.v2018_09_01.aio.operations.MetricBaselineOperations>`
552545
"""
553546
api_version = self._get_api_version('metric_baseline')
554547
if api_version == '2017-11-01-preview':
555548
from ..v2017_11_01_preview.aio.operations import MetricBaselineOperations as OperationClass
556-
elif api_version == '2018-09-01':
557-
from ..v2018_09_01.aio.operations import MetricBaselineOperations as OperationClass
558549
else:
559550
raise ValueError("API version {} does not have operation group 'metric_baseline'".format(api_version))
560551
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))

sdk/monitor/azure-mgmt-monitor/azure/mgmt/monitor/models.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88
from .v2015_07_01.models import *
99
from .v2016_03_01.models import *
1010
from .v2016_09_01.models import *
11+
from .v2017_11_01_preview.models import *
1112
from .v2017_12_01_preview.models import *
1213
from .v2018_01_01.models import *
1314
from .v2018_03_01.models import *
1415
from .v2018_04_16.models import *
1516
from .v2018_06_01_preview.models import *
16-
from .v2018_09_01.models import *
1717
from .v2018_11_27_preview.models import *
1818
from .v2019_03_01.models import *
1919
from .v2019_10_17.models import *
2020
from .v2020_10_01.models import *
2121
from .v2021_04_01.models import *
2222
from .v2021_05_01_preview.models import *
23-
from .v2021_09_01.models import *
23+
from .v2022_04_01.models import *

sdk/monitor/azure-mgmt-monitor/azure/mgmt/monitor/v2015_04_01/_configuration.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from azure.core.credentials import TokenCredential
2020

2121

22-
class MonitorManagementClientConfiguration(Configuration):
22+
class MonitorManagementClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes
2323
"""Configuration for MonitorManagementClient.
2424
2525
Note that all parameters used to create this instance are saved as instance

sdk/monitor/azure-mgmt-monitor/azure/mgmt/monitor/v2015_04_01/_metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"azure_arm": true,
1111
"has_lro_operations": false,
1212
"client_side_validation": false,
13-
"sync_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"msrest\": [\"Deserializer\", \"Serializer\"], \"azure.mgmt.core\": [\"ARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"MonitorManagementClientConfiguration\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}",
14-
"async_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"], \"azure.core.credentials\": [\"TokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"msrest\": [\"Deserializer\", \"Serializer\"], \"azure.mgmt.core\": [\"AsyncARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"MonitorManagementClientConfiguration\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}"
13+
"sync_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"azure.mgmt.core\": [\"ARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"MonitorManagementClientConfiguration\"]}, \"thirdparty\": {\"msrest\": [\"Deserializer\", \"Serializer\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}",
14+
"async_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"], \"azure.core.credentials\": [\"TokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"azure.mgmt.core\": [\"AsyncARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"MonitorManagementClientConfiguration\"]}, \"thirdparty\": {\"msrest\": [\"Deserializer\", \"Serializer\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}"
1515
},
1616
"global_parameters": {
1717
"sync": {

sdk/monitor/azure-mgmt-monitor/azure/mgmt/monitor/v2015_04_01/_monitor_management_client.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@
77
# --------------------------------------------------------------------------
88

99
from copy import deepcopy
10-
from typing import Any, Optional, TYPE_CHECKING
10+
from typing import Any, TYPE_CHECKING
11+
12+
from msrest import Deserializer, Serializer
1113

1214
from azure.core.rest import HttpRequest, HttpResponse
1315
from azure.mgmt.core import ARMPipelineClient
14-
from msrest import Deserializer, Serializer
1516

1617
from . import models
1718
from ._configuration import MonitorManagementClientConfiguration
@@ -43,7 +44,7 @@ class MonitorManagementClient:
4344
:type credential: ~azure.core.credentials.TokenCredential
4445
:param subscription_id: The ID of the target subscription.
4546
:type subscription_id: str
46-
:param base_url: Service URL. Default value is 'https://management.azure.com'.
47+
:param base_url: Service URL. Default value is "https://management.azure.com".
4748
:type base_url: str
4849
"""
4950

@@ -71,7 +72,7 @@ def __init__(
7172

7273
def _send_request(
7374
self,
74-
request, # type: HttpRequest
75+
request: HttpRequest,
7576
**kwargs: Any
7677
) -> HttpResponse:
7778
"""Runs the network request through the client's chained policies.

sdk/monitor/azure-mgmt-monitor/azure/mgmt/monitor/v2015_04_01/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
77
# --------------------------------------------------------------------------
88

9-
VERSION = "3.1.0"
9+
VERSION = "1.0.0b1"

sdk/monitor/azure-mgmt-monitor/azure/mgmt/monitor/v2015_04_01/aio/_configuration.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from azure.core.credentials_async import AsyncTokenCredential
2020

2121

22-
class MonitorManagementClientConfiguration(Configuration):
22+
class MonitorManagementClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes
2323
"""Configuration for MonitorManagementClient.
2424
2525
Note that all parameters used to create this instance are saved as instance

sdk/monitor/azure-mgmt-monitor/azure/mgmt/monitor/v2015_04_01/aio/_monitor_management_client.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@
77
# --------------------------------------------------------------------------
88

99
from copy import deepcopy
10-
from typing import Any, Awaitable, Optional, TYPE_CHECKING
10+
from typing import Any, Awaitable, TYPE_CHECKING
11+
12+
from msrest import Deserializer, Serializer
1113

1214
from azure.core.rest import AsyncHttpResponse, HttpRequest
1315
from azure.mgmt.core import AsyncARMPipelineClient
14-
from msrest import Deserializer, Serializer
1516

1617
from .. import models
1718
from ._configuration import MonitorManagementClientConfiguration
@@ -44,7 +45,7 @@ class MonitorManagementClient:
4445
:type credential: ~azure.core.credentials_async.AsyncTokenCredential
4546
:param subscription_id: The ID of the target subscription.
4647
:type subscription_id: str
47-
:param base_url: Service URL. Default value is 'https://management.azure.com'.
48+
:param base_url: Service URL. Default value is "https://management.azure.com".
4849
:type base_url: str
4950
"""
5051

0 commit comments

Comments
 (0)