diff --git a/data/grid5000/sites/grenoble/network_equipments/gw.json b/data/grid5000/sites/grenoble/network_equipments/gw.json
index 0de896d893a45e4a6665776f6dd7eceeeb671a41..5d1aaa6c1f1cd47961b74637b1607b08a1cf73d8 100644
--- a/data/grid5000/sites/grenoble/network_equipments/gw.json
+++ b/data/grid5000/sites/grenoble/network_equipments/gw.json
@@ -28,6 +28,12 @@
"port": "port-channel30",
"rate": 20000000000,
"uid": "orichard-nixbuild"
+ },
+ "port-channel50": {
+ "kind": "channel",
+ "port": "port-channel50",
+ "rate": 50000000000,
+ "uid": "imag-1b-F3-prod-01"
}
},
"ip": "172.16.31.254",
@@ -365,8 +371,14 @@
{
},
{
+ "kind": "channel",
+ "snmp_name": "ethernet1/1/67:1",
+ "uid": "port-channel50"
},
{
+ "kind": "channel",
+ "snmp_name": "ethernet1/1/68:1",
+ "uid": "port-channel50"
},
{
},
diff --git a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F1-prod-01.json b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F1-prod-01.json
new file mode 100644
index 0000000000000000000000000000000000000000..61ed1f3c45fab53ec55d7f5b383f767c2d7683d9
--- /dev/null
+++ b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F1-prod-01.json
@@ -0,0 +1,139 @@
+{
+ "backplane_bps": 4800000000000,
+ "channels_ssh_pattern": "#{/\\D+/.match(\"%CHANNEL%\")} #{/\\d+/.match(\"%CHANNEL%\")}",
+ "ip": "172.17.31.250",
+ "kind": "switch",
+ "linecards": [
+ {
+ },
+ {
+ "backplane_bps": 4800000000000,
+ "kavlan_pattern": "%LINECARD%/1/%PORT%",
+ "ports": [
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "switch",
+ "rate": 10000000000,
+ "snmp_name": "1/1/33",
+ "trunk": false,
+ "uid": "imag-1b-F1-admin"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "switch",
+ "snmp_name": "1/1/49",
+ "uid": "imag-1b-F3-prod-01"
+ },
+ {
+ "kind": "switch",
+ "snmp_name": "1/1/50",
+ "uid": "imag-1b-F2-prod-01"
+ }
+ ],
+ "rate": 25000000000,
+ "snmp_pattern": "%LINECARD%/1/%PORT%"
+ }
+ ],
+ "managed_by_us": true,
+ "model": "Aruba JL719C 8360-48Y6C v2 Switch",
+ "serial": "SG46L5L0BP",
+ "site": "grenoble",
+ "snmp_community": "public",
+ "type": "network_equipment",
+ "uid": "imag-1b-F1-prod-01",
+ "warranty": "2048-05"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F2-prod-01.json b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F2-prod-01.json
new file mode 100644
index 0000000000000000000000000000000000000000..e276a2485e24ddb97ef003e7a870057cfcaf7971
--- /dev/null
+++ b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F2-prod-01.json
@@ -0,0 +1,139 @@
+{
+ "backplane_bps": 4800000000000,
+ "channels_ssh_pattern": "#{/\\D+/.match(\"%CHANNEL%\")} #{/\\d+/.match(\"%CHANNEL%\")}",
+ "ip": "172.17.31.251",
+ "kind": "switch",
+ "linecards": [
+ {
+ },
+ {
+ "backplane_bps": 4800000000000,
+ "kavlan_pattern": "%LINECARD%/1/%PORT%",
+ "ports": [
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "switch",
+ "rate": 10000000000,
+ "snmp_name": "1/1/33",
+ "trunk": false,
+ "uid": "imag-1b-F2-admin"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "switch",
+ "snmp_name": "1/1/49",
+ "uid": "imag-1b-F1-prod-01"
+ },
+ {
+ "kind": "switch",
+ "snmp_name": "1/1/50",
+ "uid": "imag-1b-F3-prod-01"
+ }
+ ],
+ "rate": 25000000000,
+ "snmp_pattern": "%LINECARD%/1/%PORT%"
+ }
+ ],
+ "managed_by_us": true,
+ "model": "Aruba JL719C 8360-48Y6C v2 Switch",
+ "serial": "SG46L5L0BQ",
+ "site": "grenoble",
+ "snmp_community": "public",
+ "type": "network_equipment",
+ "uid": "imag-1b-F2-prod-01",
+ "warranty": "2048-05"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-prod-01.json b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-prod-01.json
new file mode 100644
index 0000000000000000000000000000000000000000..8afe3c7d11f84362bc96abf59454fdd5e1cff3c2
--- /dev/null
+++ b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-prod-01.json
@@ -0,0 +1,176 @@
+{
+ "backplane_bps": 4800000000000,
+ "channels": {
+ "lag1": {
+ "kind": "channel",
+ "port": "lag1",
+ "rate": 50000000000,
+ "ssh_name": "lag 1",
+ "uid": "gw"
+ }
+ },
+ "channels_ssh_pattern": "#{/\\D+/.match(\"%CHANNEL%\")} #{/\\d+/.match(\"%CHANNEL%\")}",
+ "ip": "172.17.31.252",
+ "kind": "switch",
+ "linecards": [
+ {
+ },
+ {
+ "backplane_bps": 4800000000000,
+ "kavlan_pattern": "%LINECARD%/1/%PORT%",
+ "ports": [
+ {
+ },
+ {
+ "kind": "channel",
+ "snmp_name": "1/1/1",
+ "uid": "lag1"
+ },
+ {
+ "kind": "channel",
+ "snmp_name": "1/1/2",
+ "uid": "lag1"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "server",
+ "snmp_name": "1/1/14",
+ "uid": "pve-1"
+ },
+ {
+ "kind": "server",
+ "snmp_name": "1/1/15",
+ "uid": "pve-2"
+ },
+ {
+ "kind": "server",
+ "snmp_name": "1/1/16",
+ "uid": "nfs-1"
+ },
+ {
+ "kind": "server",
+ "snmp_name": "1/1/17",
+ "uid": "group-storage-1"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "snmp_name": "1/1/22",
+ "uid": "nessie-1"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "switch",
+ "rate": 10000000000,
+ "snmp_name": "1/1/44",
+ "trunk": false,
+ "uid": "imag-1b-F3-admin"
+ },
+ {
+ "snmp_name": "1/1/45",
+ "uid": "chartreuse1-1"
+ },
+ {
+ "snmp_name": "1/1/46",
+ "uid": "chartreuse1-2"
+ },
+ {
+ "snmp_name": "1/1/47",
+ "uid": "chartreuse1-3"
+ },
+ {
+ "snmp_name": "1/1/48",
+ "uid": "chartreuse1-4"
+ },
+ {
+ "kind": "switch",
+ "snmp_name": "1/1/49",
+ "uid": "imag-1b-F1-prod-01"
+ },
+ {
+ "kind": "switch",
+ "snmp_name": "1/1/50",
+ "uid": "imag-1b-F2-prod-01"
+ }
+ ],
+ "rate": 25000000000,
+ "snmp_pattern": "%LINECARD%/1/%PORT%"
+ }
+ ],
+ "managed_by_us": true,
+ "model": "Aruba JL719C 8360-48Y6C v2 Switch",
+ "serial": "SG46L5L09G",
+ "site": "grenoble",
+ "snmp_community": "public",
+ "type": "network_equipment",
+ "uid": "imag-1b-F3-prod-01",
+ "warranty": "2048-05"
+}
\ No newline at end of file
diff --git a/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml b/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml
index b2fe681159052a6ed41ef1f622183fe94552ef43..d90bc07ee396f244689b24da1c6385ec15ef981e 100644
--- a/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml
+++ b/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml
@@ -168,6 +168,12 @@ gw:
46: drac-10
47: drac-11
48: drac-12
+ 67:
+ uid: port-channel50
+ kind: channel
+ 68:
+ uid: port-channel50
+ kind: channel
75:
uid: port-channel30
kind: channel
@@ -279,6 +285,11 @@ gw:
port: port-channel20
kind: server
rate: 20000000000
+ port-channel50:
+ uid: imag-1b-F3-prod-01
+ port: port-channel50
+ kind: channel
+ rate: 50_000_000_000
port-channel30:
uid: orichard-nixbuild
port: port-channel30
diff --git a/input/grid5000/sites/grenoble/networks/imag-1b-F1-prod-01.yaml b/input/grid5000/sites/grenoble/networks/imag-1b-F1-prod-01.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ddb422180c8cb3f65c3c11b7ce053cca647edc80
--- /dev/null
+++ b/input/grid5000/sites/grenoble/networks/imag-1b-F1-prod-01.yaml
@@ -0,0 +1,31 @@
+---
+imag-1b-F1-prod-01:
+ model: Aruba JL719C 8360-48Y6C v2 Switch
+ warranty: 2048-05
+ serial: SG46L5L0BP
+ kind: switch
+ managed_by_us: true
+ site: grenoble
+ snmp_community: public
+ ip: 172.17.31.250
+ backplane_bps: 4_800_000_000_000
+ linecards:
+ 1:
+ snmp_pattern: "%LINECARD%/1/%PORT%"
+ kavlan_pattern: "%LINECARD%/1/%PORT%"
+ rate: 25_000_000_000
+ backplane_bps: 4_800_000_000_000
+ ports:
+ 33:
+ uid: imag-1b-F1-admin
+ kind: switch
+ rate: 10_000_000_000
+ trunk: false
+ 49:
+ uid: imag-1b-F3-prod-01
+ kind: switch
+ 50:
+ uid: imag-1b-F2-prod-01
+ kind: switch
+ channels_ssh_pattern: '#{/\D+/.match("%CHANNEL%")} #{/\d+/.match("%CHANNEL%")}'
+
diff --git a/input/grid5000/sites/grenoble/networks/imag-1b-F2-prod-01.yaml b/input/grid5000/sites/grenoble/networks/imag-1b-F2-prod-01.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..1ad54014c0714c50021064007c828315af8999d7
--- /dev/null
+++ b/input/grid5000/sites/grenoble/networks/imag-1b-F2-prod-01.yaml
@@ -0,0 +1,31 @@
+---
+imag-1b-F2-prod-01:
+ model: Aruba JL719C 8360-48Y6C v2 Switch
+ warranty: 2048-05
+ serial: SG46L5L0BQ
+ kind: switch
+ managed_by_us: true
+ site: grenoble
+ snmp_community: public
+ ip: 172.17.31.251
+ backplane_bps: 4_800_000_000_000
+ linecards:
+ 1:
+ snmp_pattern: "%LINECARD%/1/%PORT%"
+ kavlan_pattern: "%LINECARD%/1/%PORT%"
+ rate: 25_000_000_000
+ backplane_bps: 4_800_000_000_000
+ ports:
+ 33:
+ uid: imag-1b-F2-admin
+ kind: switch
+ rate: 10_000_000_000
+ trunk: false
+ 49:
+ uid: imag-1b-F1-prod-01
+ kind: switch
+ 50:
+ uid: imag-1b-F3-prod-01
+ kind: switch
+ channels_ssh_pattern: '#{/\D+/.match("%CHANNEL%")} #{/\d+/.match("%CHANNEL%")}'
+
diff --git a/input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml b/input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..dbeff09b0424151500cfa879afd3464c4edd5cc8
--- /dev/null
+++ b/input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml
@@ -0,0 +1,64 @@
+---
+imag-1b-F3-prod-01:
+ model: Aruba JL719C 8360-48Y6C v2 Switch
+ warranty: 2048-05
+ serial: SG46L5L09G
+ kind: switch
+ managed_by_us: true
+ site: grenoble
+ snmp_community: public
+ ip: 172.17.31.252
+ backplane_bps: 4_800_000_000_000
+ linecards:
+ 1:
+ snmp_pattern: "%LINECARD%/1/%PORT%"
+ kavlan_pattern: "%LINECARD%/1/%PORT%"
+ rate: 25_000_000_000
+ backplane_bps: 4_800_000_000_000
+ ports:
+ 1:
+ uid: lag1
+ kind: channel
+ 2:
+ uid: lag1
+ kind: channel
+ 14:
+ uid: pve-1
+ kind: server
+ 15:
+ uid: pve-2
+ kind: server
+ 16:
+ uid: nfs-1
+ kind: server
+ 17:
+ uid: group-storage-1
+ kind: server
+ 22:
+ uid: nessie-1
+ 44:
+ uid: imag-1b-F3-admin
+ kind: switch
+ rate: 10_000_000_000
+ trunk: false
+ 45:
+ uid: chartreuse1-1
+ 46:
+ uid: chartreuse1-2
+ 47:
+ uid: chartreuse1-3
+ 48:
+ uid: chartreuse1-4
+ 49:
+ uid: imag-1b-F1-prod-01
+ kind: switch
+ 50:
+ uid: imag-1b-F2-prod-01
+ kind: switch
+ channels_ssh_pattern: '#{/\D+/.match("%CHANNEL%")} #{/\d+/.match("%CHANNEL%")}'
+ channels:
+ lag1:
+ kind: channel
+ rate: 50_000_000_000
+ uid: gw
+ port: lag1
diff --git a/input/grid5000/sites/grenoble/servers/physical.yaml b/input/grid5000/sites/grenoble/servers/physical.yaml
index fc5a1d51bcf7b523ecdc09039640316d8e739eea..1ed92a6bc9d126f6225bb7fda4ea602e7931b80b 100644
--- a/input/grid5000/sites/grenoble/servers/physical.yaml
+++ b/input/grid5000/sites/grenoble/servers/physical.yaml
@@ -72,3 +72,4 @@ dignfs:
name: storage1
size: 55000000000000
rate: 50000000000
+