Kathará 3.5.1

src/Kathara/cli/command/CheckCommand.py

@@ -59,7 +59,7 @@ def linux_platform_info():
         args['no_shared'] = False
         args['no_hosthome'] = False
 
-        lab = Lab("kathara_vlab")
+        lab = Lab("kathara_test")
         lab.get_or_new_machine("hello_world")
 
         try:

src/Kathara/cli/command/ConnectCommand.py

@@ -5,6 +5,8 @@
 from ... import utils
 from ...foundation.cli.command.Command import Command
 from ...manager.Kathara import Kathara
+from ...model.Lab import Lab
+from ...parser.netkit.LabParser import LabParser
 from ...strings import strings, wiki_description
 
 
@@ -59,14 +61,16 @@ def run(self, current_path: str, argv: List[str]) -> None:
         args = self.get_args()
 
         if args['vmachine']:
-            lab_path = "kathara_vlab"
+            lab = Lab("kathara_vlab")
         else:
             lab_path = args['directory'].replace('"', '').replace("'", '') if args['directory'] else current_path
             lab_path = utils.get_absolute_path(lab_path)
+            try:
+                lab = LabParser.parse(lab_path)
+            except (Exception, IOError):
+                lab = Lab(None, path=lab_path)
 
-        logging.debug("Executing `connect` command in path `%s`..." % lab_path)
+        logging.debug("Executing `connect` command with hash `%s`..." % lab.hash)
 
-        lab_hash = utils.generate_urlsafe_hash(lab_path)
-
-        Kathara.get_instance().connect_tty(machine_name=args['machine_name'], lab_hash=lab_hash, shell=args['shell'],
+        Kathara.get_instance().connect_tty(machine_name=args['machine_name'], lab_hash=lab.hash, shell=args['shell'],
                                            logs=args['logs'])

src/Kathara/cli/command/ExecCommand.py

@@ -5,6 +5,8 @@
 from ... import utils
 from ...foundation.cli.command.Command import Command
 from ...manager.Kathara import Kathara
+from ...model.Lab import Lab
+from ...parser.netkit.LabParser import LabParser
 from ...strings import strings, wiki_description
 
 
@@ -67,13 +69,16 @@ def run(self, current_path: str, argv: List[str]) -> None:
         args = self.get_args()
 
         if args['vmachine']:
-            lab_path = "kathara_vlab"
+            lab = Lab("kathara_vlab")
         else:
             lab_path = args['directory'].replace('"', '').replace("'", '') if args['directory'] else current_path
             lab_path = utils.get_absolute_path(lab_path)
+            try:
+                lab = LabParser.parse(lab_path)
+            except (Exception, IOError):
+                lab = Lab(None, path=lab_path)
 
-        lab_hash = utils.generate_urlsafe_hash(lab_path)
-        exec_output = Kathara.get_instance().exec(args['machine_name'], args['command'], lab_hash=lab_hash)
+        exec_output = Kathara.get_instance().exec(args['machine_name'], args['command'], lab_hash=lab.hash)
 
         try:
             while True:

src/Kathara/cli/command/LcleanCommand.py

@@ -6,6 +6,8 @@
 from ... import utils
 from ...foundation.cli.command.Command import Command
 from ...manager.Kathara import Kathara
+from ...model.Lab import Lab
+from ...parser.netkit.LabParser import LabParser
 from ...strings import strings, wiki_description
 
 
@@ -45,9 +47,11 @@ def run(self, current_path: str, argv: List[str]) -> None:
 
         lab_path = args['directory'].replace('"', '').replace("'", '') if args['directory'] else current_path
         lab_path = utils.get_absolute_path(lab_path)
-
-        lab_hash = utils.generate_urlsafe_hash(lab_path)
+        try:
+            lab = LabParser.parse(lab_path)
+        except (Exception, IOError):
+            lab = Lab(None, path=lab_path)
 
         logging.info(format_headers("Stopping Network Scenario"))
 
-        Kathara.get_instance().undeploy_lab(lab_hash=lab_hash, selected_machines=set(args['machine_names']))
+        Kathara.get_instance().undeploy_lab(lab_hash=lab.hash, selected_machines=set(args['machine_names']))

src/Kathara/cli/command/LconfigCommand.py

@@ -8,6 +8,7 @@
 from ...foundation.cli.command.Command import Command
 from ...manager.Kathara import Kathara
 from ...model.Lab import Lab
+from ...parser.netkit.LabParser import LabParser
 from ...strings import strings, wiki_description
 
 
@@ -53,9 +54,6 @@ def run(self, current_path: str, argv: List[str]) -> None:
         self.parse_args(argv)
         args = self.get_args()
 
-        lab_path = args['directory'].replace('"', '').replace("'", '') if args['directory'] else current_path
-        lab_path = utils.get_absolute_path(lab_path)
-
         for eth in args['eths']:
             # Only alphanumeric characters are allowed
             matches = re.search(r"^\w+$", eth)
@@ -65,13 +63,22 @@ def run(self, current_path: str, argv: List[str]) -> None:
                 self.parser.print_help()
                 exit(1)
 
-        lab = Lab(None, path=lab_path)
+        lab_path = args['directory'].replace('"', '').replace("'", '') if args['directory'] else current_path
+        lab_path = utils.get_absolute_path(lab_path)
+        try:
+            lab = LabParser.parse(lab_path)
+        except (Exception, IOError):
+            lab = Lab(None, path=lab_path)
 
-        device = lab.get_or_new_machine(args['name'])
-        device.api_object = Kathara.get_instance().get_machine_api_object(args['name'], lab_hash=lab.hash)
+        machine_name = args['name']
+        device = lab.get_or_new_machine(machine_name)
+        device.api_object = Kathara.get_instance().get_machine_api_object(machine_name, lab_hash=lab.hash)
 
         for eth in args['eths']:
-            logging.info("Adding interface to device `%s` for collision domain `%s`..." % (args['name'], eth))
-            lab.connect_machine_to_link(args['name'], eth)
+            logging.info("Adding interface to device `%s` for collision domain `%s`..." % (machine_name, eth))
+            lab.connect_machine_to_link(machine_name, eth)
+
+        # Remove all the lab machines, except the one to update
+        lab.machines = {machine_name: device}
 
         Kathara.get_instance().update_lab(lab)

src/Kathara/cli/command/LinfoCommand.py

@@ -6,6 +6,7 @@
 from ... import utils
 from ...foundation.cli.command.Command import Command
 from ...manager.Kathara import Kathara
+from ...model.Lab import Lab
 from ...model.Link import BRIDGE_LINK_NAME
 from ...parser.netkit.LabParser import LabParser
 from ...strings import strings, wiki_description
@@ -65,45 +66,48 @@ def run(self, current_path: str, argv: List[str]) -> None:
 
         lab_path = args['directory'].replace('"', '').replace("'", '') if args['directory'] else current_path
         lab_path = utils.get_absolute_path(lab_path)
-        lab_hash = utils.generate_urlsafe_hash(lab_path)
+        try:
+            lab = LabParser.parse(lab_path)
+        except (Exception, IOError):
+            lab = Lab(None, path=lab_path)
 
         if args['live']:
             if args['name']:
-                self._get_machine_live_info(lab_hash, args['name'])
+                self._get_machine_live_info(lab, args['name'])
             else:
-                self._get_lab_live_info(lab_hash)
+                self._get_lab_live_info(lab)
 
             return
 
         if args['conf']:
-            self._get_conf_info(lab_path, machine_name=args['name'])
+            self._get_conf_info(lab, machine_name=args['name'])
             return
 
         if args['name']:
             print(format_headers("Device Information"))
-            print(str(next(Kathara.get_instance().get_machine_stats(args['name'], lab_hash))))
+            print(str(next(Kathara.get_instance().get_machine_stats(args['name'], lab.hash))))
             print(format_headers())
         else:
-            machines_stats = Kathara.get_instance().get_machines_stats(lab_hash)
+            machines_stats = Kathara.get_instance().get_machines_stats(lab.hash)
             print(next(create_table(machines_stats)))
 
     @staticmethod
-    def _get_machine_live_info(lab_hash: str, machine_name: str) -> None:
+    def _get_machine_live_info(lab: Lab, machine_name: str) -> None:
         Curses.get_instance().init_window()
 
         try:
             while True:
                 Curses.get_instance().print_string(
                     format_headers("Device Information") + "\n" +
-                    str(next(Kathara.get_instance().get_machine_stats(machine_name, lab_hash))) + "\n" +
+                    str(next(Kathara.get_instance().get_machine_stats(machine_name, lab.hash))) + "\n" +
                     format_headers()
                 )
         finally:
             Curses.get_instance().close()
 
     @staticmethod
-    def _get_lab_live_info(lab_hash: str) -> None:
-        machines_stats = Kathara.get_instance().get_machines_stats(lab_hash)
+    def _get_lab_live_info(lab: Lab) -> None:
+        machines_stats = Kathara.get_instance().get_machines_stats(lab.hash)
         table = create_table(machines_stats)
 
         Curses.get_instance().init_window()
@@ -117,8 +121,7 @@ def _get_lab_live_info(lab_hash: str) -> None:
             Curses.get_instance().close()
 
     @staticmethod
-    def _get_conf_info(lab_path: str, machine_name: str = None) -> None:
-        lab = LabParser.parse(lab_path)
+    def _get_conf_info(lab: Lab, machine_name: str = None) -> None:
         if machine_name:
             print(format_headers("Device Information"))
             print(str(lab.machines[machine_name]))

src/Kathara/cli/command/VcleanCommand.py

@@ -2,9 +2,9 @@
 import logging
 from typing import List
 
-from ... import utils
 from ...foundation.cli.command.Command import Command
 from ...manager.Kathara import Kathara
+from ...model.Lab import Lab
 from ...strings import strings, wiki_description
 
 
@@ -37,8 +37,7 @@ def run(self, current_path: str, argv: List[str]) -> None:
         self.parse_args(argv)
         args = self.get_args()
 
-        lab_hash = utils.generate_urlsafe_hash("kathara_vlab")
-
-        Kathara.get_instance().undeploy_lab(lab_hash=lab_hash, selected_machines={args['name']})
+        lab = Lab("kathara_vlab")
+        Kathara.get_instance().undeploy_lab(lab_name=lab.name, selected_machines={args['name']})
 
         logging.info("Device `%s` deleted successfully!" % args['name'])

src/Kathara/cli/command/VconfigCommand.py

@@ -57,11 +57,12 @@ def run(self, current_path: str, argv: List[str]) -> None:
 
         lab = Lab("kathara_vlab")
 
-        device = lab.get_or_new_machine(args['name'])
-        device.api_object = Kathara.get_instance().get_machine_api_object(args['name'], lab_name=lab.name)
+        machine_name = args['name']
+        device = lab.get_or_new_machine(machine_name)
+        device.api_object = Kathara.get_instance().get_machine_api_object(machine_name, lab_name=lab.name)
 
         for eth in args['eths']:
-            logging.info("Adding interface to device `%s` for collision domain `%s`..." % (args['name'], eth))
-            lab.connect_machine_to_link(args['name'], eth)
+            logging.info("Adding interface to device `%s` for collision domain `%s`..." % (machine_name, eth))
+            lab.connect_machine_to_link(machine_name, eth)
 
         Kathara.get_instance().update_lab(lab)

src/Kathara/model/Lab.py

@@ -31,7 +31,7 @@ class Lab(object):
         shared_shutdown_path(str) The path of the shared shutdown file, if exists.
         shared_folder(str) The path of the shared folder, if exists.
     """
-    __slots__ = ['name', 'description', 'version', 'author', 'email', 'web',
+    __slots__ = ['_name', 'description', 'version', 'author', 'email', 'web',
                  'path', 'hash', 'machines', 'links', 'general_options', 'has_dependencies',
                  'shared_startup_path', 'shared_shutdown_path', 'shared_folder']
 
@@ -45,7 +45,7 @@ def __init__(self, name: Optional[str], path: str = None) -> None:
         Returns:
             None
         """
-        self.name: Optional[str] = name
+        self._name: Optional[str] = name
         self.description: Optional[str] = None
         self.version: Optional[str] = None
         self.author: Optional[str] = None
@@ -63,20 +63,26 @@ def __init__(self, name: Optional[str], path: str = None) -> None:
         self.shared_startup_path: Optional[str] = None
         self.shared_shutdown_path: Optional[str] = None
 
-        self.hash: str = ""
+        self.hash: str = utils.generate_urlsafe_hash(self.path if self._name is None else self._name)
 
         if self.path:
-            self.hash = utils.generate_urlsafe_hash(self.path)
             shared_startup_file = os.path.join(self.path, 'shared.startup')
             self.shared_startup_path = shared_startup_file if os.path.exists(shared_startup_file) else None
 
             shared_shutdown_file = os.path.join(self.path, 'shared.shutdown')
             self.shared_shutdown_path = shared_shutdown_file if os.path.exists(shared_shutdown_file) else None
-        else:
-            self.hash = utils.generate_urlsafe_hash(self.name)
 
         self.shared_folder: Optional[str] = None
 
+    @property
+    def name(self):
+        return self._name
+
+    @name.setter
+    def name(self, value):
+        self._name = value
+        self.hash = utils.generate_urlsafe_hash(value)
+
     def connect_machine_to_link(self, machine_name: str, link_name: str, machine_iface_number: int = None) -> None:
         """Connect the specified device to the specified collision domain.
 
@@ -258,8 +264,8 @@ def __repr__(self) -> str:
     def __str__(self) -> str:
         lab_info = ""
 
-        if self.name:
-            lab_info += "Name: %s\n" % self.name
+        if self._name:
+            lab_info += "Name: %s\n" % self._name
 
         if self.description:
             lab_info += "Description: %s\n" % self.description

tests/model/lab_test.py

@@ -17,6 +17,11 @@ def default_scenario():
     return Lab("default_scenario")
 
 
+@pytest.fixture()
+def default_scenario_path():
+    return Lab(None, path="/lab/path")
+
+
 @pytest.fixture()
 def temporary_path():
     return mkdtemp("kathara_test")
@@ -47,6 +52,31 @@ def test_default_scenario_creation(default_scenario: Lab):
     assert default_scenario.hash == utils.generate_urlsafe_hash(default_scenario.name)
 
 
+def test_default_scenario_creation_with_path(default_scenario_path: Lab):
+    assert default_scenario_path.name is None
+    assert default_scenario_path.description is None
+    assert default_scenario_path.version is None
+    assert default_scenario_path.author is None
+    assert default_scenario_path.email is None
+    assert default_scenario_path.web is None
+    assert default_scenario_path.machines == {}
+    assert default_scenario_path.links == {}
+    assert default_scenario_path.general_options == {}
+    assert not default_scenario_path.has_dependencies
+    assert default_scenario_path.path == "/lab/path"
+    assert default_scenario_path.shared_shutdown_path is None
+    assert default_scenario_path.shared_startup_path is None
+    assert default_scenario_path.shared_folder is None
+    assert default_scenario_path.hash == utils.generate_urlsafe_hash(default_scenario_path.path)
+
+
+def test_default_scenario_creation_with_path_and_name(default_scenario_path: Lab):
+    default_scenario_path.name = "lab_with_path"
+    assert default_scenario_path.name == "lab_with_path"
+    assert default_scenario_path.path == "/lab/path"
+    assert default_scenario_path.hash == utils.generate_urlsafe_hash(default_scenario_path.name)
+
+
 def test_directory_scenario_creation_no_shared_files(directory_scenario: Lab, temporary_path: str):
     assert directory_scenario.name == "directory_scenario"
     assert directory_scenario.description is None
@@ -62,7 +92,7 @@ def test_directory_scenario_creation_no_shared_files(directory_scenario: Lab, te
     assert directory_scenario.shared_shutdown_path == os.path.join(temporary_path, 'shared.shutdown')
     assert directory_scenario.shared_startup_path == os.path.join(temporary_path, 'shared.startup')
     assert directory_scenario.shared_folder is None
-    assert directory_scenario.hash == utils.generate_urlsafe_hash(temporary_path)
+    assert directory_scenario.hash == utils.generate_urlsafe_hash(directory_scenario.name)
 
 
 def test_get_or_new_machine_not_exist(default_scenario: Lab):