[bordeaux] network-api re-structured

data/grid5000/sites/bordeaux/network_equipments/gw.json

@@ -12,9 +12,11 @@
 
         },
         {
+          "kind": "other",
           "uid": "storage"
         },
         {
+          "kind": "other",
           "uid": "mx"
         },
         {
@@ -28,6 +30,7 @@
           "uid": "labri"
         },
         {
+          "kind": "other",
           "uid": "ib"
         },
         {
@@ -369,6 +372,12 @@
   "type": "network_equipment",
   "uid": "gw",
   "vlans": {
+    "1": {
+      "addresses": [
+        "172.16.15.254"
+      ],
+      "administrative": true
+    },
     "naming_pattern": "Vlan%VLANID%"
   }
 }
\ No newline at end of file

generators/input/sites/bordeaux/net-links.yaml → generators/input/sites/bordeaux/net-links/gw.yaml

@@ -6,6 +6,10 @@ gw:
   snmp_community: public
   vlans: 
     naming_pattern: Vlan%VLANID%
+    "1": 
+      administrative: yes
+      addresses: 
+        - 172.16.15.254
   routes: {}
 
   linecards: 
@@ -14,14 +18,20 @@ gw:
       kind: switch
       rate: 10000000000
       ports: 
-        1: storage
-        2: mx
+        1: 
+          uid: storage
+          kind: other
+        2: 
+          uid: mx
+          kind: other
         3: sborderline
         4: renater
         5: 
           uid: labri
           rate: 1000000000
-        6: ib
+        6: 
+          uid: ib
+          kind: other
         7: st-bordemer
     1: 
       naming_pattern: "%LINECARD%/%PORT%"
@@ -146,195 +156,3 @@ gw:
           port: eth1
   channels: 
     naming_pattern: Po%CHANNELID%
-sborderline: 
-  model: Nortel 5530
-  kind: switch
-  site: bordeaux
-  snmp_community: public
-  vlans: 
-    naming_pattern: Vlan%VLANID%
-  routes: {}
-
-  linecards: 
-    0: 
-      naming_pattern: "%LINECARD%/%PORT%"
-      kind: router
-      rate: 10000000000
-      ports: 
-        0: gw
-    1: 
-      naming_pattern: "%LINECARD%/%PORT%"
-      kind: node
-      rate: 1000000000
-      ports: 
-        1: borderline-1
-        2: borderline-2
-        3: borderline-3
-        4: borderline-4
-        5: borderline-5
-        6: borderline-6
-        7: borderline-7
-        8: borderline-8
-        9: borderline-9
-        10: borderline-10
-  channels: 
-    naming_pattern: Po%CHANNELID%
-st-bordemer: 
-  model: Cisco 3750
-  kind: switch
-  site: bordeaux
-  snmp_community: public
-  vlans: 
-    naming_pattern: Vlan%VLANID%
-  routes: {}
-
-  linecards: 
-    0: 
-      naming_pattern: "%LINECARD%/%PORT%"
-      kind: router
-      rate: 10000000000
-      ports: 
-        0: gw
-    1: 
-      naming_pattern: "%LINECARD%/%PORT%"
-      kind: switch
-      rate: 1000000000
-      ports: 
-        1: sbordeplage-1
-        2: sbordeplage-2
-  channels: 
-    naming_pattern: Po%CHANNELID%
-sbordeplage-1: 
-  model: Dell Proconnect 2024
-  kind: switch
-  site: bordeaux
-  snmp_community: public
-  vlans: 
-    naming_pattern: Vlan%VLANID%
-  routes: {}
-
-  linecards: 
-    0: 
-      naming_pattern: "%LINECARD%/%PORT%"
-      kind: switch
-      rate: 1000000000
-      ports: 
-        0: st-bordemer
-        1: dinkum-thinkum
-    1: 
-      naming_pattern: "%LINECARD%/%PORT%"
-      kind: node
-      rate: 1000000000
-      ports: 
-        1: bordeplage-1
-        2: bordeplage-2
-        3: bordeplage-3
-        4: bordeplage-4
-        5: bordeplage-5
-        6: bordeplage-6
-        7: bordeplage-7
-        8: bordeplage-8
-        9: bordeplage-9
-        10: bordeplage-10
-  channels: 
-    naming_pattern: Po%CHANNELID%
-sbordeplage-2: 
-  model: Dell Proconnect 2024
-  kind: switch
-  site: bordeaux
-  snmp_community: public
-  vlans: 
-    naming_pattern: Vlan%VLANID%
-  routes: {}
-
-  linecards: 
-    0: 
-      naming_pattern: "%LINECARD%/%PORT%"
-      kind: switch
-      rate: 1000000000
-      ports: 
-        0: st-bordemer
-    1: 
-      naming_pattern: "%LINECARD%/%PORT%"
-      kind: node
-      rate: 1000000000
-      ports: 
-        1: bordeplage-11
-        2: bordeplage-12
-        3: bordeplage-13
-        4: bordeplage-14
-        5: bordeplage-15
-        6: bordeplage-16
-        7: bordeplage-17
-        8: bordeplage-18
-        9: bordeplage-19
-        10: bordeplage-20
-        11: bordeplage-21
-        12: bordeplage-22
-        13: bordeplage-23
-        14: bordeplage-24
-        15: bordeplage-25
-        16: bordeplage-26
-        17: bordeplage-27
-        18: bordeplage-28
-        19: bordeplage-29
-        20: bordeplage-30
-        21: bordeplage-31
-        22: bordeplage-32
-        23: bordeplage-33
-        24: bordeplage-34
-        25: bordeplage-35
-        26: bordeplage-36
-        27: bordeplage-37
-        28: bordeplage-38
-        29: bordeplage-39
-        30: bordeplage-40
-        31: bordeplage-41
-        32: bordeplage-42
-        33: bordeplage-43
-        34: bordeplage-44
-        35: bordeplage-45
-        36: bordeplage-46
-        37: bordeplage-47
-        38: bordeplage-48
-        39: bordeplage-49
-        40: bordeplage-50
-        41: bordeplage-51
-  channels: 
-    naming_pattern: Po%CHANNELID%
-ib: 
-  model: Infiniband
-  kind: switch
-  site: bordeaux
-  snmp_community: public
-  vlans: 
-    naming_pattern: Vlan%VLANID%
-  routes: {}
-
-  linecards: 
-    0: 
-      naming_pattern: "%LINECARD%/%PORT%"
-      kind: node
-      rate: 100000000
-      ports: 
-        0: gw
-  channels: 
-    naming_pattern: Po%CHANNELID%
-mx: 
-  model: Infiniband
-  kind: switch
-  site: bordeaux
-  snmp_community: public
-  vlans: 
-    naming_pattern: Vlan%VLANID%
-  routes: {}
-
-  linecards: 
-    0: 
-      naming_pattern: "%LINECARD%/%PORT%"
-      kind: node
-      rate: 100000000
-      ports: 
-        0: gw
-  channels: 
-    naming_pattern: Po%CHANNELID%

generators/input/sites/bordeaux/net-links/sbordeplage-1.yaml

+--- 
+sbordeplage-1: 
+  model: Dell Proconnect 2024
+  kind: switch
+  site: bordeaux
+  snmp_community: public
+  vlans: 
+    naming_pattern: Vlan%VLANID%
+  routes: {}
+
+  linecards: 
+    0: 
+      naming_pattern: "%LINECARD%/%PORT%"
+      kind: switch
+      rate: 1000000000
+      ports: 
+        0: st-bordemer
+        1: dinkum-thinkum
+    1: 
+      naming_pattern: "%LINECARD%/%PORT%"
+      kind: node
+      rate: 1000000000
+      ports: 
+        1: bordeplage-1
+        2: bordeplage-2
+        3: bordeplage-3
+        4: bordeplage-4
+        5: bordeplage-5
+        6: bordeplage-6
+        7: bordeplage-7
+        8: bordeplage-8
+        9: bordeplage-9
+        10: bordeplage-10
+  channels: 
+    naming_pattern: Po%CHANNELID%

generators/input/sites/bordeaux/net-links/sbordeplage-2.yaml

+--- 
+sbordeplage-2: 
+  model: Dell Proconnect 2024
+  kind: switch
+  site: bordeaux
+  snmp_community: public
+  vlans: 
+    naming_pattern: Vlan%VLANID%
+  routes: {}
+
+  linecards: 
+    0: 
+      naming_pattern: "%LINECARD%/%PORT%"
+      kind: switch
+      rate: 1000000000
+      ports: 
+        0: st-bordemer
+    1: 
+      naming_pattern: "%LINECARD%/%PORT%"
+      kind: node
+      rate: 1000000000
+      ports: 
+        1: bordeplage-11
+        2: bordeplage-12
+        3: bordeplage-13
+        4: bordeplage-14
+        5: bordeplage-15
+        6: bordeplage-16
+        7: bordeplage-17
+        8: bordeplage-18
+        9: bordeplage-19
+        10: bordeplage-20
+        11: bordeplage-21
+        12: bordeplage-22
+        13: bordeplage-23
+        14: bordeplage-24
+        15: bordeplage-25
+        16: bordeplage-26
+        17: bordeplage-27
+        18: bordeplage-28
+        19: bordeplage-29
+        20: bordeplage-30
+        21: bordeplage-31
+        22: bordeplage-32
+        23: bordeplage-33
+        24: bordeplage-34
+        25: bordeplage-35
+        26: bordeplage-36
+        27: bordeplage-37
+        28: bordeplage-38
+        29: bordeplage-39
+        30: bordeplage-40
+        31: bordeplage-41
+        32: bordeplage-42
+        33: bordeplage-43
+        34: bordeplage-44
+        35: bordeplage-45
+        36: bordeplage-46
+        37: bordeplage-47
+        38: bordeplage-48
+        39: bordeplage-49
+        40: bordeplage-50
+        41: bordeplage-51
+  channels: 
+    naming_pattern: Po%CHANNELID%

generators/input/sites/bordeaux/net-links/sborderline.yaml

+--- 
+sborderline: 
+  model: Nortel 5530
+  kind: switch
+  site: bordeaux
+  snmp_community: public
+  vlans: 
+    naming_pattern: Vlan%VLANID%
+  routes: {}
+
+  linecards: 
+    0: 
+      naming_pattern: "%LINECARD%/%PORT%"
+      kind: router
+      rate: 10000000000
+      ports: 
+        0: gw
+    1: 
+      naming_pattern: "%LINECARD%/%PORT%"
+      kind: node
+      rate: 1000000000
+      ports: 
+        1: borderline-1
+        2: borderline-2
+        3: borderline-3
+        4: borderline-4
+        5: borderline-5
+        6: borderline-6
+        7: borderline-7
+        8: borderline-8
+        9: borderline-9
+        10: borderline-10
+  channels: 
+    naming_pattern: Po%CHANNELID%

generators/input/sites/bordeaux/net-links/st-bordemer.yaml

+--- 
+st-bordemer: 
+  model: Cisco 3750
+  kind: switch
+  site: bordeaux
+  snmp_community: public
+  vlans: 
+    naming_pattern: Vlan%VLANID%
+  routes: {}
+
+  linecards: 
+    0: 
+      naming_pattern: "%LINECARD%/%PORT%"
+      kind: router
+      rate: 10000000000
+      ports: 
+        0: gw
+    1: 
+      naming_pattern: "%LINECARD%/%PORT%"
+      kind: switch
+      rate: 1000000000
+      ports: 
+        1: sbordeplage-1
+        2: sbordeplage-2
+  channels: 
+    naming_pattern: Po%CHANNELID%