feat: Refactor VM object to inherit from Host

Refactor VM object to inherit Host funcionalities, attributes and sub-objects.

Signed-off-by: Kacper Tokarzewski <[email protected]>

Author: KTokarze

mfd_hyperv/instances/vm.py

@@ -8,6 +8,8 @@
 
 from mfd_common_libs import add_logging_level, log_levels
 from mfd_connect import RPyCConnection, Connection
+from mfd_host import Host
+
 from mfd_hyperv.attributes.vm_params import VMParams
 from mfd_hyperv.exceptions import HyperVException
 from mfd_hyperv.hypervisor import VMProcessorAttributes
@@ -24,8 +26,12 @@
 add_logging_level(level_name="MODULE_DEBUG", level_value=log_levels.MODULE_DEBUG)
 
 
-class VM:
-    """VM class."""
+class VM(Host):
+    """VM class that inherits from Host."""
+
+    def __new__(cls, connection: "Connection", vm_params: VMParams, *args, **kwargs):
+        """Override __new__ to bypass Host's factory pattern for VM instances."""
+        return object.__new__(cls)
 
     def __init__(
         self,
@@ -34,15 +40,15 @@ def __init__(
         owner: NetworkAdapterOwner = None,
         hyperv: "HyperV" = None,
         connection_timeout: int = None,
+        **kwargs
     ):
         """VM constructor."""
-        self.connection = connection
+        super().__init__(connection=connection, **kwargs)
         self.guest = NetworkAdapterOwner(connection=connection)
         self.attributes = {}
         self.owner = owner
         self._hyperv = None
         self.hyperv = hyperv
-
         self.connection_timeout = connection_timeout
         self._propagate_params(vm_params)
 
@@ -51,7 +57,7 @@ def __str__(self) -> str:
 
     @property
     def hyperv(self) -> "HyperV":
-        """Hyperv property representing host's hyperv object.
+        """HyperV property representing host's HyperV object.
 
         :raises: HyperVException when this property is empty
         """
@@ -63,7 +69,7 @@ def hyperv(self) -> "HyperV":
 
     @property
     def interfaces(self) -> List["VMNetworkInterface"]:
-        """Hyperv property representing VM interfaces.
+        """HyperV property representing VM interfaces.
 
         :raises: HyperVException when this property is empty
         """
@@ -130,7 +136,7 @@ def reboot(self, timeout: int = 300) -> None:
         self.wait_functional(timeout)
 
     def wait_functional(self, timeout: int = 300) -> None:
-        """Wait untill this VM can be pinged.
+        """Wait until this VM can be pinged.
 
         :param timeout: time given for VM to reach functional state
         """
@@ -171,7 +177,7 @@ def _get_ifaces_from_vm(self) -> Dict[str, str]:
     def _check_vnic_correct_matching(self, created_vm_interfaces: List["VMNetworkInterface"]) -> None:
         """Check if matching was successful, if not raise Exception.
 
-        :param created_vm_interfaces: list of vnics after matching VM interfaces witt VM Guest OS interfaces
+        :param created_vm_interfaces: list of vNICs after matching VM interfaces with VM Guest OS interfaces
         """
         all_have_iface = all(hasattr(vnic, "interface") for vnic in created_vm_interfaces)
         if not all_have_iface:

requirements.txt

@@ -2,4 +2,5 @@ mfd-common-libs >= 1.11.0, < 2
 mfd-typing >= 1.23.0, < 2
 mfd_connect >= 7.12.0, < 8
 mfd-ping >= 1.15.0, < 2
-mfd_network_adapter >= 14.0.0, < 15
+mfd_network_adapter >= 14.0.0, < 15
+mfd-host >= 2.0.0, < 3