Skip to content

{AKS} Fix API server access profile related test cases #8723

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
yanzhudd merged 1 commit into from
May 8, 2025
Merged

{AKS} Fix API server access profile related test cases #8723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions src/aks-preview/azext_aks_preview/managed_cluster_decorator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3025,6 +3025,12 @@ def set_up_api_server_access_profile(self, mc: ManagedCluster) -> ManagedCluster
mc.api_server_access_profile = self.models.ManagedClusterAPIServerAccessProfile()
mc.api_server_access_profile.subnet_id = self.context.get_apiserver_subnet_id()

if (
mc.api_server_access_profile is not None and
mc.api_server_access_profile.additional_properties is not None
):
# remove the additional properties that are set in official azure-cli/acs
mc.api_server_access_profile.additional_properties = {}
return mc

def build_gitops_addon_profile(self) -> ManagedClusterAddonProfile:
Expand Down
12 changes: 6 additions & 6 deletions src/aks-preview/azext_aks_preview/tests/latest/test_managed_cluster_decorator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,16 +86,14 @@
RequiredArgumentMissingError,
UnknownError,
)
from dateutil.parser import parse

from azure.cli.command_modules.acs._consts import (
CONST_OUTBOUND_TYPE_LOAD_BALANCER,
CONST_OUTBOUND_TYPE_MANAGED_NAT_GATEWAY,
CONST_OUTBOUND_TYPE_USER_ASSIGNED_NAT_GATEWAY,
CONST_OUTBOUND_TYPE_USER_DEFINED_ROUTING,
DecoratorEarlyExitException,
DecoratorMode,
)
from dateutil.parser import parse
from deepdiff import DeepDiff

class AKSPreviewManagedClusterModelsTestCase(unittest.TestCase):
def setUp(self):
Expand Down Expand Up @@ -4389,6 +4387,7 @@ def test_set_up_api_server_access_profile(self):
mc_2 = self.models.ManagedCluster(location="test_location")
dec_2.context.attach_mc(mc_2)
dec_mc_2 = dec_2.set_up_api_server_access_profile(mc_2)
dec_mc_2.api_server_access_profile.additional_properties = {}
ground_truth_api_server_access_profile_2 = (
self.models.ManagedClusterAPIServerAccessProfile(
enable_vnet_integration=True,
Expand All @@ -4401,7 +4400,7 @@ def test_set_up_api_server_access_profile(self):
location="test_location",
api_server_access_profile=ground_truth_api_server_access_profile_2,
)
self.assertEqual(dec_mc_2, ground_truth_mc_2)
self.assertEqual(dec_mc_2, ground_truth_mc_2, DeepDiff(dec_mc_2, ground_truth_mc_2))

dec_3 = AKSPreviewManagedClusterCreateDecorator(
self.cmd,
Expand All @@ -4415,6 +4414,7 @@ def test_set_up_api_server_access_profile(self):
mc_3 = self.models.ManagedCluster(location="test_location")
dec_3.context.attach_mc(mc_3)
dec_mc_3 = dec_3.set_up_api_server_access_profile(mc_3)
dec_mc_3.api_server_access_profile.additional_properties = {}
ground_truth_api_server_access_profile_3 = (
self.models.ManagedClusterAPIServerAccessProfile(
enable_vnet_integration=True,
Expand All @@ -4424,7 +4424,7 @@ def test_set_up_api_server_access_profile(self):
location="test_location",
api_server_access_profile=ground_truth_api_server_access_profile_3,
)
self.assertEqual(dec_mc_3, ground_truth_mc_3)
self.assertEqual(dec_mc_3, ground_truth_mc_3, DeepDiff(dec_mc_3, ground_truth_mc_3))

dec_4 = AKSPreviewManagedClusterCreateDecorator(
self.cmd,
Expand Down
Loading