refactor upgrades with feedback

canonical · Aug 21, 2024 · 19f2694 · 19f2694
1 parent 4b96bd0
commit 19f2694
Show file tree

Hide file tree

Showing 7 changed files with 207 additions and 209 deletions.
diff --git a/anvil-python/anvil/commands/haproxy.py b/anvil-python/anvil/commands/haproxy.py
@@ -30,7 +30,6 @@
 
 from anvil.jobs.manifest import Manifest
 from anvil.jobs.steps import RemoveMachineUnitStep
-from anvil.utils import UpgradeCharm
 
 LOG = logging.getLogger(__name__)
 
@@ -187,28 +186,6 @@ def get_unit_timeout(self) -> int:
         return HAPROXY_UNIT_TIMEOUT
 
 
-class UpgradeHAProxyUnitCharms(UpgradeCharm):
-    def __init__(
-        self,
-        client: Client,
-        jhelper: JujuHelper,
-        manifest: Manifest,
-        model: str,
-    ):
-        super().__init__(
-            "Upgrade HAProxy unit charms",
-            "Upgrading HAProxy unit charms.",
-            client,
-            jhelper,
-            manifest,
-            model,
-            ["haproxy", "keepalived"],
-            "haproxy-plan",
-            HAPROXY_CONFIG_KEY,
-            HAPROXY_UNIT_TIMEOUT,
-        )
-
-
 def haproxy_install_steps(
     client: Client,
     manifest: Manifest,

diff --git a/anvil-python/anvil/commands/maas_agent.py b/anvil-python/anvil/commands/maas_agent.py
@@ -26,7 +26,6 @@
 
 from anvil.jobs.manifest import Manifest
 from anvil.jobs.steps import RemoveMachineUnitStep
-from anvil.utils import UpgradeCharm
 
 APPLICATION = "maas-agent"
 CONFIG_KEY = "TerraformVarsMaasagentPlan"
@@ -112,28 +111,6 @@ def get_unit_timeout(self) -> int:
         return MAASAGENT_UNIT_TIMEOUT
 
 
-class UpgradeMAASAgentUnitCharms(UpgradeCharm):
-    def __init__(
-        self,
-        client: Client,
-        jhelper: JujuHelper,
-        manifest: Manifest,
-        model: str,
-    ):
-        super().__init__(
-            "Upgrade MAAS Agent unit charms",
-            "Upgrading MAAS Agent unit charms.",
-            client,
-            jhelper,
-            manifest,
-            model,
-            ["maas-agent"],
-            "maas-agent-plan",
-            CONFIG_KEY,
-            MAASAGENT_UNIT_TIMEOUT,
-        )
-
-
 def maas_agent_install_steps(
     client: Client,
     manifest: Manifest,

diff --git a/anvil-python/anvil/commands/maas_region.py b/anvil-python/anvil/commands/maas_region.py
@@ -26,7 +26,6 @@
 
 from anvil.jobs.manifest import Manifest
 from anvil.jobs.steps import RemoveMachineUnitStep
-from anvil.utils import UpgradeCharm
 
 APPLICATION = "maas-region"
 CONFIG_KEY = "TerraformVarsMaasregionPlan"
@@ -120,28 +119,6 @@ def get_unit_timeout(self) -> int:
         return MAASREGION_UNIT_TIMEOUT
 
 
-class UpgradeMAASRegionUnitCharms(UpgradeCharm):
-    def __init__(
-        self,
-        client: Client,
-        jhelper: JujuHelper,
-        manifest: Manifest,
-        model: str,
-    ):
-        super().__init__(
-            "Upgrade MAAS Region unit charms",
-            "Upgrading MAAS Region unit charms.",
-            client,
-            jhelper,
-            manifest,
-            model,
-            ["maas-region", "pgbouncer"],
-            "maas-region-plan",
-            CONFIG_KEY,
-            MAASREGION_UNIT_TIMEOUT,
-        )
-
-
 def maas_region_install_steps(
     client: Client,
     manifest: Manifest,

diff --git a/anvil-python/anvil/commands/postgresql.py b/anvil-python/anvil/commands/postgresql.py
@@ -29,7 +29,6 @@
 
 from anvil.jobs.manifest import Manifest
 from anvil.jobs.steps import RemoveMachineUnitStep
-from anvil.utils import UpgradeCharm
 
 LOG = logging.getLogger(__name__)
 APPLICATION = "postgresql"
@@ -278,25 +277,3 @@ def __init__(
 
     def get_unit_timeout(self) -> int:
         return POSTGRESQL_UNIT_TIMEOUT
-
-
-class UpgradePostgreSQLUnitCharms(UpgradeCharm):
-    def __init__(
-        self,
-        client: Client,
-        jhelper: JujuHelper,
-        manifest: Manifest,
-        model: str,
-    ):
-        super().__init__(
-            "Upgrade PostgreSQL unit charms",
-            "Upgrading PostgreSQL unit charms.",
-            client,
-            jhelper,
-            manifest,
-            model,
-            ["postgresql"],
-            "postgresql-plan",
-            CONFIG_KEY,
-            POSTGRESQL_UNIT_TIMEOUT,
-        )
diff --git a/anvil-python/anvil/commands/refresh.py b/anvil-python/anvil/commands/refresh.py
@@ -47,7 +47,7 @@
     is_flag=True,
     show_default=True,
     default=False,
-    help="Upgrade MAAS-Anvil release.",
+    help="Upgrade MAAS Anvil release.",
 )
 @click.pass_context
 def refresh(