Skip to content

{AKS} Fix aks byo appgw test case #4894

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zhoxing-ms merged 5 commits into from
May 25, 2022
Merged

{AKS} Fix aks byo appgw test case #4894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f501e7e
update appgw test case
FumingZhang May 25, 2022
5c4767c
update comment
FumingZhang May 25, 2022
469cfbb
fix typo
FumingZhang May 25, 2022
e93107a
format test
FumingZhang May 25, 2022
1085924
update test matrix
FumingZhang May 25, 2022
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
3 changes: 0 additions & 3 deletions src/aks-preview/azcli_aks_live_test/configs/cli_matrix_default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 0 additions & 3 deletions src/aks-preview/azcli_aks_live_test/configs/ext_matrix_default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
17 changes: 13 additions & 4 deletions src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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, otherwise would block creating appgw
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'),
self.check('networkSecurityGroup', None),
])

vnet_id = vnet['newVNet']["id"]
assert vnet_id is not None
self.kwargs.update({
Expand All @@ -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
Expand All @@ -410,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),
Expand Down