updated topology format with node name (#10)

Author: networkRob

Readme.md

@@ -97,11 +97,11 @@ links:
   - [["spine1", "et2"], ["leaf1", "et1"]]
   - [["leaf1", "et3"], ["host10", "et0"]]
 nodes:
-  spine1:
+  - name: spine1
     mac: 00:1c:73:c0:c6:01
     ipaddress: 192.168.0.10
 hosts:
-  host10:
+  - name: host10
     ipaddress: 10.0.12.11
     mask: 255.255.255.0
     gateway: 10.0.12.1

build/topo-builder.py

@@ -404,13 +404,13 @@ def main(args):
     pS("INFO", "Examining devices for topology")
     if hosts:
         for _container_node in (nodes + hosts):
-            _node_name = list(_container_node.keys())[0]
+            _node_name = _container_node['name']
             _container_uid = getDevID()
             CEOS_IDS.append(_container_uid)
             CEOS_MAPPER[_node_name] = _container_uid
     else:
         for _container_node in nodes:
-            _node_name = list(_container_node.keys())[0]
+            _node_name = _container_node['name']
             _container_uid = getDevID()
             CEOS_IDS.append(_container_uid)
             CEOS_MAPPER[_node_name] = _container_uid
@@ -427,13 +427,13 @@ def main(args):
             _node_ip = _node['ip_addr']
         except KeyError:
             _node_ip = ""
-        _node_name = list(_node.keys())[0]
+        _node_name = _node['name']
         CEOS[_node_name] = CEOS_NODE(_node_name, _node_ip, mgmt_mac, _node['mac'], CEOS_LINKS[_node_name], _tag, ceos_image)
         DEVICE_INFO.append(f"# {_node_name} = {CEOS[_node_name].tag}{CEOS[_node_name].dev_id}\n")
     # Load Host nodes specific information
     if hosts:
         for _host in hosts:
-            _host_name = list(_host.keys())[0]
+            _host_name = _host['name']
             HOSTS[_host_name] = HOST_NODE(_host_name, _host['ip_addr'], _host['mask'], _host['gateway'], CEOS_LINKS[_host_name], _tag, host_image)
             DEVICE_INFO.append(f"# {_host_name} = {HOSTS[_host_name].tag}{HOSTS[_host_name].dev_id}\n")
     # Check for output directory

examples/topologies/atd.yaml

@@ -40,21 +40,21 @@ links:
   - [["leaf4", "et5"], ["host2", "et4"]]
   - [["leaf4", "et6"], ["host2", "et6"]]
 nodes:
-  - spine1:
+  - name: spine1
     mac: 00:1c:73:f0:c6:01
-  - spine2:
+  - name: spine2
     mac: 00:1c:73:f1:c6:01
-  - leaf1:
+  - name: leaf1
     mac: 00:1c:73:f2:c6:01
-  - leaf2:
+  - name: leaf2
     mac: 00:1c:73:f3:c6:01
-  - leaf3:
+  - name: leaf3
     mac: 00:1c:73:f4:c6:01
-  - leaf4:
+  - name: leaf4
     mac: 00:1c:73:f5:c6:01
-  - host1:
+  - name: host1
     mac: 00:1c:73:f7:c6:01
-  - host2:
+  - name: host2
     mac: 00:1c:73:f8:c6:01
 hosts:
 iperf:

examples/topologies/l2.yaml

@@ -38,43 +38,43 @@ links:
   - [["leaf3", "et4"], ["host31", "et0"]]
 
 nodes:
-  - spine1:
+  - name: spine1
     mac: 00:1c:73:b0:c6:01
     ip_addr: 192.168.50.21
-  - spine2:
+  - name: spine2
     mac: 00:1c:73:b1:c6:01
     ip_addr: 192.168.50.22
-  - leaf1:
+  - name: leaf1
     mac: 00:1c:73:b2:c6:01
     ip_addr: 192.168.50.23
-  - leaf2:
+  - name: leaf2
     mac: 00:1c:73:b3:c6:01
     ip_addr: 192.168.50.24
-  - leaf3:
+  - name: leaf3
     mac: 00:1c:73:b4:c6:01
     ip_addr: 192.168.50.25
 hosts:
-  - host10:
+  - name: host10
     ip_addr: 10.0.12.11
     mask: 255.255.255.0
     gateway: 10.0.12.1
-  - host11:
+  - name: host11
     ip_addr: 10.0.13.11
     mask: 255.255.255.0
     gateway: 10.0.13.1
-  - host20:
+  - name: host20
     ip_addr: 10.0.12.21
     mask: 255.255.255.0
     gateway: 10.0.12.1
-  - host21:
+  - name: host21
     ip_addr: 10.0.13.21
     mask: 255.255.255.0
     gateway: 10.0.13.1
-  - host30:
+  - name: host30
     ip_addr: 10.0.12.31
     mask: 255.255.255.0
     gateway: 10.0.12.1
-  - host31:
+  - name: host31
     ip_addr: 10.0.13.31
     mask: 255.255.255.0
     gateway: 10.0.13.1

examples/topologies/l3.yaml

@@ -51,58 +51,58 @@ links:
   - [["brdr1", "et1"], ["brdr2", "et1"]]
 
 nodes:
-  - spine1:
+  - name: spine1
     mac: 00:1c:73:c0:c6:01
     ip_addr: 192.168.50.31
-  - spine2:
+  - name: spine2
     mac: 00:1c:73:c1:c6:01
     ip_addr: 192.168.50.32
-  - leaf11:
+  - name: leaf11
     mac: 00:1c:73:c2:c6:01
     ip_addr: 192.168.50.33
-  - leaf12:
+  - name: leaf12
     mac: 00:1c:73:c3:c6:01
     ip_addr: 192.168.50.34
-  - leaf21:
+  - name: leaf21
     mac: 00:1c:73:c4:c6:01
     ip_addr: 192.168.50.35
-  - leaf22:
+  - name: leaf22
     mac: 00:1c:73:c5:c6:01
     ip_addr: 192.168.50.36
-  - leaf31:
+  - name: leaf31
     mac: 00:1c:73:c6:c6:01
     ip_addr: 192.168.50.37
-  - leaf32:
+  - name: leaf32
     mac: 00:1c:73:c7:c6:01
     ip_addr: 192.168.50.38
-  - brdr1:
+  - name: brdr1
     mac: 00:1c:73:c8:c6:01
     ip_addr: 192.168.50.39
-  - brdr2:
+  - name: brdr2
     mac: 00:1c:73:c9:c6:01
     ip_addr: 192.168.50.40
 hosts:
-  - host11:
+  - name: host11
     ip_addr: 192.168.12.11
     mask: 255.255.255.0
     gateway: 192.168.12.1
-  - host12:
+  - name: host12
     ip_addr: 192.168.13.11
     mask: 255.255.255.0
     gateway: 192.168.13.1
-  - host21:
+  - name: host21
     ip_addr: 192.168.12.21
     mask: 255.255.255.0
     gateway: 192.168.12.1
-  - host22:
+  - name: host22
     ip_addr: 192.168.13.21
     mask: 255.255.255.0
     gateway: 192.168.13.1
-  - host31:
+  - name: host31
     ip_addr: 192.168.12.31
     mask: 255.255.255.0
     gateway: 192.168.12.1
-  - host32:
+  - name: host32
     ip_addr: 192.168.13.31
     mask: 255.255.255.0
     gateway: 192.168.13.1

examples/topologies/ratd.yaml

@@ -48,45 +48,45 @@ links:
   - [["eos12", "et1"], ["eos13", "et2"]]
 
 nodes:
-  - eos1:
+  - name: eos1
     mac: 00:1c:73:d0:c6:01
-  - eos2:
+  - name: eos2
     mac: 00:1c:73:d1:c6:01
-  - eos3:
+  - name: eos3
     mac: 00:1c:73:d2:c6:01
-  - eos4:
+  - name: eos4
     mac: 00:1c:73:d3:c6:01
-  - eos5:
+  - name: eos5
     mac: 00:1c:73:d4:c6:01
-  - eos6:
+  - name: eos6
     mac: 00:1c:73:d5:c6:01
-  - eos7:
+  - name: eos7
     mac: 00:1c:73:d6:c6:01
-  - eos8:
+  - name: eos8
     mac: 00:1c:73:d7:c6:01
-  - eos9:
+  - name: eos9
     mac: 00:1c:73:d8:c6:01
-  - eos10:
+  - name: eos10
     mac: 00:1c:73:d9:c6:01
-  - eos11:
+  - name: eos11
     mac: 00:1c:73:e0:c6:01
-  - eos12:
+  - name: eos12
     mac: 00:1c:73:e1:c6:01
-  - eos13:
+  - name: eos13
     mac: 00:1c:73:e2:c6:01
-  - eos14:
+  - name: eos14
     mac: 00:1c:73:e3:c6:01
-  - eos15:
+  - name: eos15
     mac: 00:1c:73:e4:c6:01
-  - eos16:
+  - name: eos16
     mac: 00:1c:73:d5:c6:01
-  - eos17:
+  - name: eos17
     mac: 00:1c:73:e6:c6:01
-  - eos18:
+  - name: eos18
     mac: 00:1c:73:e7:c6:01
-  - eos19:
+  - name: eos19
     mac: 00:1c:73:e8:c6:01
-  - eos20:
+  - name: eos20
     mac: 00:1c:73:e9:c6:01
 hosts:
 iperf: