Skip to content

[AKS] az aks nodepool add: Fix incorrectly specified property name for option --drain-timeout #27621

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 1 commit into from
Oct 20, 2023
Merged

[AKS] az aks nodepool add: Fix incorrectly specified property name for option --drain-timeout #27621

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
2 changes: 1 addition & 1 deletion src/azure-cli/azure/cli/command_modules/acs/agentpool_decorator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -943,7 +943,7 @@ def get_drain_timeout(self):
if (
self.agentpool and
self.agentpool.upgrade_settings and
self.agentpool.upgrade_settings.drain_timeout is not None
self.agentpool.upgrade_settings.drain_timeout_in_minutes is not None
):
drain_timeout = self.agentpool.upgrade_settings.drain_timeout_in_minutes

Expand Down
20 changes: 20 additions & 0 deletions src/azure-cli/azure/cli/command_modules/acs/tests/latest/test_agentpool_decorator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1308,6 +1308,20 @@ def common_get_gpu_instance_profile(self):
ctx_1.attach_agentpool(agentpool_1)
self.assertEqual(ctx_1.get_gpu_instance_profile(), "test_gpu_instance_profile")

def common_get_drain_timeout(self):
# default
ctx_1 = AKSAgentPoolContext(
self.cmd,
AKSAgentPoolParamDict({"drain_timeout": None}),
self.models,
DecoratorMode.CREATE,
self.agentpool_decorator_mode,
)
self.assertEqual(ctx_1.get_drain_timeout(), None)
agentpool_1 = self.create_initialized_agentpool_instance(upgrade_settings=self.models.AgentPoolUpgradeSettings(drain_timeout_in_minutes=123))
ctx_1.attach_agentpool(agentpool_1)
self.assertEqual(ctx_1.get_drain_timeout(), 123)

class AKSAgentPoolContextStandaloneModeTestCase(AKSAgentPoolContextCommonTestCase):
def setUp(self):
self.cli_ctx = MockCLI()
Expand Down Expand Up @@ -1488,6 +1502,9 @@ def test_get_no_wait(self):
def test_get_gpu_instance_profile(self):
self.common_get_gpu_instance_profile()

def test_get_drain_timeout(self):
self.common_get_drain_timeout()

class AKSAgentPoolContextManagedClusterModeTestCase(AKSAgentPoolContextCommonTestCase):
def setUp(self):
self.cli_ctx = MockCLI()
Expand Down Expand Up @@ -1642,6 +1659,9 @@ def test_get_no_wait(self):
def test_get_gpu_instance_profile(self):
self.common_get_gpu_instance_profile()

def test_get_drain_timeout(self):
self.common_get_drain_timeout()

class AKSAgentPoolAddDecoratorCommonTestCase(unittest.TestCase):
def _remove_defaults_in_agentpool(self, agentpool):
self.defaults_in_agentpool = {}
Expand Down