From ab5e9169051a4ad4dbcfdfa343f12ea6d84f2019 Mon Sep 17 00:00:00 2001 From: Zhiyi Huang <17182306+calvinhzy@users.noreply.github.com> Date: Fri, 1 Sep 2023 16:22:50 +0800 Subject: [PATCH 1/4] fix az network manager group static-member create cross-tenant resource_id --- .../azext_network_manager/commands.py | 4 ++ .../azext_network_manager/custom.py | 13 ++++- ...st_network_manager_static_member_crud.yaml | 58 +++++++++---------- 3 files changed, 45 insertions(+), 30 deletions(-) diff --git a/src/network-manager/azext_network_manager/commands.py b/src/network-manager/azext_network_manager/commands.py index 080a7892afa..4982c1cb161 100644 --- a/src/network-manager/azext_network_manager/commands.py +++ b/src/network-manager/azext_network_manager/commands.py @@ -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) \ No newline at end of file diff --git a/src/network-manager/azext_network_manager/custom.py b/src/network-manager/azext_network_manager/custom.py index 45d476c937a..aebc7566da5 100644 --- a/src/network-manager/azext_network_manager/custom.py +++ b/src/network-manager/azext_network_manager/custom.py @@ -10,7 +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, resource_group_name, @@ -245,3 +245,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 diff --git a/src/network-manager/azext_network_manager/tests/latest/recordings/test_network_manager_static_member_crud.yaml b/src/network-manager/azext_network_manager/tests/latest/recordings/test_network_manager_static_member_crud.yaml index e6d58d3b4ec..8a3be7da6e9 100644 --- a/src/network-manager/azext_network_manager/tests/latest/recordings/test_network_manager_static_member_crud.yaml +++ b/src/network-manager/azext_network_manager/tests/latest/recordings/test_network_manager_static_member_crud.yaml @@ -19,13 +19,13 @@ interactions: ParameterSetName: - --name --description --scope-accesses --network-manager-scopes -l --resource-group User-Agent: - - AZURECLI/2.51.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) + - AZURECLI/2.52.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_static_member000001/providers/Microsoft.Network/networkManagers/TestNetworkManager?api-version=2022-01-01 response: body: string: '{"name":"TestNetworkManager","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_static_member000001/providers/Microsoft.Network/networkManagers/TestNetworkManager","location":"eastus2","type":"Microsoft.Network/networkManagers","tags":{},"etag":"","properties":{"description":"My - Test Network Manager","networkManagerScopes":{"managementGroups":[],"subscriptions":["/subscriptions/00000000-0000-0000-0000-000000000000"],"crossTenantScopes":[]},"provisioningState":"Succeeded","networkManagerScopeAccesses":["Connectivity"],"resourceGuid":"9b2622b0-595a-49fc-ac13-6859da1fa7db"},"systemData":{"createdBy":"zhiyihuang@microsoft.com","createdByType":"User","createdAt":"2023-08-28T03:55:13.4964004Z","lastModifiedBy":"zhiyihuang@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2023-08-28T03:55:13.4964004Z"}}' + Test Network Manager","networkManagerScopes":{"managementGroups":[],"subscriptions":["/subscriptions/00000000-0000-0000-0000-000000000000"],"crossTenantScopes":[]},"provisioningState":"Succeeded","networkManagerScopeAccesses":["Connectivity"],"resourceGuid":"e83ddeef-7fb2-4cf1-92f0-24e98ec53695"},"systemData":{"createdBy":"zhiyihuang@microsoft.com","createdByType":"User","createdAt":"2023-09-01T07:08:25.3279665Z","lastModifiedBy":"zhiyihuang@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2023-09-01T07:08:25.3279665Z"}}' headers: cache-control: - no-cache @@ -34,7 +34,7 @@ interactions: content-type: - application/json; charset=utf-8 date: - - Mon, 28 Aug 2023 03:55:13 GMT + - Fri, 01 Sep 2023 07:08:25 GMT expires: - '-1' pragma: @@ -50,9 +50,9 @@ interactions: x-content-type-options: - nosniff x-ms-operation-identifier: - - tenantId=54826b22-38d6-4fb2-bad9-b7b93a3e9c5a,objectId=a7250e3a-0e5e-48e2-9a34-45f1f5e1a91e/eastus2euap/2ec367d5-2e4c-47bf-9b08-6d3b86db3b0b + - tenantId=54826b22-38d6-4fb2-bad9-b7b93a3e9c5a,objectId=a7250e3a-0e5e-48e2-9a34-45f1f5e1a91e/eastus2euap/05b1708e-2881-44ef-872f-c1d959f30516 x-ms-ratelimit-remaining-subscription-writes: - - '1195' + - '1199' status: code: 200 message: OK @@ -74,13 +74,13 @@ interactions: ParameterSetName: - --name --network-manager-name --description -g User-Agent: - - AZURECLI/2.51.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) + - AZURECLI/2.52.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_static_member000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/networkGroups/TestNetworkGroup?api-version=2022-01-01 response: body: string: '{"name":"TestNetworkGroup","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_static_member000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/networkGroups/TestNetworkGroup","type":"Microsoft.Network/networkManagers/networkGroups","etag":"","properties":{"description":"A - sample group","provisioningState":"Succeeded","memberType":"VirtualNetwork","resourceGuid":"e809f8f0-fefd-4619-b606-f0c2d430d80c"},"systemData":{"createdBy":"zhiyihuang@microsoft.com","createdByType":"User","createdAt":"2023-08-28T03:55:15.9537090Z","lastModifiedBy":"zhiyihuang@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2023-08-28T03:55:15.9537090Z"}}' + sample group","provisioningState":"Succeeded","memberType":"VirtualNetwork","resourceGuid":"b45e7917-3357-4297-a59d-fbbe89df55eb"},"systemData":{"createdBy":"zhiyihuang@microsoft.com","createdByType":"User","createdAt":"2023-09-01T07:08:29.1204737Z","lastModifiedBy":"zhiyihuang@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2023-09-01T07:08:29.1204737Z"}}' headers: cache-control: - no-cache @@ -89,7 +89,7 @@ interactions: content-type: - application/json; charset=utf-8 date: - - Mon, 28 Aug 2023 03:55:15 GMT + - Fri, 01 Sep 2023 07:08:29 GMT expires: - '-1' pragma: @@ -105,7 +105,7 @@ interactions: x-content-type-options: - nosniff x-ms-ratelimit-remaining-subscription-writes: - - '1198' + - '1199' status: code: 200 message: OK @@ -127,12 +127,12 @@ interactions: ParameterSetName: - --name --network-group-name --network-manager-name --resource-id -g User-Agent: - - AZURECLI/2.51.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) + - AZURECLI/2.52.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_static_member000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/networkGroups/TestNetworkGroup/staticMembers/TestStaticMember?api-version=2022-01-01 response: body: - string: '{"name":"TestStaticMember","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_static_member000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/networkGroups/TestNetworkGroup/staticMembers/TestStaticMember","type":"Microsoft.Network/networkManagers/networkGroups/staticMembers","etag":"","properties":{"resourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_static_member000001/providers/Microsoft.Network/virtualnetworks/clitest.vn000002","provisioningState":"Updating","location":""},"systemData":{"createdBy":"zhiyihuang@microsoft.com","createdByType":"User","createdAt":"2023-08-28T03:55:17.7620708Z","lastModifiedBy":"zhiyihuang@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2023-08-28T03:55:17.7620708Z"}}' + string: '{"name":"TestStaticMember","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_static_member000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/networkGroups/TestNetworkGroup/staticMembers/TestStaticMember","type":"Microsoft.Network/networkManagers/networkGroups/staticMembers","etag":"","properties":{"resourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_static_member000001/providers/Microsoft.Network/virtualnetworks/clitest.vn000002","provisioningState":"Updating","location":""},"systemData":{"createdBy":"zhiyihuang@microsoft.com","createdByType":"User","createdAt":"2023-09-01T07:08:32.1957203Z","lastModifiedBy":"zhiyihuang@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2023-09-01T07:08:32.1957203Z"}}' headers: cache-control: - no-cache @@ -141,7 +141,7 @@ interactions: content-type: - application/json; charset=utf-8 date: - - Mon, 28 Aug 2023 03:55:17 GMT + - Fri, 01 Sep 2023 07:08:32 GMT expires: - '-1' pragma: @@ -157,7 +157,7 @@ interactions: x-content-type-options: - nosniff x-ms-ratelimit-remaining-subscription-writes: - - '1194' + - '1199' status: code: 200 message: OK @@ -175,12 +175,12 @@ interactions: ParameterSetName: - -g --name --network-group-name --network-manager-name User-Agent: - - AZURECLI/2.51.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) + - AZURECLI/2.52.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_static_member000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/networkGroups/TestNetworkGroup/staticMembers/TestStaticMember?api-version=2022-01-01 response: body: - string: '{"name":"TestStaticMember","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_static_member000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/networkGroups/TestNetworkGroup/staticMembers/TestStaticMember","type":"Microsoft.Network/networkManagers/networkGroups/staticMembers","etag":"\"7000aa50-0000-0200-0000-64ec1aa50000\"","properties":{"resourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_static_member000001/providers/Microsoft.Network/virtualnetworks/clitest.vn000002","provisioningState":"Updating","location":""},"systemData":{"createdBy":"zhiyihuang@microsoft.com","createdByType":"User","createdAt":"2023-08-28T03:55:17.7620708Z","lastModifiedBy":"zhiyihuang@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2023-08-28T03:55:17.7620708Z"}}' + string: '{"name":"TestStaticMember","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_static_member000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/networkGroups/TestNetworkGroup/staticMembers/TestStaticMember","type":"Microsoft.Network/networkManagers/networkGroups/staticMembers","etag":"\"2a01de47-0000-0200-0000-64f18df00000\"","properties":{"resourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_static_member000001/providers/Microsoft.Network/virtualnetworks/clitest.vn000002","provisioningState":"Updating","location":""},"systemData":{"createdBy":"zhiyihuang@microsoft.com","createdByType":"User","createdAt":"2023-09-01T07:08:32.1957203Z","lastModifiedBy":"zhiyihuang@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2023-09-01T07:08:32.1957203Z"}}' headers: cache-control: - no-cache @@ -189,7 +189,7 @@ interactions: content-type: - application/json; charset=utf-8 date: - - Mon, 28 Aug 2023 03:55:18 GMT + - Fri, 01 Sep 2023 07:08:34 GMT expires: - '-1' pragma: @@ -221,21 +221,21 @@ interactions: ParameterSetName: - -g --network-group-name --network-manager-name User-Agent: - - AZURECLI/2.51.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) + - AZURECLI/2.52.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_static_member000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/networkGroups/TestNetworkGroup/staticMembers?api-version=2022-01-01 response: body: - string: '{"nextLink":"","value":[{"name":"TestStaticMember","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_static_member000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/networkGroups/TestNetworkGroup/staticMembers/TestStaticMember","type":"Microsoft.Network/networkManagers/networkGroups/staticMembers","etag":"","properties":{"resourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_static_member000001/providers/Microsoft.Network/virtualnetworks/clitest.vn000002","provisioningState":"Updating","location":""},"systemData":{"createdBy":"zhiyihuang@microsoft.com","createdByType":"User","createdAt":"2023-08-28T03:55:17.7620708Z","lastModifiedBy":"zhiyihuang@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2023-08-28T03:55:17.7620708Z"}}]}' + string: '{"nextLink":"","value":[{"name":"TestStaticMember","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_static_member000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/networkGroups/TestNetworkGroup/staticMembers/TestStaticMember","type":"Microsoft.Network/networkManagers/networkGroups/staticMembers","etag":"","properties":{"resourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_static_member000001/providers/Microsoft.Network/virtualnetworks/clitest.vn000002","provisioningState":"Succeeded","location":"eastus2"},"systemData":{"createdBy":"zhiyihuang@microsoft.com","createdByType":"User","createdAt":"2023-09-01T07:08:32.1957203Z","lastModifiedBy":"zhiyihuang@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2023-09-01T07:08:32.1957203Z"}}]}' headers: cache-control: - no-cache content-length: - - '858' + - '866' content-type: - application/json; charset=utf-8 date: - - Mon, 28 Aug 2023 03:55:21 GMT + - Fri, 01 Sep 2023 07:08:36 GMT expires: - '-1' pragma: @@ -269,7 +269,7 @@ interactions: ParameterSetName: - -g --name --network-group-name --network-manager-name --yes User-Agent: - - AZURECLI/2.51.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) + - AZURECLI/2.52.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) method: DELETE uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_static_member000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/networkGroups/TestNetworkGroup/staticMembers/TestStaticMember?api-version=2022-01-01 response: @@ -281,7 +281,7 @@ interactions: content-length: - '0' date: - - Mon, 28 Aug 2023 03:55:23 GMT + - Fri, 01 Sep 2023 07:08:39 GMT expires: - '-1' pragma: @@ -293,7 +293,7 @@ interactions: x-content-type-options: - nosniff x-ms-ratelimit-remaining-subscription-deletes: - - '14996' + - '14999' status: code: 200 message: OK @@ -313,7 +313,7 @@ interactions: ParameterSetName: - -g --name --network-manager-name --force --yes User-Agent: - - AZURECLI/2.51.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) + - AZURECLI/2.52.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) method: DELETE uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_static_member000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/networkGroups/TestNetworkGroup?force=true&api-version=2022-01-01 response: @@ -325,7 +325,7 @@ interactions: content-length: - '0' date: - - Mon, 28 Aug 2023 03:55:24 GMT + - Fri, 01 Sep 2023 07:08:41 GMT expires: - '-1' pragma: @@ -337,7 +337,7 @@ interactions: x-content-type-options: - nosniff x-ms-ratelimit-remaining-subscription-deletes: - - '14995' + - '14999' status: code: 200 message: OK @@ -357,7 +357,7 @@ interactions: ParameterSetName: - --resource-group --name --force --yes User-Agent: - - AZURECLI/2.51.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) + - AZURECLI/2.52.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) method: DELETE uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_static_member000001/providers/Microsoft.Network/networkManagers/TestNetworkManager?force=true&api-version=2022-01-01 response: @@ -369,7 +369,7 @@ interactions: content-length: - '0' date: - - Mon, 28 Aug 2023 03:55:29 GMT + - Fri, 01 Sep 2023 07:08:45 GMT expires: - '-1' pragma: @@ -381,7 +381,7 @@ interactions: x-content-type-options: - nosniff x-ms-ratelimit-remaining-subscription-deletes: - - '14999' + - '14998' status: code: 200 message: OK From e50c332b38bf749e82c14d084cdf4665068c4617 Mon Sep 17 00:00:00 2001 From: Zhiyi Huang <17182306+calvinhzy@users.noreply.github.com> Date: Mon, 4 Sep 2023 17:53:09 +0800 Subject: [PATCH 2/4] fix az network manager post-commit so it succeeds when no response body is returned --- .../latest/network/manager/_post_commit.py | 69 +---- ...t_network_manager_connect_config_crud.yaml | 259 +++++++++++++++--- .../tests/latest/test_network_scenario.py | 11 +- 3 files changed, 230 insertions(+), 109 deletions(-) diff --git a/src/network-manager/azext_network_manager/aaz/latest/network/manager/_post_commit.py b/src/network-manager/azext_network_manager/aaz/latest/network/manager/_post_commit.py index 76a91007ce7..8934b73ba54 100644 --- a/src/network-manager/azext_network_manager/aaz/latest/network/manager/_post_commit.py +++ b/src/network-manager/azext_network_manager/aaz/latest/network/manager/_post_commit.py @@ -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 @@ -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" @@ -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 @@ -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"] diff --git a/src/network-manager/azext_network_manager/tests/latest/recordings/test_network_manager_connect_config_crud.yaml b/src/network-manager/azext_network_manager/tests/latest/recordings/test_network_manager_connect_config_crud.yaml index 42ff926d554..c9d8528dece 100644 --- a/src/network-manager/azext_network_manager/tests/latest/recordings/test_network_manager_connect_config_crud.yaml +++ b/src/network-manager/azext_network_manager/tests/latest/recordings/test_network_manager_connect_config_crud.yaml @@ -19,13 +19,13 @@ interactions: ParameterSetName: - --name --description --scope-accesses --network-manager-scopes -l --resource-group User-Agent: - - AZURECLI/2.51.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) + - AZURECLI/2.52.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager?api-version=2022-01-01 response: body: string: '{"name":"TestNetworkManager","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager","location":"eastus2","type":"Microsoft.Network/networkManagers","tags":{},"etag":"","properties":{"description":"My - Test Network Manager","networkManagerScopes":{"managementGroups":[],"subscriptions":["/subscriptions/00000000-0000-0000-0000-000000000000"],"crossTenantScopes":[]},"provisioningState":"Succeeded","networkManagerScopeAccesses":["SecurityAdmin","Connectivity"],"resourceGuid":"5825bd6d-f3b0-4ad8-96ce-b6440558b0e9"},"systemData":{"createdBy":"zhiyihuang@microsoft.com","createdByType":"User","createdAt":"2023-08-28T04:04:55.3404395Z","lastModifiedBy":"zhiyihuang@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2023-08-28T04:04:55.3404395Z"}}' + Test Network Manager","networkManagerScopes":{"managementGroups":[],"subscriptions":["/subscriptions/00000000-0000-0000-0000-000000000000"],"crossTenantScopes":[]},"provisioningState":"Succeeded","networkManagerScopeAccesses":["SecurityAdmin","Connectivity"],"resourceGuid":"3a043e39-f75a-4780-9e3b-ae8f4b69a758"},"systemData":{"createdBy":"zhiyihuang@microsoft.com","createdByType":"User","createdAt":"2023-09-04T09:51:10.4380264Z","lastModifiedBy":"zhiyihuang@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2023-09-04T09:51:10.4380264Z"}}' headers: cache-control: - no-cache @@ -34,7 +34,7 @@ interactions: content-type: - application/json; charset=utf-8 date: - - Mon, 28 Aug 2023 04:04:55 GMT + - Mon, 04 Sep 2023 09:51:10 GMT expires: - '-1' pragma: @@ -50,7 +50,7 @@ interactions: x-content-type-options: - nosniff x-ms-operation-identifier: - - tenantId=54826b22-38d6-4fb2-bad9-b7b93a3e9c5a,objectId=a7250e3a-0e5e-48e2-9a34-45f1f5e1a91e/eastus2euap/6f15a8d6-e579-4f45-b6fa-6b632fc115d7 + - tenantId=54826b22-38d6-4fb2-bad9-b7b93a3e9c5a,objectId=a7250e3a-0e5e-48e2-9a34-45f1f5e1a91e/eastus2euap/3f10fd28-c9cc-46c1-a4c7-3ef2f3871c92 x-ms-ratelimit-remaining-subscription-writes: - '1196' status: @@ -74,13 +74,13 @@ interactions: ParameterSetName: - --name --network-manager-name --description -g User-Agent: - - AZURECLI/2.51.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) + - AZURECLI/2.52.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/networkGroups/TestNetworkGroup?api-version=2022-01-01 response: body: string: '{"name":"TestNetworkGroup","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/networkGroups/TestNetworkGroup","type":"Microsoft.Network/networkManagers/networkGroups","etag":"","properties":{"description":"A - sample policy","provisioningState":"Succeeded","memberType":"VirtualNetwork","resourceGuid":"3cf44c92-3fd2-4d14-98cd-5786aca79f99"},"systemData":{"createdBy":"zhiyihuang@microsoft.com","createdByType":"User","createdAt":"2023-08-28T04:04:57.8687786Z","lastModifiedBy":"zhiyihuang@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2023-08-28T04:04:57.8687786Z"}}' + sample policy","provisioningState":"Succeeded","memberType":"VirtualNetwork","resourceGuid":"6c6a3ea8-94f2-4a9d-89ed-8b6be6374a6f"},"systemData":{"createdBy":"zhiyihuang@microsoft.com","createdByType":"User","createdAt":"2023-09-04T09:51:13.3731685Z","lastModifiedBy":"zhiyihuang@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2023-09-04T09:51:13.3731685Z"}}' headers: cache-control: - no-cache @@ -89,7 +89,7 @@ interactions: content-type: - application/json; charset=utf-8 date: - - Mon, 28 Aug 2023 04:04:57 GMT + - Mon, 04 Sep 2023 09:51:13 GMT expires: - '-1' pragma: @@ -105,7 +105,7 @@ interactions: x-content-type-options: - nosniff x-ms-ratelimit-remaining-subscription-writes: - - '1196' + - '1199' status: code: 200 message: OK @@ -127,12 +127,12 @@ interactions: ParameterSetName: - --name --network-group-name --network-manager-name --resource-id -g User-Agent: - - AZURECLI/2.51.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) + - AZURECLI/2.52.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/networkGroups/TestNetworkGroup/staticMembers/TestStaticMember?api-version=2022-01-01 response: body: - string: '{"name":"TestStaticMember","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/networkGroups/TestNetworkGroup/staticMembers/TestStaticMember","type":"Microsoft.Network/networkManagers/networkGroups/staticMembers","etag":"","properties":{"resourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/virtualnetworks/clitest.vn000002","provisioningState":"Updating","location":""},"systemData":{"createdBy":"zhiyihuang@microsoft.com","createdByType":"User","createdAt":"2023-08-28T04:04:59.8308633Z","lastModifiedBy":"zhiyihuang@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2023-08-28T04:04:59.8308633Z"}}' + string: '{"name":"TestStaticMember","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/networkGroups/TestNetworkGroup/staticMembers/TestStaticMember","type":"Microsoft.Network/networkManagers/networkGroups/staticMembers","etag":"","properties":{"resourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/virtualnetworks/clitest.vn000002","provisioningState":"Updating","location":""},"systemData":{"createdBy":"zhiyihuang@microsoft.com","createdByType":"User","createdAt":"2023-09-04T09:51:15.2267234Z","lastModifiedBy":"zhiyihuang@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2023-09-04T09:51:15.2267234Z"}}' headers: cache-control: - no-cache @@ -141,7 +141,7 @@ interactions: content-type: - application/json; charset=utf-8 date: - - Mon, 28 Aug 2023 04:04:59 GMT + - Mon, 04 Sep 2023 09:51:15 GMT expires: - '-1' pragma: @@ -157,7 +157,7 @@ interactions: x-content-type-options: - nosniff x-ms-ratelimit-remaining-subscription-writes: - - '1195' + - '1199' status: code: 200 message: OK @@ -184,13 +184,13 @@ interactions: - --configuration-name --network-manager-name -g --applies-to-groups --connectivity-topology --delete-existing-peering --hub --description --is-global User-Agent: - - AZURECLI/2.51.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) + - AZURECLI/2.52.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/connectivityConfigurations/myTestSecurityConfig?api-version=2022-01-01 response: body: string: '{"name":"myTestSecurityConfig","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/connectivityConfigurations/myTestSecurityConfig","type":"Microsoft.Network/networkManagers/connectivityConfigurations","etag":"","properties":{"description":"Sample - Configuration","connectivityTopology":"HubAndSpoke","hubs":[{"resourceType":"Microsoft.Network/virtualNetworks","resourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/virtualnetworks/clitest.vn000002"}],"appliesToGroups":[{"networkGroupId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/networkGroups/TestNetworkGroup","groupConnectivity":"None","useHubGateway":"True","isGlobal":"False"}],"provisioningState":"Succeeded","deleteExistingPeering":"True","isGlobal":"True","resourceGuid":"f29107fb-ccc5-4a54-876a-19664b9e6467"},"systemData":{"createdBy":"zhiyihuang@microsoft.com","createdByType":"User","createdAt":"2023-08-28T04:05:01.7528453Z","lastModifiedBy":"zhiyihuang@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2023-08-28T04:05:01.7528453Z"}}' + Configuration","connectivityTopology":"HubAndSpoke","hubs":[{"resourceType":"Microsoft.Network/virtualNetworks","resourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/virtualnetworks/clitest.vn000002"}],"appliesToGroups":[{"networkGroupId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/networkGroups/TestNetworkGroup","groupConnectivity":"None","useHubGateway":"True","isGlobal":"False"}],"provisioningState":"Succeeded","deleteExistingPeering":"True","isGlobal":"True","resourceGuid":"04c25731-eaf5-40b7-9af8-b2b1c5810286"},"systemData":{"createdBy":"zhiyihuang@microsoft.com","createdByType":"User","createdAt":"2023-09-04T09:51:18.1348281Z","lastModifiedBy":"zhiyihuang@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2023-09-04T09:51:18.1348281Z"}}' headers: cache-control: - no-cache @@ -199,7 +199,7 @@ interactions: content-type: - application/json; charset=utf-8 date: - - Mon, 28 Aug 2023 04:05:01 GMT + - Mon, 04 Sep 2023 09:51:18 GMT expires: - '-1' pragma: @@ -215,7 +215,7 @@ interactions: x-content-type-options: - nosniff x-ms-ratelimit-remaining-subscription-writes: - - '1192' + - '1199' status: code: 200 message: OK @@ -233,13 +233,13 @@ interactions: ParameterSetName: - --configuration-name --network-manager-name -g User-Agent: - - AZURECLI/2.51.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) + - AZURECLI/2.52.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/connectivityConfigurations/myTestSecurityConfig?api-version=2022-01-01 response: body: - string: '{"name":"myTestSecurityConfig","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/connectivityConfigurations/myTestSecurityConfig","type":"Microsoft.Network/networkManagers/connectivityConfigurations","etag":"\"70003874-0000-0200-0000-64ec1ced0000\"","properties":{"description":"Sample - Configuration","connectivityTopology":"HubAndSpoke","hubs":[{"resourceType":"Microsoft.Network/virtualNetworks","resourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/virtualnetworks/clitest.vn000002"}],"appliesToGroups":[{"networkGroupId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/networkGroups/TestNetworkGroup","groupConnectivity":"None","useHubGateway":"True","isGlobal":"False"}],"provisioningState":"Succeeded","deleteExistingPeering":"True","isGlobal":"True","resourceGuid":"f29107fb-ccc5-4a54-876a-19664b9e6467"},"systemData":{"createdBy":"zhiyihuang@microsoft.com","createdByType":"User","createdAt":"2023-08-28T04:05:01.7528453Z","lastModifiedBy":"zhiyihuang@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2023-08-28T04:05:01.7528453Z"}}' + string: '{"name":"myTestSecurityConfig","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/connectivityConfigurations/myTestSecurityConfig","type":"Microsoft.Network/networkManagers/connectivityConfigurations","etag":"\"d401a7a1-0000-0200-0000-64f5a8960000\"","properties":{"description":"Sample + Configuration","connectivityTopology":"HubAndSpoke","hubs":[{"resourceType":"Microsoft.Network/virtualNetworks","resourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/virtualnetworks/clitest.vn000002"}],"appliesToGroups":[{"networkGroupId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/networkGroups/TestNetworkGroup","groupConnectivity":"None","useHubGateway":"True","isGlobal":"False"}],"provisioningState":"Succeeded","deleteExistingPeering":"True","isGlobal":"True","resourceGuid":"04c25731-eaf5-40b7-9af8-b2b1c5810286"},"systemData":{"createdBy":"zhiyihuang@microsoft.com","createdByType":"User","createdAt":"2023-09-04T09:51:18.1348281Z","lastModifiedBy":"zhiyihuang@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2023-09-04T09:51:18.1348281Z"}}' headers: cache-control: - no-cache @@ -248,7 +248,7 @@ interactions: content-type: - application/json; charset=utf-8 date: - - Mon, 28 Aug 2023 04:05:03 GMT + - Mon, 04 Sep 2023 09:51:19 GMT expires: - '-1' pragma: @@ -266,6 +266,183 @@ interactions: status: code: 200 message: OK +- request: + body: '{"commitType": "Connectivity", "configurationIds": ["/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/connectivityConfigurations/myTestSecurityConfig"], + "targetLocations": ["eastus2"]}' + headers: + Accept: + - '*/*' + Accept-Encoding: + - gzip, deflate + CommandName: + - network manager post-commit + Connection: + - keep-alive + Content-Length: + - '312' + Content-Type: + - application/json + ParameterSetName: + - --network-manager-name --commit-type --target-locations -g --configuration-ids + User-Agent: + - AZURECLI/2.52.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) + method: POST + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/commit?api-version=2022-01-01 + response: + body: + string: '{"configurationIds":["/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/connectivityConfigurations/myTestSecurityConfig"],"targetLocations":["eastus2"],"commitType":"Connectivity","commitId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/commit/bbf29322-d253-446c-8615-7515ca901c02"}' + headers: + cache-control: + - no-cache + content-length: + - '541' + content-type: + - application/json; charset=utf-8 + date: + - Mon, 04 Sep 2023 09:51:21 GMT + expires: + - '-1' + location: + - https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/operationResults/00000000-0000-0000-0000-000000000000?api-version=2022-01-01 + pragma: + - no-cache + server: + - Kestrel + strict-transport-security: + - max-age=31536000; includeSubDomains + x-content-type-options: + - nosniff + x-ms-ratelimit-remaining-subscription-writes: + - '1195' + status: + code: 202 + message: Accepted +- request: + body: null + headers: + Accept: + - '*/*' + Accept-Encoding: + - gzip, deflate + CommandName: + - network manager post-commit + Connection: + - keep-alive + ParameterSetName: + - --network-manager-name --commit-type --target-locations -g --configuration-ids + User-Agent: + - AZURECLI/2.52.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/operationResults/00000000-0000-0000-0000-000000000000?api-version=2022-01-01 + response: + body: + string: '' + headers: + cache-control: + - no-cache + date: + - Mon, 04 Sep 2023 09:51:21 GMT + expires: + - '-1' + pragma: + - no-cache + server: + - Kestrel + strict-transport-security: + - max-age=31536000; includeSubDomains + x-content-type-options: + - nosniff + status: + code: 204 + message: No Content +- request: + body: '{"commitType": "Connectivity", "targetLocations": ["eastus2"]}' + headers: + Accept: + - '*/*' + Accept-Encoding: + - gzip, deflate + CommandName: + - network manager post-commit + Connection: + - keep-alive + Content-Length: + - '62' + Content-Type: + - application/json + ParameterSetName: + - --network-manager-name --commit-type --target-locations -g + User-Agent: + - AZURECLI/2.52.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) + method: POST + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/commit?api-version=2022-01-01 + response: + body: + string: '{"configurationIds":[],"targetLocations":["eastus2"],"commitType":"Connectivity","commitId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/commit/e313051f-d192-4dfd-8e58-c10b4e7cadc9"}' + headers: + cache-control: + - no-cache + content-length: + - '315' + content-type: + - application/json; charset=utf-8 + date: + - Mon, 04 Sep 2023 09:51:24 GMT + expires: + - '-1' + location: + - https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/operationResults/00000000-0000-0000-0000-000000000000?api-version=2022-01-01 + pragma: + - no-cache + server: + - Kestrel + strict-transport-security: + - max-age=31536000; includeSubDomains + x-content-type-options: + - nosniff + x-ms-ratelimit-remaining-subscription-writes: + - '1199' + status: + code: 202 + message: Accepted +- request: + body: null + headers: + Accept: + - '*/*' + Accept-Encoding: + - gzip, deflate + CommandName: + - network manager post-commit + Connection: + - keep-alive + ParameterSetName: + - --network-manager-name --commit-type --target-locations -g + User-Agent: + - AZURECLI/2.52.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/operationResults/00000000-0000-0000-0000-000000000000?api-version=2022-01-01 + response: + body: + string: '' + headers: + cache-control: + - no-cache + date: + - Mon, 04 Sep 2023 09:51:24 GMT + expires: + - '-1' + pragma: + - no-cache + server: + - Kestrel + strict-transport-security: + - max-age=31536000; includeSubDomains + x-content-type-options: + - nosniff + status: + code: 204 + message: No Content - request: body: null headers: @@ -280,13 +457,13 @@ interactions: ParameterSetName: - --configuration-name --network-manager-name -g User-Agent: - - AZURECLI/2.51.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) + - AZURECLI/2.52.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/connectivityConfigurations/myTestSecurityConfig?api-version=2022-01-01 response: body: - string: '{"name":"myTestSecurityConfig","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/connectivityConfigurations/myTestSecurityConfig","type":"Microsoft.Network/networkManagers/connectivityConfigurations","etag":"\"70003874-0000-0200-0000-64ec1ced0000\"","properties":{"description":"Sample - Configuration","connectivityTopology":"HubAndSpoke","hubs":[{"resourceType":"Microsoft.Network/virtualNetworks","resourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/virtualnetworks/clitest.vn000002"}],"appliesToGroups":[{"networkGroupId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/networkGroups/TestNetworkGroup","groupConnectivity":"None","useHubGateway":"True","isGlobal":"False"}],"provisioningState":"Succeeded","deleteExistingPeering":"True","isGlobal":"True","resourceGuid":"f29107fb-ccc5-4a54-876a-19664b9e6467"},"systemData":{"createdBy":"zhiyihuang@microsoft.com","createdByType":"User","createdAt":"2023-08-28T04:05:01.7528453Z","lastModifiedBy":"zhiyihuang@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2023-08-28T04:05:01.7528453Z"}}' + string: '{"name":"myTestSecurityConfig","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/connectivityConfigurations/myTestSecurityConfig","type":"Microsoft.Network/networkManagers/connectivityConfigurations","etag":"\"d401a7a1-0000-0200-0000-64f5a8960000\"","properties":{"description":"Sample + Configuration","connectivityTopology":"HubAndSpoke","hubs":[{"resourceType":"Microsoft.Network/virtualNetworks","resourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/virtualnetworks/clitest.vn000002"}],"appliesToGroups":[{"networkGroupId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/networkGroups/TestNetworkGroup","groupConnectivity":"None","useHubGateway":"True","isGlobal":"False"}],"provisioningState":"Succeeded","deleteExistingPeering":"True","isGlobal":"True","resourceGuid":"04c25731-eaf5-40b7-9af8-b2b1c5810286"},"systemData":{"createdBy":"zhiyihuang@microsoft.com","createdByType":"User","createdAt":"2023-09-04T09:51:18.1348281Z","lastModifiedBy":"zhiyihuang@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2023-09-04T09:51:18.1348281Z"}}' headers: cache-control: - no-cache @@ -295,7 +472,7 @@ interactions: content-type: - application/json; charset=utf-8 date: - - Mon, 28 Aug 2023 04:05:05 GMT + - Mon, 04 Sep 2023 09:51:26 GMT expires: - '-1' pragma: @@ -335,13 +512,13 @@ interactions: ParameterSetName: - --configuration-name --network-manager-name -g User-Agent: - - AZURECLI/2.51.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) + - AZURECLI/2.52.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/connectivityConfigurations/myTestSecurityConfig?api-version=2022-01-01 response: body: string: '{"name":"myTestSecurityConfig","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/connectivityConfigurations/myTestSecurityConfig","type":"Microsoft.Network/networkManagers/connectivityConfigurations","etag":"","properties":{"description":"Sample - Configuration","connectivityTopology":"HubAndSpoke","hubs":[{"resourceType":"Microsoft.Network/virtualNetworks","resourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/virtualnetworks/clitest.vn000002"}],"appliesToGroups":[{"networkGroupId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/networkGroups/TestNetworkGroup","groupConnectivity":"None","useHubGateway":"True","isGlobal":"False"}],"provisioningState":"Succeeded","deleteExistingPeering":"True","isGlobal":"True","resourceGuid":"f29107fb-ccc5-4a54-876a-19664b9e6467"},"systemData":{"createdBy":"zhiyihuang@microsoft.com","createdByType":"User","createdAt":"2023-08-28T04:05:01.7528453Z","lastModifiedBy":"zhiyihuang@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2023-08-28T04:05:05.9454376Z"}}' + Configuration","connectivityTopology":"HubAndSpoke","hubs":[{"resourceType":"Microsoft.Network/virtualNetworks","resourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/virtualnetworks/clitest.vn000002"}],"appliesToGroups":[{"networkGroupId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/networkGroups/TestNetworkGroup","groupConnectivity":"None","useHubGateway":"True","isGlobal":"False"}],"provisioningState":"Succeeded","deleteExistingPeering":"True","isGlobal":"True","resourceGuid":"04c25731-eaf5-40b7-9af8-b2b1c5810286"},"systemData":{"createdBy":"zhiyihuang@microsoft.com","createdByType":"User","createdAt":"2023-09-04T09:51:18.1348281Z","lastModifiedBy":"zhiyihuang@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2023-09-04T09:51:26.7814454Z"}}' headers: cache-control: - no-cache @@ -350,7 +527,7 @@ interactions: content-type: - application/json; charset=utf-8 date: - - Mon, 28 Aug 2023 04:05:05 GMT + - Mon, 04 Sep 2023 09:51:26 GMT expires: - '-1' pragma: @@ -366,7 +543,7 @@ interactions: x-content-type-options: - nosniff x-ms-ratelimit-remaining-subscription-writes: - - '1192' + - '1197' status: code: 200 message: OK @@ -384,13 +561,13 @@ interactions: ParameterSetName: - --network-manager-name -g User-Agent: - - AZURECLI/2.51.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) + - AZURECLI/2.52.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/connectivityConfigurations?api-version=2022-01-01 response: body: - string: '{"nextLink":"","value":[{"name":"myTestSecurityConfig","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/connectivityConfigurations/myTestSecurityConfig","type":"Microsoft.Network/networkManagers/connectivityConfigurations","etag":"\"70008674-0000-0200-0000-64ec1cf20000\"","properties":{"description":"Sample - Configuration","connectivityTopology":"HubAndSpoke","hubs":[{"resourceType":"Microsoft.Network/virtualNetworks","resourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/virtualnetworks/clitest.vn000002"}],"appliesToGroups":[{"networkGroupId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/networkGroups/TestNetworkGroup","groupConnectivity":"None","useHubGateway":"True","isGlobal":"False"}],"provisioningState":"Succeeded","deleteExistingPeering":"True","isGlobal":"True","resourceGuid":"f29107fb-ccc5-4a54-876a-19664b9e6467"},"systemData":{"createdBy":"zhiyihuang@microsoft.com","createdByType":"User","createdAt":"2023-08-28T04:05:01.7528453Z","lastModifiedBy":"zhiyihuang@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2023-08-28T04:05:05.9454376Z"}}]}' + string: '{"nextLink":"","value":[{"name":"myTestSecurityConfig","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/connectivityConfigurations/myTestSecurityConfig","type":"Microsoft.Network/networkManagers/connectivityConfigurations","etag":"\"d401b0a2-0000-0200-0000-64f5a89e0000\"","properties":{"description":"Sample + Configuration","connectivityTopology":"HubAndSpoke","hubs":[{"resourceType":"Microsoft.Network/virtualNetworks","resourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/virtualnetworks/clitest.vn000002"}],"appliesToGroups":[{"networkGroupId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/networkGroups/TestNetworkGroup","groupConnectivity":"None","useHubGateway":"True","isGlobal":"False"}],"provisioningState":"Succeeded","deleteExistingPeering":"True","isGlobal":"True","resourceGuid":"04c25731-eaf5-40b7-9af8-b2b1c5810286"},"systemData":{"createdBy":"zhiyihuang@microsoft.com","createdByType":"User","createdAt":"2023-09-04T09:51:18.1348281Z","lastModifiedBy":"zhiyihuang@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2023-09-04T09:51:26.7814454Z"}}]}' headers: cache-control: - no-cache @@ -399,7 +576,7 @@ interactions: content-type: - application/json; charset=utf-8 date: - - Mon, 28 Aug 2023 04:05:08 GMT + - Mon, 04 Sep 2023 09:51:28 GMT expires: - '-1' pragma: @@ -433,7 +610,7 @@ interactions: ParameterSetName: - --configuration-name --network-manager-name -g --force --yes User-Agent: - - AZURECLI/2.51.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) + - AZURECLI/2.52.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) method: DELETE uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/connectivityConfigurations/myTestSecurityConfig?force=true&api-version=2022-01-01 response: @@ -445,7 +622,7 @@ interactions: content-length: - '0' date: - - Mon, 28 Aug 2023 04:05:10 GMT + - Mon, 04 Sep 2023 09:51:30 GMT expires: - '-1' pragma: @@ -457,7 +634,7 @@ interactions: x-content-type-options: - nosniff x-ms-ratelimit-remaining-subscription-deletes: - - '14997' + - '14999' status: code: 200 message: OK @@ -477,7 +654,7 @@ interactions: ParameterSetName: - -g --name --network-manager-name --force --yes User-Agent: - - AZURECLI/2.51.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) + - AZURECLI/2.52.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) method: DELETE uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/networkGroups/TestNetworkGroup?force=true&api-version=2022-01-01 response: @@ -489,7 +666,7 @@ interactions: content-length: - '0' date: - - Mon, 28 Aug 2023 04:05:12 GMT + - Mon, 04 Sep 2023 09:51:32 GMT expires: - '-1' pragma: @@ -501,7 +678,7 @@ interactions: x-content-type-options: - nosniff x-ms-ratelimit-remaining-subscription-deletes: - - '14995' + - '14999' status: code: 200 message: OK @@ -521,7 +698,7 @@ interactions: ParameterSetName: - --resource-group --name --force --yes User-Agent: - - AZURECLI/2.51.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) + - AZURECLI/2.52.0 (PIP) (AAZ) azsdk-python-core/1.26.0 Python/3.9.13 (Windows-10-10.0.19045-SP0) method: DELETE uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_connect_config_crud000001/providers/Microsoft.Network/networkManagers/TestNetworkManager?force=true&api-version=2022-01-01 response: @@ -533,7 +710,7 @@ interactions: content-length: - '0' date: - - Mon, 28 Aug 2023 04:05:15 GMT + - Mon, 04 Sep 2023 09:51:36 GMT expires: - '-1' pragma: @@ -545,7 +722,7 @@ interactions: x-content-type-options: - nosniff x-ms-ratelimit-remaining-subscription-deletes: - - '14996' + - '14999' status: code: 200 message: OK diff --git a/src/network-manager/azext_network_manager/tests/latest/test_network_scenario.py b/src/network-manager/azext_network_manager/tests/latest/test_network_scenario.py index 87799c13edb..95e442f2331 100644 --- a/src/network-manager/azext_network_manager/tests/latest/test_network_scenario.py +++ b/src/network-manager/azext_network_manager/tests/latest/test_network_scenario.py @@ -390,7 +390,16 @@ def test_network_manager_connect_config_crud(self, virtual_network, resource_gro 'is-global=false use-hub-gateway=true --connectivity-topology "HubAndSpoke" --delete-existing-peering true --hub ' 'resource-id={sub}/resourceGroups/{rg}/providers/Microsoft.Network/virtualnetworks/{virtual_network} ' 'resource-type="Microsoft.Network/virtualNetworks" --description "Sample Configuration" --is-global true') - self.cmd('network manager connect-config show --configuration-name {config_name} --network-manager-name {manager_name} -g {rg}') + config_id = self.cmd('network manager connect-config show --configuration-name {config_name} --network-manager-name {manager_name} -g {rg}').get_output_in_json()["id"] + self.kwargs.update({"config_id": config_id}) + + # test nm connect-config commit + self.cmd('network manager post-commit --network-manager-name {manager_name} --commit-type "Connectivity" ' + '--target-locations "eastus2" -g {rg} --configuration-ids {config_id}') + # test nm connect-config uncommit + self.cmd('network manager post-commit --network-manager-name {manager_name} --commit-type "Connectivity" ' + '--target-locations "eastus2" -g {rg}') + self.cmd('network manager connect-config update --configuration-name {config_name} --network-manager-name {manager_name} -g {rg}') self.cmd('network manager connect-config list --network-manager-name {manager_name} -g {rg}') self.cmd('network manager connect-config delete --configuration-name {config_name} --network-manager-name {manager_name} -g {rg} --force --yes') From 6d27d475b403ed39394edbe49d4d503911e0760b Mon Sep 17 00:00:00 2001 From: Zhiyi Huang <17182306+calvinhzy@users.noreply.github.com> Date: Thu, 7 Sep 2023 15:30:54 +0800 Subject: [PATCH 3/4] lint --- src/network-manager/azext_network_manager/commands.py | 2 +- src/network-manager/azext_network_manager/custom.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/network-manager/azext_network_manager/commands.py b/src/network-manager/azext_network_manager/commands.py index 4982c1cb161..ab0ee45e0b0 100644 --- a/src/network-manager/azext_network_manager/commands.py +++ b/src/network-manager/azext_network_manager/commands.py @@ -31,4 +31,4 @@ def load_command_table(self, _): 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) \ No newline at end of file + self.command_table["network manager group static-member create"] = GroupStaticMemberCreate(loader=self) diff --git a/src/network-manager/azext_network_manager/custom.py b/src/network-manager/azext_network_manager/custom.py index aebc7566da5..bc727c89071 100644 --- a/src/network-manager/azext_network_manager/custom.py +++ b/src/network-manager/azext_network_manager/custom.py @@ -12,6 +12,7 @@ from knack.util import CLIError from .aaz.latest.network.manager.group.static_member import Create as _GroupStaticMemberCreate + def network_manager_create(cmd, resource_group_name, network_manager_name, From 3e6f2e4c22c4a5d5252e784300254375b79f05d2 Mon Sep 17 00:00:00 2001 From: Zhiyi Huang <17182306+calvinhzy@users.noreply.github.com> Date: Wed, 13 Sep 2023 10:20:27 +0800 Subject: [PATCH 4/4] version update --- src/network-manager/HISTORY.rst | 5 +++++ src/network-manager/setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/network-manager/HISTORY.rst b/src/network-manager/HISTORY.rst index 1be511c9502..0ab915e0fc9 100644 --- a/src/network-manager/HISTORY.rst +++ b/src/network-manager/HISTORY.rst @@ -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 diff --git a/src/network-manager/setup.py b/src/network-manager/setup.py index 3d2b6ec85e4..a551c517500 100644 --- a/src/network-manager/setup.py +++ b/src/network-manager/setup.py @@ -10,7 +10,7 @@ from setuptools import setup, find_packages # 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