Skip to content

Commit d924e75

Browse files
author
SDKAuto
committed
CodeGen from PR 24211 in Azure/azure-rest-api-specs
Merge 6ccb8d1cf74dfa4885ad371af238c29617fcb2d0 into b0068e9b28991f4d24a3d247ed36bfa3737a520c
1 parent a9dba88 commit d924e75

File tree

214 files changed

+1215
-391
lines changed

Some content is hidden

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

214 files changed

+1215
-391
lines changed
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"commit": "18b397a02e5c7b856f61b6d7fb66a69c9c56c8ce",
2+
"commit": "a47b186bb893483daebf98f21f65e29bfd449034",
33
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
44
"autorest": "3.9.2",
55
"use": [
6-
"@autorest/python@6.4.12",
6+
"@autorest/python@6.6.0",
77
"@autorest/[email protected]"
88
],
9-
"autorest_command": "autorest specification/recoveryservices/resource-manager/readme.md --generate-sample=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --use=@autorest/python@6.4.12 --use=@autorest/[email protected] --version=3.9.2 --version-tolerant=False",
9+
"autorest_command": "autorest specification/recoveryservices/resource-manager/readme.md --generate-sample=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-python/sdk --use=@autorest/python@6.6.0 --use=@autorest/[email protected] --version=3.9.2 --version-tolerant=False",
1010
"readme": "specification/recoveryservices/resource-manager/readme.md"
1111
}

sdk/recoveryservices/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/_configuration.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ class RecoveryServicesClientConfiguration(Configuration): # pylint: disable=too
2929
:type credential: ~azure.core.credentials.TokenCredential
3030
:param subscription_id: The ID of the target subscription. Required.
3131
:type subscription_id: str
32-
:keyword api_version: Api Version. Default value is "2023-02-01". Note that overriding this
32+
:keyword api_version: Api Version. Default value is "2023-04-01". Note that overriding this
3333
default value may result in unsupported behavior.
3434
:paramtype api_version: str
3535
"""
3636

3737
def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None:
3838
super(RecoveryServicesClientConfiguration, self).__init__(**kwargs)
39-
api_version: str = kwargs.pop("api_version", "2023-02-01")
39+
api_version: str = kwargs.pop("api_version", "2023-04-01")
4040

4141
if credential is None:
4242
raise ValueError("Parameter 'credential' must not be None.")

sdk/recoveryservices/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/_recovery_services_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class RecoveryServicesClient(
6565
:type subscription_id: str
6666
:param base_url: Service URL. Default value is "https://management.azure.com".
6767
:type base_url: str
68-
:keyword api_version: Api Version. Default value is "2023-02-01". Note that overriding this
68+
:keyword api_version: Api Version. Default value is "2023-04-01". Note that overriding this
6969
default value may result in unsupported behavior.
7070
:paramtype api_version: str
7171
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no

sdk/recoveryservices/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/_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 = "2.4.0"
9+
VERSION = "1.0.0b1"

sdk/recoveryservices/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/aio/_configuration.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ class RecoveryServicesClientConfiguration(Configuration): # pylint: disable=too
2929
:type credential: ~azure.core.credentials_async.AsyncTokenCredential
3030
:param subscription_id: The ID of the target subscription. Required.
3131
:type subscription_id: str
32-
:keyword api_version: Api Version. Default value is "2023-02-01". Note that overriding this
32+
:keyword api_version: Api Version. Default value is "2023-04-01". Note that overriding this
3333
default value may result in unsupported behavior.
3434
:paramtype api_version: str
3535
"""
3636

3737
def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None:
3838
super(RecoveryServicesClientConfiguration, self).__init__(**kwargs)
39-
api_version: str = kwargs.pop("api_version", "2023-02-01")
39+
api_version: str = kwargs.pop("api_version", "2023-04-01")
4040

4141
if credential is None:
4242
raise ValueError("Parameter 'credential' must not be None.")

sdk/recoveryservices/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/aio/_recovery_services_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class RecoveryServicesClient(
6868
:type subscription_id: str
6969
:param base_url: Service URL. Default value is "https://management.azure.com".
7070
:type base_url: str
71-
:keyword api_version: Api Version. Default value is "2023-02-01". Note that overriding this
71+
:keyword api_version: Api Version. Default value is "2023-04-01". Note that overriding this
7272
default value may result in unsupported behavior.
7373
:paramtype api_version: str
7474
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no

sdk/recoveryservices/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/models/__init__.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
from ._models_py3 import RestoreSettings
5555
from ._models_py3 import SecuritySettings
5656
from ._models_py3 import Sku
57+
from ._models_py3 import SoftDeleteSettings
5758
from ._models_py3 import SystemData
5859
from ._models_py3 import TrackedResource
5960
from ._models_py3 import UpgradeDetails
@@ -77,12 +78,15 @@
7778
from ._recovery_services_client_enums import CrossSubscriptionRestoreState
7879
from ._recovery_services_client_enums import ImmutabilityState
7980
from ._recovery_services_client_enums import InfrastructureEncryptionState
81+
from ._recovery_services_client_enums import MultiUserAuthorization
8082
from ._recovery_services_client_enums import PrivateEndpointConnectionStatus
8183
from ._recovery_services_client_enums import ProvisioningState
8284
from ._recovery_services_client_enums import PublicNetworkAccess
8385
from ._recovery_services_client_enums import ResourceIdentityType
8486
from ._recovery_services_client_enums import ResourceMoveState
87+
from ._recovery_services_client_enums import SecureScoreLevel
8588
from ._recovery_services_client_enums import SkuName
89+
from ._recovery_services_client_enums import SoftDeleteState
8690
from ._recovery_services_client_enums import StandardTierStorageRedundancy
8791
from ._recovery_services_client_enums import TriggerType
8892
from ._recovery_services_client_enums import UsagesUnit
@@ -142,6 +146,7 @@
142146
"RestoreSettings",
143147
"SecuritySettings",
144148
"Sku",
149+
"SoftDeleteSettings",
145150
"SystemData",
146151
"TrackedResource",
147152
"UpgradeDetails",
@@ -164,12 +169,15 @@
164169
"CrossSubscriptionRestoreState",
165170
"ImmutabilityState",
166171
"InfrastructureEncryptionState",
172+
"MultiUserAuthorization",
167173
"PrivateEndpointConnectionStatus",
168174
"ProvisioningState",
169175
"PublicNetworkAccess",
170176
"ResourceIdentityType",
171177
"ResourceMoveState",
178+
"SecureScoreLevel",
172179
"SkuName",
180+
"SoftDeleteState",
173181
"StandardTierStorageRedundancy",
174182
"TriggerType",
175183
"UsagesUnit",

sdk/recoveryservices/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/models/_models_py3.py

Lines changed: 61 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1914,23 +1914,45 @@ def __init__(
19141914
class SecuritySettings(_serialization.Model):
19151915
"""Security Settings of the vault.
19161916
1917+
Variables are only populated by the server, and will be ignored when sending a request.
1918+
19171919
:ivar immutability_settings: Immutability Settings of a vault.
19181920
:vartype immutability_settings: ~azure.mgmt.recoveryservices.models.ImmutabilitySettings
1921+
:ivar soft_delete_settings: Soft delete Settings of a vault.
1922+
:vartype soft_delete_settings: ~azure.mgmt.recoveryservices.models.SoftDeleteSettings
1923+
:ivar multi_user_authorization: MUA Settings of a vault. Known values are: "Invalid",
1924+
"Enabled", and "Disabled".
1925+
:vartype multi_user_authorization: str or
1926+
~azure.mgmt.recoveryservices.models.MultiUserAuthorization
19191927
"""
19201928

1929+
_validation = {
1930+
"multi_user_authorization": {"readonly": True},
1931+
}
1932+
19211933
_attribute_map = {
19221934
"immutability_settings": {"key": "immutabilitySettings", "type": "ImmutabilitySettings"},
1935+
"soft_delete_settings": {"key": "softDeleteSettings", "type": "SoftDeleteSettings"},
1936+
"multi_user_authorization": {"key": "multiUserAuthorization", "type": "str"},
19231937
}
19241938

19251939
def __init__(
1926-
self, *, immutability_settings: Optional["_models.ImmutabilitySettings"] = None, **kwargs: Any
1940+
self,
1941+
*,
1942+
immutability_settings: Optional["_models.ImmutabilitySettings"] = None,
1943+
soft_delete_settings: Optional["_models.SoftDeleteSettings"] = None,
1944+
**kwargs: Any
19271945
) -> None:
19281946
"""
19291947
:keyword immutability_settings: Immutability Settings of a vault.
19301948
:paramtype immutability_settings: ~azure.mgmt.recoveryservices.models.ImmutabilitySettings
1949+
:keyword soft_delete_settings: Soft delete Settings of a vault.
1950+
:paramtype soft_delete_settings: ~azure.mgmt.recoveryservices.models.SoftDeleteSettings
19311951
"""
19321952
super().__init__(**kwargs)
19331953
self.immutability_settings = immutability_settings
1954+
self.soft_delete_settings = soft_delete_settings
1955+
self.multi_user_authorization = None
19341956

19351957

19361958
class Sku(_serialization.Model):
@@ -1998,6 +2020,38 @@ def __init__(
19982020
self.capacity = capacity
19992021

20002022

2023+
class SoftDeleteSettings(_serialization.Model):
2024+
"""Soft delete Settings of vault.
2025+
2026+
:ivar soft_delete_state: Known values are: "Invalid", "Enabled", "Disabled", and "AlwaysON".
2027+
:vartype soft_delete_state: str or ~azure.mgmt.recoveryservices.models.SoftDeleteState
2028+
:ivar soft_delete_retention_period_in_days: Soft delete retention period in days.
2029+
:vartype soft_delete_retention_period_in_days: int
2030+
"""
2031+
2032+
_attribute_map = {
2033+
"soft_delete_state": {"key": "softDeleteState", "type": "str"},
2034+
"soft_delete_retention_period_in_days": {"key": "softDeleteRetentionPeriodInDays", "type": "int"},
2035+
}
2036+
2037+
def __init__(
2038+
self,
2039+
*,
2040+
soft_delete_state: Optional[Union[str, "_models.SoftDeleteState"]] = None,
2041+
soft_delete_retention_period_in_days: Optional[int] = None,
2042+
**kwargs: Any
2043+
) -> None:
2044+
"""
2045+
:keyword soft_delete_state: Known values are: "Invalid", "Enabled", "Disabled", and "AlwaysON".
2046+
:paramtype soft_delete_state: str or ~azure.mgmt.recoveryservices.models.SoftDeleteState
2047+
:keyword soft_delete_retention_period_in_days: Soft delete retention period in days.
2048+
:paramtype soft_delete_retention_period_in_days: int
2049+
"""
2050+
super().__init__(**kwargs)
2051+
self.soft_delete_state = soft_delete_state
2052+
self.soft_delete_retention_period_in_days = soft_delete_retention_period_in_days
2053+
2054+
20012055
class SystemData(_serialization.Model):
20022056
"""Metadata pertaining to creation and last modification of the resource.
20032057
@@ -2478,6 +2532,9 @@ class VaultProperties(_serialization.Model): # pylint: disable=too-many-instanc
24782532
~azure.mgmt.recoveryservices.models.VaultPropertiesRedundancySettings
24792533
:ivar security_settings: Security Settings of the vault.
24802534
:vartype security_settings: ~azure.mgmt.recoveryservices.models.SecuritySettings
2535+
:ivar secure_score: Secure Score of Recovery Services Vault. Known values are: "None",
2536+
"Minimum", "Adequate", and "Maximum".
2537+
:vartype secure_score: str or ~azure.mgmt.recoveryservices.models.SecureScoreLevel
24812538
"""
24822539

24832540
_validation = {
@@ -2487,6 +2544,7 @@ class VaultProperties(_serialization.Model): # pylint: disable=too-many-instanc
24872544
"private_endpoint_state_for_site_recovery": {"readonly": True},
24882545
"move_state": {"readonly": True},
24892546
"backup_storage_version": {"readonly": True},
2547+
"secure_score": {"readonly": True},
24902548
}
24912549

24922550
_attribute_map = {
@@ -2507,6 +2565,7 @@ class VaultProperties(_serialization.Model): # pylint: disable=too-many-instanc
25072565
"restore_settings": {"key": "restoreSettings", "type": "RestoreSettings"},
25082566
"redundancy_settings": {"key": "redundancySettings", "type": "VaultPropertiesRedundancySettings"},
25092567
"security_settings": {"key": "securitySettings", "type": "SecuritySettings"},
2568+
"secure_score": {"key": "secureScore", "type": "str"},
25102569
}
25112570

25122571
def __init__(
@@ -2559,6 +2618,7 @@ def __init__(
25592618
self.restore_settings = restore_settings
25602619
self.redundancy_settings = redundancy_settings
25612620
self.security_settings = security_settings
2621+
self.secure_score = None
25622622

25632623

25642624
class VaultPropertiesEncryption(_serialization.Model):

sdk/recoveryservices/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/models/_recovery_services_client_enums.py

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,14 @@ class InfrastructureEncryptionState(str, Enum, metaclass=CaseInsensitiveEnumMeta
7474
DISABLED = "Disabled"
7575

7676

77+
class MultiUserAuthorization(str, Enum, metaclass=CaseInsensitiveEnumMeta):
78+
"""MUA Settings of vault."""
79+
80+
INVALID = "Invalid"
81+
ENABLED = "Enabled"
82+
DISABLED = "Disabled"
83+
84+
7785
class PrivateEndpointConnectionStatus(str, Enum, metaclass=CaseInsensitiveEnumMeta):
7886
"""Gets or sets the status."""
7987

@@ -126,6 +134,15 @@ class ResourceMoveState(str, Enum, metaclass=CaseInsensitiveEnumMeta):
126134
PARTIAL_SUCCESS = "PartialSuccess"
127135

128136

137+
class SecureScoreLevel(str, Enum, metaclass=CaseInsensitiveEnumMeta):
138+
"""Secure Score of Recovery Services Vault."""
139+
140+
NONE = "None"
141+
MINIMUM = "Minimum"
142+
ADEQUATE = "Adequate"
143+
MAXIMUM = "Maximum"
144+
145+
129146
class SkuName(str, Enum, metaclass=CaseInsensitiveEnumMeta):
130147
"""Name of SKU is RS0 (Recovery Services 0th version) and the tier is standard tier. They do not
131148
have affect on backend storage redundancy or any other vault settings. To manage storage
@@ -136,6 +153,15 @@ class SkuName(str, Enum, metaclass=CaseInsensitiveEnumMeta):
136153
RS0 = "RS0"
137154

138155

156+
class SoftDeleteState(str, Enum, metaclass=CaseInsensitiveEnumMeta):
157+
"""SoftDeleteState."""
158+
159+
INVALID = "Invalid"
160+
ENABLED = "Enabled"
161+
DISABLED = "Disabled"
162+
ALWAYS_ON = "AlwaysON"
163+
164+
139165
class StandardTierStorageRedundancy(str, Enum, metaclass=CaseInsensitiveEnumMeta):
140166
"""The storage redundancy setting of a vault."""
141167

sdk/recoveryservices/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/operations/_operations.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def build_list_request(**kwargs: Any) -> HttpRequest:
4040
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
4141
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
4242

43-
api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01"))
43+
api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-04-01"))
4444
accept = _headers.pop("Accept", "application/json")
4545

4646
# Construct URL

0 commit comments

Comments
 (0)