Minor fixes + Polish

src/Kathara/manager/docker/DockerMachine.py

@@ -35,8 +35,8 @@
 
     # If /etc/hosts is not configured by the user, add the localhost mapping
     "if [ ! -s \"/etc/hosts\" ]; then "
-    "echo '127.0.0.1 localhost' > /etc/hosts;"
-    "echo '::1 localhost' >> /etc/hosts;"
+    "echo '127.0.0.1 localhost' > /etc/hosts",
+    "echo '::1 localhost' >> /etc/hosts",
     "fi",
 
     # Give proper permissions to /var/www

src/Kathara/manager/docker/DockerManager.py

@@ -503,13 +503,15 @@ def get_lab_from_api(self, lab_hash: str = None, lab_name: str = None) -> Lab:
                     host_port = port_data[0]["HostPort"]
                     device.meta["ports"][(int(host_port), protocol)] = int(guest_port)
 
+            # Reassign sysctls directly
             device.meta["sysctls"] = container.attrs["HostConfig"]["Sysctls"]
 
             if "none" not in container.attrs["NetworkSettings"]["Networks"]:
                 for network_name in container.attrs["NetworkSettings"]["Networks"]:
                     if network_name == "bridge":
                         device.add_meta("bridged", True)
                         continue
+
                     network = lab_networks[network_name]
                     link = reconstructed_lab.get_or_new_link(network.attrs["Labels"]["name"])
                     link.api_object = network
@@ -527,34 +529,42 @@ def update_lab_from_api(self, lab: Lab) -> None:
         running_containers = self.get_machines_api_objects(lab_hash=lab.hash)
 
         deployed_networks = dict(
-            map(lambda x: (x.name, x), self.get_links_api_objects(lab_hash=lab.hash)))
+            map(lambda x: (x.name, x), self.get_links_api_objects(lab_hash=lab.hash))
+        )
+        for network in deployed_networks.values():
+            network.reload()
 
         deployed_networks_by_link_name = dict(
-            map(lambda x: (x.attrs["Labels"]["name"], x), self.get_links_api_objects(lab_hash=lab.hash)))
+            map(lambda x: (x.attrs["Labels"]["name"], x), self.get_links_api_objects(lab_hash=lab.hash))
+        )
 
         for container in running_containers:
             container.reload()
             device = lab.get_or_new_machine(container.labels["name"])
             device.api_object = container
 
+            # Collision domains declared in the network scenario
             static_links = set(device.interfaces.values())
-            current_links = set(map(lambda x: lab.get_or_new_link(
-                deployed_networks[x].attrs["Labels"]["name"]),
-                                    filter(lambda x: x != "bridge", container.attrs["NetworkSettings"]["Networks"])))
-
+            # Collision domains currently attached to the device
+            current_links = set(
+                map(lambda x: lab.get_or_new_link(deployed_networks[x].attrs["Labels"]["name"]),
+                    filter(lambda x: x != "bridge", container.attrs["NetworkSettings"]["Networks"]))
+            )
+            # Collision domains attached at runtime to the device
             dynamic_links = current_links - static_links
+            # Static collision domains detached at runtime from the device
             deleted_links = static_links - current_links
 
             for link in static_links:
                 if link.name in deployed_networks_by_link_name:
                     link.api_object = deployed_networks_by_link_name[link.name]
+
             for link in dynamic_links:
                 link.api_object = deployed_networks_by_link_name[link.name]
                 device.add_interface(link)
+
             for link in deleted_links:
                 device.remove_interface(link)
-            for network in deployed_networks.values():
-                network.reload()
 
     @privileged
     def get_machines_stats(self, lab_hash: str = None, lab_name: str = None, machine_name: str = None,

src/Kathara/manager/kubernetes/KubernetesMachine.py

@@ -55,8 +55,8 @@
 
     # If /etc/hosts is not configured by the user, add the localhost mapping
     "if [ ! -s \"/etc/hosts\" ]; then "
-    "echo '127.0.0.1 localhost' > /etc/hosts;"
-    "echo '::1 localhost' >> /etc/hosts;"
+    "echo '127.0.0.1 localhost' > /etc/hosts",
+    "echo '::1 localhost' >> /etc/hosts",
     "fi",
 
     # Give proper permissions to /var/www