Error message if --client or --hub does not exist in configuration

Author: brunorijsman

TODO

@@ -1,5 +1,3 @@
-TODO: Error message if --client or --hub does not exist in configuration
-
 TODO: Cleanup Shamir's Secret Sharing (SSS) code (no back-and-forth conversion to RawShare)
 
 TODO: Move code coverage data files to subdirectory

common/configuration.py

@@ -41,6 +41,14 @@
 MAX_MIN_NR_SHARES = 128
 
 
+def fatal_error(message: str):
+    """
+    Print a fatal error message and exit.
+    """
+    print(message, file=sys.stderr)
+    sys.exit(1)
+
+
 class Configuration:
     """
     Configuration for the DSKE manager.
@@ -158,18 +166,15 @@ def parse_configuration_file(filename: str) -> Configuration:
             try:
                 parsed_config = yaml.safe_load(file)
             except yaml.YAMLError as err:
-                print(
-                    f"Could not load configuration file {filename}: {str(err)}",
-                    file=sys.stderr,
+                fatal_error(
+                    f"Could not parse configuration file {filename}: {str(err)}"
                 )
-                sys.exit(1)
     except (OSError, IOError) as err:
-        print(f"Could not open configuration file {filename} ({err})", file=sys.stderr)
-        sys.exit(1)
+        fatal_error(f"Could not open configuration file {filename}: {err}")
     validator = cerberus.Validator()
     if not validator.validate(parsed_config, SCHEMA):
-        print(f"Could not parse configuration file {filename}", file=sys.stderr)
-        pretty_printer = pprint.PrettyPrinter()
+        print(f"Could not validate configuration file {filename}", file=sys.stderr)
+        pretty_printer = pprint.PrettyPrinter(stream=sys.stderr)
         pretty_printer.pprint(validator.errors)
         sys.exit(1)
     parsed_config = validator.normalized(parsed_config)

manager.py

@@ -39,6 +39,7 @@ def main(self):
         self.parse_command_line_arguments()
         self._config = configuration.parse_configuration_file(self._args.config)
         self._nodes = self._config.nodes
+        self.check_clients_and_hubs_exist()
         match self._args.command:
             case "start":
                 self.start()
@@ -261,6 +262,31 @@ def selected_nodes_description(self):
                 description += f"hub {hub_name}"
         return description
 
+    def check_clients_and_hubs_exist(self):
+        """
+        Check that all clients and hubs selected in the command-line arguments exist in the
+        configuration.
+        """
+        print("HEY")
+        if self._args.client is not None:
+            for client_name in self._args.client:
+                found = False
+                for node in self._nodes:
+                    if node.type == NodeType.CLIENT and node.name == client_name:
+                        found = True
+                        break
+                if not found:
+                    self.fatal_error(f"There is no client with name {client_name}")
+        if self._args.hub is not None:
+            for hub_name in self._args.hub:
+                found = False
+                for node in self._nodes:
+                    if node.type == NodeType.HUB and node.name == hub_name:
+                        found = True
+                        break
+                if not found:
+                    self.fatal_error(f"There is no hub with name {hub_name}")
+
     def wait_for_selected_nodes_condition(
         self, condition_func: typing.Callable[[Node], bool], condition_description: str
     ):