Add leaf-spine topology parser

Author: PaulRalnikov

configs/leaf-spine/network.yml

@@ -1,4 +1,4 @@
-topology_config_path: topology.yml
+topology_config_path: new-topology.yml
 
 presets:
   default-connection:
@@ -16,50 +16,50 @@ presets:
 
 connections:
   conn_1--2:
-    sender_id: host_1
-    receiver_id: host_2
+    sender_id: host-1
+    receiver_id: host-2
     preset-name: default-connection
   conn_1--3:
-    sender_id: host_1
-    receiver_id: host_3
+    sender_id: host-1
+    receiver_id: host-3
     preset-name: default-connection
   conn_1--4:
-    sender_id: host_1
-    receiver_id: host_4
+    sender_id: host-1
+    receiver_id: host-4
     preset-name: default-connection
   conn_2--1:
-    sender_id: host_2
-    receiver_id: host_1
+    sender_id: host-2
+    receiver_id: host-1
     preset-name: default-connection
   conn_2--3:
-    sender_id: host_2
-    receiver_id: host_3
+    sender_id: host-2
+    receiver_id: host-3
     preset-name: default-connection
   conn_2--4:
-    sender_id: host_2
-    receiver_id: host_4
+    sender_id: host-2
+    receiver_id: host-4
     preset-name: default-connection
   conn_3--1:
-    sender_id: host_3
-    receiver_id: host_1
+    sender_id: host-3
+    receiver_id: host-1
     preset-name: default-connection
   conn_3--2:
-    sender_id: host_3
-    receiver_id: host_2
+    sender_id: host-3
+    receiver_id: host-2
     preset-name: default-connection
   conn_3--4:
-    sender_id: host_3
-    receiver_id: host_4
+    sender_id: host-3
+    receiver_id: host-4
     preset-name: default-connection
   conn_4--1:
-    sender_id: host_4
-    receiver_id: host_1
+    sender_id: host-4
+    receiver_id: host-1
     preset-name: default-connection
   conn_4--2:
-    sender_id: host_4
-    receiver_id: host_2
+    sender_id: host-4
+    receiver_id: host-2
     preset-name: default-connection
   conn_4--3:
-    sender_id: host_4
-    receiver_id: host_3
+    sender_id: host-4
+    receiver_id: host-3
     preset-name: default-connection

configs/leaf-spine/new-topology.yml

@@ -0,0 +1,29 @@
+type: leaf-spine
+
+presets:
+  link:
+    latency: 0ns
+    throughput: 100Gbps
+    ingress_buffer_size: 64KB
+    egress_buffer_size: 64KB
+    metrics_filters:
+      queue_sizes: false
+
+packet-spraying:
+  type: random
+
+switches:
+  spine:
+    count: 2
+  
+  leaf:
+    count: 4
+
+hosts:
+
+links:
+  leaf-spine:
+    preset-name: link
+  
+  host-leaf:
+    preset-name: link

configs/leaf-spine/topology.yml

@@ -12,10 +12,10 @@ packet-spraying:
   type: random
 
 hosts:
-  host_1:
-  host_2:
-  host_3:
-  host_4:
+  host-1:
+  host-2:
+  host-3:
+  host-4:
 
 switches:
   spine_1:
@@ -94,38 +94,38 @@ links:
     to: spine_2
     preset-name: default-link
 
-  leaf_1--host_1:
+  leaf_1--host-1:
     from: leaf_1
-    to: host_1
+    to: host-1
     preset-name: default-link
-  host_1--leaf_1:
-    from: host_1
+  host-1--leaf_1:
+    from: host-1
     to: leaf_1
     preset-name: default-link
 
-  leaf_2--host_2:
+  leaf_2--host-2:
     from: leaf_2
-    to: host_2
+    to: host-2
     preset-name: default-link
-  host_2--leaf_2:
-    from: host_2
+  host-2--leaf_2:
+    from: host-2
     to: leaf_2
     preset-name: default-link
 
-  leaf_3--host_3:
+  leaf_3--host-3:
     from: leaf_3
-    to: host_3
+    to: host-3
     preset-name: default-link
-  host_3--leaf_3:
-    from: host_3
+  host-3--leaf_3:
+    from: host-3
     to: leaf_3
     preset-name: default-link
 
-  leaf_4--host_4:
+  leaf_4--host-4:
     from: leaf_4
-    to: host_4
+    to: host-4
     preset-name: default-link
-  host_4--leaf_4:
-    from: host_4
+  host-4--leaf_4:
+    from: host-4
     to: leaf_4
     preset-name: default-link

source/parser/config_reader/config_node_with_preset_.cpp

@@ -105,4 +105,9 @@ const std::optional<ConfigNode> ConfigNodeWithPreset::get_presets_node()
     return m_presets_node;
 }
 
+ConfigNodeWithPreset load_file_with_presets(std::filesystem::path path) {
+    ConfigNode node = load_file(path);
+    return ConfigNodeWithPreset(node, node["presets"].to_optional());
+}
+
 }  // namespace sim

source/parser/config_reader/config_node_with_preset_.hpp

@@ -52,4 +52,6 @@ class ConfigNodeWithPreset {
     mutable std::optional<ConfigNode> m_preset;
 };
 
+ConfigNodeWithPreset load_file_with_presets(std::filesystem::path path);
+
 }  // namespace sim

source/parser/network/network_parser.cpp

@@ -12,7 +12,8 @@ Network parse_network(const std::filesystem::path& path) {
     std::string topology_config_path =
         parse_relative_path(node, "topology_config_path", path.parent_path());
 
-    const ConfigNode topology_config = load_file(topology_config_path);
+    const ConfigNodeWithPreset topology_config =
+        load_file_with_presets(topology_config_path);
 
     Topology topology = parse_topology(topology_config);
 

source/parser/topology/common.cpp

@@ -0,0 +1,26 @@
+#include "common.hpp"
+
+#include "link/link_parser.hpp"
+
+namespace sim {
+
+void add_directed_link(std::shared_ptr<IDevice> from,
+                       std::shared_ptr<IDevice> to,
+                       const ConfigNodeWithPreset& preset,
+                       utils::IdTable<ILink>& links_table) {
+    std::shared_ptr<ILink> link = parse_i_link(from, to, preset);
+    if (!links_table.emplace(link->get_id(), link).second) {
+        throw std::runtime_error(
+            fmt::format("Duplicate of link with name {} ", link->get_id()));
+    }
+};
+
+void add_links_between(std::shared_ptr<IDevice> from,
+                       std::shared_ptr<IDevice> to,
+                       const ConfigNodeWithPreset& preset,
+                       utils::IdTable<ILink>& links_table) {
+    add_directed_link(from, to, preset, links_table);
+    add_directed_link(to, from, preset, links_table);
+};
+
+}  // namespace sim

source/parser/topology/common.hpp

@@ -0,0 +1,18 @@
+#pragma once
+#include "parser/config_reader/config_node_with_preset_.hpp"
+#include "topology/link/i_link.hpp"
+#include "utils/id_table.hpp"
+
+namespace sim {
+
+void add_directed_link(std::shared_ptr<IDevice> from,
+                       std::shared_ptr<IDevice> to,
+                       const ConfigNodeWithPreset& preset,
+                       utils::IdTable<ILink>& links_table);
+
+void add_links_between(std::shared_ptr<IDevice> device_1,
+                       std::shared_ptr<IDevice> device_2,
+                       const ConfigNodeWithPreset& preset,
+                       utils::IdTable<ILink>& links_table);
+
+}  // namespace sim

source/parser/topology/incast_topology_parser.cpp

@@ -1,7 +1,7 @@
 #include "incast_topology_parser.hpp"
 
+#include "common.hpp"
 #include "host/host_parser.hpp"
-#include "link/link_parser.hpp"
 #include "switch/switch_parser.hpp"
 
 namespace sim {
@@ -43,32 +43,16 @@ Topology parse_incast_topology(const ConfigNode& node) {
         node_with_preset["links"].value_or_throw();
 
     utils::IdTable<ILink> links;
-    auto add_two_way_link = [&links](const ConfigNodeWithPreset& preset,
-                                     std::shared_ptr<IDevice> from,
-                                     std::shared_ptr<IDevice> to) {
-        auto add_directed_link = [&preset, &links](
-                                     std::shared_ptr<IDevice> from,
-                                     std::shared_ptr<IDevice> to) {
-            std::shared_ptr<ILink> link = parse_i_link(from, to, preset);
-            if (!links.emplace(link->get_id(), link).second) {
-                throw std::runtime_error(fmt::format(
-                    "Duplicate of link with name {} ", link->get_id()));
-            }
-        };
-
-        add_directed_link(from, to);
-        add_directed_link(to, from);
-    };
 
     // create links from between senders and switch
     for (const auto& [_, sender] : senders) {
-        add_two_way_link(links_preset, sender, swtch);
+        add_links_between(sender, swtch, links_preset, links);
     }
 
     const ConfigNodeWithPreset& bottleneck_link_preset =
         ConfigNodeWithPreset(node)["bottleneck-link"].value_or(links_preset);
 
-    add_two_way_link(bottleneck_link_preset, swtch, receiver);
+    add_links_between(swtch, receiver, bottleneck_link_preset, links);
 
     TopologyContext ctx;