Implementation universal presets (#492)

close #484

Author: S1mpotyaga

configuration_examples/topology_examples/adaptive_flowlet.yml

@@ -22,36 +22,48 @@ links:
   link-1:
     from: sender
     to: switch-1
+    preset-name: default
   link-2:
     from: switch-1
     to: sender
+    preset-name: default
   link-3:
     from: sender
     to: switch-2
+    preset-name: default
   link-4:
     from: switch-2
     to: sender
+    preset-name: default
   link-5:
     from: sender
     to: switch-3
+    preset-name: default
   link-6:
     from: switch-3
     to: sender
+    preset-name: default
   link-7:
     from: switch-1
     to: receiver
+    preset-name: default
   link-8:
     from: receiver
     to: switch-1
+    preset-name: default
   link-9:
     from: switch-2
     to: receiver
+    preset-name: default
   link-10:
     from: receiver
     to: switch-2
+    preset-name: default
   link-11:
     from: switch-3
     to: receiver
+    preset-name: default
   link-12:
     from: receiver
     to: switch-3
+    preset-name: default

configuration_examples/topology_examples/bus_topology.yml

@@ -26,24 +26,32 @@ links:
   link1:
     from: sender1
     to: bus
+    preset-name: default
   link2:
     from: bus
     to: sender1
+    preset-name: default
   link3:
     from: sender2
     to: bus
+    preset-name: default
   link4:
     from: bus
     to: sender2
+    preset-name: default
   link5:
     from: receiver1
     to: bus
+    preset-name: default
   link6:
     from: bus
     to: receiver1  
+    preset-name: default
   link7:
     from: receiver2
     to: bus    
+    preset-name: default
   link8:
     from: bus
     to: receiver2
+    preset-name: default

configuration_examples/topology_examples/for_swift_testing.yml

@@ -21,21 +21,27 @@ links:
   link1:
     from: sender1
     to: switch1
+    preset-name: default
   link2:
     from: sender2
     to: switch1
+    preset-name: default
 
   # bottleneck link
   link3_bottleneck:
     from: switch1
     to: receiver1
     throughput: 5Gbps
+    preset-name: default
   link4:
     from: receiver1
     to: switch1
+    preset-name: default
   link5:
     from: switch1
     to: sender1
+    preset-name: default
   link6:
     from: switch1
     to: sender2
+    preset-name: default

configuration_examples/topology_examples/incast_topology.yml

@@ -27,36 +27,48 @@ links:
   link0:
     from: sender0
     to: switch
+    preset-name: default
   link1:
     from: switch
     to: sender0
+    preset-name: default
   link2:
     from: sender1
     to: switch
+    preset-name: default
   link3:
     from: switch
     to: sender1
+    preset-name: default
   link4:
     from: sender2
     to: switch
+    preset-name: default
   link5:
     from: switch
     to: sender2
+    preset-name: default
   link6:
     from: sender3
     to: switch
+    preset-name: default
   link7:
     from: switch
     to: sender3
+    preset-name: default
   link8:
     from: sender4
     to: switch
+    preset-name: default
   link9:
     from: switch
     to: sender4
+    preset-name: default
   link10:
     from: switch
     to: receiver0
+    preset-name: default
   link11:
     from: receiver0
     to: switch
+    preset-name: default

configuration_examples/topology_examples/single_layer_fractal.yml

@@ -22,36 +22,48 @@ links:
   link-1:
     from: sender
     to: switch-1
+    preset-name: default
   link-2:
     from: switch-1
     to: sender
+    preset-name: default
   link-3:
     from: sender
     to: switch-2
+    preset-name: default
   link-4:
     from: switch-2
     to: sender
+    preset-name: default
   link-5:
     from: sender
     to: switch-3
+    preset-name: default
   link-6:
     from: switch-3
     to: sender
+    preset-name: default
   link-7:
     from: switch-1
     to: receiver
+    preset-name: default
   link-8:
     from: receiver
     to: switch-1
+    preset-name: default
   link-9:
     from: switch-2
     to: receiver
+    preset-name: default
   link-10:
     from: receiver
     to: switch-2
+    preset-name: default
   link-11:
     from: switch-3
     to: receiver
+    preset-name: default
   link-12:
     from: receiver
     to: switch-3
+    preset-name: default

configuration_examples/topology_examples/two_layers_fractal.yml

@@ -24,60 +24,80 @@ links:
   link-1:
     from: sender
     to: switch-1
+    preset-name: default
   link-2:
     from: switch-1
     to: sender
+    preset-name: default
   link-3:
     from: sender
     to: switch-2
+    preset-name: default
   link-4:
     from: switch-2
     to: sender
+    preset-name: default
   link-5:
     from: switch-1
     to: switch-1-1
+    preset-name: default
   link-6:
     from: switch-1-1
     to: switch-1
+    preset-name: default
   link-7:
     from: switch-1
     to: switch-1-2
+    preset-name: default
   link-8:
     from: switch-1-2
     to: switch-1
+    preset-name: default
   link-9:
     from: switch-2
     to: switch-2-1
+    preset-name: default
   link-10:
     from: switch-2-1
     to: switch-2
+    preset-name: default
   link-11:
     from: switch-2
     to: switch-2-2
+    preset-name: default
   link-12:
     from: switch-2-2
     to: switch-2
+    preset-name: default
   link-13:
     from: switch-1-1
     to: receiver
+    preset-name: default
   link-14:
     from: receiver
     to: switch-1-1
+    preset-name: default
   link-15:
     from: switch-1-2
     to: receiver
+    preset-name: default
   link-16:
     from: receiver
     to: switch-1-2
+    preset-name: default
   link-17:
     from: switch-2-1
     to: receiver
+    preset-name: default
   link-18:
     from: receiver
     to: switch-2-1
+    preset-name: default
   link-19:
     from: switch-2-2
     to: receiver
+    preset-name: default
   link-20:
     from: receiver
     to: switch-2-2
+    preset-name: default

scripts/generators/topology/common.py

@@ -58,8 +58,7 @@ def add_directed_link(self, source_id : str, dest_id : str, preset_name : str =
             "from" : source_id,
             "to" : dest_id
         }
-        if preset_name != "default":
-            self.topology["links"][link_name]["preset-name"] = preset_name
+        self.topology["links"][link_name]["preset-name"] = preset_name
         self.next_link_num += 1
 
     def add_bidirectional_link(self,

source/parser/config_reader/config_node_with_preset.cpp

@@ -0,0 +1,76 @@
+#include "./config_node_with_preset.hpp"
+
+namespace sim{
+
+ConfigNodeWithPreset::ConfigNodeWithPreset(ConfigNode a_node, std::optional<ConfigNode> a_presets_node, std::optional<ConfigNode> a_preset)
+    : m_node(std::move(a_node)), m_presets_node(std::move(a_presets_node)), m_preset(std::move(a_preset)){}
+
+ConfigNodeWithPresetExpected ConfigNodeWithPreset::operator[](std::string_view key) const{
+    const ConfigNodeExpected child_node = m_node[key];
+    if (!child_node.has_value()){
+        // m_node hasn't key. Tries to find key in m_preset
+        if (!m_preset.has_value()){
+            // m_preset doesn't exist. Tries to find preset for this node
+            if (!m_presets_node.has_value()){
+                // m_presets_node doesn't exist. Returns message about it
+                std::stringstream ss;
+                ss << "Key error: node " << m_node << ":\n";
+                ss << "does not have key " << key;
+                return std::unexpected(ss.str());
+            }
+            // m_presets_node exist. Tries to find field 'preset-name' in m_node
+            ConfigNodeExpected node_preset_name = m_node["preset-name"];
+            if (!node_preset_name.has_value()){
+                // config hasn't field 'preset-name'. Returns message about it
+                std::stringstream ss;
+                ss << "Key error: node " << m_node << ":\n";
+                ss << "does not have key `preset-name`";
+                return std::unexpected(ss.str());
+            }
+            // field 'preset-name' was found. Tries to convert it to string
+            ConfigNode presets_node = m_presets_node.value();
+            utils::StrExpected<std::string> preset_name = node_preset_name.value().as<std::string>();
+            if (!preset_name.has_value()){
+                // field 'preset-name' couldn't be converted to string. Returns message about it
+                std::stringstream ss;
+                ss << "Error: field 'preset-name' in node " << m_node << '\n';
+                ss << "couldn't be converted to string";
+                return std::unexpected(ss.str());
+            }
+            // conversion is successful. tries to find preset in m_presets_node
+            ConfigNodeExpected preset_node = presets_node[preset_name.value()];
+            if (!preset_node.has_value()){
+                // m_presets_node hasn't preset with the specified name in config. Retruns message about it
+                std::stringstream ss;
+                ss << "Error: preset named '" << preset_name.value() << "' of node " << m_node << '\n';
+                ss << "can not be found in presets node:" << presets_node << ":\n";
+                return std::unexpected(ss.str());
+            }
+            // preset was found successfull. put the found value in m_preset
+            m_preset.emplace(preset_node.value());
+        }
+        // tries to find key in preset
+        ConfigNodeExpected key_node = m_preset.value()[key];
+        if (!key_node.has_value()){
+            // m_preset hasn't key. Returns message about it
+            std::stringstream ss;
+            ss << "Key error: preset '" << m_preset.value().get_name().value() << "' ";
+            ss << "does not have key: " << key;
+            return std::unexpected(ss.str());
+        }
+        // key was found in preset
+        return ConfigNodeWithPreset(key_node.value(), m_presets_node, m_preset);
+    }
+    // key was found in m_node
+    return ConfigNodeWithPreset(child_node.value(), m_presets_node, m_preset);
+}
+
+const std::string& ConfigNodeWithPreset::get_name_or_throw() const{
+    return m_node.get_name_or_throw();
+}
+
+const ConfigNode& ConfigNodeWithPreset::get_node() const noexcept{
+    return m_node;
+}
+
+} // namespace sim