Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,7 @@
# Licensed under the MIT License. See License.txt in the project root for license information.
# --------------------------------------------------------------------------------------------
from azure.cli.core.breaking_change import (
register_argument_deprecate,
register_command_group_deprecate,
)
register_argument_deprecate('netappfiles volume create', '--is-default-quota-enabled',
redirect='netappfiles volume quota-rule')
register_argument_deprecate('netappfiles volume update', '--is-default-quota-enabled',
redirect='netappfiles volume quota-rule')
register_argument_deprecate('netappfiles volume create', '--default-group-quota-in-ki-bs',
redirect='netappfiles volume quota-rule')
register_argument_deprecate('netappfiles volume update', '--default-group-quota-in-ki-bs',
redirect='netappfiles volume quota-rule')
register_argument_deprecate('netappfiles volume create', '--default-user-quota-in-ki-bs',
redirect='netappfiles volume quota-rule')
register_argument_deprecate('netappfiles volume update', '--default-user-quota-in-ki-bs',
redirect='netappfiles volume quota-rule')
register_command_group_deprecate('netappfiles subvolume', message='netappfiles subvolume command group is '
'being deprecated and will be removed in a future release.')
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,11 @@ class Create(AAZCommand):
:example: Create an ANF account
az netappfiles account create -g mygroup --name myname -l location --tags testtag1=mytag1 testtag3=mytagg

:example: Create an ANF account enabling CMK encryption
az netappfiles account create -g mygroup --name myname -l location --key-source Microsoft.KeyVault --key-name cmkKey --key-vault-uri https://mykvuri.vault.azure.net/ --keyvault-resource-id myKeyVaultResourceId --identity-type UserAssigned --user-assigned-identity '/subscriptions/xxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourcegroups/myrg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/anf-mi'
:example: Create an ANF account enabling CMK encryption, bash (and zsh)
az netappfiles account create -g mygroup --name myname -l location --key-source Microsoft.KeyVault --key-name cmkKey --key-vault-uri https://mykvuri.vault.azure.net/ --keyvault-resource-id myKeyVaultResourceId --identity-type UserAssigned --user-assigned-identities "'/subscriptions/xxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourcegroups/myrg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/anf-mi'={}" --user-assigned-identity '/subscriptions/xxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourcegroups/myrg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/anf-mi'

:example: Create an ANF account enabling CMK encryption, PowerShell
az netappfiles account create -g mygroup --name myname -l location --key-source Microsoft.KeyVault --key-name cmkKey --key-vault-uri https://mykvuri.vault.azure.net/ --keyvault-resource-id myKeyVaultResourceId --identity-type UserAssigned --user-assigned-identities '''/subscriptions/xxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourcegroups/myrg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/anf-mi''={}' --user-assigned-identity '/subscriptions/xxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourcegroups/myrg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/anf-mi'
"""

_aaz_info = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -296,18 +296,6 @@ def _build_arguments_schema(cls, *args, **kwargs):
min_length=1,
),
)
_args_schema.default_group_quota_in_ki_bs = AAZIntArg(
options=["--default-group-quota", "--default-group-quota-in-ki-bs"],
arg_group="Properties",
help="Default group quota for volume in KiBs. If isDefaultQuotaEnabled is set, the minimum value of 4 KiBs applies.",
default=0,
)
_args_schema.default_user_quota_in_ki_bs = AAZIntArg(
options=["--default-user-quota", "--default-user-quota-in-ki-bs"],
arg_group="Properties",
help="Default user quota for volume in KiBs. If isDefaultQuotaEnabled is set, the minimum value of 4 KiBs applies .",
default=0,
)
_args_schema.delete_base_snapshot = AAZBoolArg(
options=["--delete-base-snapshot"],
arg_group="Properties",
Expand All @@ -320,12 +308,6 @@ def _build_arguments_schema(cls, *args, **kwargs):
default="Disabled",
enum={"Disabled": "Disabled", "Enabled": "Enabled"},
)
_args_schema.is_default_quota_enabled = AAZBoolArg(
options=["--is-def-quota-enabled", "--default-quota-enabled", "--is-default-quota-enabled"],
arg_group="Properties",
help="Specifies if default quota is enabled for the volume.",
default=False,
)
_args_schema.is_large_volume = AAZBoolArg(
options=["--is-large-volume"],
arg_group="Properties",
Expand All @@ -348,7 +330,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
options=["--network-features"],
arg_group="Properties",
help="Basic network, or Standard features available to the volume.",
default="Basic",
default="Standard",
enum={"Basic": "Basic", "Basic_Standard": "Basic_Standard", "Standard": "Standard", "Standard_Basic": "Standard_Basic"},
)
_args_schema.placement_rules = AAZListArg(
Expand Down Expand Up @@ -679,13 +661,10 @@ def content(self):
properties.set_prop("coolnessPeriod", AAZIntType, ".coolness_period")
properties.set_prop("creationToken", AAZStrType, ".creation_token", typ_kwargs={"flags": {"required": True}})
properties.set_prop("dataProtection", AAZObjectType)
properties.set_prop("defaultGroupQuotaInKiBs", AAZIntType, ".default_group_quota_in_ki_bs")
properties.set_prop("defaultUserQuotaInKiBs", AAZIntType, ".default_user_quota_in_ki_bs")
properties.set_prop("deleteBaseSnapshot", AAZBoolType, ".delete_base_snapshot")
properties.set_prop("enableSubvolumes", AAZStrType, ".enable_subvolumes")
properties.set_prop("encryptionKeySource", AAZStrType, ".encryption_key_source")
properties.set_prop("exportPolicy", AAZObjectType)
properties.set_prop("isDefaultQuotaEnabled", AAZBoolType, ".is_default_quota_enabled")
properties.set_prop("isLargeVolume", AAZBoolType, ".is_large_volume")
properties.set_prop("kerberosEnabled", AAZBoolType, ".kerberos_enabled")
properties.set_prop("keyVaultPrivateEndpointResourceId", AAZStrType, ".key_vault_private_endpoint_resource_id")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -286,18 +286,6 @@ def _build_arguments_schema(cls, *args, **kwargs):
minimum=2,
),
)
_args_schema.default_group_quota_in_ki_bs = AAZIntArg(
options=["--default-group-quota", "--default-group-quota-in-ki-bs"],
arg_group="Properties",
help="Default group quota for volume in KiBs. If isDefaultQuotaEnabled is set, the minimum value of 4 KiBs applies.",
nullable=True,
)
_args_schema.default_user_quota_in_ki_bs = AAZIntArg(
options=["--default-user-quota", "--default-user-quota-in-ki-bs"],
arg_group="Properties",
help="Default user quota for volume in KiBs. If isDefaultQuotaEnabled is set, the minimum value of 4 KiBs applies .",
nullable=True,
)
_args_schema.delete_base_snapshot = AAZBoolArg(
options=["--delete-base-snapshot"],
arg_group="Properties",
Expand All @@ -311,12 +299,6 @@ def _build_arguments_schema(cls, *args, **kwargs):
nullable=True,
enum={"Disabled": "Disabled", "Enabled": "Enabled"},
)
_args_schema.is_default_quota_enabled = AAZBoolArg(
options=["--is-def-quota-enabled", "--default-quota-enabled", "--is-default-quota-enabled"],
arg_group="Properties",
help="Specifies if default quota is enabled for the volume.",
nullable=True,
)
_args_schema.placement_rules = AAZListArg(
options=["--placement-rules"],
arg_group="Properties",
Expand Down Expand Up @@ -731,13 +713,10 @@ def _update_instance(self, instance):
properties.set_prop("coolAccessTieringPolicy", AAZStrType, ".cool_access_tiering_policy")
properties.set_prop("coolnessPeriod", AAZIntType, ".coolness_period")
properties.set_prop("dataProtection", AAZObjectType)
properties.set_prop("defaultGroupQuotaInKiBs", AAZIntType, ".default_group_quota_in_ki_bs")
properties.set_prop("defaultUserQuotaInKiBs", AAZIntType, ".default_user_quota_in_ki_bs")
properties.set_prop("deleteBaseSnapshot", AAZBoolType, ".delete_base_snapshot")
properties.set_prop("enableSubvolumes", AAZStrType, ".enable_subvolumes")
properties.set_prop("encryptionKeySource", AAZStrType, ".encryption_key_source")
properties.set_prop("exportPolicy", AAZObjectType)
properties.set_prop("isDefaultQuotaEnabled", AAZBoolType, ".is_default_quota_enabled")
properties.set_prop("keyVaultPrivateEndpointResourceId", AAZStrType, ".key_vault_private_endpoint_resource_id")
properties.set_prop("placementRules", AAZListType, ".placement_rules")
properties.set_prop("protocolTypes", AAZListType, ".protocol_types")
Expand Down
Loading
Loading