Skip to content

Commit afeb643

Browse files
FumingZhangFumingZhang
committed
update
1 parent 49cc84b commit afeb643

47 files changed

Lines changed: 5236 additions & 5498 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/aks-preview/azext_aks_preview/_loadbalancer.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ def configure_load_balancer_profile(
175175
if managed_outbound_ip_count is not None:
176176
profile.managed_outbound_i_ps.count = managed_outbound_ip_count
177177
if managed_outbound_ipv6_count is not None:
178-
profile.managed_outbound_i_ps.count_ipv6 = managed_outbound_ipv6_count
178+
profile.managed_outbound_i_ps.count_i_pv6 = managed_outbound_ipv6_count
179179
else:
180180
profile.managed_outbound_i_ps = None
181181

‎src/aks-preview/azext_aks_preview/tests/latest/recordings/test_aks_abort.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ interactions:
301301
- AZURECLI/2.53.0 azsdk-python-azure-mgmt-containerservice/28.0.0b Python/3.8.10
302302
(Linux-5.15.0-1051-azure-x86_64-with-glibc2.29)
303303
method: POST
304-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedclusters/cliakstest000002/abort?api-version=2025-10-02-preview
304+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002/abort?api-version=2025-10-02-preview
305305
response:
306306
body:
307307
string: "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002\",\n

‎src/aks-preview/azext_aks_preview/tests/latest/test_agentpool_decorator.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
CONST_NODEPOOL_MODE_SYSTEM,
2323
CONST_NODEPOOL_MODE_USER,
2424
CONST_SCALE_DOWN_MODE_DELETE,
25+
CONST_SCALE_SET_PRIORITY_REGULAR,
2526
CONST_VIRTUAL_MACHINE_SCALE_SETS,
2627
AgentPoolDecoratorMode,
2728
DecoratorMode,
@@ -1245,6 +1246,7 @@ def test_construct_agentpool_profile_preview(self):
12451246
enable_ultra_ssd=False,
12461247
enable_fips=False,
12471248
mode=CONST_NODEPOOL_MODE_SYSTEM,
1249+
scale_set_priority=CONST_SCALE_SET_PRIORITY_REGULAR,
12481250
workload_runtime=CONST_WORKLOAD_RUNTIME_OCI_CONTAINER,
12491251
network_profile=self.models.AgentPoolNetworkProfile(),
12501252
security_profile=ground_truth_security_profile,
@@ -2012,6 +2014,7 @@ def test_construct_agentpool_profile_preview(self):
20122014
enable_fips=False,
20132015
mode=CONST_NODEPOOL_MODE_USER,
20142016
scale_down_mode=CONST_SCALE_DOWN_MODE_DELETE,
2017+
scale_set_priority=CONST_SCALE_SET_PRIORITY_REGULAR,
20152018
workload_runtime=CONST_WORKLOAD_RUNTIME_OCI_CONTAINER,
20162019
network_profile=self.models.AgentPoolNetworkProfile(),
20172020
security_profile=ground_truth_security_profile,
@@ -2145,6 +2148,7 @@ def test_construct_agentpool_profile_preview(self):
21452148
enable_ultra_ssd=False,
21462149
enable_fips=False,
21472150
mode=CONST_NODEPOOL_MODE_SYSTEM,
2151+
scale_set_priority=CONST_SCALE_SET_PRIORITY_REGULAR,
21482152
workload_runtime=CONST_WORKLOAD_RUNTIME_OCI_CONTAINER,
21492153
network_profile=self.models.AgentPoolNetworkProfile(),
21502154
security_profile=ground_truth_security_profile,

‎src/aks-preview/azext_aks_preview/tests/latest/test_loadbalancer.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def test_configure_load_balancer_profile(self):
7474
)
7575

7676
self.assertEqual(p.managed_outbound_i_ps.count, 5)
77-
self.assertEqual(p.managed_outbound_i_ps.count_ipv6, 3)
77+
self.assertEqual(p.managed_outbound_i_ps.count_i_pv6, 3)
7878
self.assertEqual(p.outbound_i_ps, None)
7979
self.assertEqual(p.outbound_ip_prefixes, None)
8080
self.assertEqual(p.allocated_outbound_ports, 80)
@@ -95,7 +95,7 @@ def test_configure_load_balancer_profile(self):
9595
)
9696

9797
self.assertEqual(p.managed_outbound_i_ps.count, 0)
98-
self.assertEqual(p.managed_outbound_i_ps.count_ipv6, 3)
98+
self.assertEqual(p.managed_outbound_i_ps.count_i_pv6, 3)
9999
self.assertEqual(p.outbound_i_ps, None)
100100
self.assertEqual(p.outbound_ip_prefixes, None)
101101
self.assertEqual(p.allocated_outbound_ports, 80)
@@ -152,7 +152,7 @@ def test_configure_load_balancer_profile_error(self):
152152
self.load_balancer_models,
153153
)
154154
self.assertEqual(p.managed_outbound_i_ps.count, 5)
155-
self.assertEqual(p.managed_outbound_i_ps.count_ipv6, 3)
155+
self.assertEqual(p.managed_outbound_i_ps.count_i_pv6, 3)
156156
self.assertEqual(
157157
p.outbound_i_ps.public_i_ps,
158158
[

‎src/aks-preview/azext_aks_preview/tests/latest/test_managed_cluster_decorator.py‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
CONST_PRIVATE_DNS_ZONE_NONE,
5050
CONST_PRIVATE_DNS_ZONE_SYSTEM,
5151
CONST_ROTATION_POLL_INTERVAL,
52+
CONST_SCALE_SET_PRIORITY_REGULAR,
5253
CONST_SECRET_ROTATION_ENABLED,
5354
CONST_VIRTUAL_MACHINE_SCALE_SETS,
5455
CONST_AVAILABILITY_SET,
@@ -507,7 +508,7 @@ def test_get_load_balancer_managed_outbound_ip_count(self):
507508
)
508509
load_balancer_profile_2 = self.models.load_balancer_models.ManagedClusterLoadBalancerProfile(
509510
managed_outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileManagedOutboundIPs(
510-
count=10, count_ipv6=20
511+
count=10, count_i_pv6=20
511512
),
512513
outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileOutboundIPs(
513514
public_i_ps=[
@@ -548,7 +549,7 @@ def test_get_load_balancer_managed_outbound_ipv6_count(self):
548549
self.assertEqual(ctx_1.get_load_balancer_managed_outbound_ipv6_count(), None)
549550
load_balancer_profile = self.models.load_balancer_models.ManagedClusterLoadBalancerProfile(
550551
managed_outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileManagedOutboundIPs(
551-
count_ipv6=10
552+
count_i_pv6=10
552553
)
553554
)
554555
network_profile = self.models.ContainerServiceNetworkProfile(
@@ -586,7 +587,7 @@ def test_get_load_balancer_managed_outbound_ipv6_count(self):
586587
)
587588
load_balancer_profile_3 = self.models.load_balancer_models.ManagedClusterLoadBalancerProfile(
588589
managed_outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileManagedOutboundIPs(
589-
count=10, count_ipv6=20
590+
count=10, count_i_pv6=20
590591
),
591592
outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileOutboundIPs(
592593
public_i_ps=[
@@ -4678,6 +4679,7 @@ def test_set_up_agentpool_profile(self):
46784679
gpu_instance_profile="test_gpu_instance_profile",
46794680
workload_runtime=CONST_WORKLOAD_RUNTIME_OCI_CONTAINER,
46804681
network_profile=self.models.AgentPoolNetworkProfile(),
4682+
scale_set_priority=CONST_SCALE_SET_PRIORITY_REGULAR,
46814683
)
46824684
ground_truth_mc_1 = self.models.ManagedCluster(location="test_location")
46834685
ground_truth_mc_1.agent_pool_profiles = [ground_truth_agentpool_profile_1]
@@ -4733,7 +4735,7 @@ def test_set_up_network_profile_preview(self):
47334735

47344736
load_balancer_profile_1 = self.models.load_balancer_models.ManagedClusterLoadBalancerProfile(
47354737
managed_outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileManagedOutboundIPs(
4736-
count_ipv6=3,
4738+
count_i_pv6=3,
47374739
),
47384740
backend_pool_type=CONST_LOAD_BALANCER_BACKEND_POOL_TYPE_NODE_IP,
47394741
)
@@ -6123,6 +6125,7 @@ def test_construct_mc_profile_preview(self):
61236125
workload_runtime=CONST_WORKLOAD_RUNTIME_OCI_CONTAINER,
61246126
network_profile=self.models.AgentPoolNetworkProfile(),
61256127
security_profile=ground_truth_security_profile,
6128+
scale_set_priority=CONST_SCALE_SET_PRIORITY_REGULAR,
61266129
)
61276130
ssh_config_1 = self.models.ContainerServiceSshConfiguration(
61286131
public_keys=[self.models.ContainerServiceSshPublicKey(key_data=public_key)]
@@ -7079,7 +7082,7 @@ def test_update_load_balancer_profile(self):
70797082
network_profile=self.models.ContainerServiceNetworkProfile(
70807083
load_balancer_profile=self.models.load_balancer_models.ManagedClusterLoadBalancerProfile(
70817084
managed_outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileManagedOutboundIPs(
7082-
count=10, count_ipv6=20
7085+
count=10, count_i_pv6=20
70837086
),
70847087
)
70857088
),
@@ -7093,15 +7096,15 @@ def test_update_load_balancer_profile(self):
70937096
self.models.ContainerServiceNetworkProfile(
70947097
load_balancer_profile=self.models.load_balancer_models.ManagedClusterLoadBalancerProfile(
70957098
managed_outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileManagedOutboundIPs(
7096-
count=5, count_ipv6=20
7099+
count=5, count_i_pv6=20
70977100
),
70987101
)
70997102
)
71007103
),
71017104
)
71027105
self.assertEqual(dec_mc_4, ground_truth_mc_4)
71037106

7104-
# custom value - managed outbound ip, count_ipv6 only
7107+
# custom value - managed outbound ip, count_i_pv6 only
71057108
dec_5 = AKSPreviewManagedClusterUpdateDecorator(
71067109
self.cmd,
71077110
self.client,
@@ -7119,7 +7122,7 @@ def test_update_load_balancer_profile(self):
71197122
network_profile=self.models.ContainerServiceNetworkProfile(
71207123
load_balancer_profile=self.models.load_balancer_models.ManagedClusterLoadBalancerProfile(
71217124
managed_outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileManagedOutboundIPs(
7122-
count=10, count_ipv6=20
7125+
count=10, count_i_pv6=20
71237126
),
71247127
)
71257128
),
@@ -7133,7 +7136,7 @@ def test_update_load_balancer_profile(self):
71337136
self.models.ContainerServiceNetworkProfile(
71347137
load_balancer_profile=self.models.load_balancer_models.ManagedClusterLoadBalancerProfile(
71357138
managed_outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileManagedOutboundIPs(
7136-
count=10, count_ipv6=5
7139+
count=10, count_i_pv6=5
71377140
),
71387141
)
71397142
)
@@ -7159,7 +7162,7 @@ def test_update_load_balancer_profile(self):
71597162
network_profile=self.models.ContainerServiceNetworkProfile(
71607163
load_balancer_profile=self.models.load_balancer_models.ManagedClusterLoadBalancerProfile(
71617164
managed_outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileManagedOutboundIPs(
7162-
count=10, count_ipv6=20
7165+
count=10, count_i_pv6=20
71637166
),
71647167
)
71657168
),
@@ -7173,7 +7176,7 @@ def test_update_load_balancer_profile(self):
71737176
self.models.ContainerServiceNetworkProfile(
71747177
load_balancer_profile=self.models.load_balancer_models.ManagedClusterLoadBalancerProfile(
71757178
managed_outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileManagedOutboundIPs(
7176-
count=25, count_ipv6=5
7179+
count=25, count_i_pv6=5
71777180
),
71787181
)
71797182
)
@@ -7198,7 +7201,7 @@ def test_update_load_balancer_profile(self):
71987201
network_profile=self.models.ContainerServiceNetworkProfile(
71997202
load_balancer_profile=self.models.load_balancer_models.ManagedClusterLoadBalancerProfile(
72007203
managed_outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileManagedOutboundIPs(
7201-
count=3, count_ipv6=2
7204+
count=3, count_i_pv6=2
72027205
)
72037206
)
72047207
),
@@ -7260,7 +7263,7 @@ def test_update_load_balancer_profile(self):
72607263

72617264
ground_truth_load_balancer_profile_8 = self.models.load_balancer_models.ManagedClusterLoadBalancerProfile(
72627265
managed_outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileManagedOutboundIPs(
7263-
count=10, count_ipv6=5
7266+
count=10, count_i_pv6=5
72647267
),
72657268
)
72667269
ground_truth_network_profile_8 = self.models.ContainerServiceNetworkProfile(

0 commit comments

Comments
 (0)