Skip to content

Commit 9443b6b

Browse files
author
SDKAuto
committed
CodeGen from PR 19735 in Azure/azure-rest-api-specs
Merge 5b5114c2898e2993372b423e5463870d4e255924 into 778b1621b49e171a89b429de6c7eac9cc4fb332b
1 parent eaab1ff commit 9443b6b

File tree

576 files changed

+28870
-12904
lines changed

Some content is hidden

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

576 files changed

+28870
-12904
lines changed

‎sdk/monitor/azure-mgmt-monitor/_meta.json‎

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.16.0",
55
"@autorest/[email protected]"
66
],
7-
"commit": "8174b2fc60e288a9d7fcdff5f9414e43a6ad5989",
7+
"commit": "6748c5ff4a4b9803dd57dead46dcb5c46b0068d7",
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 --python --python-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-python/sdk --python3-only --use=@autorest/python@5.16.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: 18 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-06-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,8 @@ 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>`
153+
* 2022-06-01: :mod:`v2022_06_01.models<azure.mgmt.monitor.v2022_06_01.models>`
152154
"""
153155
if api_version == '2015-04-01':
154156
from .v2015_04_01 import models
@@ -228,6 +230,12 @@ def models(cls, api_version=DEFAULT_API_VERSION):
228230
elif api_version == '2021-09-01-preview':
229231
from .v2022_02_01_preview import models
230232
return models
233+
elif api_version == '2022-04-01':
234+
from .v2022_04_01 import models
235+
return models
236+
elif api_version == '2022-06-01':
237+
from .v2022_06_01 import models
238+
return models
231239
raise ValueError("API version {} is not available".format(api_version))
232240

233241
@property
@@ -240,6 +248,8 @@ def action_groups(self):
240248
* 2019-03-01: :class:`ActionGroupsOperations<azure.mgmt.monitor.v2019_03_01.operations.ActionGroupsOperations>`
241249
* 2019-06-01: :class:`ActionGroupsOperations<azure.mgmt.monitor.v2019_06_01.operations.ActionGroupsOperations>`
242250
* 2021-09-01: :class:`ActionGroupsOperations<azure.mgmt.monitor.v2021_09_01.operations.ActionGroupsOperations>`
251+
* 2022-04-01: :class:`ActionGroupsOperations<azure.mgmt.monitor.v2022_04_01.operations.ActionGroupsOperations>`
252+
* 2022-06-01: :class:`ActionGroupsOperations<azure.mgmt.monitor.v2022_06_01.operations.ActionGroupsOperations>`
243253
"""
244254
api_version = self._get_api_version('action_groups')
245255
if api_version == '2017-04-01':
@@ -254,6 +264,10 @@ def action_groups(self):
254264
from .v2019_06_01.operations import ActionGroupsOperations as OperationClass
255265
elif api_version == '2021-09-01':
256266
from .v2021_09_01.operations import ActionGroupsOperations as OperationClass
267+
elif api_version == '2022-04-01':
268+
from .v2022_04_01.operations import ActionGroupsOperations as OperationClass
269+
elif api_version == '2022-06-01':
270+
from .v2022_06_01.operations import ActionGroupsOperations as OperationClass
257271
else:
258272
raise ValueError("API version {} does not have operation group 'action_groups'".format(api_version))
259273
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
@@ -338,19 +352,6 @@ def autoscale_settings(self):
338352
raise ValueError("API version {} does not have operation group 'autoscale_settings'".format(api_version))
339353
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
340354

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-
354355
@property
355356
def baselines(self):
356357
"""Instance depends on the API version:
@@ -549,13 +550,10 @@ def metric_baseline(self):
549550
"""Instance depends on the API version:
550551
551552
* 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>`
553553
"""
554554
api_version = self._get_api_version('metric_baseline')
555555
if api_version == '2017-11-01-preview':
556556
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
559557
else:
560558
raise ValueError("API version {} does not have operation group 'metric_baseline'".format(api_version))
561559
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: 18 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-06-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,8 @@ 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>`
152+
* 2022-06-01: :mod:`v2022_06_01.models<azure.mgmt.monitor.v2022_06_01.models>`
151153
"""
152154
if api_version == '2015-04-01':
153155
from ..v2015_04_01 import models
@@ -227,6 +229,12 @@ def models(cls, api_version=DEFAULT_API_VERSION):
227229
elif api_version == '2021-09-01-preview':
228230
from ..v2022_02_01_preview import models
229231
return models
232+
elif api_version == '2022-04-01':
233+
from ..v2022_04_01 import models
234+
return models
235+
elif api_version == '2022-06-01':
236+
from ..v2022_06_01 import models
237+
return models
230238
raise ValueError("API version {} is not available".format(api_version))
231239

232240
@property
@@ -239,6 +247,8 @@ def action_groups(self):
239247
* 2019-03-01: :class:`ActionGroupsOperations<azure.mgmt.monitor.v2019_03_01.aio.operations.ActionGroupsOperations>`
240248
* 2019-06-01: :class:`ActionGroupsOperations<azure.mgmt.monitor.v2019_06_01.aio.operations.ActionGroupsOperations>`
241249
* 2021-09-01: :class:`ActionGroupsOperations<azure.mgmt.monitor.v2021_09_01.aio.operations.ActionGroupsOperations>`
250+
* 2022-04-01: :class:`ActionGroupsOperations<azure.mgmt.monitor.v2022_04_01.aio.operations.ActionGroupsOperations>`
251+
* 2022-06-01: :class:`ActionGroupsOperations<azure.mgmt.monitor.v2022_06_01.aio.operations.ActionGroupsOperations>`
242252
"""
243253
api_version = self._get_api_version('action_groups')
244254
if api_version == '2017-04-01':
@@ -253,6 +263,10 @@ def action_groups(self):
253263
from ..v2019_06_01.aio.operations import ActionGroupsOperations as OperationClass
254264
elif api_version == '2021-09-01':
255265
from ..v2021_09_01.aio.operations import ActionGroupsOperations as OperationClass
266+
elif api_version == '2022-04-01':
267+
from ..v2022_04_01.aio.operations import ActionGroupsOperations as OperationClass
268+
elif api_version == '2022-06-01':
269+
from ..v2022_06_01.aio.operations import ActionGroupsOperations as OperationClass
256270
else:
257271
raise ValueError("API version {} does not have operation group 'action_groups'".format(api_version))
258272
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
@@ -337,19 +351,6 @@ def autoscale_settings(self):
337351
raise ValueError("API version {} does not have operation group 'autoscale_settings'".format(api_version))
338352
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
339353

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-
353354
@property
354355
def baselines(self):
355356
"""Instance depends on the API version:
@@ -548,13 +549,10 @@ def metric_baseline(self):
548549
"""Instance depends on the API version:
549550
550551
* 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>`
552552
"""
553553
api_version = self._get_api_version('metric_baseline')
554554
if api_version == '2017-11-01-preview':
555555
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
558556
else:
559557
raise ValueError("API version {} does not have operation group 'metric_baseline'".format(api_version))
560558
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_06_01.models import *

‎sdk/monitor/azure-mgmt-monitor/azure/mgmt/monitor/v2015_04_01/__init__.py‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,14 @@
1010
from ._version import VERSION
1111

1212
__version__ = VERSION
13+
14+
try:
15+
from ._patch import __all__ as _patch_all
16+
from ._patch import * # type: ignore # pylint: disable=unused-wildcard-import
17+
except ImportError:
18+
_patch_all = []
19+
from ._patch import patch_sdk as _patch_sdk
1320
__all__ = ['MonitorManagementClient']
21+
__all__.extend([p for p in _patch_all if p not in __all__])
1422

15-
# `._patch.py` is used for handwritten extensions to the generated code
16-
# Example: https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
17-
from ._patch import patch_sdk
18-
patch_sdk()
23+
_patch_sdk()

‎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": {

0 commit comments

Comments
 (0)