diff --git a/data/grid5000/accesses/nodesets.json b/data/grid5000/accesses/nodesets.json
index 70f2027c6f021c21ce5445005c496be61f66e56f..cddb7b05a74231554dff669d0eabd66355871ecc 100644
--- a/data/grid5000/accesses/nodesets.json
+++ b/data/grid5000/accesses/nodesets.json
@@ -1671,6 +1671,61 @@
]
}
},
+ "esterel11": {
+ "besteffort": {
+ "ggas": [
+ "cidre",
+ "kerdata",
+ "magellan",
+ "myriads",
+ "pacap",
+ "wide",
+ "pirat",
+ "coast",
+ "avalon",
+ "chroma",
+ "emeraude",
+ "maracas",
+ "inria-chile",
+ "inria-dsi",
+ "inria-sidf",
+ "swh",
+ "tadaam"
+ ],
+ "sites": [
+ "mc-rennes",
+ "mc-nancy",
+ "mc-lyon",
+ "mc-economic-activity",
+ "mc-sophia",
+ "mc-lille",
+ "mc-grenoble",
+ "mc-paris",
+ "mc-saclay",
+ "mc-bordeaux",
+ "mc-siege",
+ "mc-guest",
+ "slices-fr-grenoble",
+ "slices-fr-lille",
+ "slices-fr-lyon",
+ "slices-fr-nancy",
+ "slices-fr-nantes",
+ "slices-fr-rennes",
+ "slices-fr-sophia",
+ "slices-fr-strasbourg",
+ "slices-fr-toulouse"
+ ]
+ },
+ "p1": {
+ "ggas": [
+ "stars"
+ ],
+ "sites": [
+ "mc-staff-site",
+ "g5k-staff-site"
+ ]
+ }
+ },
"esterel12": {
"besteffort": {
"ggas": [
@@ -1946,6 +2001,69 @@
]
}
},
+ "esterel27": {
+ "p1": {
+ "ggas": [
+ "zenith"
+ ],
+ "sites": [
+ "mc-sophia",
+ "mc-staff-site",
+ "g5k-staff-site"
+ ]
+ },
+ "p3": {
+ "ggas": [
+ "cidre",
+ "kerdata",
+ "magellan",
+ "myriads",
+ "pacap",
+ "wide",
+ "pirat",
+ "coast",
+ "avalon",
+ "chroma",
+ "emeraude",
+ "maracas",
+ "inria-chile",
+ "inria-dsi",
+ "inria-sidf",
+ "swh",
+ "tadaam"
+ ],
+ "sites": [
+ "mc-rennes",
+ "mc-nancy",
+ "mc-lyon",
+ "mc-economic-activity",
+ "mc-sophia",
+ "mc-lille",
+ "mc-grenoble",
+ "mc-paris",
+ "mc-saclay",
+ "mc-bordeaux",
+ "mc-siege"
+ ]
+ },
+ "p4": {
+ "ggas": [
+
+ ],
+ "sites": [
+ "mc-guest",
+ "slices-fr-grenoble",
+ "slices-fr-lille",
+ "slices-fr-lyon",
+ "slices-fr-nancy",
+ "slices-fr-nantes",
+ "slices-fr-rennes",
+ "slices-fr-sophia",
+ "slices-fr-strasbourg",
+ "slices-fr-toulouse"
+ ]
+ }
+ },
"esterel3": {
"besteffort": {
"ggas": [
diff --git a/data/grid5000/sites/louvain/servers/g5k-gw.json b/data/grid5000/sites/louvain/servers/g5k-gw.json
new file mode 100644
index 0000000000000000000000000000000000000000..c8e14c85ec602c91284d239e2a1bbe2185f4d57f
--- /dev/null
+++ b/data/grid5000/sites/louvain/servers/g5k-gw.json
@@ -0,0 +1,12 @@
+{
+ "kind": "physical",
+ "network_adapters": {
+ "default": {
+ "ip": "172.17.223.250",
+ "mac": "d8:eb:97:b3:aa:27"
+ }
+ },
+ "redfish": false,
+ "type": "server",
+ "uid": "g5k-gw"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/abacus2/nodes/abacus2-1.json b/data/grid5000/sites/rennes/clusters/abacus2/nodes/abacus2-1.json
index db06a072a41d439c06bc7d48544efd1d9450b109..18e98e7384f7b3ae7212d7a4d3e497f03b856dfa 100644
--- a/data/grid5000/sites/rennes/clusters/abacus2/nodes/abacus2-1.json
+++ b/data/grid5000/sites/rennes/clusters/abacus2/nodes/abacus2-1.json
@@ -233,7 +233,7 @@
"storage_devices": [
{
"by_id": "/dev/disk/by-id/wwn-0x6107d1a0ff26b8002126d6f512642ace",
- "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0",
+ "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
"firmware_version": 4.3,
"id": "disk0",
"interface": "SAS",
diff --git a/data/grid5000/sites/rennes/clusters/roazhon6/nodes/roazhon6-1.json b/data/grid5000/sites/rennes/clusters/roazhon6/nodes/roazhon6-1.json
index b63f718f0d38031db37d7e3dbdbbfc184993bec3..7fd4524f0a73457989eb7fbae201c1d5f5cbd469 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon6/nodes/roazhon6-1.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon6/nodes/roazhon6-1.json
@@ -187,7 +187,7 @@
"storage_devices": [
{
"by_id": "/dev/disk/by-id/wwn-0x6509a4c0b190c60021b9917105ed855f",
- "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
+ "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0",
"firmware_version": 4.3,
"id": "disk0",
"interface": "SAS",
diff --git a/data/grid5000/sites/rennes/clusters/roazhon6/nodes/roazhon6-2.json b/data/grid5000/sites/rennes/clusters/roazhon6/nodes/roazhon6-2.json
index 0dd98c53a7c3644159994a0c517696ad4fbef363..b13ff0be6e88c2c5d45b34fb99db3a0971cb1806 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon6/nodes/roazhon6-2.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon6/nodes/roazhon6-2.json
@@ -187,7 +187,7 @@
"storage_devices": [
{
"by_id": "/dev/disk/by-id/wwn-0x6509a4c0b18f8b0021b99a4605ed616f",
- "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
+ "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0",
"firmware_version": 4.3,
"id": "disk0",
"interface": "SAS",
diff --git a/data/grid5000/sites/rennes/clusters/roazhon6/nodes/roazhon6-3.json b/data/grid5000/sites/rennes/clusters/roazhon6/nodes/roazhon6-3.json
index 8b8a16de28c8f90457801d0ec6347c03f23362d7..6e79de1270c067c90e8a68ece9e39d18e776bd37 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon6/nodes/roazhon6-3.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon6/nodes/roazhon6-3.json
@@ -187,7 +187,7 @@
"storage_devices": [
{
"by_id": "/dev/disk/by-id/wwn-0x6509a4c0b190970021b99a7f05f0ef97",
- "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
+ "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0",
"firmware_version": 4.3,
"id": "disk0",
"interface": "SAS",
diff --git a/data/grid5000/sites/rennes/clusters/roazhon6/nodes/roazhon6-4.json b/data/grid5000/sites/rennes/clusters/roazhon6/nodes/roazhon6-4.json
index cc38096b80275c1b3a725d31ec575198e4e96b56..7390a2d51bfb6ebeefb8d9a822a9ee60c19a9781 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon6/nodes/roazhon6-4.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon6/nodes/roazhon6-4.json
@@ -187,7 +187,7 @@
"storage_devices": [
{
"by_id": "/dev/disk/by-id/wwn-0x6509a4c0b191510021b99ac105efb408",
- "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
+ "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0",
"firmware_version": 4.3,
"id": "disk0",
"interface": "SAS",
diff --git a/data/grid5000/sites/sophia/clusters/esterel11/esterel11.json b/data/grid5000/sites/sophia/clusters/esterel11/esterel11.json
index 1aa7344a2e6ecb2313512371a83ddef10440cd5a..9782808b58e68f3aa2009028f0630c56e4634dc5 100644
--- a/data/grid5000/sites/sophia/clusters/esterel11/esterel11.json
+++ b/data/grid5000/sites/sophia/clusters/esterel11/esterel11.json
@@ -84,7 +84,7 @@
"priority": 197101,
"queues": [
"admin",
- "testing"
+ "production"
],
"redfish": true,
"type": "cluster",
diff --git a/data/grid5000/sites/sophia/clusters/esterel11/nodes/esterel11-1.json b/data/grid5000/sites/sophia/clusters/esterel11/nodes/esterel11-1.json
index b0bcca77aa77d05e639361fb1500a437849849e1..286e53d76ac636c775d4374bec874e1f6f6f0c03 100644
--- a/data/grid5000/sites/sophia/clusters/esterel11/nodes/esterel11-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel11/nodes/esterel11-1.json
@@ -277,10 +277,10 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
- "max_walltime": 0,
+ "max_walltime": 604800,
"queues": [
"admin",
- "testing"
+ "production"
],
"virtual": "ivt"
},
diff --git a/data/grid5000/sites/sophia/clusters/esterel11/nodes/esterel11-2.json b/data/grid5000/sites/sophia/clusters/esterel11/nodes/esterel11-2.json
index e4a3a1a1c092e2a07dac7f0b527ab5d3063310b4..4f24e5a82d75391ddf76bc19640aa9d0051c9df0 100644
--- a/data/grid5000/sites/sophia/clusters/esterel11/nodes/esterel11-2.json
+++ b/data/grid5000/sites/sophia/clusters/esterel11/nodes/esterel11-2.json
@@ -260,10 +260,10 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
- "max_walltime": 0,
+ "max_walltime": 604800,
"queues": [
"admin",
- "testing"
+ "production"
],
"virtual": "ivt"
},
diff --git a/data/grid5000/sites/sophia/clusters/esterel27/esterel27.json b/data/grid5000/sites/sophia/clusters/esterel27/esterel27.json
index 60222590da3eca56ee38fbeedce9f83061e53d86..267180fe8b01fdebfd321655bcac68923ce03afc 100644
--- a/data/grid5000/sites/sophia/clusters/esterel27/esterel27.json
+++ b/data/grid5000/sites/sophia/clusters/esterel27/esterel27.json
@@ -188,9 +188,9 @@
"priority": 202001,
"queues": [
"admin",
- "testing"
+ "production"
],
- "redfish": true,
+ "redfish": false,
"type": "cluster",
"uid": "esterel27",
"warranty_end": "2021-06-07"
diff --git a/data/grid5000/sites/sophia/clusters/esterel27/nodes/esterel27-1.json b/data/grid5000/sites/sophia/clusters/esterel27/nodes/esterel27-1.json
index 497a111b7a9be69b7a21a4dd288289a481cc71d0..7a38b05e52ae827de9002271dbca292c4353d2a9 100644
--- a/data/grid5000/sites/sophia/clusters/esterel27/nodes/esterel27-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel27/nodes/esterel27-1.json
@@ -316,7 +316,7 @@
"vendor": "Intel",
"version": "Gold 5115"
},
- "redfish": true,
+ "redfish": false,
"software": {
"forced-deployment-timestamp": 202007300948,
"postinstall-version": "1.2025042314",
@@ -349,10 +349,10 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
- "max_walltime": 0,
+ "max_walltime": 604800,
"queues": [
"admin",
- "testing"
+ "production"
],
"virtual": "ivt"
},
diff --git a/data/grid5000/sites/toulouse/clusters/estats/estats.json b/data/grid5000/sites/toulouse/clusters/estats/estats.json
index 20fad92a2d0c9aa2f2158c59e82961990a66c83c..eaa9ba1c770deda822875886900b98c0ef337e3b 100644
--- a/data/grid5000/sites/toulouse/clusters/estats/estats.json
+++ b/data/grid5000/sites/toulouse/clusters/estats/estats.json
@@ -2,7 +2,7 @@
"boot_type": "uefi",
"created_at": "Tue, 13 Jun 2023 00:00:00 GMT",
"exotic": true,
- "kavlan": false,
+ "kavlan": true,
"manufactured_at": "2022-12-01",
"metrics": [
diff --git a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-1.json b/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-1.json
index 45a59fa29c4f4fa8ee11db567aee349c1e1506ed..252d4d5ecf05e44abd279731d53543ccd27f1787 100644
--- a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-1.json
+++ b/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-1.json
@@ -37,6 +37,50 @@
"vendor": "Nvidia"
}
},
+ "kavlan": {
+ "eth0": {
+ "kavlan-1": "192.168.193.1",
+ "kavlan-11": "10.7.243.1",
+ "kavlan-12": "10.11.243.1",
+ "kavlan-13": "10.15.243.1",
+ "kavlan-14": "10.19.243.1",
+ "kavlan-16": "10.27.243.1",
+ "kavlan-17": "10.31.243.1",
+ "kavlan-18": "10.35.243.1",
+ "kavlan-2": "192.168.209.1",
+ "kavlan-20": "10.43.243.1",
+ "kavlan-21": "10.47.243.1",
+ "kavlan-3": "192.168.225.1",
+ "kavlan-4": "10.28.1.1",
+ "kavlan-5": "10.28.65.1",
+ "kavlan-6": "10.28.129.1",
+ "kavlan-7": "10.28.193.1",
+ "kavlan-8": "10.29.1.1",
+ "kavlan-9": "10.29.65.1"
+ }
+ },
+ "kavlan6": {
+ "eth0": {
+ "kavlan-1": "2001:660:4406:980:a::1",
+ "kavlan-11": "2001:660:4406:1a0:90a::1",
+ "kavlan-12": "2001:660:4406:2a0:90a::1",
+ "kavlan-13": "2001:660:4406:4a0:90a::1",
+ "kavlan-14": "2001:660:4406:5a0:90a::1",
+ "kavlan-16": "2001:660:4406:7a0:90a::1",
+ "kavlan-17": "2001:660:4406:9a0:90a::1",
+ "kavlan-18": "2001:660:4406:8a0:90a::1",
+ "kavlan-2": "2001:660:4406:981:a::1",
+ "kavlan-20": "2001:660:4406:3a0:90a::1",
+ "kavlan-21": "2001:660:4406:6a0:90a::1",
+ "kavlan-3": "2001:660:4406:982:a::1",
+ "kavlan-4": "2001:660:4406:990:a::1",
+ "kavlan-5": "2001:660:4406:991:a::1",
+ "kavlan-6": "2001:660:4406:992:a::1",
+ "kavlan-7": "2001:660:4406:993:a::1",
+ "kavlan-8": "2001:660:4406:994:a::1",
+ "kavlan-9": "2001:660:4406:995:a::1"
+ }
+ },
"main_memory": {
"ram_size": 34359738368
},
@@ -62,7 +106,7 @@
"interface": "Ethernet",
"ip": "172.16.121.1",
"ip6": "2001:660:4406:900:a::1",
- "kavlan": false,
+ "kavlan": true,
"mac": "48:b0:2d:3a:ba:11",
"management": false,
"mountable": true,
diff --git a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-10.json b/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-10.json
index 57456b173b90fee1cfcb2734ff8ef38bca41101b..ab779e1709c44e1c084cb0125afaf1c94bad4f81 100644
--- a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-10.json
+++ b/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-10.json
@@ -37,6 +37,50 @@
"vendor": "Nvidia"
}
},
+ "kavlan": {
+ "eth0": {
+ "kavlan-1": "192.168.193.10",
+ "kavlan-11": "10.7.243.10",
+ "kavlan-12": "10.11.243.10",
+ "kavlan-13": "10.15.243.10",
+ "kavlan-14": "10.19.243.10",
+ "kavlan-16": "10.27.243.10",
+ "kavlan-17": "10.31.243.10",
+ "kavlan-18": "10.35.243.10",
+ "kavlan-2": "192.168.209.10",
+ "kavlan-20": "10.43.243.10",
+ "kavlan-21": "10.47.243.10",
+ "kavlan-3": "192.168.225.10",
+ "kavlan-4": "10.28.1.10",
+ "kavlan-5": "10.28.65.10",
+ "kavlan-6": "10.28.129.10",
+ "kavlan-7": "10.28.193.10",
+ "kavlan-8": "10.29.1.10",
+ "kavlan-9": "10.29.65.10"
+ }
+ },
+ "kavlan6": {
+ "eth0": {
+ "kavlan-1": "2001:660:4406:980:a::a",
+ "kavlan-11": "2001:660:4406:1a0:90a::a",
+ "kavlan-12": "2001:660:4406:2a0:90a::a",
+ "kavlan-13": "2001:660:4406:4a0:90a::a",
+ "kavlan-14": "2001:660:4406:5a0:90a::a",
+ "kavlan-16": "2001:660:4406:7a0:90a::a",
+ "kavlan-17": "2001:660:4406:9a0:90a::a",
+ "kavlan-18": "2001:660:4406:8a0:90a::a",
+ "kavlan-2": "2001:660:4406:981:a::a",
+ "kavlan-20": "2001:660:4406:3a0:90a::a",
+ "kavlan-21": "2001:660:4406:6a0:90a::a",
+ "kavlan-3": "2001:660:4406:982:a::a",
+ "kavlan-4": "2001:660:4406:990:a::a",
+ "kavlan-5": "2001:660:4406:991:a::a",
+ "kavlan-6": "2001:660:4406:992:a::a",
+ "kavlan-7": "2001:660:4406:993:a::a",
+ "kavlan-8": "2001:660:4406:994:a::a",
+ "kavlan-9": "2001:660:4406:995:a::a"
+ }
+ },
"main_memory": {
"ram_size": 34359738368
},
@@ -62,7 +106,7 @@
"interface": "Ethernet",
"ip": "172.16.121.10",
"ip6": "2001:660:4406:900:a::a",
- "kavlan": false,
+ "kavlan": true,
"mac": "48:b0:2d:3a:ba:1c",
"management": false,
"mountable": true,
diff --git a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-11.json b/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-11.json
index d54350fae92e00ab9329ed6c61ca45e22be6d9d2..dc529f9208316fd22c89265cf87d363acfb685f8 100644
--- a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-11.json
+++ b/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-11.json
@@ -37,6 +37,50 @@
"vendor": "Nvidia"
}
},
+ "kavlan": {
+ "eth0": {
+ "kavlan-1": "192.168.193.11",
+ "kavlan-11": "10.7.243.11",
+ "kavlan-12": "10.11.243.11",
+ "kavlan-13": "10.15.243.11",
+ "kavlan-14": "10.19.243.11",
+ "kavlan-16": "10.27.243.11",
+ "kavlan-17": "10.31.243.11",
+ "kavlan-18": "10.35.243.11",
+ "kavlan-2": "192.168.209.11",
+ "kavlan-20": "10.43.243.11",
+ "kavlan-21": "10.47.243.11",
+ "kavlan-3": "192.168.225.11",
+ "kavlan-4": "10.28.1.11",
+ "kavlan-5": "10.28.65.11",
+ "kavlan-6": "10.28.129.11",
+ "kavlan-7": "10.28.193.11",
+ "kavlan-8": "10.29.1.11",
+ "kavlan-9": "10.29.65.11"
+ }
+ },
+ "kavlan6": {
+ "eth0": {
+ "kavlan-1": "2001:660:4406:980:a::b",
+ "kavlan-11": "2001:660:4406:1a0:90a::b",
+ "kavlan-12": "2001:660:4406:2a0:90a::b",
+ "kavlan-13": "2001:660:4406:4a0:90a::b",
+ "kavlan-14": "2001:660:4406:5a0:90a::b",
+ "kavlan-16": "2001:660:4406:7a0:90a::b",
+ "kavlan-17": "2001:660:4406:9a0:90a::b",
+ "kavlan-18": "2001:660:4406:8a0:90a::b",
+ "kavlan-2": "2001:660:4406:981:a::b",
+ "kavlan-20": "2001:660:4406:3a0:90a::b",
+ "kavlan-21": "2001:660:4406:6a0:90a::b",
+ "kavlan-3": "2001:660:4406:982:a::b",
+ "kavlan-4": "2001:660:4406:990:a::b",
+ "kavlan-5": "2001:660:4406:991:a::b",
+ "kavlan-6": "2001:660:4406:992:a::b",
+ "kavlan-7": "2001:660:4406:993:a::b",
+ "kavlan-8": "2001:660:4406:994:a::b",
+ "kavlan-9": "2001:660:4406:995:a::b"
+ }
+ },
"main_memory": {
"ram_size": 34359738368
},
@@ -62,7 +106,7 @@
"interface": "Ethernet",
"ip": "172.16.121.11",
"ip6": "2001:660:4406:900:a::b",
- "kavlan": false,
+ "kavlan": true,
"mac": "48:b0:2d:3a:ba:56",
"management": false,
"mountable": true,
diff --git a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-12.json b/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-12.json
index 564bcd9ba01c5739d78317facf8291df122cc1e6..8b94b4d24c3360dc45d2e8d45ddbbb3dada670de 100644
--- a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-12.json
+++ b/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-12.json
@@ -37,6 +37,50 @@
"vendor": "Nvidia"
}
},
+ "kavlan": {
+ "eth0": {
+ "kavlan-1": "192.168.193.12",
+ "kavlan-11": "10.7.243.12",
+ "kavlan-12": "10.11.243.12",
+ "kavlan-13": "10.15.243.12",
+ "kavlan-14": "10.19.243.12",
+ "kavlan-16": "10.27.243.12",
+ "kavlan-17": "10.31.243.12",
+ "kavlan-18": "10.35.243.12",
+ "kavlan-2": "192.168.209.12",
+ "kavlan-20": "10.43.243.12",
+ "kavlan-21": "10.47.243.12",
+ "kavlan-3": "192.168.225.12",
+ "kavlan-4": "10.28.1.12",
+ "kavlan-5": "10.28.65.12",
+ "kavlan-6": "10.28.129.12",
+ "kavlan-7": "10.28.193.12",
+ "kavlan-8": "10.29.1.12",
+ "kavlan-9": "10.29.65.12"
+ }
+ },
+ "kavlan6": {
+ "eth0": {
+ "kavlan-1": "2001:660:4406:980:a::c",
+ "kavlan-11": "2001:660:4406:1a0:90a::c",
+ "kavlan-12": "2001:660:4406:2a0:90a::c",
+ "kavlan-13": "2001:660:4406:4a0:90a::c",
+ "kavlan-14": "2001:660:4406:5a0:90a::c",
+ "kavlan-16": "2001:660:4406:7a0:90a::c",
+ "kavlan-17": "2001:660:4406:9a0:90a::c",
+ "kavlan-18": "2001:660:4406:8a0:90a::c",
+ "kavlan-2": "2001:660:4406:981:a::c",
+ "kavlan-20": "2001:660:4406:3a0:90a::c",
+ "kavlan-21": "2001:660:4406:6a0:90a::c",
+ "kavlan-3": "2001:660:4406:982:a::c",
+ "kavlan-4": "2001:660:4406:990:a::c",
+ "kavlan-5": "2001:660:4406:991:a::c",
+ "kavlan-6": "2001:660:4406:992:a::c",
+ "kavlan-7": "2001:660:4406:993:a::c",
+ "kavlan-8": "2001:660:4406:994:a::c",
+ "kavlan-9": "2001:660:4406:995:a::c"
+ }
+ },
"main_memory": {
"ram_size": 34359738368
},
@@ -62,7 +106,7 @@
"interface": "Ethernet",
"ip": "172.16.121.12",
"ip6": "2001:660:4406:900:a::c",
- "kavlan": false,
+ "kavlan": true,
"mac": "48:b0:2d:3a:b9:d0",
"management": false,
"mountable": true,
diff --git a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-2.json b/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-2.json
index 56523cd322b8bda7bfa234debca3cb022a5228dd..e4c81593d2e19fd3e4f9f6a1275bfdb0b19b29e4 100644
--- a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-2.json
+++ b/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-2.json
@@ -37,6 +37,50 @@
"vendor": "Nvidia"
}
},
+ "kavlan": {
+ "eth0": {
+ "kavlan-1": "192.168.193.2",
+ "kavlan-11": "10.7.243.2",
+ "kavlan-12": "10.11.243.2",
+ "kavlan-13": "10.15.243.2",
+ "kavlan-14": "10.19.243.2",
+ "kavlan-16": "10.27.243.2",
+ "kavlan-17": "10.31.243.2",
+ "kavlan-18": "10.35.243.2",
+ "kavlan-2": "192.168.209.2",
+ "kavlan-20": "10.43.243.2",
+ "kavlan-21": "10.47.243.2",
+ "kavlan-3": "192.168.225.2",
+ "kavlan-4": "10.28.1.2",
+ "kavlan-5": "10.28.65.2",
+ "kavlan-6": "10.28.129.2",
+ "kavlan-7": "10.28.193.2",
+ "kavlan-8": "10.29.1.2",
+ "kavlan-9": "10.29.65.2"
+ }
+ },
+ "kavlan6": {
+ "eth0": {
+ "kavlan-1": "2001:660:4406:980:a::2",
+ "kavlan-11": "2001:660:4406:1a0:90a::2",
+ "kavlan-12": "2001:660:4406:2a0:90a::2",
+ "kavlan-13": "2001:660:4406:4a0:90a::2",
+ "kavlan-14": "2001:660:4406:5a0:90a::2",
+ "kavlan-16": "2001:660:4406:7a0:90a::2",
+ "kavlan-17": "2001:660:4406:9a0:90a::2",
+ "kavlan-18": "2001:660:4406:8a0:90a::2",
+ "kavlan-2": "2001:660:4406:981:a::2",
+ "kavlan-20": "2001:660:4406:3a0:90a::2",
+ "kavlan-21": "2001:660:4406:6a0:90a::2",
+ "kavlan-3": "2001:660:4406:982:a::2",
+ "kavlan-4": "2001:660:4406:990:a::2",
+ "kavlan-5": "2001:660:4406:991:a::2",
+ "kavlan-6": "2001:660:4406:992:a::2",
+ "kavlan-7": "2001:660:4406:993:a::2",
+ "kavlan-8": "2001:660:4406:994:a::2",
+ "kavlan-9": "2001:660:4406:995:a::2"
+ }
+ },
"main_memory": {
"ram_size": 34359738368
},
@@ -62,7 +106,7 @@
"interface": "Ethernet",
"ip": "172.16.121.2",
"ip6": "2001:660:4406:900:a::2",
- "kavlan": false,
+ "kavlan": true,
"mac": "48:b0:2d:4d:44:87",
"management": false,
"mountable": true,
diff --git a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-3.json b/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-3.json
index 1181a8f2d76741a5d01d4526edd1bdbbdb72174a..e10a81c2f0ffb60d2062412fcc3585769ed71cc8 100644
--- a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-3.json
+++ b/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-3.json
@@ -37,6 +37,50 @@
"vendor": "Nvidia"
}
},
+ "kavlan": {
+ "eth0": {
+ "kavlan-1": "192.168.193.3",
+ "kavlan-11": "10.7.243.3",
+ "kavlan-12": "10.11.243.3",
+ "kavlan-13": "10.15.243.3",
+ "kavlan-14": "10.19.243.3",
+ "kavlan-16": "10.27.243.3",
+ "kavlan-17": "10.31.243.3",
+ "kavlan-18": "10.35.243.3",
+ "kavlan-2": "192.168.209.3",
+ "kavlan-20": "10.43.243.3",
+ "kavlan-21": "10.47.243.3",
+ "kavlan-3": "192.168.225.3",
+ "kavlan-4": "10.28.1.3",
+ "kavlan-5": "10.28.65.3",
+ "kavlan-6": "10.28.129.3",
+ "kavlan-7": "10.28.193.3",
+ "kavlan-8": "10.29.1.3",
+ "kavlan-9": "10.29.65.3"
+ }
+ },
+ "kavlan6": {
+ "eth0": {
+ "kavlan-1": "2001:660:4406:980:a::3",
+ "kavlan-11": "2001:660:4406:1a0:90a::3",
+ "kavlan-12": "2001:660:4406:2a0:90a::3",
+ "kavlan-13": "2001:660:4406:4a0:90a::3",
+ "kavlan-14": "2001:660:4406:5a0:90a::3",
+ "kavlan-16": "2001:660:4406:7a0:90a::3",
+ "kavlan-17": "2001:660:4406:9a0:90a::3",
+ "kavlan-18": "2001:660:4406:8a0:90a::3",
+ "kavlan-2": "2001:660:4406:981:a::3",
+ "kavlan-20": "2001:660:4406:3a0:90a::3",
+ "kavlan-21": "2001:660:4406:6a0:90a::3",
+ "kavlan-3": "2001:660:4406:982:a::3",
+ "kavlan-4": "2001:660:4406:990:a::3",
+ "kavlan-5": "2001:660:4406:991:a::3",
+ "kavlan-6": "2001:660:4406:992:a::3",
+ "kavlan-7": "2001:660:4406:993:a::3",
+ "kavlan-8": "2001:660:4406:994:a::3",
+ "kavlan-9": "2001:660:4406:995:a::3"
+ }
+ },
"main_memory": {
"ram_size": 34359738368
},
@@ -62,7 +106,7 @@
"interface": "Ethernet",
"ip": "172.16.121.3",
"ip6": "2001:660:4406:900:a::3",
- "kavlan": false,
+ "kavlan": true,
"mac": "48:b0:2d:3a:ba:1e",
"management": false,
"mountable": true,
diff --git a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-4.json b/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-4.json
index 8cdd45f499da0be6d36102e6ab40992953a1fc17..2ae371c59708b7d11098428cc026bb29bae52808 100644
--- a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-4.json
+++ b/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-4.json
@@ -37,6 +37,50 @@
"vendor": "Nvidia"
}
},
+ "kavlan": {
+ "eth0": {
+ "kavlan-1": "192.168.193.4",
+ "kavlan-11": "10.7.243.4",
+ "kavlan-12": "10.11.243.4",
+ "kavlan-13": "10.15.243.4",
+ "kavlan-14": "10.19.243.4",
+ "kavlan-16": "10.27.243.4",
+ "kavlan-17": "10.31.243.4",
+ "kavlan-18": "10.35.243.4",
+ "kavlan-2": "192.168.209.4",
+ "kavlan-20": "10.43.243.4",
+ "kavlan-21": "10.47.243.4",
+ "kavlan-3": "192.168.225.4",
+ "kavlan-4": "10.28.1.4",
+ "kavlan-5": "10.28.65.4",
+ "kavlan-6": "10.28.129.4",
+ "kavlan-7": "10.28.193.4",
+ "kavlan-8": "10.29.1.4",
+ "kavlan-9": "10.29.65.4"
+ }
+ },
+ "kavlan6": {
+ "eth0": {
+ "kavlan-1": "2001:660:4406:980:a::4",
+ "kavlan-11": "2001:660:4406:1a0:90a::4",
+ "kavlan-12": "2001:660:4406:2a0:90a::4",
+ "kavlan-13": "2001:660:4406:4a0:90a::4",
+ "kavlan-14": "2001:660:4406:5a0:90a::4",
+ "kavlan-16": "2001:660:4406:7a0:90a::4",
+ "kavlan-17": "2001:660:4406:9a0:90a::4",
+ "kavlan-18": "2001:660:4406:8a0:90a::4",
+ "kavlan-2": "2001:660:4406:981:a::4",
+ "kavlan-20": "2001:660:4406:3a0:90a::4",
+ "kavlan-21": "2001:660:4406:6a0:90a::4",
+ "kavlan-3": "2001:660:4406:982:a::4",
+ "kavlan-4": "2001:660:4406:990:a::4",
+ "kavlan-5": "2001:660:4406:991:a::4",
+ "kavlan-6": "2001:660:4406:992:a::4",
+ "kavlan-7": "2001:660:4406:993:a::4",
+ "kavlan-8": "2001:660:4406:994:a::4",
+ "kavlan-9": "2001:660:4406:995:a::4"
+ }
+ },
"main_memory": {
"ram_size": 34359738368
},
@@ -62,7 +106,7 @@
"interface": "Ethernet",
"ip": "172.16.121.4",
"ip6": "2001:660:4406:900:a::4",
- "kavlan": false,
+ "kavlan": true,
"mac": "48:b0:2d:3a:ba:17",
"management": false,
"mountable": true,
diff --git a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-5.json b/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-5.json
index ebc5d21f907657417b91e24479fc5ba2106153f9..3a3c39f54ed7332157870e6b9b903864b6432c95 100644
--- a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-5.json
+++ b/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-5.json
@@ -37,6 +37,50 @@
"vendor": "Nvidia"
}
},
+ "kavlan": {
+ "eth0": {
+ "kavlan-1": "192.168.193.5",
+ "kavlan-11": "10.7.243.5",
+ "kavlan-12": "10.11.243.5",
+ "kavlan-13": "10.15.243.5",
+ "kavlan-14": "10.19.243.5",
+ "kavlan-16": "10.27.243.5",
+ "kavlan-17": "10.31.243.5",
+ "kavlan-18": "10.35.243.5",
+ "kavlan-2": "192.168.209.5",
+ "kavlan-20": "10.43.243.5",
+ "kavlan-21": "10.47.243.5",
+ "kavlan-3": "192.168.225.5",
+ "kavlan-4": "10.28.1.5",
+ "kavlan-5": "10.28.65.5",
+ "kavlan-6": "10.28.129.5",
+ "kavlan-7": "10.28.193.5",
+ "kavlan-8": "10.29.1.5",
+ "kavlan-9": "10.29.65.5"
+ }
+ },
+ "kavlan6": {
+ "eth0": {
+ "kavlan-1": "2001:660:4406:980:a::5",
+ "kavlan-11": "2001:660:4406:1a0:90a::5",
+ "kavlan-12": "2001:660:4406:2a0:90a::5",
+ "kavlan-13": "2001:660:4406:4a0:90a::5",
+ "kavlan-14": "2001:660:4406:5a0:90a::5",
+ "kavlan-16": "2001:660:4406:7a0:90a::5",
+ "kavlan-17": "2001:660:4406:9a0:90a::5",
+ "kavlan-18": "2001:660:4406:8a0:90a::5",
+ "kavlan-2": "2001:660:4406:981:a::5",
+ "kavlan-20": "2001:660:4406:3a0:90a::5",
+ "kavlan-21": "2001:660:4406:6a0:90a::5",
+ "kavlan-3": "2001:660:4406:982:a::5",
+ "kavlan-4": "2001:660:4406:990:a::5",
+ "kavlan-5": "2001:660:4406:991:a::5",
+ "kavlan-6": "2001:660:4406:992:a::5",
+ "kavlan-7": "2001:660:4406:993:a::5",
+ "kavlan-8": "2001:660:4406:994:a::5",
+ "kavlan-9": "2001:660:4406:995:a::5"
+ }
+ },
"main_memory": {
"ram_size": 34359738368
},
@@ -62,7 +106,7 @@
"interface": "Ethernet",
"ip": "172.16.121.5",
"ip6": "2001:660:4406:900:a::5",
- "kavlan": false,
+ "kavlan": true,
"mac": "48:b0:2d:3a:b9:a3",
"management": false,
"mountable": true,
diff --git a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-6.json b/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-6.json
index dbfd65b3a977193ff3e6f15ef00a77bbd9c33e46..9b5b4d52a3add646d745a8f3f659d47a81ffe389 100644
--- a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-6.json
+++ b/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-6.json
@@ -37,6 +37,50 @@
"vendor": "Nvidia"
}
},
+ "kavlan": {
+ "eth0": {
+ "kavlan-1": "192.168.193.6",
+ "kavlan-11": "10.7.243.6",
+ "kavlan-12": "10.11.243.6",
+ "kavlan-13": "10.15.243.6",
+ "kavlan-14": "10.19.243.6",
+ "kavlan-16": "10.27.243.6",
+ "kavlan-17": "10.31.243.6",
+ "kavlan-18": "10.35.243.6",
+ "kavlan-2": "192.168.209.6",
+ "kavlan-20": "10.43.243.6",
+ "kavlan-21": "10.47.243.6",
+ "kavlan-3": "192.168.225.6",
+ "kavlan-4": "10.28.1.6",
+ "kavlan-5": "10.28.65.6",
+ "kavlan-6": "10.28.129.6",
+ "kavlan-7": "10.28.193.6",
+ "kavlan-8": "10.29.1.6",
+ "kavlan-9": "10.29.65.6"
+ }
+ },
+ "kavlan6": {
+ "eth0": {
+ "kavlan-1": "2001:660:4406:980:a::6",
+ "kavlan-11": "2001:660:4406:1a0:90a::6",
+ "kavlan-12": "2001:660:4406:2a0:90a::6",
+ "kavlan-13": "2001:660:4406:4a0:90a::6",
+ "kavlan-14": "2001:660:4406:5a0:90a::6",
+ "kavlan-16": "2001:660:4406:7a0:90a::6",
+ "kavlan-17": "2001:660:4406:9a0:90a::6",
+ "kavlan-18": "2001:660:4406:8a0:90a::6",
+ "kavlan-2": "2001:660:4406:981:a::6",
+ "kavlan-20": "2001:660:4406:3a0:90a::6",
+ "kavlan-21": "2001:660:4406:6a0:90a::6",
+ "kavlan-3": "2001:660:4406:982:a::6",
+ "kavlan-4": "2001:660:4406:990:a::6",
+ "kavlan-5": "2001:660:4406:991:a::6",
+ "kavlan-6": "2001:660:4406:992:a::6",
+ "kavlan-7": "2001:660:4406:993:a::6",
+ "kavlan-8": "2001:660:4406:994:a::6",
+ "kavlan-9": "2001:660:4406:995:a::6"
+ }
+ },
"main_memory": {
"ram_size": 34359738368
},
@@ -62,7 +106,7 @@
"interface": "Ethernet",
"ip": "172.16.121.6",
"ip6": "2001:660:4406:900:a::6",
- "kavlan": false,
+ "kavlan": true,
"mac": "48:b0:2d:3a:ba:0d",
"management": false,
"mountable": true,
diff --git a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-7.json b/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-7.json
index 8ae0008592b9d9964f42d33689d8b5610f8d8b7f..3937489034fa496e1b199abb82ac966f00399f17 100644
--- a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-7.json
+++ b/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-7.json
@@ -37,6 +37,50 @@
"vendor": "Nvidia"
}
},
+ "kavlan": {
+ "eth0": {
+ "kavlan-1": "192.168.193.7",
+ "kavlan-11": "10.7.243.7",
+ "kavlan-12": "10.11.243.7",
+ "kavlan-13": "10.15.243.7",
+ "kavlan-14": "10.19.243.7",
+ "kavlan-16": "10.27.243.7",
+ "kavlan-17": "10.31.243.7",
+ "kavlan-18": "10.35.243.7",
+ "kavlan-2": "192.168.209.7",
+ "kavlan-20": "10.43.243.7",
+ "kavlan-21": "10.47.243.7",
+ "kavlan-3": "192.168.225.7",
+ "kavlan-4": "10.28.1.7",
+ "kavlan-5": "10.28.65.7",
+ "kavlan-6": "10.28.129.7",
+ "kavlan-7": "10.28.193.7",
+ "kavlan-8": "10.29.1.7",
+ "kavlan-9": "10.29.65.7"
+ }
+ },
+ "kavlan6": {
+ "eth0": {
+ "kavlan-1": "2001:660:4406:980:a::7",
+ "kavlan-11": "2001:660:4406:1a0:90a::7",
+ "kavlan-12": "2001:660:4406:2a0:90a::7",
+ "kavlan-13": "2001:660:4406:4a0:90a::7",
+ "kavlan-14": "2001:660:4406:5a0:90a::7",
+ "kavlan-16": "2001:660:4406:7a0:90a::7",
+ "kavlan-17": "2001:660:4406:9a0:90a::7",
+ "kavlan-18": "2001:660:4406:8a0:90a::7",
+ "kavlan-2": "2001:660:4406:981:a::7",
+ "kavlan-20": "2001:660:4406:3a0:90a::7",
+ "kavlan-21": "2001:660:4406:6a0:90a::7",
+ "kavlan-3": "2001:660:4406:982:a::7",
+ "kavlan-4": "2001:660:4406:990:a::7",
+ "kavlan-5": "2001:660:4406:991:a::7",
+ "kavlan-6": "2001:660:4406:992:a::7",
+ "kavlan-7": "2001:660:4406:993:a::7",
+ "kavlan-8": "2001:660:4406:994:a::7",
+ "kavlan-9": "2001:660:4406:995:a::7"
+ }
+ },
"main_memory": {
"ram_size": 34359738368
},
@@ -62,7 +106,7 @@
"interface": "Ethernet",
"ip": "172.16.121.7",
"ip6": "2001:660:4406:900:a::7",
- "kavlan": false,
+ "kavlan": true,
"mac": "48:b0:2d:3a:b9:ba",
"management": false,
"mountable": true,
diff --git a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-8.json b/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-8.json
index 96637549791e59e563f9f5654c432c0b6290c2c5..fbd54ac977d1629f956ac549c5f9aa02607d8f3b 100644
--- a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-8.json
+++ b/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-8.json
@@ -37,6 +37,50 @@
"vendor": "Nvidia"
}
},
+ "kavlan": {
+ "eth0": {
+ "kavlan-1": "192.168.193.8",
+ "kavlan-11": "10.7.243.8",
+ "kavlan-12": "10.11.243.8",
+ "kavlan-13": "10.15.243.8",
+ "kavlan-14": "10.19.243.8",
+ "kavlan-16": "10.27.243.8",
+ "kavlan-17": "10.31.243.8",
+ "kavlan-18": "10.35.243.8",
+ "kavlan-2": "192.168.209.8",
+ "kavlan-20": "10.43.243.8",
+ "kavlan-21": "10.47.243.8",
+ "kavlan-3": "192.168.225.8",
+ "kavlan-4": "10.28.1.8",
+ "kavlan-5": "10.28.65.8",
+ "kavlan-6": "10.28.129.8",
+ "kavlan-7": "10.28.193.8",
+ "kavlan-8": "10.29.1.8",
+ "kavlan-9": "10.29.65.8"
+ }
+ },
+ "kavlan6": {
+ "eth0": {
+ "kavlan-1": "2001:660:4406:980:a::8",
+ "kavlan-11": "2001:660:4406:1a0:90a::8",
+ "kavlan-12": "2001:660:4406:2a0:90a::8",
+ "kavlan-13": "2001:660:4406:4a0:90a::8",
+ "kavlan-14": "2001:660:4406:5a0:90a::8",
+ "kavlan-16": "2001:660:4406:7a0:90a::8",
+ "kavlan-17": "2001:660:4406:9a0:90a::8",
+ "kavlan-18": "2001:660:4406:8a0:90a::8",
+ "kavlan-2": "2001:660:4406:981:a::8",
+ "kavlan-20": "2001:660:4406:3a0:90a::8",
+ "kavlan-21": "2001:660:4406:6a0:90a::8",
+ "kavlan-3": "2001:660:4406:982:a::8",
+ "kavlan-4": "2001:660:4406:990:a::8",
+ "kavlan-5": "2001:660:4406:991:a::8",
+ "kavlan-6": "2001:660:4406:992:a::8",
+ "kavlan-7": "2001:660:4406:993:a::8",
+ "kavlan-8": "2001:660:4406:994:a::8",
+ "kavlan-9": "2001:660:4406:995:a::8"
+ }
+ },
"main_memory": {
"ram_size": 34359738368
},
@@ -62,7 +106,7 @@
"interface": "Ethernet",
"ip": "172.16.121.8",
"ip6": "2001:660:4406:900:a::8",
- "kavlan": false,
+ "kavlan": true,
"mac": "48:b0:2d:3a:ba:70",
"management": false,
"mountable": true,
diff --git a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-9.json b/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-9.json
index 155ea81523831570a8be64a9cc99915bfc61c14b..52208003184fea92d3349d95639363c9259d6cda 100644
--- a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-9.json
+++ b/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-9.json
@@ -37,6 +37,50 @@
"vendor": "Nvidia"
}
},
+ "kavlan": {
+ "eth0": {
+ "kavlan-1": "192.168.193.9",
+ "kavlan-11": "10.7.243.9",
+ "kavlan-12": "10.11.243.9",
+ "kavlan-13": "10.15.243.9",
+ "kavlan-14": "10.19.243.9",
+ "kavlan-16": "10.27.243.9",
+ "kavlan-17": "10.31.243.9",
+ "kavlan-18": "10.35.243.9",
+ "kavlan-2": "192.168.209.9",
+ "kavlan-20": "10.43.243.9",
+ "kavlan-21": "10.47.243.9",
+ "kavlan-3": "192.168.225.9",
+ "kavlan-4": "10.28.1.9",
+ "kavlan-5": "10.28.65.9",
+ "kavlan-6": "10.28.129.9",
+ "kavlan-7": "10.28.193.9",
+ "kavlan-8": "10.29.1.9",
+ "kavlan-9": "10.29.65.9"
+ }
+ },
+ "kavlan6": {
+ "eth0": {
+ "kavlan-1": "2001:660:4406:980:a::9",
+ "kavlan-11": "2001:660:4406:1a0:90a::9",
+ "kavlan-12": "2001:660:4406:2a0:90a::9",
+ "kavlan-13": "2001:660:4406:4a0:90a::9",
+ "kavlan-14": "2001:660:4406:5a0:90a::9",
+ "kavlan-16": "2001:660:4406:7a0:90a::9",
+ "kavlan-17": "2001:660:4406:9a0:90a::9",
+ "kavlan-18": "2001:660:4406:8a0:90a::9",
+ "kavlan-2": "2001:660:4406:981:a::9",
+ "kavlan-20": "2001:660:4406:3a0:90a::9",
+ "kavlan-21": "2001:660:4406:6a0:90a::9",
+ "kavlan-3": "2001:660:4406:982:a::9",
+ "kavlan-4": "2001:660:4406:990:a::9",
+ "kavlan-5": "2001:660:4406:991:a::9",
+ "kavlan-6": "2001:660:4406:992:a::9",
+ "kavlan-7": "2001:660:4406:993:a::9",
+ "kavlan-8": "2001:660:4406:994:a::9",
+ "kavlan-9": "2001:660:4406:995:a::9"
+ }
+ },
"main_memory": {
"ram_size": 34359738368
},
@@ -62,7 +106,7 @@
"interface": "Ethernet",
"ip": "172.16.121.9",
"ip6": "2001:660:4406:900:a::9",
- "kavlan": false,
+ "kavlan": true,
"mac": "48:b0:2d:3a:b9:e6",
"management": false,
"mountable": true,
diff --git a/input/grid5000/access/sophia.yaml b/input/grid5000/access/sophia.yaml
index a879272ceb72227b11704c3ef306c28d8b99abd0..2341f4c7f0322542725397718b921a3f73cc6228 100644
--- a/input/grid5000/access/sophia.yaml
+++ b/input/grid5000/access/sophia.yaml
@@ -14,6 +14,7 @@ mercantour2: &inria-sophia
p3: ['@inria_group']
p4: ['@other_groups_with_access']
esterel10: *inria-sophia
+esterel27: *inria-sophia
mercantour1: *inria-sophia
mercantour5: *inria-sophia
@@ -39,6 +40,7 @@ esterel5: &dedicated-stars
esterel4: *dedicated-stars
esterel7: *dedicated-stars
+esterel11: *dedicated-stars
esterel26: *dedicated-stars
esterel32: &dedicated-i3s-sparks
diff --git a/input/grid5000/sites/louvain/servers/physical.yaml b/input/grid5000/sites/louvain/servers/physical.yaml
index 8ccae9f93c98b99812d9152e5e9c0fd5b6d5b72c..89ecaa18ca221e81afcfaefdf39f4230f4fc53e9 100644
--- a/input/grid5000/sites/louvain/servers/physical.yaml
+++ b/input/grid5000/sites/louvain/servers/physical.yaml
@@ -39,3 +39,15 @@ srv-data:
mac: e8:eb:d3:30:2c:3e
adm:
ip: 172.17.223.3
+
+# This machine is used to access Louvain G5K Site
+# through UCL's network, in case of network outage.
+# It will be replaced by the network backup when site
+# installation is over.
+g5k-gw:
+ kind: physical
+ redfish: false
+ network_adapters:
+ default:
+ ip: 172.17.223.250
+ mac: d8:eb:97:b3:aa:27
diff --git a/input/grid5000/sites/rennes/clusters/abacus2/abacus2.yaml b/input/grid5000/sites/rennes/clusters/abacus2/abacus2.yaml
index c952b6a9f2fefeb3a1e4c8aaa6d7569a7ef97440..ba637ee6499bd62a64882bd1be4e59274da929d8 100644
--- a/input/grid5000/sites/rennes/clusters/abacus2/abacus2.yaml
+++ b/input/grid5000/sites/rennes/clusters/abacus2/abacus2.yaml
@@ -42,7 +42,7 @@ nodes:
mountable: false
mounted: false
storage_devices:
- pci-0000:02:00.0-scsi-0:2:0:0:
+ pci-0000:03:00.0-scsi-0:2:0:0:
id: disk0
interface: SAS
nodeset: abacus2
diff --git a/input/grid5000/sites/rennes/clusters/abacus2/nodes/abacus2-1.yaml b/input/grid5000/sites/rennes/clusters/abacus2/nodes/abacus2-1.yaml
index fc0eecca03bbe0d37af09c5b5471060bc3962954..820dadbbcdb83cb8906fe3bb4b74a343fbe2c1c8 100644
--- a/input/grid5000/sites/rennes/clusters/abacus2/nodes/abacus2-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/abacus2/nodes/abacus2-1.yaml
@@ -131,9 +131,9 @@ abacus2-1:
vendor: Intel
version: E5-2609 v4
storage_devices:
- pci-0000:02:00.0-scsi-0:2:0:0:
+ pci-0000:03:00.0-scsi-0:2:0:0:
by_id: "/dev/disk/by-id/wwn-0x6107d1a0ff26b8002126d6f512642ace"
- by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
+ by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
firmware_version: 4.3
model: PERC H330 Mini
size: 299439751168
diff --git a/input/grid5000/sites/rennes/clusters/roazhon6/nodes/roazhon6-1.yaml b/input/grid5000/sites/rennes/clusters/roazhon6/nodes/roazhon6-1.yaml
index 5b8e5b594934e21d7b177f607faedce5eb1ac971..e0c85d323993bf034cea51adca8560f1f655f574 100644
--- a/input/grid5000/sites/rennes/clusters/roazhon6/nodes/roazhon6-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/roazhon6/nodes/roazhon6-1.yaml
@@ -108,9 +108,9 @@ roazhon6-1:
vendor: Intel
version: E5-2650 v4
storage_devices:
- pci-0000:03:00.0-scsi-0:2:0:0:
+ pci-0000:02:00.0-scsi-0:2:0:0:
by_id: "/dev/disk/by-id/wwn-0x6509a4c0b190c60021b9917105ed855f"
- by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
+ by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
firmware_version: 4.3
model: PERC H330 Mini
size: 1199101181952
diff --git a/input/grid5000/sites/rennes/clusters/roazhon6/nodes/roazhon6-2.yaml b/input/grid5000/sites/rennes/clusters/roazhon6/nodes/roazhon6-2.yaml
index 835dc2e0bb31745d8c6f85eeac011e4727518180..06cbc5a0aa0c4b1bb897f72d9c56b2a3214979ec 100644
--- a/input/grid5000/sites/rennes/clusters/roazhon6/nodes/roazhon6-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/roazhon6/nodes/roazhon6-2.yaml
@@ -108,9 +108,9 @@ roazhon6-2:
vendor: Intel
version: E5-2650 v4
storage_devices:
- pci-0000:03:00.0-scsi-0:2:0:0:
+ pci-0000:02:00.0-scsi-0:2:0:0:
by_id: "/dev/disk/by-id/wwn-0x6509a4c0b18f8b0021b99a4605ed616f"
- by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
+ by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
firmware_version: 4.3
model: PERC H330 Mini
size: 1199101181952
diff --git a/input/grid5000/sites/rennes/clusters/roazhon6/nodes/roazhon6-3.yaml b/input/grid5000/sites/rennes/clusters/roazhon6/nodes/roazhon6-3.yaml
index fc63e779021240bfa06f275c5c429ac64ee2bb14..1a1ecdd5a03493dd85f8f51a6f84f85842274e7d 100644
--- a/input/grid5000/sites/rennes/clusters/roazhon6/nodes/roazhon6-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/roazhon6/nodes/roazhon6-3.yaml
@@ -108,9 +108,9 @@ roazhon6-3:
vendor: Intel
version: E5-2650 v4
storage_devices:
- pci-0000:03:00.0-scsi-0:2:0:0:
+ pci-0000:02:00.0-scsi-0:2:0:0:
by_id: "/dev/disk/by-id/wwn-0x6509a4c0b190970021b99a7f05f0ef97"
- by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
+ by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
firmware_version: 4.3
model: PERC H330 Mini
size: 1199101181952
diff --git a/input/grid5000/sites/rennes/clusters/roazhon6/nodes/roazhon6-4.yaml b/input/grid5000/sites/rennes/clusters/roazhon6/nodes/roazhon6-4.yaml
index f4dd30dbcc39cefc939d2908b107b1c6d4358137..fcb8b3558e04e21e5cab2f05481cc9aad63c7623 100644
--- a/input/grid5000/sites/rennes/clusters/roazhon6/nodes/roazhon6-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/roazhon6/nodes/roazhon6-4.yaml
@@ -108,9 +108,9 @@ roazhon6-4:
vendor: Intel
version: E5-2650 v4
storage_devices:
- pci-0000:03:00.0-scsi-0:2:0:0:
+ pci-0000:02:00.0-scsi-0:2:0:0:
by_id: "/dev/disk/by-id/wwn-0x6509a4c0b191510021b99ac105efb408"
- by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
+ by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
firmware_version: 4.3
model: PERC H330 Mini
size: 1199101181952
diff --git a/input/grid5000/sites/rennes/clusters/roazhon6/roazhon6.yaml b/input/grid5000/sites/rennes/clusters/roazhon6/roazhon6.yaml
index 0c35096a00a8a920ea16eb864ef781c78828642d..92297310a5bd6c48780067708f2a32d15f2429ca 100644
--- a/input/grid5000/sites/rennes/clusters/roazhon6/roazhon6.yaml
+++ b/input/grid5000/sites/rennes/clusters/roazhon6/roazhon6.yaml
@@ -42,7 +42,7 @@ nodes:
mountable: false
mounted: false
storage_devices:
- pci-0000:03:00.0-scsi-0:2:0:0:
+ pci-0000:02:00.0-scsi-0:2:0:0:
id: disk0
interface: SAS
nodeset: roazhon6
diff --git a/input/grid5000/sites/sophia/clusters/esterel11/esterel11.yaml b/input/grid5000/sites/sophia/clusters/esterel11/esterel11.yaml
index 0269deb6ce1e259d9f41df27819c221d262b254d..d3c7b6e4903262d315d861251bed03cad3363c8c 100644
--- a/input/grid5000/sites/sophia/clusters/esterel11/esterel11.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel11/esterel11.yaml
@@ -6,13 +6,13 @@ boot_type: bios
exotic: false
queues:
- admin
- - testing
+ - production
nodes:
esterel11-[1-2]:
supported_job_types:
deploy: true
besteffort: true
- max_walltime: 0
+ max_walltime: 604800
processor:
microarchitecture: Broadwell
clock_speed: 2_100_000_000
diff --git a/input/grid5000/sites/sophia/clusters/esterel27/esterel27.yaml b/input/grid5000/sites/sophia/clusters/esterel27/esterel27.yaml
index 8ad5ba04d974f73d2ae40d3ef21e40ec9e95dad7..77a15f23273077e1596bf10922510c13b3753bbe 100644
--- a/input/grid5000/sites/sophia/clusters/esterel27/esterel27.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel27/esterel27.yaml
@@ -2,11 +2,12 @@
model: Asus ESC8000G4
created_at: 2025-03-17
kavlan: false
+redfish: false
boot_type: bios
exotic: false
queues:
- admin
- - testing
+ - production
nodes:
esterel27-1:
gpu_devices:
@@ -24,7 +25,7 @@ nodes:
supported_job_types:
deploy: true
besteffort: true
- max_walltime: 0
+ max_walltime: 604800
processor:
microarchitecture: Skylake-SP
clock_speed: 2400000000
diff --git a/input/grid5000/sites/toulouse/clusters/estats/estats.yaml b/input/grid5000/sites/toulouse/clusters/estats/estats.yaml
index f549c0db1ff53dc3e1fca7cfe8772fa5f411790e..185459b665c2cbb558cf4ce2f878585bb472c63d 100644
--- a/input/grid5000/sites/toulouse/clusters/estats/estats.yaml
+++ b/input/grid5000/sites/toulouse/clusters/estats/estats.yaml
@@ -1,6 +1,6 @@
model: Connecttech/Nvidia Jetson AGX Xavier
created_at: 2023-06-13
-kavlan: false
+kavlan: true
boot_type: uefi
exotic: true
queues:
diff --git a/lib/refrepo/gen/puppet/kavlanngg5k.rb b/lib/refrepo/gen/puppet/kavlanngg5k.rb
index 005df403a8fb4fefd2333c73f269315e002f2063..3084517f5bfb1b9fcf2afbbf72084172d0626893 100644
--- a/lib/refrepo/gen/puppet/kavlanngg5k.rb
+++ b/lib/refrepo/gen/puppet/kavlanngg5k.rb
@@ -3,15 +3,41 @@
require 'refrepo/data_loader'
require 'set'
-TRUNK_KINDS = ['router', 'switch', 'backbone'] # how to detect trunk ports in network refapi
+TRUNK_KINDS = [ 'router', 'switch' ] # how to detect trunk ports in network refapi
KAVLANNGG5K_OPTIONS = [ 'additional_trunk_ports' ] # these options are for us, not for neutron/NGS
+# entry point
def generate_puppet_kavlanngg5k(options)
- available_gw_sites = get_sites_with_gw(File.join(options[:output_dir], "platforms/production/generators/kavlanng/kavlanng.yaml"), options)
- gen_kavlanapi_g5k_desc(File.join(options[:output_dir], "platforms/production/modules/generated/files/grid5000/kavlanng/g5k/"), options, available_gw_sites)
- gen_sites_ngs_device_configs(File.join(options[:output_dir], "platforms/production/generators/kavlanng/kavlanng.yaml"), File.join(options[:output_dir], "platforms/production/modules/generated/files/grid5000/kavlanng/ngs_agent.conf.d"), options)
+ # Filter out sites without gateways.
+ available_gw_sites = get_sites_with_gw(File.join(options[:output_dir],
+ "platforms/production/generators/kavlanng/kavlanng.yaml"),
+ options)
+
+ # Generate a subset of the refapi with only the informations needed
+ # for kavlan-api.
+ gen_kavlanapi_g5k_desc(File.join(options[:output_dir],
+ "platforms/production/modules/generated/files/grid5000/kavlanng/g5k/"),
+ options,
+ available_gw_sites)
+
+ # Generate NGS configurations
+ gen_sites_ngs_device_configs(File.join(options[:output_dir],
+ "platforms/production/generators/kavlanng/kavlanng.yaml"),
+ File.join(options[:output_dir],
+ "platforms/production/modules/generated/files/grid5000/kavlanng/ngs_agent.conf.d"),
+ options)
end
+# Generate a subset of the refapi with only the informations needed
+# for kavlan-api to be able to map network interfaces on nodes to
+# ports on network interfaces, in order to set the correct
+# binding:profile of neutron ports, that NGS will use to configure the
+# network devices.
+#
+# The generated data is splitted by site and by cluster for two
+# reasons: 1/ allow independant modifications to sites/clusters to not
+# pollute each others and 2/ to allow distribution between separate
+# kavlan-api instances.
def gen_kavlanapi_g5k_desc(output_path, options, available_gw_sites)
puts "KavlanNG: generate g5k network description for kavlan-api"
puts " to #{output_path}"
@@ -45,7 +71,7 @@ def gen_kavlanapi_g5k_desc(output_path, options, available_gw_sites)
site_h['network_equipments'].delete_if { |_k, v| (v['kind'] != 'router') || (!available_gw_sites.include?(site_id)) }
routers = site_h['network_equipments'].keys
if routers.length > 1
- puts "ERROR: #{site_id} has #{routers.length} routers"
+ puts "WARNING: #{site_id} has #{routers.length} routers"
end
if routers.length == 1
gw = routers[0]
@@ -54,21 +80,21 @@ def gen_kavlanapi_g5k_desc(output_path, options, available_gw_sites)
site_h['servers'].delete_if { |k, _v| k != 'dns' }
dns_list = site_h['servers'].keys
if dns_list.length != 1
- puts "ERROR: #{site_id} has #{dns_list.length} DNS"
+ puts "WARNING: #{site_id} has #{dns_list.length} DNS"
end
begin
site_h['servers']['dns'].delete_if { |k, _v| k != 'network_adapters' }
site_h['servers']['dns']['network_adapters'].delete_if { |k, _v| k != 'default' }
rescue
- puts "ERROR: #{site_id} unable to properly clean DNS server entry"
+ puts "WARNING: #{site_id} unable to properly clean DNS server entry"
end
begin
dns_ip = site_h['servers']['dns']['network_adapters']['default']['ip']
if !dns_ip
- puts "ERROR: #{site_id} unable to get DNS IP address"
+ puts "WARNING: #{site_id} unable to get DNS IP address"
end
rescue StandardError
- puts "ERROR: #{site_id} unable to get DNS IP address"
+ puts "WARNING: #{site_id} unable to get DNS IP address"
end
end
# consistent order
@@ -88,17 +114,17 @@ def gen_kavlanapi_g5k_desc(output_path, options, available_gw_sites)
# the generated files for the site, these files need to be removed
# manually)
refapi['sites'].each { |site_id, _site_h|
- FileUtils.rm Dir.glob(File.join(output_path, "#{site_id}.json"))
- FileUtils.rm Dir.glob(File.join(output_path, "#{site_id}-*"))
+ FileUtils.remove_dir(File.join(output_path, site_id), true)
}
refapi['sites'].each do |site_id, site_h|
+ Dir.mkdir(File.join(output_path, site_id))
refapi_site = { 'sites' => { site_id => site_h.select { |k, _v| k != 'clusters' } } }
- File.open(File.join(output_path, "#{site_id}.json"), 'w') do |f|
+ File.open(File.join(output_path, site_id, "#{site_id}.json"), 'w') do |f|
f.write(JSON.pretty_generate(refapi_site))
end
site_h['clusters'].each do |cluster_id, cluster_h|
refapi_site_cluster = { 'sites' => { site_id => { 'clusters' => { cluster_id => cluster_h } } } }
- File.open(File.join(output_path, "#{site_id}-#{cluster_id}.json"), 'w') do |f|
+ File.open(File.join(output_path, site_id, "#{site_id}-#{cluster_id}.json"), 'w') do |f|
f.write(JSON.pretty_generate(refapi_site_cluster))
end
end
@@ -134,6 +160,11 @@ def get_channel_name(_refapi, _site_name, _device_name, channel, channel_name)
end
end
+# Generate the NGS configuration for all network devices (device name,
+# device type, ip address, trunk ports, auth credentials, routing
+# config, etc.)
+#
+# The generated configurations are splitted by site.
def gen_sites_ngs_device_configs(input_path, output_path, options)
puts "KavlanNG: generate sites NGS device configurations"
puts " to #{output_path}"
@@ -166,7 +197,7 @@ def gen_sites_ngs_device_configs(input_path, output_path, options)
end
end
if ! refapi_device
- puts "ERROR #{site}/#{device} is not in refapi. refapi['sites'][#{site}]['network_equipments'] contains #{refapi['sites'][site]['network_equipments'].keys}"
+ puts "WARNING: #{site}/#{device} is not in refapi. refapi['sites'][#{site}]['network_equipments'] contains #{refapi['sites'][site]['network_equipments'].keys}"
else
if options[:verbose]
if device == refapi_device
@@ -259,6 +290,8 @@ def gen_sites_ngs_device_configs(input_path, output_path, options)
end
end
+# Take the list of sites passed in options, and filter out those
+# without gateways.
def get_sites_with_gw(input_path, options)
puts "KavlanNG: check which sites have a kavlanng usable gateway"
puts " based on kavlanng configuration in #{input_path}"