Skip to content

Commit 74a55a7

Browse files
authored
{AKS} Fix API server access profile related test cases (#8723)
1 parent 8d7f731 commit 74a55a7

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

src/aks-preview/azext_aks_preview/managed_cluster_decorator.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3025,6 +3025,12 @@ def set_up_api_server_access_profile(self, mc: ManagedCluster) -> ManagedCluster
30253025
mc.api_server_access_profile = self.models.ManagedClusterAPIServerAccessProfile()
30263026
mc.api_server_access_profile.subnet_id = self.context.get_apiserver_subnet_id()
30273027

3028+
if (
3029+
mc.api_server_access_profile is not None and
3030+
mc.api_server_access_profile.additional_properties is not None
3031+
):
3032+
# remove the additional properties that are set in official azure-cli/acs
3033+
mc.api_server_access_profile.additional_properties = {}
30283034
return mc
30293035

30303036
def build_gitops_addon_profile(self) -> ManagedClusterAddonProfile:

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,16 +86,14 @@
8686
RequiredArgumentMissingError,
8787
UnknownError,
8888
)
89-
from dateutil.parser import parse
90-
9189
from azure.cli.command_modules.acs._consts import (
9290
CONST_OUTBOUND_TYPE_LOAD_BALANCER,
9391
CONST_OUTBOUND_TYPE_MANAGED_NAT_GATEWAY,
94-
CONST_OUTBOUND_TYPE_USER_ASSIGNED_NAT_GATEWAY,
95-
CONST_OUTBOUND_TYPE_USER_DEFINED_ROUTING,
9692
DecoratorEarlyExitException,
9793
DecoratorMode,
9894
)
95+
from dateutil.parser import parse
96+
from deepdiff import DeepDiff
9997

10098
class AKSPreviewManagedClusterModelsTestCase(unittest.TestCase):
10199
def setUp(self):
@@ -4389,6 +4387,7 @@ def test_set_up_api_server_access_profile(self):
43894387
mc_2 = self.models.ManagedCluster(location="test_location")
43904388
dec_2.context.attach_mc(mc_2)
43914389
dec_mc_2 = dec_2.set_up_api_server_access_profile(mc_2)
4390+
dec_mc_2.api_server_access_profile.additional_properties = {}
43924391
ground_truth_api_server_access_profile_2 = (
43934392
self.models.ManagedClusterAPIServerAccessProfile(
43944393
enable_vnet_integration=True,
@@ -4401,7 +4400,7 @@ def test_set_up_api_server_access_profile(self):
44014400
location="test_location",
44024401
api_server_access_profile=ground_truth_api_server_access_profile_2,
44034402
)
4404-
self.assertEqual(dec_mc_2, ground_truth_mc_2)
4403+
self.assertEqual(dec_mc_2, ground_truth_mc_2, DeepDiff(dec_mc_2, ground_truth_mc_2))
44054404

44064405
dec_3 = AKSPreviewManagedClusterCreateDecorator(
44074406
self.cmd,
@@ -4415,6 +4414,7 @@ def test_set_up_api_server_access_profile(self):
44154414
mc_3 = self.models.ManagedCluster(location="test_location")
44164415
dec_3.context.attach_mc(mc_3)
44174416
dec_mc_3 = dec_3.set_up_api_server_access_profile(mc_3)
4417+
dec_mc_3.api_server_access_profile.additional_properties = {}
44184418
ground_truth_api_server_access_profile_3 = (
44194419
self.models.ManagedClusterAPIServerAccessProfile(
44204420
enable_vnet_integration=True,
@@ -4424,7 +4424,7 @@ def test_set_up_api_server_access_profile(self):
44244424
location="test_location",
44254425
api_server_access_profile=ground_truth_api_server_access_profile_3,
44264426
)
4427-
self.assertEqual(dec_mc_3, ground_truth_mc_3)
4427+
self.assertEqual(dec_mc_3, ground_truth_mc_3, DeepDiff(dec_mc_3, ground_truth_mc_3))
44284428

44294429
dec_4 = AKSPreviewManagedClusterCreateDecorator(
44304430
self.cmd,

0 commit comments

Comments
 (0)