Skip to content
Merged
Changes from all commits
Commits
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
162 changes: 81 additions & 81 deletions src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -1986,22 +1986,22 @@ 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)

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)
])
# 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)

# 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(
Expand Down Expand Up @@ -2310,73 +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, 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):
# 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)

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')
])
# 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')
Expand Down