diff --git a/src/nsp/HISTORY.rst b/src/nsp/HISTORY.rst index 69a754c1c27..87281ebd400 100644 --- a/src/nsp/HISTORY.rst +++ b/src/nsp/HISTORY.rst @@ -4,6 +4,11 @@ Release History =============== =============== +##### 1.0.0b2 +++++++ +No new commands added. Flatten false the properties of the command output. + + ##### 1.0.0b1 ++++++ No new commands added. diff --git a/src/nsp/azext_nsp/aaz/latest/network/perimeter/_create.py b/src/nsp/azext_nsp/aaz/latest/network/perimeter/_create.py index 02aa2ad4f5c..c2feac20a2e 100644 --- a/src/nsp/azext_nsp/aaz/latest/network/perimeter/_create.py +++ b/src/nsp/azext_nsp/aaz/latest/network/perimeter/_create.py @@ -87,7 +87,7 @@ def post_operations(self): pass def _output(self, *args, **kwargs): - result = self.deserialize_output(self.ctx.vars.instance, client_flatten=True) + result = self.deserialize_output(self.ctx.vars.instance, client_flatten=False) return result class NetworkSecurityPerimetersCreateOrUpdate(AAZHttpOperation): @@ -196,9 +196,7 @@ def _build_schema_on_200_201(cls): ) _schema_on_200_201.location = AAZStrType() _schema_on_200_201.name = AAZStrType() - _schema_on_200_201.properties = AAZObjectType( - flags={"client_flatten": True}, - ) + _schema_on_200_201.properties = AAZObjectType() _schema_on_200_201.tags = AAZDictType() _schema_on_200_201.type = AAZStrType( flags={"read_only": True}, diff --git a/src/nsp/azext_nsp/aaz/latest/network/perimeter/_list.py b/src/nsp/azext_nsp/aaz/latest/network/perimeter/_list.py index 832b3d01ea9..3227be10379 100644 --- a/src/nsp/azext_nsp/aaz/latest/network/perimeter/_list.py +++ b/src/nsp/azext_nsp/aaz/latest/network/perimeter/_list.py @@ -80,7 +80,7 @@ def post_operations(self): pass def _output(self, *args, **kwargs): - result = self.deserialize_output(self.ctx.vars.instance.value, client_flatten=True) + result = self.deserialize_output(self.ctx.vars.instance.value, client_flatten=False) next_link = self.deserialize_output(self.ctx.vars.instance.next_link) return result, next_link @@ -181,9 +181,7 @@ def _build_schema_on_200(cls): ) _element.location = AAZStrType() _element.name = AAZStrType() - _element.properties = AAZObjectType( - flags={"client_flatten": True}, - ) + _element.properties = AAZObjectType() _element.tags = AAZDictType() _element.type = AAZStrType( flags={"read_only": True}, @@ -297,9 +295,7 @@ def _build_schema_on_200(cls): ) _element.location = AAZStrType() _element.name = AAZStrType() - _element.properties = AAZObjectType( - flags={"client_flatten": True}, - ) + _element.properties = AAZObjectType() _element.tags = AAZDictType() _element.type = AAZStrType( flags={"read_only": True}, diff --git a/src/nsp/azext_nsp/aaz/latest/network/perimeter/_show.py b/src/nsp/azext_nsp/aaz/latest/network/perimeter/_show.py index 29b6c726932..ecc06fef010 100644 --- a/src/nsp/azext_nsp/aaz/latest/network/perimeter/_show.py +++ b/src/nsp/azext_nsp/aaz/latest/network/perimeter/_show.py @@ -69,7 +69,7 @@ def post_operations(self): pass def _output(self, *args, **kwargs): - result = self.deserialize_output(self.ctx.vars.instance, client_flatten=True) + result = self.deserialize_output(self.ctx.vars.instance, client_flatten=False) return result class NetworkSecurityPerimetersGet(AAZHttpOperation): @@ -158,9 +158,7 @@ def _build_schema_on_200(cls): ) _schema_on_200.location = AAZStrType() _schema_on_200.name = AAZStrType() - _schema_on_200.properties = AAZObjectType( - flags={"client_flatten": True}, - ) + _schema_on_200.properties = AAZObjectType() _schema_on_200.tags = AAZDictType() _schema_on_200.type = AAZStrType( flags={"read_only": True}, diff --git a/src/nsp/azext_nsp/aaz/latest/network/perimeter/association/_create.py b/src/nsp/azext_nsp/aaz/latest/network/perimeter/association/_create.py index 353ed1d8bfb..59ff98dab1e 100644 --- a/src/nsp/azext_nsp/aaz/latest/network/perimeter/association/_create.py +++ b/src/nsp/azext_nsp/aaz/latest/network/perimeter/association/_create.py @@ -132,7 +132,7 @@ def post_operations(self): pass def _output(self, *args, **kwargs): - result = self.deserialize_output(self.ctx.vars.instance, client_flatten=True) + result = self.deserialize_output(self.ctx.vars.instance, client_flatten=False) return result class NspAssociationsCreateOrUpdate(AAZHttpOperation): @@ -214,7 +214,7 @@ def content(self): ) _builder.set_prop("location", AAZStrType, ".location") _builder.set_prop("name", AAZStrType, ".association_name") - _builder.set_prop("properties", AAZObjectType, typ_kwargs={"flags": {"client_flatten": True}}) + _builder.set_prop("properties", AAZObjectType) _builder.set_prop("tags", AAZDictType, ".tags") properties = _builder.get(".properties") @@ -252,9 +252,7 @@ def _build_schema_on_200_201(cls): ) _schema_on_200_201.location = AAZStrType() _schema_on_200_201.name = AAZStrType() - _schema_on_200_201.properties = AAZObjectType( - flags={"client_flatten": True}, - ) + _schema_on_200_201.properties = AAZObjectType() _schema_on_200_201.tags = AAZDictType() _schema_on_200_201.type = AAZStrType( flags={"read_only": True}, diff --git a/src/nsp/azext_nsp/aaz/latest/network/perimeter/association/_list.py b/src/nsp/azext_nsp/aaz/latest/network/perimeter/association/_list.py index 38b43f0baa4..f74d4b6772b 100644 --- a/src/nsp/azext_nsp/aaz/latest/network/perimeter/association/_list.py +++ b/src/nsp/azext_nsp/aaz/latest/network/perimeter/association/_list.py @@ -81,7 +81,7 @@ def post_operations(self): pass def _output(self, *args, **kwargs): - result = self.deserialize_output(self.ctx.vars.instance.value, client_flatten=True) + result = self.deserialize_output(self.ctx.vars.instance.value, client_flatten=False) next_link = self.deserialize_output(self.ctx.vars.instance.next_link) return result, next_link @@ -186,9 +186,7 @@ def _build_schema_on_200(cls): ) _element.location = AAZStrType() _element.name = AAZStrType() - _element.properties = AAZObjectType( - flags={"client_flatten": True}, - ) + _element.properties = AAZObjectType() _element.tags = AAZDictType() _element.type = AAZStrType( flags={"read_only": True}, diff --git a/src/nsp/azext_nsp/aaz/latest/network/perimeter/association/_show.py b/src/nsp/azext_nsp/aaz/latest/network/perimeter/association/_show.py index cc035552bdb..44bcbf22aec 100644 --- a/src/nsp/azext_nsp/aaz/latest/network/perimeter/association/_show.py +++ b/src/nsp/azext_nsp/aaz/latest/network/perimeter/association/_show.py @@ -75,7 +75,7 @@ def post_operations(self): pass def _output(self, *args, **kwargs): - result = self.deserialize_output(self.ctx.vars.instance, client_flatten=True) + result = self.deserialize_output(self.ctx.vars.instance, client_flatten=False) return result class NspAssociationsGet(AAZHttpOperation): @@ -168,9 +168,7 @@ def _build_schema_on_200(cls): ) _schema_on_200.location = AAZStrType() _schema_on_200.name = AAZStrType() - _schema_on_200.properties = AAZObjectType( - flags={"client_flatten": True}, - ) + _schema_on_200.properties = AAZObjectType() _schema_on_200.tags = AAZDictType() _schema_on_200.type = AAZStrType( flags={"read_only": True}, diff --git a/src/nsp/azext_nsp/aaz/latest/network/perimeter/association/_update.py b/src/nsp/azext_nsp/aaz/latest/network/perimeter/association/_update.py index 39e873b5ccf..a789f2ec4cf 100644 --- a/src/nsp/azext_nsp/aaz/latest/network/perimeter/association/_update.py +++ b/src/nsp/azext_nsp/aaz/latest/network/perimeter/association/_update.py @@ -159,7 +159,7 @@ def post_instance_update(self, instance): pass def _output(self, *args, **kwargs): - result = self.deserialize_output(self.ctx.vars.instance, client_flatten=True) + result = self.deserialize_output(self.ctx.vars.instance, client_flatten=False) return result class NspAssociationsGet(AAZHttpOperation): @@ -361,7 +361,7 @@ def _update_instance(self, instance): ) _builder.set_prop("location", AAZStrType, ".location") _builder.set_prop("name", AAZStrType, ".association_name") - _builder.set_prop("properties", AAZObjectType, typ_kwargs={"flags": {"client_flatten": True}}) + _builder.set_prop("properties", AAZObjectType) _builder.set_prop("tags", AAZDictType, ".tags") properties = _builder.get(".properties") @@ -415,9 +415,7 @@ def _build_schema_nsp_association_read(cls, _schema): ) nsp_association_read.location = AAZStrType() nsp_association_read.name = AAZStrType() - nsp_association_read.properties = AAZObjectType( - flags={"client_flatten": True}, - ) + nsp_association_read.properties = AAZObjectType() nsp_association_read.tags = AAZDictType() nsp_association_read.type = AAZStrType( flags={"read_only": True}, diff --git a/src/nsp/azext_nsp/aaz/latest/network/perimeter/association/_wait.py b/src/nsp/azext_nsp/aaz/latest/network/perimeter/association/_wait.py index 84e368e2640..a87336a7539 100644 --- a/src/nsp/azext_nsp/aaz/latest/network/perimeter/association/_wait.py +++ b/src/nsp/azext_nsp/aaz/latest/network/perimeter/association/_wait.py @@ -164,9 +164,7 @@ def _build_schema_on_200(cls): ) _schema_on_200.location = AAZStrType() _schema_on_200.name = AAZStrType() - _schema_on_200.properties = AAZObjectType( - flags={"client_flatten": True}, - ) + _schema_on_200.properties = AAZObjectType() _schema_on_200.tags = AAZDictType() _schema_on_200.type = AAZStrType( flags={"read_only": True}, diff --git a/src/nsp/azext_nsp/aaz/latest/network/perimeter/link/_create.py b/src/nsp/azext_nsp/aaz/latest/network/perimeter/link/_create.py index b04f5b06e0a..7423e2e3a46 100644 --- a/src/nsp/azext_nsp/aaz/latest/network/perimeter/link/_create.py +++ b/src/nsp/azext_nsp/aaz/latest/network/perimeter/link/_create.py @@ -109,7 +109,7 @@ def post_operations(self): pass def _output(self, *args, **kwargs): - result = self.deserialize_output(self.ctx.vars.instance, client_flatten=True) + result = self.deserialize_output(self.ctx.vars.instance, client_flatten=False) return result class NspLinksCreateOrUpdate(AAZHttpOperation): @@ -189,7 +189,7 @@ def content(self): typ=AAZObjectType, typ_kwargs={"flags": {"required": True, "client_flatten": True}} ) - _builder.set_prop("properties", AAZObjectType, typ_kwargs={"flags": {"client_flatten": True}}) + _builder.set_prop("properties", AAZObjectType) properties = _builder.get(".properties") if properties is not None: @@ -235,9 +235,7 @@ def _build_schema_on_200_201(cls): _schema_on_200_201.name = AAZStrType( flags={"read_only": True}, ) - _schema_on_200_201.properties = AAZObjectType( - flags={"client_flatten": True}, - ) + _schema_on_200_201.properties = AAZObjectType() _schema_on_200_201.type = AAZStrType( flags={"read_only": True}, ) diff --git a/src/nsp/azext_nsp/aaz/latest/network/perimeter/link/_list.py b/src/nsp/azext_nsp/aaz/latest/network/perimeter/link/_list.py index 8de295811ca..466d30b4b15 100644 --- a/src/nsp/azext_nsp/aaz/latest/network/perimeter/link/_list.py +++ b/src/nsp/azext_nsp/aaz/latest/network/perimeter/link/_list.py @@ -81,7 +81,7 @@ def post_operations(self): pass def _output(self, *args, **kwargs): - result = self.deserialize_output(self.ctx.vars.instance.value, client_flatten=True) + result = self.deserialize_output(self.ctx.vars.instance.value, client_flatten=False) next_link = self.deserialize_output(self.ctx.vars.instance.next_link) return result, next_link @@ -190,9 +190,7 @@ def _build_schema_on_200(cls): _element.name = AAZStrType( flags={"read_only": True}, ) - _element.properties = AAZObjectType( - flags={"client_flatten": True}, - ) + _element.properties = AAZObjectType() _element.type = AAZStrType( flags={"read_only": True}, ) diff --git a/src/nsp/azext_nsp/aaz/latest/network/perimeter/link/_show.py b/src/nsp/azext_nsp/aaz/latest/network/perimeter/link/_show.py index 5eabdecddd6..b8664f2eab1 100644 --- a/src/nsp/azext_nsp/aaz/latest/network/perimeter/link/_show.py +++ b/src/nsp/azext_nsp/aaz/latest/network/perimeter/link/_show.py @@ -75,7 +75,7 @@ def post_operations(self): pass def _output(self, *args, **kwargs): - result = self.deserialize_output(self.ctx.vars.instance, client_flatten=True) + result = self.deserialize_output(self.ctx.vars.instance, client_flatten=False) return result class NspLinksGet(AAZHttpOperation): @@ -172,9 +172,7 @@ def _build_schema_on_200(cls): _schema_on_200.name = AAZStrType( flags={"read_only": True}, ) - _schema_on_200.properties = AAZObjectType( - flags={"client_flatten": True}, - ) + _schema_on_200.properties = AAZObjectType() _schema_on_200.type = AAZStrType( flags={"read_only": True}, ) diff --git a/src/nsp/azext_nsp/aaz/latest/network/perimeter/link/_update.py b/src/nsp/azext_nsp/aaz/latest/network/perimeter/link/_update.py index 339564b4abd..ea24835842c 100644 --- a/src/nsp/azext_nsp/aaz/latest/network/perimeter/link/_update.py +++ b/src/nsp/azext_nsp/aaz/latest/network/perimeter/link/_update.py @@ -128,7 +128,7 @@ def post_instance_update(self, instance): pass def _output(self, *args, **kwargs): - result = self.deserialize_output(self.ctx.vars.instance, client_flatten=True) + result = self.deserialize_output(self.ctx.vars.instance, client_flatten=False) return result class NspLinksGet(AAZHttpOperation): @@ -328,7 +328,7 @@ def _update_instance(self, instance): value=instance, typ=AAZObjectType ) - _builder.set_prop("properties", AAZObjectType, typ_kwargs={"flags": {"client_flatten": True}}) + _builder.set_prop("properties", AAZObjectType) properties = _builder.get(".properties") if properties is not None: @@ -382,9 +382,7 @@ def _build_schema_nsp_link_read(cls, _schema): nsp_link_read.name = AAZStrType( flags={"read_only": True}, ) - nsp_link_read.properties = AAZObjectType( - flags={"client_flatten": True}, - ) + nsp_link_read.properties = AAZObjectType() nsp_link_read.type = AAZStrType( flags={"read_only": True}, ) diff --git a/src/nsp/azext_nsp/aaz/latest/network/perimeter/link/_wait.py b/src/nsp/azext_nsp/aaz/latest/network/perimeter/link/_wait.py index 72415f3af6e..cec51d5e67b 100644 --- a/src/nsp/azext_nsp/aaz/latest/network/perimeter/link/_wait.py +++ b/src/nsp/azext_nsp/aaz/latest/network/perimeter/link/_wait.py @@ -168,9 +168,7 @@ def _build_schema_on_200(cls): _schema_on_200.name = AAZStrType( flags={"read_only": True}, ) - _schema_on_200.properties = AAZObjectType( - flags={"client_flatten": True}, - ) + _schema_on_200.properties = AAZObjectType() _schema_on_200.type = AAZStrType( flags={"read_only": True}, ) diff --git a/src/nsp/azext_nsp/aaz/latest/network/perimeter/link_reference/_list.py b/src/nsp/azext_nsp/aaz/latest/network/perimeter/link_reference/_list.py index d93c59b0d15..94bba7e6c08 100644 --- a/src/nsp/azext_nsp/aaz/latest/network/perimeter/link_reference/_list.py +++ b/src/nsp/azext_nsp/aaz/latest/network/perimeter/link_reference/_list.py @@ -81,7 +81,7 @@ def post_operations(self): pass def _output(self, *args, **kwargs): - result = self.deserialize_output(self.ctx.vars.instance.value, client_flatten=True) + result = self.deserialize_output(self.ctx.vars.instance.value, client_flatten=False) next_link = self.deserialize_output(self.ctx.vars.instance.next_link) return result, next_link @@ -190,9 +190,7 @@ def _build_schema_on_200(cls): _element.name = AAZStrType( flags={"read_only": True}, ) - _element.properties = AAZObjectType( - flags={"client_flatten": True}, - ) + _element.properties = AAZObjectType() _element.type = AAZStrType( flags={"read_only": True}, ) diff --git a/src/nsp/azext_nsp/aaz/latest/network/perimeter/link_reference/_show.py b/src/nsp/azext_nsp/aaz/latest/network/perimeter/link_reference/_show.py index fa298e171de..7ac36afba71 100644 --- a/src/nsp/azext_nsp/aaz/latest/network/perimeter/link_reference/_show.py +++ b/src/nsp/azext_nsp/aaz/latest/network/perimeter/link_reference/_show.py @@ -75,7 +75,7 @@ def post_operations(self): pass def _output(self, *args, **kwargs): - result = self.deserialize_output(self.ctx.vars.instance, client_flatten=True) + result = self.deserialize_output(self.ctx.vars.instance, client_flatten=False) return result class NspLinkReferencesGet(AAZHttpOperation): @@ -172,9 +172,7 @@ def _build_schema_on_200(cls): _schema_on_200.name = AAZStrType( flags={"read_only": True}, ) - _schema_on_200.properties = AAZObjectType( - flags={"client_flatten": True}, - ) + _schema_on_200.properties = AAZObjectType() _schema_on_200.type = AAZStrType( flags={"read_only": True}, ) diff --git a/src/nsp/azext_nsp/aaz/latest/network/perimeter/link_reference/_wait.py b/src/nsp/azext_nsp/aaz/latest/network/perimeter/link_reference/_wait.py index 97460837924..f1397ec1353 100644 --- a/src/nsp/azext_nsp/aaz/latest/network/perimeter/link_reference/_wait.py +++ b/src/nsp/azext_nsp/aaz/latest/network/perimeter/link_reference/_wait.py @@ -168,9 +168,7 @@ def _build_schema_on_200(cls): _schema_on_200.name = AAZStrType( flags={"read_only": True}, ) - _schema_on_200.properties = AAZObjectType( - flags={"client_flatten": True}, - ) + _schema_on_200.properties = AAZObjectType() _schema_on_200.type = AAZStrType( flags={"read_only": True}, ) diff --git a/src/nsp/azext_nsp/aaz/latest/network/perimeter/onboarded_resources/_list.py b/src/nsp/azext_nsp/aaz/latest/network/perimeter/onboarded_resources/_list.py index abd296f7913..9240b927f17 100644 --- a/src/nsp/azext_nsp/aaz/latest/network/perimeter/onboarded_resources/_list.py +++ b/src/nsp/azext_nsp/aaz/latest/network/perimeter/onboarded_resources/_list.py @@ -64,7 +64,7 @@ def post_operations(self): pass def _output(self, *args, **kwargs): - result = self.deserialize_output(self.ctx.vars.instance.value, client_flatten=True) + result = self.deserialize_output(self.ctx.vars.instance.value, client_flatten=False) next_link = self.deserialize_output(self.ctx.vars.instance.next_link) return result, next_link diff --git a/src/nsp/azext_nsp/aaz/latest/network/perimeter/profile/_create.py b/src/nsp/azext_nsp/aaz/latest/network/perimeter/profile/_create.py index 2d25dad8342..1f406e4a579 100644 --- a/src/nsp/azext_nsp/aaz/latest/network/perimeter/profile/_create.py +++ b/src/nsp/azext_nsp/aaz/latest/network/perimeter/profile/_create.py @@ -92,7 +92,7 @@ def post_operations(self): pass def _output(self, *args, **kwargs): - result = self.deserialize_output(self.ctx.vars.instance, client_flatten=True) + result = self.deserialize_output(self.ctx.vars.instance, client_flatten=False) return result class NspProfilesCreateOrUpdate(AAZHttpOperation): @@ -205,9 +205,7 @@ def _build_schema_on_200_201(cls): ) _schema_on_200_201.location = AAZStrType() _schema_on_200_201.name = AAZStrType() - _schema_on_200_201.properties = AAZObjectType( - flags={"client_flatten": True}, - ) + _schema_on_200_201.properties = AAZObjectType() _schema_on_200_201.tags = AAZDictType() _schema_on_200_201.type = AAZStrType( flags={"read_only": True}, diff --git a/src/nsp/azext_nsp/aaz/latest/network/perimeter/profile/_list.py b/src/nsp/azext_nsp/aaz/latest/network/perimeter/profile/_list.py index b4871d84e8b..2a1e1119d93 100644 --- a/src/nsp/azext_nsp/aaz/latest/network/perimeter/profile/_list.py +++ b/src/nsp/azext_nsp/aaz/latest/network/perimeter/profile/_list.py @@ -81,7 +81,7 @@ def post_operations(self): pass def _output(self, *args, **kwargs): - result = self.deserialize_output(self.ctx.vars.instance.value, client_flatten=True) + result = self.deserialize_output(self.ctx.vars.instance.value, client_flatten=False) next_link = self.deserialize_output(self.ctx.vars.instance.next_link) return result, next_link @@ -186,9 +186,7 @@ def _build_schema_on_200(cls): ) _element.location = AAZStrType() _element.name = AAZStrType() - _element.properties = AAZObjectType( - flags={"client_flatten": True}, - ) + _element.properties = AAZObjectType() _element.tags = AAZDictType() _element.type = AAZStrType( flags={"read_only": True}, diff --git a/src/nsp/azext_nsp/aaz/latest/network/perimeter/profile/_show.py b/src/nsp/azext_nsp/aaz/latest/network/perimeter/profile/_show.py index c732f5ca089..c2597c9f6de 100644 --- a/src/nsp/azext_nsp/aaz/latest/network/perimeter/profile/_show.py +++ b/src/nsp/azext_nsp/aaz/latest/network/perimeter/profile/_show.py @@ -75,7 +75,7 @@ def post_operations(self): pass def _output(self, *args, **kwargs): - result = self.deserialize_output(self.ctx.vars.instance, client_flatten=True) + result = self.deserialize_output(self.ctx.vars.instance, client_flatten=False) return result class NspProfilesGet(AAZHttpOperation): @@ -168,9 +168,7 @@ def _build_schema_on_200(cls): ) _schema_on_200.location = AAZStrType() _schema_on_200.name = AAZStrType() - _schema_on_200.properties = AAZObjectType( - flags={"client_flatten": True}, - ) + _schema_on_200.properties = AAZObjectType() _schema_on_200.tags = AAZDictType() _schema_on_200.type = AAZStrType( flags={"read_only": True}, diff --git a/src/nsp/azext_nsp/aaz/latest/network/perimeter/profile/access_rule/_create.py b/src/nsp/azext_nsp/aaz/latest/network/perimeter/profile/access_rule/_create.py index 3a6690d57eb..368d3763fad 100644 --- a/src/nsp/azext_nsp/aaz/latest/network/perimeter/profile/access_rule/_create.py +++ b/src/nsp/azext_nsp/aaz/latest/network/perimeter/profile/access_rule/_create.py @@ -173,7 +173,7 @@ def post_operations(self): pass def _output(self, *args, **kwargs): - result = self.deserialize_output(self.ctx.vars.instance, client_flatten=True) + result = self.deserialize_output(self.ctx.vars.instance, client_flatten=False) return result class NspAccessRulesCreateOrUpdate(AAZHttpOperation): @@ -259,7 +259,7 @@ def content(self): ) _builder.set_prop("location", AAZStrType, ".location") _builder.set_prop("name", AAZStrType, ".access_rule_name") - _builder.set_prop("properties", AAZObjectType, typ_kwargs={"flags": {"client_flatten": True}}) + _builder.set_prop("properties", AAZObjectType) _builder.set_prop("tags", AAZDictType, ".tags") properties = _builder.get(".properties") @@ -329,9 +329,7 @@ def _build_schema_on_200_201(cls): ) _schema_on_200_201.location = AAZStrType() _schema_on_200_201.name = AAZStrType() - _schema_on_200_201.properties = AAZObjectType( - flags={"client_flatten": True}, - ) + _schema_on_200_201.properties = AAZObjectType() _schema_on_200_201.tags = AAZDictType() _schema_on_200_201.type = AAZStrType( flags={"read_only": True}, diff --git a/src/nsp/azext_nsp/aaz/latest/network/perimeter/profile/access_rule/_list.py b/src/nsp/azext_nsp/aaz/latest/network/perimeter/profile/access_rule/_list.py index d5f9d7a116d..6df2ba63b62 100644 --- a/src/nsp/azext_nsp/aaz/latest/network/perimeter/profile/access_rule/_list.py +++ b/src/nsp/azext_nsp/aaz/latest/network/perimeter/profile/access_rule/_list.py @@ -86,7 +86,7 @@ def post_operations(self): pass def _output(self, *args, **kwargs): - result = self.deserialize_output(self.ctx.vars.instance.value, client_flatten=True) + result = self.deserialize_output(self.ctx.vars.instance.value, client_flatten=False) next_link = self.deserialize_output(self.ctx.vars.instance.next_link) return result, next_link @@ -195,9 +195,7 @@ def _build_schema_on_200(cls): ) _element.location = AAZStrType() _element.name = AAZStrType() - _element.properties = AAZObjectType( - flags={"client_flatten": True}, - ) + _element.properties = AAZObjectType() _element.tags = AAZDictType() _element.type = AAZStrType( flags={"read_only": True}, diff --git a/src/nsp/azext_nsp/aaz/latest/network/perimeter/profile/access_rule/_show.py b/src/nsp/azext_nsp/aaz/latest/network/perimeter/profile/access_rule/_show.py index ab0bbdc56f9..41405d3860d 100644 --- a/src/nsp/azext_nsp/aaz/latest/network/perimeter/profile/access_rule/_show.py +++ b/src/nsp/azext_nsp/aaz/latest/network/perimeter/profile/access_rule/_show.py @@ -81,7 +81,7 @@ def post_operations(self): pass def _output(self, *args, **kwargs): - result = self.deserialize_output(self.ctx.vars.instance, client_flatten=True) + result = self.deserialize_output(self.ctx.vars.instance, client_flatten=False) return result class NspAccessRulesGet(AAZHttpOperation): @@ -178,9 +178,7 @@ def _build_schema_on_200(cls): ) _schema_on_200.location = AAZStrType() _schema_on_200.name = AAZStrType() - _schema_on_200.properties = AAZObjectType( - flags={"client_flatten": True}, - ) + _schema_on_200.properties = AAZObjectType() _schema_on_200.tags = AAZDictType() _schema_on_200.type = AAZStrType( flags={"read_only": True}, diff --git a/src/nsp/azext_nsp/aaz/latest/network/perimeter/profile/access_rule/_update.py b/src/nsp/azext_nsp/aaz/latest/network/perimeter/profile/access_rule/_update.py index bac95741451..5d46f1f6cb3 100644 --- a/src/nsp/azext_nsp/aaz/latest/network/perimeter/profile/access_rule/_update.py +++ b/src/nsp/azext_nsp/aaz/latest/network/perimeter/profile/access_rule/_update.py @@ -15,7 +15,7 @@ "network perimeter profile access-rule update", ) class Update(AAZCommand): - """Updates a network access rule. + """Creates or updates a network access rule. :example: Update access rule az network perimeter profile access-rule update -n MyAccessRule --profile-name MyProfile --perimeter-name MyPerimeter -g MyResourceGroup --address-prefixes "[10.10.0.0/16]" @@ -203,7 +203,7 @@ def post_instance_update(self, instance): pass def _output(self, *args, **kwargs): - result = self.deserialize_output(self.ctx.vars.instance, client_flatten=True) + result = self.deserialize_output(self.ctx.vars.instance, client_flatten=False) return result class NspAccessRulesGet(AAZHttpOperation): @@ -413,7 +413,7 @@ def _update_instance(self, instance): ) _builder.set_prop("location", AAZStrType, ".location") _builder.set_prop("name", AAZStrType, ".access_rule_name") - _builder.set_prop("properties", AAZObjectType, typ_kwargs={"flags": {"client_flatten": True}}) + _builder.set_prop("properties", AAZObjectType) _builder.set_prop("tags", AAZDictType, ".tags") properties = _builder.get(".properties") @@ -493,9 +493,7 @@ def _build_schema_nsp_access_rule_read(cls, _schema): ) nsp_access_rule_read.location = AAZStrType() nsp_access_rule_read.name = AAZStrType() - nsp_access_rule_read.properties = AAZObjectType( - flags={"client_flatten": True}, - ) + nsp_access_rule_read.properties = AAZObjectType() nsp_access_rule_read.tags = AAZDictType() nsp_access_rule_read.type = AAZStrType( flags={"read_only": True}, diff --git a/src/nsp/azext_nsp/azext_metadata.json b/src/nsp/azext_nsp/azext_metadata.json index 0694c632100..c856326fb21 100644 --- a/src/nsp/azext_nsp/azext_metadata.json +++ b/src/nsp/azext_nsp/azext_metadata.json @@ -1,4 +1,4 @@ { - "azext.minCliCoreVersion": "2.57.0", - "azext.isPreview": true + "azext.isPreview": true, + "azext.minCliCoreVersion": "2.61.0" } \ No newline at end of file diff --git a/src/nsp/azext_nsp/tests/latest/test_nsp.py b/src/nsp/azext_nsp/tests/latest/test_nsp.py index 9c71363d41e..bc8bb3420d7 100644 --- a/src/nsp/azext_nsp/tests/latest/test_nsp.py +++ b/src/nsp/azext_nsp/tests/latest/test_nsp.py @@ -60,13 +60,13 @@ def test_nsp_accessrule_crud(self, resource_group): self.cmd('az network perimeter profile access-rule create --name {accessrule_name} --profile-name {profile_name} --perimeter-name {nsp_name} --resource-group {rg} --fqdn "[\'www.abc.com\', \'www.google.com\']" --direction "Outbound"') self.cmd('az network perimeter profile access-rule show --name {accessrule_name} --profile-name {profile_name} --perimeter-name {nsp_name} --resource-group {rg}', checks=[ - self.check('fullyQualifiedDomainNames', "[\'www.abc.com\', \'www.google.com\']") + self.check('properties.fullyQualifiedDomainNames', "[\'www.abc.com\', \'www.google.com\']") ]) self.cmd('az network perimeter profile access-rule update --name {accessrule_name} --profile-name {profile_name} --perimeter-name {nsp_name} --resource-group {rg} --fqdn "[\'www.abc.com\']" --direction "Outbound"') self.cmd('az network perimeter profile access-rule show --name {accessrule_name} --profile-name {profile_name} --perimeter-name {nsp_name} --resource-group {rg}', checks=[ - self.check('fullyQualifiedDomainNames', "[\'www.abc.com\']") + self.check('properties.fullyQualifiedDomainNames', "[\'www.abc.com\']") ]) self.cmd('network perimeter profile access-rule list --perimeter-name {nsp_name} --profile-name {profile_name} --resource-group {rg}') @@ -92,12 +92,12 @@ def test_nsp_accessrule_inbound(self, resource_group): # IP based access rule self.cmd('az network perimeter profile access-rule create --name {ip_accessrule_name} --profile-name {profile_name} --perimeter-name {nsp_name} --resource-group {rg} --address-prefixes "[10.10.0.0/16]"', checks=[ - self.check('addressPrefixes', "['10.10.0.0/16']") + self.check('properties.addressPrefixes', "['10.10.0.0/16']") ]) # Subscription based access rule self.cmd('az network perimeter profile access-rule create --name {sub_accessrule_name} --profile-name {profile_name} --perimeter-name {nsp_name} --resource-group {rg} --subscriptions [0].id="/subscriptions/{sub}"', checks=[ - self.check('subscriptions[0].id', "/subscriptions/{sub}") + self.check('properties.subscriptions[0].id', "/subscriptions/{sub}") ]) """ @@ -105,7 +105,7 @@ def test_nsp_accessrule_inbound(self, resource_group): self.cmd('network perimeter create --name nsp_for_rule -l eastus2euap --resource-group {rg}') self.cmd('az network perimeter profile access-rule create --name {nsp_accessrule_name} --profile-name {profile_name} --perimeter-name {nsp_name} --resource-group {rg} --nsp [0].id="/subscriptions/{sub}/resourceGroups/{rg}/providers/Microsoft.Network/networkSecurityPerimeters/nsp_for_rule"', checks=[ - self.check('networkSecurityPerimeters[0].id', "/subscriptions/{sub}/resourceGroups/{rg}/providers/Microsoft.Network/networkSecurityPerimeters/nsp_for_rule") + self.check('properties.networkSecurityPerimeters[0].id', "/subscriptions/{sub}/resourceGroups/{rg}/providers/Microsoft.Network/networkSecurityPerimeters/nsp_for_rule") ]) """ @@ -117,7 +117,7 @@ def test_nsp_accessrule_inbound(self, resource_group): # ServiceTag based access rule self.cmd('az network perimeter profile access-rule create --name {servicetag_accessrule_name} --profile-name {profile_name} --perimeter-name {nsp_name} --resource-group {rg} --service-tags [MicrosoftPublicIPSpace]', checks=[ - self.check('serviceTags', "['MicrosoftPublicIPSpace']") + self.check('properties.serviceTags', "['MicrosoftPublicIPSpace']") ]) @ResourceGroupPreparer(name_prefix='test_nsp_association_crud', location='eastus2euap') @@ -141,7 +141,7 @@ def test_nsp_association_crud(self, resource_group): '--profile id="/subscriptions/{sub}/resourceGroups/{rg}/providers/Microsoft.Network/networkSecurityPerimeters/{nsp_name}/profiles/{profile_name}"') self.cmd('network perimeter association show --name {association_name} --perimeter-name {nsp_name} --resource-group {rg}', checks=[ - self.check('accessMode', 'Learning') + self.check('properties.accessMode', 'Learning') ]) self.cmd('network perimeter association update --name {association_name} --perimeter-name {nsp_name} --resource-group {rg} --access-mode Enforced ' @@ -149,7 +149,7 @@ def test_nsp_association_crud(self, resource_group): '--profile id="/subscriptions/{sub}/resourceGroups/{rg}/providers/Microsoft.Network/networkSecurityPerimeters/{nsp_name}/profiles/{profile_name}"') self.cmd('network perimeter association show --name {association_name} --perimeter-name {nsp_name} --resource-group {rg}', checks=[ - self.check('accessMode', 'Enforced') + self.check('properties.accessMode', 'Enforced') ]) self.cmd('network perimeter association list --perimeter-name {nsp_name} --resource-group {rg}') diff --git a/src/nsp/setup.py b/src/nsp/setup.py index e2d00398ada..384481f0ec8 100644 --- a/src/nsp/setup.py +++ b/src/nsp/setup.py @@ -10,7 +10,7 @@ # HISTORY.rst entry. -VERSION = '1.0.0b1' +VERSION = '1.0.0b2' # The full list of classifiers is available at # https://pypi.python.org/pypi?%3Aaction=list_classifiers