From f501e7e3d522c885898a9529d87d8282d025ba87 Mon Sep 17 00:00:00 2001 From: Fuming Zhang Date: Wed, 25 May 2022 15:34:14 +0800 Subject: [PATCH 1/5] update appgw test case --- .../tests/latest/test_aks_commands.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py b/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py index 35e0254b9cb..c80f2a92750 100644 --- a/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py +++ b/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py @@ -377,6 +377,14 @@ def test_aks_byo_appgw_with_ingress_appgw_addon(self, resource_group, resource_g self.check('provisioningState', 'Succeeded') ]) + # clean up nsg set by policy, which would block creating appgw + update_subnet = 'network vent subnet update -n appgw-subnet --resource-group={resource_group} --vnet-name {vnet_name} ' \ + '--nsg ""' + self.cmd(update_subnet, checks=[ + self.check('provisioningState', 'Succeeded'), + self.check('networkSecurityGroup', None), + ]) + vnet_id = vnet['newVNet']["id"] assert vnet_id is not None self.kwargs.update({ @@ -391,8 +399,9 @@ def test_aks_byo_appgw_with_ingress_appgw_addon(self, resource_group, resource_g ]) # create app gateway + # add priority since this is a mandatory parameter since 2021-08-01 API version for network operations create_appgw = 'network application-gateway create -n appgw -g {resource_group} ' \ - '--sku Standard_v2 --public-ip-address appgw-ip --subnet {vnet_id}/subnets/appgw-subnet' + '--sku Standard_v2 --public-ip-address appgw-ip --subnet {vnet_id}/subnets/appgw-subnet --priority 1001' self.cmd(create_appgw) # construct group id From 5c4767cf65a22efefd2995db9b062d5a89b615aa Mon Sep 17 00:00:00 2001 From: Fuming Zhang Date: Wed, 25 May 2022 15:36:02 +0800 Subject: [PATCH 2/5] update comment --- .../azext_aks_preview/tests/latest/test_aks_commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py b/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py index c80f2a92750..0c206e6143f 100644 --- a/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py +++ b/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py @@ -377,7 +377,7 @@ def test_aks_byo_appgw_with_ingress_appgw_addon(self, resource_group, resource_g self.check('provisioningState', 'Succeeded') ]) - # clean up nsg set by policy, which would block creating appgw + # clean up nsg set by policy, otherwise would block creating appgw update_subnet = 'network vent subnet update -n appgw-subnet --resource-group={resource_group} --vnet-name {vnet_name} ' \ '--nsg ""' self.cmd(update_subnet, checks=[ From 469cfbbba3606a30855f226c4cc768f703509dee Mon Sep 17 00:00:00 2001 From: Fuming Zhang Date: Wed, 25 May 2022 15:50:20 +0800 Subject: [PATCH 3/5] fix typo --- .../azext_aks_preview/tests/latest/test_aks_commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py b/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py index 0c206e6143f..fa2c0dd4f4a 100644 --- a/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py +++ b/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py @@ -378,7 +378,7 @@ def test_aks_byo_appgw_with_ingress_appgw_addon(self, resource_group, resource_g ]) # clean up nsg set by policy, otherwise would block creating appgw - update_subnet = 'network vent subnet update -n appgw-subnet --resource-group={resource_group} --vnet-name {vnet_name} ' \ + update_subnet = 'network vnet subnet update -n appgw-subnet --resource-group={resource_group} --vnet-name {vnet_name} ' \ '--nsg ""' self.cmd(update_subnet, checks=[ self.check('provisioningState', 'Succeeded'), From e93107a5ff67ddb7408bb1c7a595527c4593f8d4 Mon Sep 17 00:00:00 2001 From: Fuming Zhang Date: Wed, 25 May 2022 16:06:23 +0800 Subject: [PATCH 4/5] format test --- .../azext_aks_preview/tests/latest/test_aks_commands.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py b/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py index fa2c0dd4f4a..cf64dad93f3 100644 --- a/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py +++ b/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py @@ -366,7 +366,7 @@ def test_aks_byo_appgw_with_ingress_appgw_addon(self, resource_group, resource_g # create virtual network create_vnet = 'network vnet create --resource-group={resource_group} --name={vnet_name} ' \ - '--address-prefix 11.0.0.0/16 --subnet-name aks-subnet --subnet-prefix 11.0.0.0/24 -o json' + '--address-prefix 11.0.0.0/16 --subnet-name aks-subnet --subnet-prefix 11.0.0.0/24 -o json' vnet = self.cmd(create_vnet, checks=[ self.check('newVNet.provisioningState', 'Succeeded') ]).get_output_in_json() @@ -419,8 +419,8 @@ def test_aks_byo_appgw_with_ingress_appgw_addon(self, resource_group, resource_g # create aks cluster create_cmd = 'aks create -n {aks_name} -g {resource_group} --enable-managed-identity ' \ '--vnet-subnet-id {vnet_id}/subnets/aks-subnet ' \ - '-a ingress-appgw --appgw-id {appgw_id} ' \ - '--yes --ssh-key-value={ssh_key_value} -o json' + '-a ingress-appgw --appgw-id {appgw_id} --yes ' \ + '--ssh-key-value={ssh_key_value} -o json' aks_cluster = self.cmd(create_cmd, checks=[ self.check('provisioningState', 'Succeeded'), self.check('addonProfiles.ingressApplicationGateway.enabled', True), From 1085924b0497c5c2c26d3bfd6fb90c19d29dd82f Mon Sep 17 00:00:00 2001 From: Fuming Zhang Date: Wed, 25 May 2022 16:07:08 +0800 Subject: [PATCH 5/5] update test matrix --- .../azcli_aks_live_test/configs/cli_matrix_default.json | 3 --- .../azcli_aks_live_test/configs/ext_matrix_default.json | 3 --- 2 files changed, 6 deletions(-) diff --git a/src/aks-preview/azcli_aks_live_test/configs/cli_matrix_default.json b/src/aks-preview/azcli_aks_live_test/configs/cli_matrix_default.json index d28a0910d86..b6b4b2045d8 100644 --- a/src/aks-preview/azcli_aks_live_test/configs/cli_matrix_default.json +++ b/src/aks-preview/azcli_aks_live_test/configs/cli_matrix_default.json @@ -8,9 +8,6 @@ "compatibility issue": [ "test_aks_nodepool_add_with_ossku" ], - "dependency breaking change": [ - "test_aks_byo_appgw_with_ingress_appgw_addon" - ], "need feature registration": [ "test_aks_create_enable_encryption", "test_aks_create_edge_zone", diff --git a/src/aks-preview/azcli_aks_live_test/configs/ext_matrix_default.json b/src/aks-preview/azcli_aks_live_test/configs/ext_matrix_default.json index 8ccfb39a5a1..ebb4fd26e25 100644 --- a/src/aks-preview/azcli_aks_live_test/configs/ext_matrix_default.json +++ b/src/aks-preview/azcli_aks_live_test/configs/ext_matrix_default.json @@ -9,9 +9,6 @@ "test_aks_nodepool_add_with_ossku", "test_aks_create_with_ossku" ], - "dependency breaking change": [ - "test_aks_byo_appgw_with_ingress_appgw_addon" - ], "need feature registration": [ "test_aks_create_with_gitops_addon", "test_aks_enable_addon_with_gitops",