Merge pull request #5 from plesk/task-nvizovitin-tuxcare-els-support

TuxCare ELS support, update submodule

ubuntu18to20/actions/__init__.py

@@ -0,0 +1,2 @@
+# Copyright 2024. WebPros International GmbH. All rights reserved.
+from .packages import *

ubuntu18to20/actions/packages.py

@@ -0,0 +1,33 @@
+# Copyright 2024. WebPros International GmbH. All rights reserved.
+from pleskdistup.common import action, packages
+
+
+class RemoveUnusedPackages(action.ActiveAction):
+    """ Removes packages that are not used anymore in the target OS after the dist-upgrade.
+        These are mostly versioned packages, which have corresponding alternatives in the
+        target OS with a different package name, which makes these ones obsolete and useless.
+        The alternatives are expected to have been installed by the dist-upgrade itself.
+    """
+
+    def __init__(self):
+        self.name = "remove unused packages"
+        self.unused_packages = [
+            "libmagickcore-6.q16-3",
+            "libmagickwand-6.q16-3",
+            "libmysqlclient20",
+            "libprocps6",
+            "perl-modules-5.26",
+        ]
+
+    def _prepare_action(self) -> action.ActionResult:
+        return action.ActionResult()
+
+    def _post_action(self) -> action.ActionResult:
+        packages.remove_packages(packages.filter_installed_packages(self.unused_packages))
+        return action.ActionResult()
+
+    def _revert_action(self) -> action.ActionResult:
+        return action.ActionResult()
+
+    def estimate_post_time(self) -> int:
+        return 5

ubuntu18to20/upgrader.py

@@ -7,45 +7,34 @@
 from pleskdistup import actions
 from pleskdistup.common import action, feedback
 from pleskdistup.phase import Phase
-from pleskdistup.upgrader import DistUpgrader, DistUpgraderFactory, PathType, SystemDescription
+from pleskdistup.upgrader import dist, DistUpgrader, DistUpgraderFactory, PathType
 
 import ubuntu18to20.config
+import ubuntu18to20.actions
 
 
 class Ubuntu18to20Upgrader(DistUpgrader):
-    _os_from_name = "Ubuntu"
-    _os_from_version = "18"
-    _os_to_name = "Ubuntu"
-    _os_to_version = "20"
+    _distro_from = dist.Ubuntu("18")
+    _distro_to = dist.Ubuntu("20")
 
     def __init__(self):
         super().__init__()
 
     def __repr__(self) -> str:
-        attrs = ", ".join(f"{k}={getattr(self, k)!r}" for k in (
-            "_os_from_name", "_os_from_version",
-            "_os_to_name", "_os_to_version",
-        ))
-        return f"{self.__class__.__name__}({attrs})"
+        return f"{self.__class__.__name__}(From {self._distro_from}, To {self._distro_to})"
 
     def __str__(self) -> str:
         return f"{self.__class__.__name__}"
 
     @classmethod
     def supports(
         cls,
-        from_system: typing.Optional[SystemDescription] = None,
-        to_system: typing.Optional[SystemDescription] = None
+        from_system: typing.Optional[dist.Distro] = None,
+        to_system: typing.Optional[dist.Distro] = None
     ) -> bool:
-        def matching_system(system: SystemDescription, os_name: str, os_version: str) -> bool:
-            return (
-                (system.os_name is None or system.os_name == os_name)
-                and (system.os_version is None or system.os_version == os_version)
-            )
-
         return (
-            (from_system is None or matching_system(from_system, cls._os_from_name, cls._os_from_version))
-            and (to_system is None or matching_system(to_system, cls._os_to_name, cls._os_to_version))
+            (from_system is None or cls._distro_from == from_system)
+            and (to_system is None or cls._distro_to == to_system)
         )
 
     @property
@@ -78,14 +67,15 @@ def construct_actions(
         options: typing.Any,
         phase: Phase
     ) -> typing.Dict[str, typing.List[action.ActiveAction]]:
-        new_os = f"{self._os_to_name} {self._os_to_version}"
+        new_os = str(self._distro_to)
         return {
             "Prepare": [
                 actions.HandleConversionStatus(options.status_flag_path, options.completion_flag_path),
                 actions.AddFinishSshLoginMessage(new_os),  # Executed at the finish phase only
                 actions.AddInProgressSshLoginMessage(new_os),
                 actions.DisablePleskSshBanner(),
                 actions.RepairPleskInstallation(),  # Executed at the finish phase only
+                actions.UninstallTuxcareEls(),
                 actions.DisableMariadbInnodbFastShutdown(),
                 actions.DisableUnsupportedMysqlModes(),
                 actions.InstallUbuntuUpdateManager(),
@@ -113,6 +103,7 @@ def construct_actions(
             ],
             "Dist-upgrade": [
                 actions.DoDistupgrade(),
+                ubuntu18to20.actions.RemoveUnusedPackages(),
             ],
             "Finishing actions": [
                 actions.Reboot(prepare_next_phase=Phase.FINISH, name="reboot and perform finishing actions"),
@@ -134,7 +125,7 @@ def get_check_actions(self, options: typing.Any, phase: Phase) -> typing.List[ac
         ]
 
     def parse_args(self, args: typing.Sequence[str]) -> None:
-        DESC_MESSAGE = f"""Use this upgrader to dist-upgrade an {self._os_from_name} {self._os_from_version} server with Plesk to {self._os_to_name} {self._os_to_version}. The process consists of the following general stages:
+        DESC_MESSAGE = f"""Use this upgrader to dist-upgrade an {self._distro_from} server with Plesk to {self._distro_to}. The process consists of the following general stages:
 
 -- Preparation (about 5 minutes) - The OS is prepared for the conversion.
 -- Conversion (about 15 minutes) - Plesk and system dist-upgrade is performed.
@@ -173,8 +164,8 @@ def __str__(self) -> str:
 
     def supports(
         self,
-        from_system: typing.Optional[SystemDescription] = None,
-        to_system: typing.Optional[SystemDescription] = None
+        from_system: typing.Optional[dist.Distro] = None,
+        to_system: typing.Optional[dist.Distro] = None
     ) -> bool:
         return Ubuntu18to20Upgrader.supports(from_system, to_system)