diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-1.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-1.json
index e9a8f72c62e97695e39d131eac3346debfcc8f29..b0ca941bb0b531b9305d6e302cff0e8690e66884 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-1.json
+++ b/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"
},
{
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-2.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-2.json
index 4ceb67a439a54d605f1bcb568c0429489bc76abc..00be632d933986c0d1ad922ff56bbc53585db1c7 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-2.json
+++ b/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"
},
{
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.json
index a49e429092c78c24a4428456d5081804ad1339e7..a226c80a51a18b8ca6d5b831cacb85d62455da47 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.json
+++ b/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"
},
{
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-4.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-4.json
index 624d61ba40036f0dfb0ff471fd69a5236c27179c..ca4920d0c8cf7f81daaa5663dad2d4a4fe578164 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-4.json
+++ b/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"
},
{
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.json
index 2673f6b82f426f9dc199f061f269291d6d1ba2de..1de8261d197536bde338e344fd8c72a757c50327 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.json
+++ b/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"
},
{
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.json
index e24fcf63d8267cf4a34b8ee2904cd02ec63807c5..05025d25770cfca49f938794de51e29468022d05 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.json
+++ b/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"
},
{
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-7.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-7.json
index cbe03b78b7d90e5656575d1eb33b1593f23308c7..935d2e5c790d24b963fc1d0cf3444984c3770b18 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-7.json
+++ b/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"
},
{
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.json
index 43010af5ddfb35f534aaabf04359c3fd20758647..29a721471aa7876a02505349f28eae0f66d28e23 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.json
+++ b/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"
},
{
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-9.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-9.json
index 3de1a459a2cdf1d7d1573c4177b2efa046319bec..794302f7a82d5711fba4b10c60a0904b1ffcc6e8 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-9.json
+++ b/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"
},
{
diff --git a/data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json b/data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json
index 0b202cf0d6dba7fd4755be07b467c4b3c502b390..bf65a25cab6f0321e81d02f288c68d5c2994a23b 100644
--- a/data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json
+++ b/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": {
diff --git a/data/grid5000/sites/toulouse/network_equipments/sw-estats.json b/data/grid5000/sites/toulouse/network_equipments/sw-estats.json
new file mode 100644
index 0000000000000000000000000000000000000000..54ee4a99453cd471a37d7305cb4f5d1458638923
--- /dev/null
+++ b/data/grid5000/sites/toulouse/network_equipments/sw-estats.json
@@ -0,0 +1,39 @@
+{
+ "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
diff --git a/input/grid5000/sites/toulouse/networks/gw-toulouse.yaml b/input/grid5000/sites/toulouse/networks/gw-toulouse.yaml
index 91bb524cff90883b48266bb5e30be2071fdb5531..09ad4c522859a36e257c54337887bb9f0bf5595b 100644
--- a/input/grid5000/sites/toulouse/networks/gw-toulouse.yaml
+++ b/input/grid5000/sites/toulouse/networks/gw-toulouse.yaml
@@ -1,14 +1,14 @@
---
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
diff --git a/input/grid5000/sites/toulouse/networks/sw-estats.yaml b/input/grid5000/sites/toulouse/networks/sw-estats.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..f06e2d511d6067989dd9a875b7b5f239a4aa846c
--- /dev/null
+++ b/input/grid5000/sites/toulouse/networks/sw-estats.yaml
@@ -0,0 +1,25 @@
+---
+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