Merge branch 'toulouse_aruba' into 'master'

[toulouse][network] Describe aruba switch

See merge request !500

data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-1.json

@@ -132,7 +132,7 @@
       "sriov": false,
       "sriov_totalvfs": 0,
       "switch": "gw-toulouse",
-      "switch_port": "tengigabitethernet1/1/1",
+      "switch_port": "1/1/1",
       "vendor": "Broadcom Inc. and subsidiaries"
     },
     {

data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-2.json

@@ -132,7 +132,7 @@
       "sriov": false,
       "sriov_totalvfs": 0,
       "switch": "gw-toulouse",
-      "switch_port": "tengigabitethernet1/1/2",
+      "switch_port": "1/1/2",
       "vendor": "Broadcom Inc. and subsidiaries"
     },
     {

data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.json

@@ -132,7 +132,7 @@
       "sriov": false,
       "sriov_totalvfs": 0,
       "switch": "gw-toulouse",
-      "switch_port": "tengigabitethernet1/1/3",
+      "switch_port": "1/1/3",
       "vendor": "Broadcom Inc. and subsidiaries"
     },
     {

data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-4.json

@@ -132,7 +132,7 @@
       "sriov": false,
       "sriov_totalvfs": 0,
       "switch": "gw-toulouse",
-      "switch_port": "tengigabitethernet1/1/4",
+      "switch_port": "1/1/4",
       "vendor": "Broadcom Inc. and subsidiaries"
     },
     {

data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.json

@@ -132,7 +132,7 @@
       "sriov": false,
       "sriov_totalvfs": 0,
       "switch": "gw-toulouse",
-      "switch_port": "tengigabitethernet1/1/5",
+      "switch_port": "1/1/5",
       "vendor": "Broadcom Inc. and subsidiaries"
     },
     {

data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.json

@@ -132,7 +132,7 @@
       "sriov": false,
       "sriov_totalvfs": 0,
       "switch": "gw-toulouse",
-      "switch_port": "tengigabitethernet1/1/6",
+      "switch_port": "1/1/6",
       "vendor": "Broadcom Inc. and subsidiaries"
     },
     {

data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-7.json

@@ -132,7 +132,7 @@
       "sriov": false,
       "sriov_totalvfs": 0,
       "switch": "gw-toulouse",
-      "switch_port": "tengigabitethernet1/1/7",
+      "switch_port": "1/1/7",
       "vendor": "Broadcom Inc. and subsidiaries"
     },
     {

data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.json

@@ -132,7 +132,7 @@
       "sriov": false,
       "sriov_totalvfs": 0,
       "switch": "gw-toulouse",
-      "switch_port": "tengigabitethernet1/1/8",
+      "switch_port": "1/1/8",
       "vendor": "Broadcom Inc. and subsidiaries"
     },
     {

data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-9.json

@@ -132,7 +132,7 @@
       "sriov": false,
       "sriov_totalvfs": 0,
       "switch": "gw-toulouse",
-      "switch_port": "tengigabitethernet1/1/9",
+      "switch_port": "1/1/9",
       "vendor": "Broadcom Inc. and subsidiaries"
     },
     {

data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json

@@ -2,6 +2,20 @@
   "alias": [
     "gw"
   ],
+  "channels": {
+    "port-channel1": {
+      "kind": "server",
+      "port": "port-channel1",
+      "rate": 20000000000,
+      "uid": "nfs"
+    },
+    "port-channel2": {
+      "kind": "switch",
+      "port": "port-channel1",
+      "rate": 20000000000,
+      "uid": "sw-estats"
+    }
+  },
   "ip": "172.17.127.254",
   "ip6": "2001:660:4406:900::ffff:ffff",
   "kind": "router",
@@ -17,60 +31,60 @@
         {
           "kind": "node",
           "port": "eth0",
-          "snmp_name": "tengigabitethernet1/1/1",
+          "snmp_name": "1/1/1",
           "uid": "montcalm-1"
         },
         {
           "kind": "node",
           "port": "eth0",
-          "snmp_name": "tengigabitethernet1/1/2",
+          "snmp_name": "1/1/2",
           "uid": "montcalm-2"
         },
         {
           "kind": "node",
           "port": "eth0",
-          "snmp_name": "tengigabitethernet1/1/3",
+          "snmp_name": "1/1/3",
           "uid": "montcalm-3"
         },
         {
           "kind": "node",
           "port": "eth0",
-          "snmp_name": "tengigabitethernet1/1/4",
+          "snmp_name": "1/1/4",
           "uid": "montcalm-4"
         },
         {
           "kind": "node",
           "port": "eth0",
-          "snmp_name": "tengigabitethernet1/1/5",
+          "snmp_name": "1/1/5",
           "uid": "montcalm-5"
         },
         {
           "kind": "node",
           "port": "eth0",
-          "snmp_name": "tengigabitethernet1/1/6",
+          "snmp_name": "1/1/6",
           "uid": "montcalm-6"
         },
         {
           "kind": "node",
           "port": "eth0",
-          "snmp_name": "tengigabitethernet1/1/7",
+          "snmp_name": "1/1/7",
           "uid": "montcalm-7"
         },
         {
           "kind": "node",
           "port": "eth0",
-          "snmp_name": "tengigabitethernet1/1/8",
+          "snmp_name": "1/1/8",
           "uid": "montcalm-8"
         },
         {
           "kind": "node",
           "port": "eth0",
-          "snmp_name": "tengigabitethernet1/1/9",
+          "snmp_name": "1/1/9",
           "uid": "montcalm-9"
         },
         {
           "kind": "server",
-          "snmp_name": "tengigabitethernet1/1/10",
+          "snmp_name": "1/1/10",
           "uid": "montcalm-10"
         },
         {
@@ -82,44 +96,44 @@
         {
         },
         {
-          "kind": "server",
-          "snmp_name": "tengigabitethernet1/1/15",
-          "uid": "oobm"
+          "kind": "channel",
+          "snmp_name": "1/1/15",
+          "uid": "port-channel2"
         },
         {
-          "kind": "server",
-          "snmp_name": "tengigabitethernet1/1/16",
-          "uid": "oobm"
+          "kind": "channel",
+          "snmp_name": "1/1/16",
+          "uid": "port-channel2"
         },
         {
           "kind": "server",
-          "snmp_name": "tengigabitethernet1/1/17",
+          "snmp_name": "1/1/17",
           "uid": "pve-1"
         },
         {
           "kind": "server",
-          "snmp_name": "tengigabitethernet1/1/18",
+          "snmp_name": "1/1/18",
           "uid": "pve-2"
         },
         {
-          "kind": "server",
-          "snmp_name": "tengigabitethernet1/1/19",
-          "uid": "nfs"
+          "kind": "channel",
+          "snmp_name": "1/1/19",
+          "uid": "port-channel1"
         },
         {
-          "kind": "server",
-          "snmp_name": "tengigabitethernet1/1/20",
-          "uid": "nfs"
+          "kind": "channel",
+          "snmp_name": "1/1/20",
+          "uid": "port-channel1"
         }
       ],
       "rate": 10000000000,
-      "snmp_pattern": "tengigabitethernet1/%LINECARD%/%PORT%"
+      "snmp_pattern": "1/%LINECARD%/%PORT%"
     }
   ],
-  "model": "Temporary-Dell-OS6",
-  "serial": "unknown",
+  "model": "Aruba 6300",
+  "serial": "SG27KMX1X6",
   "site": "toulouse",
-  "snmp_community": "Unknown",
+  "snmp_community": "g5kadmin",
   "type": "network_equipment",
   "uid": "gw-toulouse",
   "vlans": {

data/grid5000/sites/toulouse/network_equipments/sw-estats.json

+{
+  "alias": [
+    "sw-uagx"
+  ],
+  "channels": {
+    "port-channel1": {
+      "kind": "router",
+      "port": "port-channel2",
+      "rate": 20000000000,
+      "uid": "gw-toulouse"
+    }
+  },
+  "ip": "172.17.127.252",
+  "kind": "switch",
+  "linecards": [
+    {
+    },
+    {
+      "ports": [
+        {
+        },
+        {
+          "kind": "channel",
+          "uid": "port-channel1"
+        },
+        {
+          "kind": "channel",
+          "uid": "port-channel1"
+        }
+      ]
+    }
+  ],
+  "model": "Connecttech XDG201",
+  "serial": "Unknown",
+  "site": "toulouse",
+  "snmp_community": "g5kadmin",
+  "type": "network_equipment",
+  "uid": "sw-estats"
+}
\ No newline at end of file

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

 ---
 gw-toulouse:
-  model: Temporary-Dell-OS6
-  serial: unknown
+  model: Aruba 6300
+  serial: SG27KMX1X6
   alias:
     - gw
   ip: 172.17.127.254
   ip6: 2001:660:4406:900::ffff:ffff
   kind: router
   site: toulouse
-  snmp_community: Unknown
+  snmp_community: g5kadmin
   vlans:
     "vlan100":
       administrative: yes
@@ -63,7 +63,7 @@ gw-toulouse:
   linecards:
     1:
       rate: 10000000000
-      snmp_pattern: "tengigabitethernet1/%LINECARD%/%PORT%"
+      snmp_pattern: "1/%LINECARD%/%PORT%"
       kavlan_pattern: "%PORT%"
       kind: node
       ports:
@@ -80,11 +80,11 @@ gw-toulouse:
           uid: montcalm-10
           kind: server
         15:
-          uid: oobm
-          kind: server
+          uid: port-channel2
+          kind: channel
         16:
-          uid: oobm
-          kind: server
+          uid: port-channel2
+          kind: channel
         17:
           uid: pve-1
           kind: server
@@ -92,8 +92,19 @@ gw-toulouse:
           uid: pve-2
           kind: server
         19:
-          uid: nfs
-          kind: server
+          uid: port-channel1
+          kind: channel
         20:
-          uid: nfs
-          kind: server
+          uid: port-channel1
+          kind: channel
+  channels:
+    port-channel1:
+      uid: nfs
+      kind: server
+      rate: 20000000000
+      port: port-channel1
+    port-channel2:
+      uid: sw-estats
+      kind: switch
+      rate: 20000000000
+      port: port-channel1

input/grid5000/sites/toulouse/networks/sw-estats.yaml

+---
+sw-estats:
+  site: toulouse
+  snmp_community: g5kadmin
+  model: Connecttech XDG201
+  serial: Unknown
+  alias:
+    - sw-uagx
+  ip: 172.17.127.252
+  kind: switch
+  linecards:
+    1:
+      ports:
+        1:
+          uid: port-channel1
+          kind: channel
+        2:
+          uid: port-channel1
+          kind: channel
+  channels:
+    port-channel1:
+      uid: gw-toulouse
+      kind: router
+      rate: 20000000000
+      port: port-channel2