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
4 changes: 4 additions & 0 deletions src/elastic-san/HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

Release History
===============
1.3.0
++++++
* `az elastic-san create`: Make `--base-size-tib` and `--extended-capacity-size-tib` optional with default value of 20 and 0

1.2.0b3
++++++
* `az elastic-san volume restore`: Support restoring soft-deleted volume
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,14 @@ def _build_arguments_schema(cls, *args, **kwargs):
arg_group="Properties",
help="Base size of the Elastic San appliance in TiB.",
required=True,
default=20,
)
_args_schema.extended_capacity_size_tib = AAZIntArg(
options=["--extended-size", "--extended-capacity-size-tib"],
arg_group="Properties",
help="Extended size of the Elastic San appliance in TiB.",
required=True,
default=0,
)
_args_schema.public_network_access = AAZStrArg(
options=["--public-network-access"],
Expand Down
4 changes: 4 additions & 0 deletions src/elastic-san/azext_elastic_san/commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,7 @@ def load_command_table(self, _): # pylint: disable=unused-argument
from .custom import VolumeGroupCreate, VolumeGroupUpdate
self.command_table['elastic-san volume-group create'] = VolumeGroupCreate(loader=self)
self.command_table['elastic-san volume-group update'] = VolumeGroupUpdate(loader=self)

with self.command_group('elastic-san'):
from .custom import ElasticSanCreate
self.command_table['elastic-san create'] = ElasticSanCreate(loader=self)
10 changes: 10 additions & 0 deletions src/elastic-san/azext_elastic_san/custom.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
from knack.log import get_logger
from .aaz.latest.elastic_san.volume_group import Create as _VolumeGroupCreate
from .aaz.latest.elastic_san.volume_group import Update as _VolumeGroupUpdate
from .aaz.latest.elastic_san import Create as _ElasticSanCreate

logger = get_logger(__name__)

Expand Down Expand Up @@ -83,3 +84,12 @@ def pre_instance_update(self, instance):
args.encryption_properties.key_vault_properties):
args.encryption_properties.key_vault_properties = \
instance.properties.encryption_properties.key_vault_properties


class ElasticSanCreate(_ElasticSanCreate):
@classmethod
def _build_arguments_schema(cls, *args, **kwargs):
args_schema = super()._build_arguments_schema(*args, **kwargs)
args_schema.base_size_tib._required = False
args_schema.extended_capacity_size_tib._required = False
return args_schema

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ class ElasticSanScenario(ScenarioTest):
@ResourceGroupPreparer(location='eastus2euap', name_prefix='clitest.rg.testelasticsan')
def test_elastic_san_scenarios(self, resource_group):
self.kwargs.update({
"san_name": self.create_random_name('elastic-san', 24)
"san_name": self.create_random_name('elastic-san', 24),
"san_2_name": self.create_random_name('elastic-san', 24)
})
self.cmd('az elastic-san create -n {san_name} -g {rg} --tags {{key1810:aaaa}} -l eastus2euap '
'--base-size-tib 23 --extended-capacity-size-tib 14 '
Expand Down Expand Up @@ -58,6 +59,14 @@ def test_elastic_san_scenarios(self, resource_group):
self.cmd('az elastic-san delete -g {rg} -n {san_name} -y')
time.sleep(20)
self.cmd('az elastic-san list -g {rg}', checks=[JMESPathCheck('length(@)', 0)])
self.cmd('az elastic-san create -n {san_2_name} -g {rg} --tags {{key1810:aaaa}} -l eastus2euap '
'--sku {{name:Premium_LRS,tier:Premium}} --public-network-access Enabled '
'--auto-scale-policy-enforcement Enabled --capacity-unit-scale-up-limit-tib 17 '
'--increase-capacity-unit-by-tib 4 --unused-size-tib 14 --availability-zones 1',
checks=[JMESPathCheck('name', self.kwargs.get('san_2_name', '')),
JMESPathCheck('baseSizeTiB', 20),
JMESPathCheck('extendedCapacitySizeTiB', 0)])
self.cmd('az elastic-san delete -g {rg} -n {san_2_name} -y')

@ResourceGroupPreparer(location='eastus2euap', name_prefix='clitest.rg.testelasticsan.volumegroup')
def test_elastic_san_volume_group_and_volume_scenarios(self, resource_group):
Expand Down
2 changes: 1 addition & 1 deletion src/elastic-san/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@


# HISTORY.rst entry.
VERSION = '1.2.0b3'
VERSION = '1.3.0'

# The full list of classifiers is available at
# https://pypi.python.org/pypi?%3Aaction=list_classifiers
Expand Down
Loading