Merge branch 'sgrappe_pdu' into 'master'

[sgrappe/sgros1-2] Fix network rate and backplane bps

See merge request !129

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

@@ -20,7 +20,7 @@
     "port-channel4": {
       "kind": "switch",
       "port": "port-channel1",
-      "rate": 1000000000000,
+      "rate": 800000000000,
       "uid": "sgrappe"
     }
   },
@@ -1498,6 +1498,22 @@
           "port": "eth3",
           "snmp_name": "Ethernet5/48",
           "uid": "grimoire-8"
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "channel",
+          "rate": 40000000000,
+          "snmp_name": "Ethernet5/51",
+          "uid": "port-channel4"
+        },
+        {
+          "kind": "channel",
+          "rate": 40000000000,
+          "snmp_name": "Ethernet5/52",
+          "uid": "port-channel4"
         }
       ],
       "rate": 10000000000,

data/grid5000/sites/nancy/network_equipments/sgrappe.json

 {
+  "backplane_bps": 2160000000000,
   "channels": {
     "port-channel1": {
       "kind": "router",
       "port": "port-channel4",
-      "rate": 1000000000000,
+      "rate": 800000000000,
       "uid": "gw"
     }
   },
@@ -13,7 +14,7 @@
     {
     },
     {
-      "kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
+      "kavlan_pattern": "Ethernet1%LINECARD%/%PORT%",
       "kind": "node",
       "ports": [
         {

data/grid5000/sites/nancy/network_equipments/sgros1.json

 {
-  "backplane_bps": 6400000000000,
+  "backplane_bps": 12800000000000,
   "channels": {
     "port-channel1": {
       "kind": "router",

data/grid5000/sites/nancy/network_equipments/sgros2.json

 {
-  "backplane_bps": 6400000000000,
+  "backplane_bps": 12800000000000,
   "channels": {
     "port-channel1": {
       "kind": "router",

input/grid5000/sites/nancy/networks/gw-nancy.yaml

@@ -609,6 +609,15 @@ gw:
           uid: grimoire-7-eth3
         48:
           uid: grimoire-8-eth3
+        51:
+          uid: port-channel4
+          kind: channel
+          rate: 40_000_000_000
+        52:
+          uid: port-channel4
+          kind: channel
+          rate: 40_000_000_000
+
     6:
       snmp_pattern: "Ethernet%LINECARD%/%PORT%"
       kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
@@ -805,5 +814,5 @@ gw:
       port: port-channel1
       uid: sgrappe
       kind: switch
-      rate: 1000000000000     
+      rate: 800000000000
     

input/grid5000/sites/nancy/networks/sgrappe.yaml

@@ -7,10 +7,11 @@ sgrappe:
   site: nancy
   snmp_community: public
   ip: 172.17.79.205
+  backplane_bps: 2160000000000
   linecards:
     1:
       snmp_pattern: "Ethernet1/%LINECARD%/%PORT%"
-      kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
+      kavlan_pattern: "Ethernet1%LINECARD%/%PORT%"
       kind: node
       rate: 25000000000
       ports:
@@ -57,4 +58,4 @@ sgrappe:
       port: port-channel4
       uid: gw
       kind: router
-      rate: 1000000000000
+      rate: 800000000000

input/grid5000/sites/nancy/networks/sgros1.yaml

@@ -7,7 +7,7 @@ sgros1:
   site: nancy
   snmp_community: public
   ip: 172.17.79.208
-  backplane_bps: 6400000000000
+  backplane_bps: 12800000000000
   metrics:
     - name: network_ifacein_bytes_total
       description: Input byte counter for the network device port

input/grid5000/sites/nancy/networks/sgros2.yaml

@@ -20,7 +20,7 @@ sgros2:
         protocol: snmp
         id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   ip: 172.17.79.209
-  backplane_bps: 6400000000000
+  backplane_bps: 12800000000000
   linecards:
     1:
       snmp_pattern: "ethernet1/1/%PORT%:1"