Skip to content

Commit 92ea821

Browse files
FumingZhangFumingZhang
committed
fix
1 parent ef15ee2 commit 92ea821

4 files changed

Lines changed: 26 additions & 18 deletions

File tree

‎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/test_aks_commands.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10074,7 +10074,7 @@ def test_aks_create_and_update_ipv6_count(
1007410074
),
1007510075
self.check("networkProfile.ipFamilies", ["IPv4", "IPv6"]),
1007610076
self.check(
10077-
"networkProfile.loadBalancerProfile.managedOutboundIPs.countIpv6", 2
10077+
"networkProfile.loadBalancerProfile.managedOutboundIPs.countIPv6", 2
1007810078
),
1007910079
self.check(
1008010080
"networkProfile.loadBalancerProfile.managedOutboundIPs.count", 1
@@ -10103,7 +10103,7 @@ def test_aks_create_and_update_ipv6_count(
1010310103
),
1010410104
self.check("networkProfile.ipFamilies", ["IPv4", "IPv6"]),
1010510105
self.check(
10106-
"networkProfile.loadBalancerProfile.managedOutboundIPs.countIpv6", 4
10106+
"networkProfile.loadBalancerProfile.managedOutboundIPs.countIPv6", 4
1010710107
),
1010810108
self.check(
1010910109
"networkProfile.loadBalancerProfile.managedOutboundIPs.count", 1

‎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: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ def test_get_load_balancer_managed_outbound_ip_count(self):
507507
)
508508
load_balancer_profile_2 = self.models.load_balancer_models.ManagedClusterLoadBalancerProfile(
509509
managed_outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileManagedOutboundIPs(
510-
count=10, count_ipv6=20
510+
count=10, count_i_pv6=20
511511
),
512512
outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileOutboundIPs(
513513
public_i_ps=[
@@ -548,7 +548,7 @@ def test_get_load_balancer_managed_outbound_ipv6_count(self):
548548
self.assertEqual(ctx_1.get_load_balancer_managed_outbound_ipv6_count(), None)
549549
load_balancer_profile = self.models.load_balancer_models.ManagedClusterLoadBalancerProfile(
550550
managed_outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileManagedOutboundIPs(
551-
count_ipv6=10
551+
count_i_pv6=10
552552
)
553553
)
554554
network_profile = self.models.ContainerServiceNetworkProfile(
@@ -586,7 +586,7 @@ def test_get_load_balancer_managed_outbound_ipv6_count(self):
586586
)
587587
load_balancer_profile_3 = self.models.load_balancer_models.ManagedClusterLoadBalancerProfile(
588588
managed_outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileManagedOutboundIPs(
589-
count=10, count_ipv6=20
589+
count=10, count_i_pv6=20
590590
),
591591
outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileOutboundIPs(
592592
public_i_ps=[
@@ -5077,6 +5077,10 @@ def test_set_up_agentpool_profile(self):
50775077
pod_ip_allocation_mode="DynamicIndividual",
50785078
enable_node_public_ip=True,
50795079
node_public_ip_prefix_id="test_node_public_ip_prefix_id",
5080+
# The new SDK defaults scale_set_priority to None, but the core
5081+
# decorator's set_up_priority_properties always sets it to "Regular"
5082+
# via get_priority() when no explicit priority is passed.
5083+
scale_set_priority="Regular",
50805084
enable_auto_scaling=True,
50815085
min_count=5,
50825086
max_count=20,
@@ -5158,7 +5162,7 @@ def test_set_up_network_profile_preview(self):
51585162

51595163
load_balancer_profile_1 = self.models.load_balancer_models.ManagedClusterLoadBalancerProfile(
51605164
managed_outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileManagedOutboundIPs(
5161-
count_ipv6=3,
5165+
count_i_pv6=3,
51625166
),
51635167
backend_pool_type=CONST_LOAD_BALANCER_BACKEND_POOL_TYPE_NODE_IP,
51645168
)
@@ -6696,6 +6700,10 @@ def test_construct_mc_profile_preview(self):
66966700
enable_node_public_ip=False,
66976701
enable_auto_scaling=False,
66986702
count=3,
6703+
# The new SDK defaults scale_set_priority to None, but the core
6704+
# decorator's set_up_priority_properties always sets it to "Regular"
6705+
# via get_priority() when no explicit priority is passed.
6706+
scale_set_priority="Regular",
66996707
node_taints=[],
67006708
node_initialization_taints=[],
67016709
os_disk_size_gb=0,
@@ -7665,7 +7673,7 @@ def test_update_load_balancer_profile(self):
76657673
network_profile=self.models.ContainerServiceNetworkProfile(
76667674
load_balancer_profile=self.models.load_balancer_models.ManagedClusterLoadBalancerProfile(
76677675
managed_outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileManagedOutboundIPs(
7668-
count=10, count_ipv6=20
7676+
count=10, count_i_pv6=20
76697677
),
76707678
)
76717679
),
@@ -7679,7 +7687,7 @@ def test_update_load_balancer_profile(self):
76797687
self.models.ContainerServiceNetworkProfile(
76807688
load_balancer_profile=self.models.load_balancer_models.ManagedClusterLoadBalancerProfile(
76817689
managed_outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileManagedOutboundIPs(
7682-
count=5, count_ipv6=20
7690+
count=5, count_i_pv6=20
76837691
),
76847692
)
76857693
)
@@ -7705,7 +7713,7 @@ def test_update_load_balancer_profile(self):
77057713
network_profile=self.models.ContainerServiceNetworkProfile(
77067714
load_balancer_profile=self.models.load_balancer_models.ManagedClusterLoadBalancerProfile(
77077715
managed_outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileManagedOutboundIPs(
7708-
count=10, count_ipv6=20
7716+
count=10, count_i_pv6=20
77097717
),
77107718
)
77117719
),
@@ -7719,7 +7727,7 @@ def test_update_load_balancer_profile(self):
77197727
self.models.ContainerServiceNetworkProfile(
77207728
load_balancer_profile=self.models.load_balancer_models.ManagedClusterLoadBalancerProfile(
77217729
managed_outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileManagedOutboundIPs(
7722-
count=10, count_ipv6=5
7730+
count=10, count_i_pv6=5
77237731
),
77247732
)
77257733
)
@@ -7745,7 +7753,7 @@ def test_update_load_balancer_profile(self):
77457753
network_profile=self.models.ContainerServiceNetworkProfile(
77467754
load_balancer_profile=self.models.load_balancer_models.ManagedClusterLoadBalancerProfile(
77477755
managed_outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileManagedOutboundIPs(
7748-
count=10, count_ipv6=20
7756+
count=10, count_i_pv6=20
77497757
),
77507758
)
77517759
),
@@ -7759,7 +7767,7 @@ def test_update_load_balancer_profile(self):
77597767
self.models.ContainerServiceNetworkProfile(
77607768
load_balancer_profile=self.models.load_balancer_models.ManagedClusterLoadBalancerProfile(
77617769
managed_outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileManagedOutboundIPs(
7762-
count=25, count_ipv6=5
7770+
count=25, count_i_pv6=5
77637771
),
77647772
)
77657773
)
@@ -7784,7 +7792,7 @@ def test_update_load_balancer_profile(self):
77847792
network_profile=self.models.ContainerServiceNetworkProfile(
77857793
load_balancer_profile=self.models.load_balancer_models.ManagedClusterLoadBalancerProfile(
77867794
managed_outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileManagedOutboundIPs(
7787-
count=3, count_ipv6=2
7795+
count=3, count_i_pv6=2
77887796
)
77897797
)
77907798
),
@@ -7846,7 +7854,7 @@ def test_update_load_balancer_profile(self):
78467854

78477855
ground_truth_load_balancer_profile_8 = self.models.load_balancer_models.ManagedClusterLoadBalancerProfile(
78487856
managed_outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileManagedOutboundIPs(
7849-
count=10, count_ipv6=5
7857+
count=10, count_i_pv6=5
78507858
),
78517859
)
78527860
ground_truth_network_profile_8 = self.models.ContainerServiceNetworkProfile(

0 commit comments

Comments
 (0)