Merge branch '285-reload-api-objects' into develop

Author: tcaiazzi

src/Kathara/manager/docker/DockerMachine.py

@@ -339,7 +339,6 @@ def connect_interface(machine: Machine, interface: Interface) -> None:
             DockerPluginError: If Kathara has been left in an inconsistent state.
             APIError: If the Docker APIs return an error.
         """
-        machine.api_object.reload()
         attached_networks = machine.api_object.attrs["NetworkSettings"]["Networks"]
 
         if interface.link.api_object.name not in attached_networks:
@@ -369,7 +368,6 @@ def disconnect_from_link(machine: Machine, link: Link) -> None:
         Returns:
             None
         """
-        machine.api_object.reload()
         attached_networks = machine.api_object.attrs["NetworkSettings"]["Networks"]
 
         if link.api_object.name in attached_networks:
@@ -466,6 +464,8 @@ def start(self, machine: Machine) -> None:
                             f"Please specify a valid shell for this device."
                             )
 
+        machine.api_object.reload()
+
     def undeploy(self, lab_hash: str, selected_machines: Set[str] = None) -> None:
         """Undeploy the devices contained in the network scenario defined by the lab_hash.
 

src/Kathara/manager/docker/DockerManager.py

@@ -155,7 +155,7 @@ def deploy_lab(self, lab: Lab, selected_machines: Set[str] = None) -> None:
 
     @privileged
     def connect_machine_to_link(self, machine: Machine, link: Link, mac_address: Optional[str] = None) -> None:
-        """Create a new interface and connect a Kathara device to a collision domain.
+        """Create a new interface on a running Kathara device and connect it to a collision domain.
 
         Args:
             machine (Kathara.model.Machine): A Kathara machine object.
@@ -174,7 +174,11 @@ def connect_machine_to_link(self, machine: Machine, link: Link, mac_address: Opt
         if not machine.lab:
             raise LabNotFoundError("Device `%s` is not associated to a network scenario." % machine.name)
 
-        if not machine.api_object or machine.api_object.status != "running":
+        if not machine.api_object:
+            raise MachineNotRunningError(machine.name)
+
+        machine.api_object.reload()
+        if machine.api_object.status != "running":
             raise MachineNotRunningError(machine.name)
 
         if not link.lab:
@@ -192,23 +196,31 @@ def connect_machine_to_link(self, machine: Machine, link: Link, mac_address: Opt
 
     @privileged
     def disconnect_machine_from_link(self, machine: Machine, link: Link) -> None:
-        """Disconnect a Kathara device from a collision domain.
+        """Disconnect a running Kathara device from a collision domain.
 
         Args:
             machine (Kathara.model.Machine): A Kathara machine object.
-            link (Kathara.model.Link): The Kathara collision domain from which disconnect the device.
+            link (Kathara.model.Link): The Kathara collision domain from which disconnect the running device.
 
         Returns:
             None
 
         Raises:
             LabNotFoundError: If the device specified is not associated to any network scenario.
+            MachineNotRunningError: If the specified device is not running.
             LabNotFoundError: If the collision domain is not associated to any network scenario.
             MachineCollisionDomainConflictError: If the device is not connected to the collision domain.
         """
         if not machine.lab:
             raise LabNotFoundError(f"Device `{machine.name}` is not associated to a network scenario.")
 
+        if not machine.api_object:
+            raise MachineNotRunningError(machine.name)
+
+        machine.api_object.reload()
+        if machine.api_object.status != "running":
+            raise MachineNotRunningError(machine.name)
+
         if not link.lab:
             raise LabNotFoundError(f"Collision domain `{link.name}` is not associated to a network scenario.")