From 9fb6e9474af899cd7c6ea1c7e10f2f9b9fbeb52f Mon Sep 17 00:00:00 2001 From: Fuming Zhang Date: Thu, 25 Nov 2021 13:01:02 +0800 Subject: [PATCH 1/4] update gmsa test cases --- .../azext_aks_preview/tests/latest/test_aks_commands.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 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 c9c3b4e23ca..1a22b028462 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 @@ -2868,7 +2868,8 @@ def test_aks_create_with_windows_gmsa(self, resource_group, resource_group_locat '--dns-name-prefix={dns_name_prefix} --node-count=1 ' \ '--windows-admin-username={windows_admin_username} --windows-admin-password={windows_admin_password} ' \ '--load-balancer-sku=standard --vm-set-type=virtualmachinescalesets --network-plugin=azure ' \ - '--ssh-key-value={ssh_key_value} --enable-windows-gmsa --yes' + '--ssh-key-value={ssh_key_value} --enable-windows-gmsa --yes ' \ + '--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/AKSWindowsGmsaPreview' self.cmd(create_cmd, checks=[ self.exists('fqdn'), self.exists('nodeResourceGroup'), @@ -2929,7 +2930,9 @@ def test_aks_update_with_windows_gmsa(self, resource_group, resource_group_locat ]) # update Windows gmsa - self.cmd('aks update --resource-group={resource_group} --name={name} --enable-windows-gmsa --yes', checks=[ + update_cmd = "aks update --resource-group={resource_group} --name={name} --enable-windows-gmsa --yes " \ + "--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/AKSWindowsGmsaPreview" + self.cmd(update_cmd, checks=[ self.check('provisioningState', 'Succeeded'), self.check('windowsProfile.gmsaProfile.enabled', 'True') ]) From c80e40bfee32958bc1357b082ed5687873c046dd Mon Sep 17 00:00:00 2001 From: Fuming Zhang Date: Thu, 25 Nov 2021 14:07:17 +0800 Subject: [PATCH 2/4] update default test matrix --- .../configs/ext_matrix_default.json | 19 ------------------- 1 file changed, 19 deletions(-) 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 6e3b958e62e..73954bc10cf 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 @@ -5,27 +5,10 @@ ] }, "exclude": { - "compatibility issue": [ - "test_aks_nodepool_add_with_ossku", - "test_aks_create_with_ossku" - ], "need additional feature": [ - "test_aks_create_with_azurekeyvaultsecretsprovider_addon", - "test_aks_create_addon_with_azurekeyvaultsecretsprovider_with_secret_rotation", - "test_aks_enable_addon_with_azurekeyvaultsecretsprovider", "test_aks_create_with_gitops_addon", "test_aks_enable_addon_with_gitops", "test_aks_disable_addon_gitops", - "test_aks_enable_addon_with_openservicemesh", - "test_aks_disable_addon_openservicemesh", - "test_aks_addon_disable_openservicemesh", - "test_aks_addon_show_openservicemesh_enabled", - "test_aks_addon_enable_with_openservicemesh", - "test_aks_addon_list_openservicemesh_enabled", - "test_aks_addon_update_with_azurekeyvaultsecretsprovider", - "test_aks_addon_enable_with_azurekeyvaultsecretsprovider", - "test_aks_create_with_auto_upgrade_channel", - "test_aks_disable_local_accounts", "test_aks_create_with_pod_identity_enabled", "test_aks_create_using_azurecni_with_pod_identity_enabled", "test_aks_pod_identity_usage", @@ -38,8 +21,6 @@ "test_aks_create_with_http_proxy_config", "test_aks_nodepool_add_with_workload_runtime", "test_aks_nodepool_add_with_gpu_instance_profile", - "test_aks_create_with_windows_gmsa", - "test_aks_update_with_windows_gmsa", "test_aks_snapshot" ] } From 81edee46df514a33006c9a892af18e0e0540dc85 Mon Sep 17 00:00:00 2001 From: Fuming Zhang Date: Mon, 29 Nov 2021 10:58:54 +0800 Subject: [PATCH 3/4] exclude ossku cases --- .../azcli_aks_live_test/configs/cli_matrix_default.json | 3 +++ .../azcli_aks_live_test/configs/ext_matrix_default.json | 4 ++++ 2 files changed, 7 insertions(+) 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 08b62155e7e..ead69c845c4 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 @@ -5,6 +5,9 @@ ] }, "exclude": { + "compatibility issue": [ + "test_aks_nodepool_add_with_ossku" + ], "need additional feature": [ "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 73954bc10cf..0156a484feb 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 @@ -5,6 +5,10 @@ ] }, "exclude": { + "compatibility issue": [ + "test_aks_nodepool_add_with_ossku", + "test_aks_create_with_ossku" + ], "need additional feature": [ "test_aks_create_with_gitops_addon", "test_aks_enable_addon_with_gitops", From 112d8c23eed735e1ca95a985b3a2ff24816318c2 Mon Sep 17 00:00:00 2001 From: Fuming Zhang Date: Mon, 29 Nov 2021 11:25:06 +0800 Subject: [PATCH 4/4] fix test --- .../azext_aks_preview/tests/latest/test_decorator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/aks-preview/azext_aks_preview/tests/latest/test_decorator.py b/src/aks-preview/azext_aks_preview/tests/latest/test_decorator.py index dcdb350024f..1c330b0f018 100644 --- a/src/aks-preview/azext_aks_preview/tests/latest/test_decorator.py +++ b/src/aks-preview/azext_aks_preview/tests/latest/test_decorator.py @@ -1969,7 +1969,7 @@ def test_construct_preview_mc_profile(self): get_subscription_id=Mock(return_value="1234-5678-9012") ) with patch( - "azure.cli.command_modules.acs.decorator._get_rg_location", + "azure.cli.command_modules.acs.decorator.get_rg_location", return_value="test_location", ), patch( "azure.cli.command_modules.acs.decorator.Profile",