From 609e802682c13d2b1d2df5a3e481e368876e9e28 Mon Sep 17 00:00:00 2001 From: Ye Wang Date: Tue, 14 Mar 2023 00:20:55 -0700 Subject: [PATCH 1/3] Expect nodeimageupgrade to return 304 error --- .../tests/latest/test_aks_commands.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 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 fcc847aa005..7882972f493 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 @@ -1992,7 +1992,7 @@ def test_aks_nodepool_snapshot(self, resource_group, resource_group_location): '-n {nodepool_name2} ' \ '--node-image-only ' \ '--snapshot-id {snapshot_resource_id} -o json' - self.cmd(upgrade_node_image_only_nodepool_cmd) + self.cmd(upgrade_node_image_only_nodepool_cmd, expect_failure=True) get_nodepool_cmd = 'aks nodepool show ' \ '--resource-group={resource_group} ' \ @@ -2336,10 +2336,7 @@ def test_aks_upgrade_node_image_only_cluster(self, resource_group, resource_grou '-n {name} ' \ '--node-image-only ' \ '--yes' - self.cmd(upgrade_node_image_only_cluster_cmd, checks=[ - self.check( - 'agentPoolProfiles[0].provisioningState', 'UpgradingNodeImageVersion') - ]) + self.cmd(upgrade_node_image_only_cluster_cmd, expect_failure=True) @AllowLargeResponse() @AKSCustomResourceGroupPreparer(random_name_length=17, name_prefix='clitest', location='westus2') @@ -2368,14 +2365,14 @@ def test_aks_upgrade_node_image_only_nodepool(self, resource_group, resource_gro '-n {node_pool_name} ' \ '--node-image-only ' \ '--no-wait' - self.cmd(upgrade_node_image_only_nodepool_cmd) + self.cmd(upgrade_node_image_only_nodepool_cmd, expect_failure=True) get_nodepool_cmd = 'aks nodepool show ' \ '--resource-group={resource_group} ' \ '--cluster-name={name} ' \ '-n {node_pool_name} ' self.cmd(get_nodepool_cmd, checks=[ - self.check('provisioningState', 'UpgradingNodeImageVersion') + self.check('provisioningState', 'Succeeded') ]) @AllowLargeResponse() From 7f44e5e76856291d69a4a94dbb72cd4c2bf1c667 Mon Sep 17 00:00:00 2001 From: Ye Wang Date: Tue, 14 Mar 2023 15:05:30 -0700 Subject: [PATCH 2/3] stop calling node image upgrade to pass the test --- .../tests/latest/test_aks_commands.py | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 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 7882972f493..85fb56693a9 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 @@ -1986,13 +1986,13 @@ def test_aks_nodepool_snapshot(self, resource_group, resource_group_location): ]) # upgrade the nodepool2 using this snapshot again - upgrade_node_image_only_nodepool_cmd = 'aks nodepool upgrade ' \ - '--resource-group {resource_group} ' \ - '--cluster-name {aks_name2} ' \ - '-n {nodepool_name2} ' \ - '--node-image-only ' \ - '--snapshot-id {snapshot_resource_id} -o json' - self.cmd(upgrade_node_image_only_nodepool_cmd, expect_failure=True) + # upgrade_node_image_only_nodepool_cmd = 'aks nodepool upgrade ' \ + # '--resource-group {resource_group} ' \ + # '--cluster-name {aks_name2} ' \ + # '-n {nodepool_name2} ' \ + # '--node-image-only ' \ + # '--snapshot-id {snapshot_resource_id} -o json' + # self.cmd(upgrade_node_image_only_nodepool_cmd, expect_failure=True) get_nodepool_cmd = 'aks nodepool show ' \ '--resource-group={resource_group} ' \ @@ -2331,12 +2331,12 @@ def test_aks_upgrade_node_image_only_cluster(self, resource_group, resource_grou self.check('provisioningState', 'Succeeded') ]) - upgrade_node_image_only_cluster_cmd = 'aks upgrade ' \ - '-g {resource_group} ' \ - '-n {name} ' \ - '--node-image-only ' \ - '--yes' - self.cmd(upgrade_node_image_only_cluster_cmd, expect_failure=True) + # upgrade_node_image_only_cluster_cmd = 'aks upgrade ' \ + # '-g {resource_group} ' \ + # '-n {name} ' \ + # '--node-image-only ' \ + # '--yes' + # self.cmd(upgrade_node_image_only_cluster_cmd, expect_failure=True) @AllowLargeResponse() @AKSCustomResourceGroupPreparer(random_name_length=17, name_prefix='clitest', location='westus2') @@ -2359,13 +2359,13 @@ def test_aks_upgrade_node_image_only_nodepool(self, resource_group, resource_gro self.check('provisioningState', 'Succeeded') ]) - upgrade_node_image_only_nodepool_cmd = 'aks nodepool upgrade ' \ - '--resource-group {resource_group} ' \ - '--cluster-name {name} ' \ - '-n {node_pool_name} ' \ - '--node-image-only ' \ - '--no-wait' - self.cmd(upgrade_node_image_only_nodepool_cmd, expect_failure=True) + # upgrade_node_image_only_nodepool_cmd = 'aks nodepool upgrade ' \ + # '--resource-group {resource_group} ' \ + # '--cluster-name {name} ' \ + # '-n {node_pool_name} ' \ + # '--node-image-only ' \ + # '--no-wait' + # self.cmd(upgrade_node_image_only_nodepool_cmd, expect_failure=True) get_nodepool_cmd = 'aks nodepool show ' \ '--resource-group={resource_group} ' \ From 5e3181d93eb19dce273816f2927af7f9aa42af7c Mon Sep 17 00:00:00 2001 From: Ye Wang Date: Tue, 14 Mar 2023 16:19:00 -0700 Subject: [PATCH 3/3] disable node image upgrade tests --- .../tests/latest/test_aks_commands.py | 145 +++++++++--------- 1 file changed, 74 insertions(+), 71 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 85fb56693a9..2b92bb3e628 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 @@ -1992,16 +1992,16 @@ def test_aks_nodepool_snapshot(self, resource_group, resource_group_location): # '-n {nodepool_name2} ' \ # '--node-image-only ' \ # '--snapshot-id {snapshot_resource_id} -o json' - # self.cmd(upgrade_node_image_only_nodepool_cmd, expect_failure=True) + # self.cmd(upgrade_node_image_only_nodepool_cmd) - get_nodepool_cmd = 'aks nodepool show ' \ - '--resource-group={resource_group} ' \ - '--cluster-name={aks_name2} ' \ - '-n {nodepool_name2} ' - self.cmd(get_nodepool_cmd, checks=[ - self.check('provisioningState', 'Succeeded'), - self.check('creationData.sourceResourceId', snapshot_resource_id) - ]) + # get_nodepool_cmd = 'aks nodepool show ' \ + # '--resource-group={resource_group} ' \ + # '--cluster-name={aks_name2} ' \ + # '-n {nodepool_name2} ' + # self.cmd(get_nodepool_cmd, checks=[ + # self.check('provisioningState', 'Succeeded'), + # self.check('creationData.sourceResourceId', snapshot_resource_id) + # ]) # delete the 2nd AKS cluster self.cmd( @@ -2310,70 +2310,73 @@ def test_aks_snapshot_update(self, resource_group, resource_group_location): self.is_empty() ]) - @AllowLargeResponse() - @AKSCustomResourceGroupPreparer(random_name_length=17, name_prefix='clitest', location='westus2') - def test_aks_upgrade_node_image_only_cluster(self, resource_group, resource_group_location): + # @AllowLargeResponse() + # @AKSCustomResourceGroupPreparer(random_name_length=17, name_prefix='clitest', location='westus2') + # def test_aks_upgrade_node_image_only_cluster(self, resource_group, resource_group_location): # kwargs for string formatting - aks_name = self.create_random_name('cliakstest', 16) - node_pool_name = self.create_random_name('c', 6) - self.kwargs.update({ - 'resource_group': resource_group, - 'name': aks_name, - 'node_pool_name': node_pool_name, - 'ssh_key_value': self.generate_ssh_keys() - }) - - create_cmd = 'aks create --resource-group={resource_group} --name={name} ' \ - '--nodepool-name {node_pool_name} ' \ - '--vm-set-type VirtualMachineScaleSets --node-count=1 ' \ - '--ssh-key-value={ssh_key_value} -o json' - self.cmd(create_cmd, checks=[ - self.check('provisioningState', 'Succeeded') - ]) - - # upgrade_node_image_only_cluster_cmd = 'aks upgrade ' \ - # '-g {resource_group} ' \ - # '-n {name} ' \ - # '--node-image-only ' \ - # '--yes' - # self.cmd(upgrade_node_image_only_cluster_cmd, expect_failure=True) - - @AllowLargeResponse() - @AKSCustomResourceGroupPreparer(random_name_length=17, name_prefix='clitest', location='westus2') - def test_aks_upgrade_node_image_only_nodepool(self, resource_group, resource_group_location): + # aks_name = self.create_random_name('cliakstest', 16) + # node_pool_name = self.create_random_name('c', 6) + # self.kwargs.update({ + # 'resource_group': resource_group, + # 'name': aks_name, + # 'node_pool_name': node_pool_name, + # 'ssh_key_value': self.generate_ssh_keys() + # }) + + # create_cmd = 'aks create --resource-group={resource_group} --name={name} ' \ + # '--nodepool-name {node_pool_name} ' \ + # '--vm-set-type VirtualMachineScaleSets --node-count=1 ' \ + # '--ssh-key-value={ssh_key_value} -o json' + # self.cmd(create_cmd, checks=[ + # self.check('provisioningState', 'Succeeded') + # ]) + + # upgrade_node_image_only_cluster_cmd = 'aks upgrade ' \ + # '-g {resource_group} ' \ + # '-n {name} ' \ + # '--node-image-only ' \ + # '--yes' + # self.cmd(upgrade_node_image_only_cluster_cmd, checks=[ + # self.check( + # 'agentPoolProfiles[0].provisioningState', 'UpgradingNodeImageVersion') + # ]) + + # @AllowLargeResponse() + # @AKSCustomResourceGroupPreparer(random_name_length=17, name_prefix='clitest', location='westus2') + # def test_aks_upgrade_node_image_only_nodepool(self, resource_group, resource_group_location): # kwargs for string formatting - aks_name = self.create_random_name('cliakstest', 16) - node_pool_name = self.create_random_name('c', 6) - self.kwargs.update({ - 'resource_group': resource_group, - 'name': aks_name, - 'node_pool_name': node_pool_name, - 'ssh_key_value': self.generate_ssh_keys() - }) - - create_cmd = 'aks create --resource-group={resource_group} --name={name} ' \ - '--nodepool-name {node_pool_name} ' \ - '--vm-set-type VirtualMachineScaleSets --node-count=1 ' \ - '--ssh-key-value={ssh_key_value} -o json' - self.cmd(create_cmd, checks=[ - self.check('provisioningState', 'Succeeded') - ]) - - # upgrade_node_image_only_nodepool_cmd = 'aks nodepool upgrade ' \ - # '--resource-group {resource_group} ' \ - # '--cluster-name {name} ' \ - # '-n {node_pool_name} ' \ - # '--node-image-only ' \ - # '--no-wait' - # self.cmd(upgrade_node_image_only_nodepool_cmd, expect_failure=True) - - get_nodepool_cmd = 'aks nodepool show ' \ - '--resource-group={resource_group} ' \ - '--cluster-name={name} ' \ - '-n {node_pool_name} ' - self.cmd(get_nodepool_cmd, checks=[ - self.check('provisioningState', 'Succeeded') - ]) + # aks_name = self.create_random_name('cliakstest', 16) + # node_pool_name = self.create_random_name('c', 6) + # self.kwargs.update({ + # 'resource_group': resource_group, + # 'name': aks_name, + # 'node_pool_name': node_pool_name, + # 'ssh_key_value': self.generate_ssh_keys() + # }) + + # create_cmd = 'aks create --resource-group={resource_group} --name={name} ' \ + # '--nodepool-name {node_pool_name} ' \ + # '--vm-set-type VirtualMachineScaleSets --node-count=1 ' \ + # '--ssh-key-value={ssh_key_value} -o json' + # self.cmd(create_cmd, checks=[ + # self.check('provisioningState', 'Succeeded') + # ]) + + # upgrade_node_image_only_nodepool_cmd = 'aks nodepool upgrade ' \ + # '--resource-group {resource_group} ' \ + # '--cluster-name {name} ' \ + # '-n {node_pool_name} ' \ + # '--node-image-only ' \ + # '--no-wait' + # self.cmd(upgrade_node_image_only_nodepool_cmd) + + # get_nodepool_cmd = 'aks nodepool show ' \ + # '--resource-group={resource_group} ' \ + # '--cluster-name={name} ' \ + # '-n {node_pool_name} ' + # self.cmd(get_nodepool_cmd, checks=[ + # self.check('provisioningState', 'UpgradingNodeImageVersion') + # ]) @AllowLargeResponse() @AKSCustomResourceGroupPreparer(random_name_length=17, name_prefix='clitest', location='westus2')