SAE progress

Author: brunorijsman

common/configuration.py

@@ -54,10 +54,17 @@ def parse_configuration_file(filename: str = DEFAULT_CONFIGURATION_FILE):
             "name": {"type": "string"},
         },
     }
+    encryptor_schema = {
+        "type": "dict",
+        "schema": {
+            "name": {"type": "string"},
+        },
+    }
     client_schema = {
         "type": "dict",
         "schema": {
             "name": {"type": "string"},
+            "encryptors": {"type": "list", "schema": encryptor_schema},
         },
     }
     schema = {

manager.py

@@ -317,9 +317,7 @@ def find_kme_node_for_sae(self, sae_id: str) -> Node:
         """
         Given an SAE ID, find the KME node that is associated with it.
         """
-        # For now we make the simplifying assumption that there is only one SAE (encryptor) attached
-        # to each KME (client), and that the SAE has the same name as the KME. This makes the code
-        # simpler, since the KMEs don't need to keep track of which SAEs are attached to them.
+        # $$$
         for node in self._nodes:
             if node.type == NodeType.CLIENT and node.name == sae_id:
                 return node

topology.yaml

@@ -6,7 +6,18 @@ hubs:
   - name: hugo
 clients:
   - name: carol
+    encryptors:
+      - name: sam
   - name: celia
+    encryptors:
+      - name: serena
   - name: cindy
+    encryptors:
+      - name: sia
   - name: connie
+    encryptors:
+      - name: sofia
   - name: curtis
+    encryptors:
+      - name: sunny
+      - name: susan