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
index e276a2485e24ddb97ef003e7a870057cfcaf7971..df219e3ed59a787886df3ed5c863ccef2403b44e 100644
--- 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
@@ -77,11 +77,6 @@
{
},
{
- "kind": "switch",
- "rate": 10000000000,
- "snmp_name": "1/1/33",
- "trunk": false,
- "uid": "imag-1b-F2-admin"
},
{
},
@@ -104,6 +99,11 @@
{
},
{
+ "kind": "switch",
+ "rate": 10000000000,
+ "snmp_name": "1/1/44",
+ "trunk": false,
+ "uid": "imag-1b-F2-admin"
},
{
},
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
index 4371608428f0a6c4f9c161d7d46c3a3fa7e912e1..a34d2fe400570b8a202952934497c42b7c57d729 100644
--- 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
@@ -37,12 +37,28 @@
{
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/5",
+ "uid": "chartreuse2-1"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/6",
+ "uid": "chartreuse2-3"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/7",
+ "uid": "chartreuse2-2"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/8",
+ "uid": "chartreuse2-4"
},
{
},
@@ -55,24 +71,12 @@
{
},
{
- "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"
},
{
},
@@ -138,38 +142,34 @@
"uid": "imag-1b-F3-admin"
},
{
- "kind": "node",
- "port": "eth0",
+ "kind": "server",
"snmp_name": "1/1/45",
- "uid": "chartreuse1-1"
+ "uid": "pve-1"
},
{
- "kind": "node",
- "port": "eth0",
+ "kind": "server",
"snmp_name": "1/1/46",
- "uid": "chartreuse1-2"
+ "uid": "pve-2"
},
{
- "kind": "node",
- "port": "eth0",
+ "kind": "server",
"snmp_name": "1/1/47",
- "uid": "chartreuse1-3"
+ "uid": "srv-data"
},
{
- "kind": "node",
- "port": "eth0",
+ "kind": "server",
"snmp_name": "1/1/48",
- "uid": "chartreuse1-4"
+ "uid": "srv-data2"
},
{
"kind": "switch",
"snmp_name": "1/1/49",
- "uid": "imag-1b-F1-prod-01"
+ "uid": "imag-1b-F2-prod-01"
},
{
"kind": "switch",
"snmp_name": "1/1/50",
- "uid": "imag-1b-F2-prod-01"
+ "uid": "imag-1b-F1-prod-01"
}
],
"rate": 25000000000,
diff --git a/data/grid5000/sites/grenoble/servers/pve-1.json b/data/grid5000/sites/grenoble/servers/pve-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..b15a43122f4dc26dd9382e37a9f503140d621355
--- /dev/null
+++ b/data/grid5000/sites/grenoble/servers/pve-1.json
@@ -0,0 +1,24 @@
+{
+ "alias": [
+
+ ],
+ "kind": "physical",
+ "network_adapters": {
+ "adm": {
+ "ip": "172.17.31.13"
+ },
+ "bmc": {
+ "ip": "172.17.30.13",
+ "mac": "7C:A6:2A:3C:B2:74"
+ },
+ "default": {
+ "ip": "172.16.31.13",
+ "mac": "D4:04:E6:42:91:7C"
+ }
+ },
+ "redfish": true,
+ "serial": "CZJD1700JN",
+ "type": "server",
+ "uid": "pve-1",
+ "warranty": "2031-07-11"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/servers/pve-2.json b/data/grid5000/sites/grenoble/servers/pve-2.json
new file mode 100644
index 0000000000000000000000000000000000000000..eec1241c1436b8dd4a3934a58db78dc3daa388cf
--- /dev/null
+++ b/data/grid5000/sites/grenoble/servers/pve-2.json
@@ -0,0 +1,24 @@
+{
+ "alias": [
+
+ ],
+ "kind": "physical",
+ "network_adapters": {
+ "adm": {
+ "ip": "172.17.31.14"
+ },
+ "bmc": {
+ "ip": "172.17.30.14",
+ "mac": "7C:A6:2A:3C:A2:28"
+ },
+ "default": {
+ "ip": "172.16.31.14",
+ "mac": "D4:04:E6:06:54:E6"
+ }
+ },
+ "redfish": true,
+ "serial": "CZJD1700JM",
+ "type": "server",
+ "uid": "pve-2",
+ "warranty": "2031-07-03"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/servers/srv-data.json b/data/grid5000/sites/grenoble/servers/srv-data.json
new file mode 100644
index 0000000000000000000000000000000000000000..9296350aae6484881db2abcf32c494b8f482cc6d
--- /dev/null
+++ b/data/grid5000/sites/grenoble/servers/srv-data.json
@@ -0,0 +1,24 @@
+{
+ "alias": [
+
+ ],
+ "kind": "physical",
+ "network_adapters": {
+ "adm": {
+ "ip": "172.17.31.15"
+ },
+ "bmc": {
+ "ip": "172.17.30.15",
+ "mac": "5C:ED:8C:F4:A1:EE"
+ },
+ "default": {
+ "ip": "172.16.31.15",
+ "mac": "D4:04:E6:A6:0F:84"
+ }
+ },
+ "redfish": true,
+ "serial": "CZ24280F8D",
+ "type": "server",
+ "uid": "srv-data",
+ "warranty": "2031-07-21"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/servers/srv-data2.json b/data/grid5000/sites/grenoble/servers/srv-data2.json
new file mode 100644
index 0000000000000000000000000000000000000000..33dee326e567961caa5a4cd40924bd8cdd224574
--- /dev/null
+++ b/data/grid5000/sites/grenoble/servers/srv-data2.json
@@ -0,0 +1,24 @@
+{
+ "alias": [
+
+ ],
+ "kind": "physical",
+ "network_adapters": {
+ "adm": {
+ "ip": "172.17.31.16"
+ },
+ "bmc": {
+ "ip": "172.17.30.16",
+ "mac": "5C:ED:8C:F4:64:78"
+ },
+ "default": {
+ "ip": "172.16.31.16",
+ "mac": "D4:04:E6:A5:E7:CA"
+ }
+ },
+ "redfish": true,
+ "serial": "CZ24280F8F",
+ "type": "server",
+ "uid": "srv-data2",
+ "warranty": "2031-07-21"
+}
\ No newline at end of file
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
index 1ad54014c0714c50021064007c828315af8999d7..20872c5f1043c0d67893964d2975dd046edee01e 100644
--- a/input/grid5000/sites/grenoble/networks/imag-1b-F2-prod-01.yaml
+++ b/input/grid5000/sites/grenoble/networks/imag-1b-F2-prod-01.yaml
@@ -16,7 +16,7 @@ imag-1b-F2-prod-01:
rate: 25_000_000_000
backplane_bps: 4_800_000_000_000
ports:
- 33:
+ 44:
uid: imag-1b-F2-admin
kind: switch
rate: 10_000_000_000
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
index c89d3f7fe12bca37008a6491e69be06bdeb3cdf7..a791a92bb2598566bb15fb948e8d4a7055ff2217 100644
--- a/input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml
+++ b/input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml
@@ -23,18 +23,14 @@ imag-1b-F3-prod-01:
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
+ 5:
+ uid: chartreuse2-1
+ 6:
+ uid: chartreuse2-3
+ 7:
+ uid: chartreuse2-2
+ 8:
+ uid: chartreuse2-4
22:
uid: nessie-1
44:
@@ -43,18 +39,22 @@ imag-1b-F3-prod-01:
rate: 10_000_000_000
trunk: false
45:
- uid: chartreuse1-1
+ uid: pve-1
+ kind: server
46:
- uid: chartreuse1-2
+ uid: pve-2
+ kind: server
47:
- uid: chartreuse1-3
+ uid: srv-data
+ kind: server
48:
- uid: chartreuse1-4
+ uid: srv-data2
+ kind: server
49:
- uid: imag-1b-F1-prod-01
+ uid: imag-1b-F2-prod-01
kind: switch
50:
- uid: imag-1b-F2-prod-01
+ uid: imag-1b-F1-prod-01
kind: switch
channels_ssh_pattern: '#{/\D+/.match("%CHANNEL%")} #{/\d+/.match("%CHANNEL%")}'
channels:
diff --git a/input/grid5000/sites/grenoble/servers/physical.yaml b/input/grid5000/sites/grenoble/servers/physical.yaml
index 1ed92a6bc9d126f6225bb7fda4ea602e7931b80b..8749c9dc840cc999f96d48eae1f4efdb1990bf29 100644
--- a/input/grid5000/sites/grenoble/servers/physical.yaml
+++ b/input/grid5000/sites/grenoble/servers/physical.yaml
@@ -73,3 +73,63 @@ dignfs:
size: 55000000000000
rate: 50000000000
+pve-1:
+ kind: physical
+ warranty: 2031-07-11
+ serial: CZJD1700JN
+ alias: []
+ network_adapters:
+ default:
+ ip: 172.16.31.13
+ mac: D4:04:E6:42:91:7C
+ bmc:
+ ip: 172.17.30.13
+ mac: 7C:A6:2A:3C:B2:74
+ adm:
+ ip: 172.17.31.13
+
+pve-2:
+ kind: physical
+ warranty: 2031-07-03
+ serial: CZJD1700JM
+ alias: []
+ network_adapters:
+ default:
+ ip: 172.16.31.14
+ mac: D4:04:E6:06:54:E6
+ bmc:
+ ip: 172.17.30.14
+ mac: 7C:A6:2A:3C:A2:28
+ adm:
+ ip: 172.17.31.14
+
+srv-data:
+ kind: physical
+ warranty: 2031-07-21
+ serial: CZ24280F8D
+ alias: []
+ network_adapters:
+ default:
+ ip: 172.16.31.15
+ mac: D4:04:E6:A6:0F:84
+ bmc:
+ ip: 172.17.30.15
+ mac: 5C:ED:8C:F4:A1:EE
+ adm:
+ ip: 172.17.31.15
+
+srv-data2:
+ kind: physical
+ warranty: 2031-07-21
+ serial: CZ24280F8F
+ alias: []
+ network_adapters:
+ default:
+ ip: 172.16.31.16
+ mac: D4:04:E6:A5:E7:CA
+ bmc:
+ ip: 172.17.30.16
+ mac: 5C:ED:8C:F4:64:78
+ adm:
+ ip: 172.17.31.16
+