[sophia] network api update - fastiron

data/grid5000/sites/sophia/network_equipments/fastiron.json

@@ -12,7 +12,7 @@
     },
     {
       "kind": "router",
-      "naming_pattern": "%LINECARD%/%PORT%",
+      "naming_pattern": "ethernet%LINECARD%/%PORT%",
       "ports": [
         {
 
@@ -26,11 +26,11 @@
           "uid": "edgeiron"
         }
       ],
-      "rate": 10000
+      "rate": 10000000000
     },
     {
       "kind": "node",
-      "naming_pattern": "%LINECARD%/%PORT%",
+      "naming_pattern": "ethernet%LINECARD%/%PORT%",
       "ports": [
         {
 
@@ -108,11 +108,11 @@
           "uid": "sol-36"
         }
       ],
-      "rate": 1000
+      "rate": 1000000000
     },
     {
       "kind": "node",
-      "naming_pattern": "%LINECARD%/%PORT%",
+      "naming_pattern": "ethernet%LINECARD%/%PORT%",
       "ports": [
         {
 
@@ -190,11 +190,11 @@
           "uid": "sol-48"
         }
       ],
-      "rate": 1000
+      "rate": 1000000000
     },
     {
       "kind": "node",
-      "naming_pattern": "%LINECARD%/%PORT%",
+      "naming_pattern": "ethernet%LINECARD%/%PORT%",
       "ports": [
         {
 
@@ -263,11 +263,11 @@
           "uid": "suno-16"
         }
       ],
-      "rate": 1000
+      "rate": 1000000000
     },
     {
       "kind": "node",
-      "naming_pattern": "%LINECARD%/%PORT%",
+      "naming_pattern": "ethernet%LINECARD%/%PORT%",
       "ports": [
         {
 
@@ -357,11 +357,11 @@
           "uid": "srv-stock"
         }
       ],
-      "rate": 1000
+      "rate": 1000000000
     },
     {
       "kind": "node",
-      "naming_pattern": "%LINECARD%/%PORT%",
+      "naming_pattern": "ethernet%LINECARD%/%PORT%",
       "ports": [
         {
 
@@ -443,14 +443,14 @@
           "uid": "srv-stock"
         }
       ],
-      "rate": 1000
+      "rate": 1000000000
     },
     {
 
     },
     {
       "kind": "other",
-      "naming_pattern": "%LINECARD%/%PORT%",
+      "naming_pattern": "ethernet%LINECARD%/%PORT%",
       "ports": [
         {
 
@@ -499,7 +499,7 @@
           "uid": "stock"
         }
       ],
-      "rate": 1000
+      "rate": 1000000000
     }
   ],
   "model": "Foundry",
@@ -511,6 +511,12 @@
   "type": "network_equipment",
   "uid": "fastiron",
   "vlans": {
+    "100": {
+      "addresses": [
+        "138.96.20.250"
+      ],
+      "administrative": true
+    },
     "naming_pattern": "Vlan%VLANID%"
   }
 }
\ No newline at end of file

generators/input/sites/sophia/net-links/edgeiron.yaml

@@ -6,6 +6,10 @@ edgeiron:
   snmp_community: public
   vlans: 
     naming_pattern: Vlan%VLANID%
+    "100": 
+      administrative: yes
+      addresses: 
+        - 138.96.20.252
   routes: {}
 
   linecards: 

generators/input/sites/sophia/net-links/fastiron.yaml

@@ -6,13 +6,17 @@ fastiron:
   snmp_community: public
   vlans: 
     naming_pattern: Vlan%VLANID%
+    "100": 
+      administrative: yes
+      addresses: 
+        - 138.96.20.250
   routes: {}
 
   linecards: 
     2: 
-      naming_pattern: "%LINECARD%/%PORT%"
+      naming_pattern: "ethernet%LINECARD%/%PORT%"
       kind: router
-      rate: 10000
+      rate: 10000000000
       ports: 
         1: 
           uid: edgeiron
@@ -21,9 +25,9 @@ fastiron:
           uid: edgeiron
           port: 0/2
     7: 
-      naming_pattern: "%LINECARD%/%PORT%"
+      naming_pattern: "ethernet%LINECARD%/%PORT%"
       kind: node
-      rate: 1000
+      rate: 1000000000
       ports: 
         1: suno-36
         2: suno-37
@@ -44,9 +48,9 @@ fastiron:
           port: eth0
           kind: other
     3: 
-      naming_pattern: "%LINECARD%/%PORT%"
+      naming_pattern: "ethernet%LINECARD%/%PORT%"
       kind: node
-      rate: 1000
+      rate: 1000000000
       ports: 
         1: sol-1
         3: sol-2
@@ -73,9 +77,9 @@ fastiron:
         22: sol-35
         24: sol-36
     4: 
-      naming_pattern: "%LINECARD%/%PORT%"
+      naming_pattern: "ethernet%LINECARD%/%PORT%"
       kind: node
-      rate: 1000
+      rate: 1000000000
       ports: 
         1: sol-13
         3: sol-14
@@ -102,9 +106,9 @@ fastiron:
         22: sol-47
         24: sol-48
     9: 
-      naming_pattern: "%LINECARD%/%PORT%"
+      naming_pattern: "ethernet%LINECARD%/%PORT%"
       kind: other
-      rate: 1000
+      rate: 1000000000
       ports: 
         1: 
           uid: sol-49
@@ -132,9 +136,9 @@ fastiron:
           uid: stock
           port: eth1
     5: 
-      naming_pattern: "%LINECARD%/%PORT%"
+      naming_pattern: "ethernet%LINECARD%/%PORT%"
       kind: node
-      rate: 1000
+      rate: 1000000000
       ports: 
         10: suno-1
         11: suno-2
@@ -154,9 +158,9 @@ fastiron:
         21: suno-16
         15: suno-17
     6: 
-      naming_pattern: "%LINECARD%/%PORT%"
+      naming_pattern: "ethernet%LINECARD%/%PORT%"
       kind: node
-      rate: 1000
+      rate: 1000000000
       ports: 
         1: suno-18
         2: suno-19