Skip to content

Commit 1b9b27f

Browse files
chenjianfei2017Zim KalinowskiSDK AutomationYour Name
authored
Sdk automation/azure mgmt resource terraform (#11835)
* Releasing mixedreality (#11618) * Generated from 6ba80acb417873f6fe2808d1a0d1ad144241ac60 Merge branch 'master' into Azure-MixedReality * changelog and version * adding mixedreality test * fixed indentation * fixed layout * one more fix * test recording * serial thing * fix + indent * indent * additional test fix Co-authored-by: SDK Automation <[email protected]> * Update from release/v3 * release azure-mgmt-resource * release azure-mgmt-resource Co-authored-by: Zim Kalinowski <[email protected]> Co-authored-by: SDK Automation <[email protected]> Co-authored-by: Your Name <[email protected]>
1 parent 111e152 commit 1b9b27f

30 files changed

+10253
-24477
lines changed

sdk/resources/azure-mgmt-resource/CHANGELOG.md

+12
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
# Release History
22

3+
# 10.0.0 (2020-06-02)
4+
5+
**Features**
6+
7+
- Model AzurePowerShellScript has a new parameter storage_account_settings
8+
- Model DeploymentOperationProperties has a new parameter provisioning_operation
9+
- Model AzureCliScript has a new parameter storage_account_settings
10+
11+
**Breaking changes**
12+
13+
- Model AliasPathType no longer has parameter pattern
14+
315
## 9.0.0 (2020-03-31)
416

517
**Features**
+9-16
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,21 @@
1-
## Microsoft Azure SDK for Python
1+
# Microsoft Azure SDK for Python
22

33
This is the Microsoft Azure Resource Management Client Library.
4-
5-
Azure Resource Manager (ARM) is the next generation of management APIs
6-
that replace the old Azure Service Management (ASM).
7-
84
This package has been tested with Python 2.7, 3.5, 3.6, 3.7 and 3.8.
5+
For a more complete view of Azure libraries, see the [Github repo](https://github.com/Azure/azure-sdk-for-python/)
96

10-
For the older Azure Service Management (ASM) libraries, see
11-
[azure-servicemanagement-legacy](https://pypi.python.org/pypi/azure-servicemanagement-legacy)
12-
library.
13-
14-
For a more complete set of Azure libraries, see the
15-
[azure](https://pypi.python.org/pypi/azure) bundle package.
167

17-
## Usage
8+
# Usage
189

1910
For code examples, see [Resource Management](https://docs.microsoft.com/python/api/overview/azure/resources)
2011
on docs.microsoft.com.
2112

22-
## Provide Feedback
2313

24-
If you encounter any bugs or have suggestions, please file an issue in
25-
the [Issues](https://github.com/Azure/azure-sdk-for-python/issues)
14+
# Provide Feedback
15+
16+
If you encounter any bugs or have suggestions, please file an issue in the
17+
[Issues](https://github.com/Azure/azure-sdk-for-python/issues)
2618
section of the project.
2719

28-
![image](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fazure-mgmt-resource%2FREADME.png)
20+
21+
![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fazure-mgmt-resource%2FREADME.png)

sdk/resources/azure-mgmt-resource/azure/mgmt/resource/deploymentscripts/v2019_10_preview/models/__init__.py

+6-3
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,16 @@
1515
from ._models_py3 import AzureResourceBase
1616
from ._models_py3 import ContainerConfiguration
1717
from ._models_py3 import DeploymentScript
18-
from ._models_py3 import DeploymentScriptUpdateParameter
1918
from ._models_py3 import DeploymentScriptsError, DeploymentScriptsErrorException
19+
from ._models_py3 import DeploymentScriptUpdateParameter
2020
from ._models_py3 import EnvironmentVariable
2121
from ._models_py3 import ErrorAdditionalInfo
2222
from ._models_py3 import ErrorResponse
2323
from ._models_py3 import ManagedServiceIdentity
2424
from ._models_py3 import ScriptLog
2525
from ._models_py3 import ScriptLogsList
2626
from ._models_py3 import ScriptStatus
27+
from ._models_py3 import StorageAccountConfiguration
2728
from ._models_py3 import SystemData
2829
from ._models_py3 import UserAssignedIdentity
2930
except (SyntaxError, ImportError):
@@ -32,15 +33,16 @@
3233
from ._models import AzureResourceBase
3334
from ._models import ContainerConfiguration
3435
from ._models import DeploymentScript
35-
from ._models import DeploymentScriptUpdateParameter
3636
from ._models import DeploymentScriptsError, DeploymentScriptsErrorException
37+
from ._models import DeploymentScriptUpdateParameter
3738
from ._models import EnvironmentVariable
3839
from ._models import ErrorAdditionalInfo
3940
from ._models import ErrorResponse
4041
from ._models import ManagedServiceIdentity
4142
from ._models import ScriptLog
4243
from ._models import ScriptLogsList
4344
from ._models import ScriptStatus
45+
from ._models import StorageAccountConfiguration
4446
from ._models import SystemData
4547
from ._models import UserAssignedIdentity
4648
from ._paged_models import DeploymentScriptPaged
@@ -57,15 +59,16 @@
5759
'AzureResourceBase',
5860
'ContainerConfiguration',
5961
'DeploymentScript',
60-
'DeploymentScriptUpdateParameter',
6162
'DeploymentScriptsError', 'DeploymentScriptsErrorException',
63+
'DeploymentScriptUpdateParameter',
6264
'EnvironmentVariable',
6365
'ErrorAdditionalInfo',
6466
'ErrorResponse',
6567
'ManagedServiceIdentity',
6668
'ScriptLog',
6769
'ScriptLogsList',
6870
'ScriptStatus',
71+
'StorageAccountConfiguration',
6972
'SystemData',
7073
'UserAssignedIdentity',
7174
'DeploymentScriptPaged',

sdk/resources/azure-mgmt-resource/azure/mgmt/resource/deploymentscripts/v2019_10_preview/models/_models.py

+65-29
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,9 @@ class AzureCliScript(DeploymentScript):
145145
:param container_settings: Container settings.
146146
:type container_settings:
147147
~azure.mgmt.resource.deploymentscripts.v2019_10_preview.models.ContainerConfiguration
148+
:param storage_account_settings: Storage Account settings.
149+
:type storage_account_settings:
150+
~azure.mgmt.resource.deploymentscripts.v2019_10_preview.models.StorageAccountConfiguration
148151
:param cleanup_preference: The clean up preference when the script
149152
execution gets in a terminal state. Default setting is 'Always'. Possible
150153
values include: 'Always', 'OnSuccess', 'OnExpiration'
@@ -216,6 +219,7 @@ class AzureCliScript(DeploymentScript):
216219
'system_data': {'key': 'systemData', 'type': 'SystemData'},
217220
'kind': {'key': 'kind', 'type': 'str'},
218221
'container_settings': {'key': 'properties.containerSettings', 'type': 'ContainerConfiguration'},
222+
'storage_account_settings': {'key': 'properties.storageAccountSettings', 'type': 'StorageAccountConfiguration'},
219223
'cleanup_preference': {'key': 'properties.cleanupPreference', 'type': 'str'},
220224
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
221225
'status': {'key': 'properties.status', 'type': 'ScriptStatus'},
@@ -234,6 +238,7 @@ class AzureCliScript(DeploymentScript):
234238
def __init__(self, **kwargs):
235239
super(AzureCliScript, self).__init__(**kwargs)
236240
self.container_settings = kwargs.get('container_settings', None)
241+
self.storage_account_settings = kwargs.get('storage_account_settings', None)
237242
self.cleanup_preference = kwargs.get('cleanup_preference', None)
238243
self.provisioning_state = None
239244
self.status = None
@@ -281,6 +286,9 @@ class AzurePowerShellScript(DeploymentScript):
281286
:param container_settings: Container settings.
282287
:type container_settings:
283288
~azure.mgmt.resource.deploymentscripts.v2019_10_preview.models.ContainerConfiguration
289+
:param storage_account_settings: Storage Account settings.
290+
:type storage_account_settings:
291+
~azure.mgmt.resource.deploymentscripts.v2019_10_preview.models.StorageAccountConfiguration
284292
:param cleanup_preference: The clean up preference when the script
285293
execution gets in a terminal state. Default setting is 'Always'. Possible
286294
values include: 'Always', 'OnSuccess', 'OnExpiration'
@@ -353,6 +361,7 @@ class AzurePowerShellScript(DeploymentScript):
353361
'system_data': {'key': 'systemData', 'type': 'SystemData'},
354362
'kind': {'key': 'kind', 'type': 'str'},
355363
'container_settings': {'key': 'properties.containerSettings', 'type': 'ContainerConfiguration'},
364+
'storage_account_settings': {'key': 'properties.storageAccountSettings', 'type': 'StorageAccountConfiguration'},
356365
'cleanup_preference': {'key': 'properties.cleanupPreference', 'type': 'str'},
357366
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
358367
'status': {'key': 'properties.status', 'type': 'ScriptStatus'},
@@ -371,6 +380,7 @@ class AzurePowerShellScript(DeploymentScript):
371380
def __init__(self, **kwargs):
372381
super(AzurePowerShellScript, self).__init__(**kwargs)
373382
self.container_settings = kwargs.get('container_settings', None)
383+
self.storage_account_settings = kwargs.get('storage_account_settings', None)
374384
self.cleanup_preference = kwargs.get('cleanup_preference', None)
375385
self.provisioning_state = None
376386
self.status = None
@@ -435,6 +445,9 @@ class DeploymentScriptPropertiesBase(Model):
435445
:param container_settings: Container settings.
436446
:type container_settings:
437447
~azure.mgmt.resource.deploymentscripts.v2019_10_preview.models.ContainerConfiguration
448+
:param storage_account_settings: Storage Account settings.
449+
:type storage_account_settings:
450+
~azure.mgmt.resource.deploymentscripts.v2019_10_preview.models.StorageAccountConfiguration
438451
:param cleanup_preference: The clean up preference when the script
439452
execution gets in a terminal state. Default setting is 'Always'. Possible
440453
values include: 'Always', 'OnSuccess', 'OnExpiration'
@@ -460,6 +473,7 @@ class DeploymentScriptPropertiesBase(Model):
460473

461474
_attribute_map = {
462475
'container_settings': {'key': 'containerSettings', 'type': 'ContainerConfiguration'},
476+
'storage_account_settings': {'key': 'storageAccountSettings', 'type': 'StorageAccountConfiguration'},
463477
'cleanup_preference': {'key': 'cleanupPreference', 'type': 'str'},
464478
'provisioning_state': {'key': 'provisioningState', 'type': 'str'},
465479
'status': {'key': 'status', 'type': 'ScriptStatus'},
@@ -469,12 +483,42 @@ class DeploymentScriptPropertiesBase(Model):
469483
def __init__(self, **kwargs):
470484
super(DeploymentScriptPropertiesBase, self).__init__(**kwargs)
471485
self.container_settings = kwargs.get('container_settings', None)
486+
self.storage_account_settings = kwargs.get('storage_account_settings', None)
472487
self.cleanup_preference = kwargs.get('cleanup_preference', None)
473488
self.provisioning_state = None
474489
self.status = None
475490
self.outputs = None
476491

477492

493+
class DeploymentScriptsError(Model):
494+
"""Deployment scripts error response.
495+
496+
:param error:
497+
:type error:
498+
~azure.mgmt.resource.deploymentscripts.v2019_10_preview.models.ErrorResponse
499+
"""
500+
501+
_attribute_map = {
502+
'error': {'key': 'error', 'type': 'ErrorResponse'},
503+
}
504+
505+
def __init__(self, **kwargs):
506+
super(DeploymentScriptsError, self).__init__(**kwargs)
507+
self.error = kwargs.get('error', None)
508+
509+
510+
class DeploymentScriptsErrorException(HttpOperationError):
511+
"""Server responsed with exception of type: 'DeploymentScriptsError'.
512+
513+
:param deserialize: A deserializer
514+
:param response: Server response to be deserialized.
515+
"""
516+
517+
def __init__(self, deserialize, response, *args):
518+
519+
super(DeploymentScriptsErrorException, self).__init__(deserialize, response, 'DeploymentScriptsError', *args)
520+
521+
478522
class DeploymentScriptUpdateParameter(AzureResourceBase):
479523
"""Deployment script parameters to be updated. .
480524
@@ -509,35 +553,6 @@ def __init__(self, **kwargs):
509553
self.tags = kwargs.get('tags', None)
510554

511555

512-
class DeploymentScriptsError(Model):
513-
"""Deployment scripts error response.
514-
515-
:param error:
516-
:type error:
517-
~azure.mgmt.resource.deploymentscripts.v2019_10_preview.models.ErrorResponse
518-
"""
519-
520-
_attribute_map = {
521-
'error': {'key': 'error', 'type': 'ErrorResponse'},
522-
}
523-
524-
def __init__(self, **kwargs):
525-
super(DeploymentScriptsError, self).__init__(**kwargs)
526-
self.error = kwargs.get('error', None)
527-
528-
529-
class DeploymentScriptsErrorException(HttpOperationError):
530-
"""Server responsed with exception of type: 'DeploymentScriptsError'.
531-
532-
:param deserialize: A deserializer
533-
:param response: Server response to be deserialized.
534-
"""
535-
536-
def __init__(self, deserialize, response, *args):
537-
538-
super(DeploymentScriptsErrorException, self).__init__(deserialize, response, 'DeploymentScriptsError', *args)
539-
540-
541556
class EnvironmentVariable(Model):
542557
"""The environment variable to pass to the script in the container instance.
543558
@@ -828,6 +843,27 @@ def __init__(self, **kwargs):
828843
self.error = kwargs.get('error', None)
829844

830845

846+
class StorageAccountConfiguration(Model):
847+
"""Settings to use an existing storage account. Valid storage account kinds
848+
are: Storage, StorageV2 and FileStorage.
849+
850+
:param storage_account_name: The storage account name.
851+
:type storage_account_name: str
852+
:param storage_account_key: The storage account access key.
853+
:type storage_account_key: str
854+
"""
855+
856+
_attribute_map = {
857+
'storage_account_name': {'key': 'storageAccountName', 'type': 'str'},
858+
'storage_account_key': {'key': 'storageAccountKey', 'type': 'str'},
859+
}
860+
861+
def __init__(self, **kwargs):
862+
super(StorageAccountConfiguration, self).__init__(**kwargs)
863+
self.storage_account_name = kwargs.get('storage_account_name', None)
864+
self.storage_account_key = kwargs.get('storage_account_key', None)
865+
866+
831867
class SystemData(Model):
832868
"""Metadata pertaining to creation and last modification of the resource.
833869

0 commit comments

Comments
 (0)