rename flag

Author: zman-ms

src/aks-preview/azext_aks_preview/_params.py

@@ -1201,7 +1201,12 @@ def load_arguments(self, _):
             help="Enable managed installation of Gateway API CRDs from the standard release channel."
         )
         c.argument("enable_hosted_system", action="store_true", is_preview=True)
-        c.argument("enable_continuous_control_plane_monitor", action="store_true", is_preview=True)
+        c.argument(
+            "enable_continuous_control_plane_and_addon_monitor",
+            action="store_true",
+            is_preview=True,
+            help="Enable continuous control plane and addon monitoring for the cluster.",
+        )
 
     with self.argument_context("aks update") as c:
         # managed cluster paramerters
@@ -1780,8 +1785,18 @@ def load_arguments(self, _):
             is_preview=True,
             help="Disable Application Load Balancer (Application Gateway for Containers)."
         )
-        c.argument("enable_continuous_control_plane_monitor", action="store_true", is_preview=True)
-        c.argument("disable_continuous_control_plane_monitor", action="store_true", is_preview=True)
+        c.argument(
+            "enable_continuous_control_plane_and_addon_monitor",
+            action="store_true",
+            is_preview=True,
+            help="Enable continuous control plane and addon monitoring for the cluster.",
+        )
+        c.argument(
+            "disable_continuous_control_plane_and_addon_monitor",
+            action="store_true",
+            is_preview=True,
+            help="Disable continuous control plane and addon monitoring for the cluster.",
+        )
 
     with self.argument_context("aks upgrade") as c:
         c.argument("kubernetes_version", completer=get_k8s_upgrades_completion_list)

src/aks-preview/azext_aks_preview/custom.py

@@ -1162,7 +1162,7 @@ def aks_create(
     enable_gateway_api=False,
     enable_hosted_system=False,
     # health monitor
-    enable_continuous_control_plane_monitor=False,
+    enable_continuous_control_plane_and_addon_monitor=False,
 ):
     # DO NOT MOVE: get all the original parameters and save them as a dictionary
     raw_parameters = locals()
@@ -1407,8 +1407,8 @@ def aks_update(
     enable_application_load_balancer=False,
     disable_application_load_balancer=False,
     # health monitor
-    enable_continuous_control_plane_monitor=False,
-    disable_continuous_control_plane_monitor=False,
+    enable_continuous_control_plane_and_addon_monitor=False,
+    disable_continuous_control_plane_and_addon_monitor=False,
 ):
     # DO NOT MOVE: get all the original parameters and save them as a dictionary
     raw_parameters = locals()

src/aks-preview/azext_aks_preview/managed_cluster_decorator.py

@@ -3767,19 +3767,19 @@ def get_enable_hosted_system(self) -> bool:
             raise RequiredArgumentMissingError('"--enable-hosted-system" requires "--sku automatic".')
         return enable_hosted_system
 
-    def get_enable_continuous_control_plane_monitor(self) -> bool:
-        """Obtain the value of enable_continuous_control_plane_monitor.
+    def get_enable_continuous_control_plane_and_addon_monitor(self) -> bool:
+        """Obtain the value of enable_continuous_control_plane_and_addon_monitor.
 
         :return: bool
         """
-        return self.raw_param.get("enable_continuous_control_plane_monitor")
+        return self.raw_param.get("enable_continuous_control_plane_and_addon_monitor")
 
-    def get_disable_continuous_control_plane_monitor(self) -> bool:
-        """Obtain the value of disable_continuous_control_plane_monitor.
+    def get_disable_continuous_control_plane_and_addon_monitor(self) -> bool:
+        """Obtain the value of disable_continuous_control_plane_and_addon_monitor.
 
         :return: bool
         """
-        return self.raw_param.get("disable_continuous_control_plane_monitor")
+        return self.raw_param.get("disable_continuous_control_plane_and_addon_monitor")
 
 
 # pylint: disable=too-many-public-methods
@@ -4817,7 +4817,7 @@ def set_up_health_monitor_profile(self, mc: ManagedCluster) -> ManagedCluster:
         """
         self._ensure_mc(mc)
 
-        if self.context.get_enable_continuous_control_plane_monitor():
+        if self.context.get_enable_continuous_control_plane_and_addon_monitor():
             if mc.health_monitor_profile is None:
                 mc.health_monitor_profile = (
                     self.models.ManagedClusterHealthMonitorProfile()  # pylint: disable=no-member
@@ -7171,15 +7171,15 @@ def update_health_monitor_profile(self, mc: ManagedCluster) -> ManagedCluster:
         """
         self._ensure_mc(mc)
 
-        enable = self.context.get_enable_continuous_control_plane_monitor()
-        disable = self.context.get_disable_continuous_control_plane_monitor()
+        enable = self.context.get_enable_continuous_control_plane_and_addon_monitor()
+        disable = self.context.get_disable_continuous_control_plane_and_addon_monitor()
 
         if not enable and not disable:
             return mc
         if enable and disable:
             raise MutuallyExclusiveArgumentError(
-                "Cannot specify --enable-continuous-control-plane-monitor and "
-                "--disable-continuous-control-plane-monitor at the same time."
+                "Cannot specify --enable-continuous-control-plane-and-addon-monitor and "
+                "--disable-continuous-control-plane-and-addon-monitor at the same time."
             )
 
         if mc.health_monitor_profile is None:

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

@@ -5002,61 +5002,61 @@ def test_get_disable_default_domain(self):
         disable_default_domain_3 = ctx_3.get_disable_default_domain()
         self.assertEqual(disable_default_domain_3, False)
 
-    def test_get_enable_continuous_control_plane_monitor(self):
+    def test_get_enable_continuous_control_plane_and_addon_monitor(self):
         # default value
         ctx_0 = AKSPreviewManagedClusterContext(
             self.cmd,
             AKSManagedClusterParamDict({}),
             self.models,
             decorator_mode=DecoratorMode.CREATE,
         )
-        self.assertEqual(ctx_0.get_enable_continuous_control_plane_monitor(), None)
+        self.assertEqual(ctx_0.get_enable_continuous_control_plane_and_addon_monitor(), None)
 
         # custom value - True
         ctx_1 = AKSPreviewManagedClusterContext(
             self.cmd,
-            AKSManagedClusterParamDict({"enable_continuous_control_plane_monitor": True}),
+            AKSManagedClusterParamDict({"enable_continuous_control_plane_and_addon_monitor": True}),
             self.models,
             decorator_mode=DecoratorMode.CREATE,
         )
-        self.assertEqual(ctx_1.get_enable_continuous_control_plane_monitor(), True)
+        self.assertEqual(ctx_1.get_enable_continuous_control_plane_and_addon_monitor(), True)
 
         # custom value - False
         ctx_2 = AKSPreviewManagedClusterContext(
             self.cmd,
-            AKSManagedClusterParamDict({"enable_continuous_control_plane_monitor": False}),
+            AKSManagedClusterParamDict({"enable_continuous_control_plane_and_addon_monitor": False}),
             self.models,
             decorator_mode=DecoratorMode.CREATE,
         )
-        self.assertEqual(ctx_2.get_enable_continuous_control_plane_monitor(), False)
+        self.assertEqual(ctx_2.get_enable_continuous_control_plane_and_addon_monitor(), False)
 
-    def test_get_disable_continuous_control_plane_monitor(self):
+    def test_get_disable_continuous_control_plane_and_addon_monitor(self):
         # default value
         ctx_0 = AKSPreviewManagedClusterContext(
             self.cmd,
             AKSManagedClusterParamDict({}),
             self.models,
             decorator_mode=DecoratorMode.UPDATE,
         )
-        self.assertEqual(ctx_0.get_disable_continuous_control_plane_monitor(), None)
+        self.assertEqual(ctx_0.get_disable_continuous_control_plane_and_addon_monitor(), None)
 
         # custom value - True
         ctx_1 = AKSPreviewManagedClusterContext(
             self.cmd,
-            AKSManagedClusterParamDict({"disable_continuous_control_plane_monitor": True}),
+            AKSManagedClusterParamDict({"disable_continuous_control_plane_and_addon_monitor": True}),
             self.models,
             decorator_mode=DecoratorMode.UPDATE,
         )
-        self.assertEqual(ctx_1.get_disable_continuous_control_plane_monitor(), True)
+        self.assertEqual(ctx_1.get_disable_continuous_control_plane_and_addon_monitor(), True)
 
         # custom value - False
         ctx_2 = AKSPreviewManagedClusterContext(
             self.cmd,
-            AKSManagedClusterParamDict({"disable_continuous_control_plane_monitor": False}),
+            AKSManagedClusterParamDict({"disable_continuous_control_plane_and_addon_monitor": False}),
             self.models,
             decorator_mode=DecoratorMode.UPDATE,
         )
-        self.assertEqual(ctx_2.get_disable_continuous_control_plane_monitor(), False)
+        self.assertEqual(ctx_2.get_disable_continuous_control_plane_and_addon_monitor(), False)
 
 
 class AKSPreviewManagedClusterCreateDecoratorTestCase(unittest.TestCase):
@@ -7539,7 +7539,7 @@ def test_set_up_health_monitor_profile(self):
             self.cmd,
             self.client,
             {
-                "enable_continuous_control_plane_monitor": True,
+                "enable_continuous_control_plane_and_addon_monitor": True,
             },
             CUSTOM_MGMT_AKS_PREVIEW,
         )
@@ -13914,8 +13914,8 @@ def test_update_health_monitor_profile(self):
             self.cmd,
             self.client,
             {
-                "enable_continuous_control_plane_monitor": True,
-                "disable_continuous_control_plane_monitor": True,
+                "enable_continuous_control_plane_and_addon_monitor": True,
+                "disable_continuous_control_plane_and_addon_monitor": True,
             },
             CUSTOM_MGMT_AKS_PREVIEW,
         )
@@ -13929,7 +13929,7 @@ def test_update_health_monitor_profile(self):
             self.cmd,
             self.client,
             {
-                "enable_continuous_control_plane_monitor": True,
+                "enable_continuous_control_plane_and_addon_monitor": True,
             },
             CUSTOM_MGMT_AKS_PREVIEW,
         )
@@ -13949,7 +13949,7 @@ def test_update_health_monitor_profile(self):
             self.cmd,
             self.client,
             {
-                "disable_continuous_control_plane_monitor": True,
+                "disable_continuous_control_plane_and_addon_monitor": True,
             },
             CUSTOM_MGMT_AKS_PREVIEW,
         )