Skip to content

[Network-Manager] Fix #27299: az network manager group static-member create and az network manager post-commit #6713

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
calvinhzy merged 7 commits into from
Sep 13, 2023
Merged

[Network-Manager] Fix #27299: az network manager group static-member create and az network manager post-commit #6713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ab5e916
fix az network manager group static-member create cross-tenant resour…
calvinhzy Sep 1, 2023
181975c
Merge remote-tracking branch 'upstream/main' into network-manager-fix…
calvinhzy Sep 4, 2023
e50c332
fix az network manager post-commit so it succeeds when no response bo…
calvinhzy Sep 4, 2023
6d27d47
lint
calvinhzy Sep 7, 2023
3e6f2e4
version update
calvinhzy Sep 13, 2023
ab459d8
Merge remote-tracking branch 'upstream/main' into network-manager-fix…
calvinhzy Sep 13, 2023
4324d75
Merge remote-tracking branch 'upstream/main' into network-manager-fix…
calvinhzy Sep 13, 2023
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
5 changes: 5 additions & 0 deletions src/network-manager/HISTORY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

Release History
===============
1.0.0b2
+++++
* `az network manager group static-member create`: Fix cross-tenant --resource-id
* `az network manager post-commit`: Fix when no response body is returned

1.0.0b1
+++++
* Migrate to CodeGen V2
Expand Down
69 changes: 2 additions & 67 deletions src/network-manager/azext_network_manager/aaz/latest/network/manager/_post_commit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class PostCommit(AAZCommand):

def _handler(self, command_args):
super()._handler(command_args)
return self.build_lro_poller(self._execute_operations, self._output)
return self.build_lro_poller(self._execute_operations, None)

_args_schema = None

Expand Down Expand Up @@ -97,10 +97,6 @@ def pre_operations(self):
def post_operations(self):
pass

def _output(self, *args, **kwargs):
result = self.deserialize_output(self.ctx.vars.instance, client_flatten=True)
return result

class NetworkManagerCommitsPost(AAZHttpOperation):
CLIENT_TYPE = "MgmtClient"

Expand Down Expand Up @@ -177,9 +173,6 @@ def header_parameters(self):
**self.serialize_header_param(
"Content-Type", "application/json",
),
**self.serialize_header_param(
"Accept", "application/json",
),
}
return parameters

Expand All @@ -205,69 +198,11 @@ def content(self):
return self.serialize_content(_content_value)

def on_200(self, session):
data = self.deserialize_http_content(session)
self.ctx.set_var(
"instance",
data,
schema_builder=self._build_schema_on_200
)

_schema_on_200 = None

@classmethod
def _build_schema_on_200(cls):
if cls._schema_on_200 is not None:
return cls._schema_on_200

cls._schema_on_200 = AAZObjectType()
_PostCommitHelper._build_schema_network_manager_commit_read(cls._schema_on_200)

return cls._schema_on_200
pass


class _PostCommitHelper:
"""Helper class for PostCommit"""

_schema_network_manager_commit_read = None

@classmethod
def _build_schema_network_manager_commit_read(cls, _schema):
if cls._schema_network_manager_commit_read is not None:
_schema.commit_id = cls._schema_network_manager_commit_read.commit_id
_schema.commit_type = cls._schema_network_manager_commit_read.commit_type
_schema.configuration_ids = cls._schema_network_manager_commit_read.configuration_ids
_schema.target_locations = cls._schema_network_manager_commit_read.target_locations
return

cls._schema_network_manager_commit_read = _schema_network_manager_commit_read = AAZObjectType()

network_manager_commit_read = _schema_network_manager_commit_read
network_manager_commit_read.commit_id = AAZStrType(
serialized_name="commitId",
flags={"read_only": True},
)
network_manager_commit_read.commit_type = AAZStrType(
serialized_name="commitType",
flags={"required": True},
)
network_manager_commit_read.configuration_ids = AAZListType(
serialized_name="configurationIds",
)
network_manager_commit_read.target_locations = AAZListType(
serialized_name="targetLocations",
flags={"required": True},
)

configuration_ids = _schema_network_manager_commit_read.configuration_ids
configuration_ids.Element = AAZStrType()

target_locations = _schema_network_manager_commit_read.target_locations
target_locations.Element = AAZStrType()

_schema.commit_id = cls._schema_network_manager_commit_read.commit_id
_schema.commit_type = cls._schema_network_manager_commit_read.commit_type
_schema.configuration_ids = cls._schema_network_manager_commit_read.configuration_ids
_schema.target_locations = cls._schema_network_manager_commit_read.target_locations


__all__ = ["PostCommit"]
4 changes: 4 additions & 0 deletions src/network-manager/azext_network_manager/commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,7 @@ def load_command_table(self, _):
with self.command_group('network manager security-admin-config rule-collection') as g:
g.custom_command('create', 'network_manager_admin_rule_collection_create')
g.custom_command('update', 'network_manager_admin_rule_collection_update')

with self.command_group("network manager group static-member") as g:
from .custom import GroupStaticMemberCreate
self.command_table["network manager group static-member create"] = GroupStaticMemberCreate(loader=self)
12 changes: 12 additions & 0 deletions src/network-manager/azext_network_manager/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
# pylint: disable=too-many-lines
# pylint: disable=unused-argument
from knack.util import CLIError
from .aaz.latest.network.manager.group.static_member import Create as _GroupStaticMemberCreate


def network_manager_create(cmd,
Expand Down Expand Up @@ -245,3 +246,14 @@ def network_manager_admin_rule_update(cmd,
if direction is not None:
rule['custom']['direction'] = direction
return _RuleUpdate(cli_ctx=cmd.cli_ctx)(command_args=rule)


class GroupStaticMemberCreate(_GroupStaticMemberCreate):
@classmethod
def _build_arguments_schema(cls, *args, **kwargs):
from azure.cli.core.aaz import AAZResourceIdArgFormat
args_schema = super()._build_arguments_schema(*args, **kwargs)
args_schema.resource_id._fmt = AAZResourceIdArgFormat(
template="/subscriptions/{subscription}/resourceGroups/{resource_group}/providers/Microsoft.Network/virtualNetworks/{}",
)
return args_schema
Loading