From 227366060b97284d1c170522a7f92cafb0854cfb Mon Sep 17 00:00:00 2001 From: Patrice RINGOT <patrice.ringot@loria.fr> Date: Thu, 4 Jul 2019 15:08:38 +0200 Subject: [PATCH] [nancy][graffiti] fix validation issues with kavlan and performance --- .../nancy/clusters/graffiti/graffiti.json | 2 +- .../clusters/graffiti/nodes/graffiti-1.json | 30 +++++++++++++++++++ .../clusters/graffiti/nodes/graffiti-10.json | 30 +++++++++++++++++++ .../clusters/graffiti/nodes/graffiti-11.json | 30 +++++++++++++++++++ .../clusters/graffiti/nodes/graffiti-12.json | 30 +++++++++++++++++++ .../clusters/graffiti/nodes/graffiti-13.json | 30 +++++++++++++++++++ .../clusters/graffiti/nodes/graffiti-2.json | 30 +++++++++++++++++++ .../clusters/graffiti/nodes/graffiti-3.json | 30 +++++++++++++++++++ .../clusters/graffiti/nodes/graffiti-4.json | 30 +++++++++++++++++++ .../clusters/graffiti/nodes/graffiti-5.json | 30 +++++++++++++++++++ .../clusters/graffiti/nodes/graffiti-6.json | 30 +++++++++++++++++++ .../clusters/graffiti/nodes/graffiti-7.json | 30 +++++++++++++++++++ .../clusters/graffiti/nodes/graffiti-8.json | 30 +++++++++++++++++++ .../clusters/graffiti/nodes/graffiti-9.json | 30 +++++++++++++++++++ .../nancy/clusters/graffiti/graffiti.yaml | 5 +++- input/grid5000/vlans.yaml | 3 ++ 16 files changed, 398 insertions(+), 2 deletions(-) diff --git a/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json b/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json index cace1445c0..6953ec4a18 100644 --- a/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json +++ b/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json @@ -1,6 +1,6 @@ { "created_at": "Thu, 06 Jun 2019 22:00:00 GMT", - "kavlan": false, + "kavlan": true, "model": "Dell PowerEdge T640", "queues": [ "admin", diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json index f9e4a713a2..b0d9a879ff 100644 --- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json +++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json @@ -22,6 +22,27 @@ "gpu_model": "RTX 2080 Ti", "gpu_vendor": "Nvidia" }, + "kavlan": { + "eth2": { + "kavlan-1": "192.168.204.1", + "kavlan-11": "10.7.220.1", + "kavlan-12": "10.11.220.1", + "kavlan-13": "10.15.220.1", + "kavlan-14": "10.19.220.1", + "kavlan-16": "10.27.220.1", + "kavlan-18": "10.35.220.1", + "kavlan-2": "192.168.220.1", + "kavlan-20": "10.43.220.1", + "kavlan-21": "10.47.220.1", + "kavlan-3": "192.168.236.1", + "kavlan-4": "10.16.12.1", + "kavlan-5": "10.16.76.1", + "kavlan-6": "10.16.140.1", + "kavlan-7": "10.16.204.1", + "kavlan-8": "10.17.12.1", + "kavlan-9": "10.17.76.1" + } + }, "main_memory": { "ram_size": 137438953472 }, @@ -36,6 +57,7 @@ "enabled": false, "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0", "interface": "Ethernet", + "kavlan": false, "mac": "f4:02:70:9a:3f:64", "management": false, "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller", @@ -51,6 +73,7 @@ "enabled": false, "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0", "interface": "Ethernet", + "kavlan": false, "mac": "f4:02:70:9a:3f:65", "management": false, "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller", @@ -67,6 +90,7 @@ "firmware_version": "6.80 0x80003d72 18.8.9", "interface": "Ethernet", "ip": "172.16.64.1", + "kavlan": true, "mac": "f8:f2:1e:60:41:20", "management": false, "model": "Ethernet Controller X710 for 10GbE SFP+", @@ -86,6 +110,7 @@ "enabled": false, "firmware_version": "6.80 0x80003d72 18.8.9", "interface": "Ethernet", + "kavlan": false, "mac": "f8:f2:1e:60:41:21", "management": false, "model": "Ethernet Controller X710 for 10GbE SFP+", @@ -99,6 +124,7 @@ "enabled": true, "interface": "Ethernet", "ip": "172.17.64.1", + "kavlan": false, "mac": "f4:02:70:9a:3f:74", "management": true, "mountable": false, @@ -114,6 +140,10 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "performance": { + "core_flops": 0, + "node_flops": 0 + }, "processor": { "cache_l1": null, "cache_l1d": 32768, diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json index 88c7938bb4..84dbb98f18 100644 --- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json +++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json @@ -22,6 +22,27 @@ "gpu_model": "RTX 2080 Ti", "gpu_vendor": "Nvidia" }, + "kavlan": { + "eth2": { + "kavlan-1": "192.168.204.10", + "kavlan-11": "10.7.220.10", + "kavlan-12": "10.11.220.10", + "kavlan-13": "10.15.220.10", + "kavlan-14": "10.19.220.10", + "kavlan-16": "10.27.220.10", + "kavlan-18": "10.35.220.10", + "kavlan-2": "192.168.220.10", + "kavlan-20": "10.43.220.10", + "kavlan-21": "10.47.220.10", + "kavlan-3": "192.168.236.10", + "kavlan-4": "10.16.12.10", + "kavlan-5": "10.16.76.10", + "kavlan-6": "10.16.140.10", + "kavlan-7": "10.16.204.10", + "kavlan-8": "10.17.12.10", + "kavlan-9": "10.17.76.10" + } + }, "main_memory": { "ram_size": 137438953472 }, @@ -36,6 +57,7 @@ "enabled": false, "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0", "interface": "Ethernet", + "kavlan": false, "mac": "4c:d9:8f:33:d7:dc", "management": false, "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller", @@ -51,6 +73,7 @@ "enabled": false, "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0", "interface": "Ethernet", + "kavlan": false, "mac": "4c:d9:8f:33:d7:dd", "management": false, "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller", @@ -67,6 +90,7 @@ "firmware_version": "6.80 0x80003d72 18.8.9", "interface": "Ethernet", "ip": "172.16.64.10", + "kavlan": true, "mac": "f8:f2:1e:60:2b:c0", "management": false, "model": "Ethernet Controller X710 for 10GbE SFP+", @@ -86,6 +110,7 @@ "enabled": false, "firmware_version": "6.80 0x80003d72 18.8.9", "interface": "Ethernet", + "kavlan": false, "mac": "f8:f2:1e:60:2b:c1", "management": false, "model": "Ethernet Controller X710 for 10GbE SFP+", @@ -99,6 +124,7 @@ "enabled": true, "interface": "Ethernet", "ip": "172.17.64.10", + "kavlan": false, "mac": "4c:d9:8f:33:d7:ec", "management": true, "mountable": false, @@ -114,6 +140,10 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "performance": { + "core_flops": 0, + "node_flops": 0 + }, "processor": { "cache_l1": null, "cache_l1d": 32768, diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json index 8beaa4b763..3fcc4fed0c 100644 --- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json +++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json @@ -22,6 +22,27 @@ "gpu_model": "RTX 2080 Ti", "gpu_vendor": "Nvidia" }, + "kavlan": { + "eth2": { + "kavlan-1": "192.168.204.11", + "kavlan-11": "10.7.220.11", + "kavlan-12": "10.11.220.11", + "kavlan-13": "10.15.220.11", + "kavlan-14": "10.19.220.11", + "kavlan-16": "10.27.220.11", + "kavlan-18": "10.35.220.11", + "kavlan-2": "192.168.220.11", + "kavlan-20": "10.43.220.11", + "kavlan-21": "10.47.220.11", + "kavlan-3": "192.168.236.11", + "kavlan-4": "10.16.12.11", + "kavlan-5": "10.16.76.11", + "kavlan-6": "10.16.140.11", + "kavlan-7": "10.16.204.11", + "kavlan-8": "10.17.12.11", + "kavlan-9": "10.17.76.11" + } + }, "main_memory": { "ram_size": 137438953472 }, @@ -36,6 +57,7 @@ "enabled": false, "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0", "interface": "Ethernet", + "kavlan": false, "mac": "4c:d9:8f:2d:3c:78", "management": false, "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller", @@ -51,6 +73,7 @@ "enabled": false, "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0", "interface": "Ethernet", + "kavlan": false, "mac": "4c:d9:8f:2d:3c:79", "management": false, "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller", @@ -67,6 +90,7 @@ "firmware_version": "6.80 0x80003d72 18.8.9", "interface": "Ethernet", "ip": "172.16.64.11", + "kavlan": true, "mac": "f8:f2:1e:60:3f:90", "management": false, "model": "Ethernet Controller X710 for 10GbE SFP+", @@ -86,6 +110,7 @@ "enabled": false, "firmware_version": "6.80 0x80003d72 18.8.9", "interface": "Ethernet", + "kavlan": false, "mac": "f8:f2:1e:60:3f:91", "management": false, "model": "Ethernet Controller X710 for 10GbE SFP+", @@ -99,6 +124,7 @@ "enabled": true, "interface": "Ethernet", "ip": "172.17.64.11", + "kavlan": false, "mac": "4c:d9:8f:2d:3c:88", "management": true, "mountable": false, @@ -114,6 +140,10 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "performance": { + "core_flops": 0, + "node_flops": 0 + }, "processor": { "cache_l1": null, "cache_l1d": 32768, diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json index 403624fcda..bf50302dd9 100644 --- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json +++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json @@ -22,6 +22,27 @@ "gpu_model": "RTX 2080 Ti", "gpu_vendor": "Nvidia" }, + "kavlan": { + "eth2": { + "kavlan-1": "192.168.204.12", + "kavlan-11": "10.7.220.12", + "kavlan-12": "10.11.220.12", + "kavlan-13": "10.15.220.12", + "kavlan-14": "10.19.220.12", + "kavlan-16": "10.27.220.12", + "kavlan-18": "10.35.220.12", + "kavlan-2": "192.168.220.12", + "kavlan-20": "10.43.220.12", + "kavlan-21": "10.47.220.12", + "kavlan-3": "192.168.236.12", + "kavlan-4": "10.16.12.12", + "kavlan-5": "10.16.76.12", + "kavlan-6": "10.16.140.12", + "kavlan-7": "10.16.204.12", + "kavlan-8": "10.17.12.12", + "kavlan-9": "10.17.76.12" + } + }, "main_memory": { "ram_size": 137438953472 }, @@ -36,6 +57,7 @@ "enabled": false, "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0", "interface": "Ethernet", + "kavlan": false, "mac": "4c:d9:8f:2d:4d:3a", "management": false, "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller", @@ -51,6 +73,7 @@ "enabled": false, "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0", "interface": "Ethernet", + "kavlan": false, "mac": "4c:d9:8f:2d:4d:3b", "management": false, "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller", @@ -67,6 +90,7 @@ "firmware_version": "6.80 0x80003d72 18.8.9", "interface": "Ethernet", "ip": "172.16.64.12", + "kavlan": true, "mac": "f8:f2:1e:60:32:00", "management": false, "model": "Ethernet Controller X710 for 10GbE SFP+", @@ -86,6 +110,7 @@ "enabled": false, "firmware_version": "6.80 0x80003d72 18.8.9", "interface": "Ethernet", + "kavlan": false, "mac": "f8:f2:1e:60:32:01", "management": false, "model": "Ethernet Controller X710 for 10GbE SFP+", @@ -99,6 +124,7 @@ "enabled": true, "interface": "Ethernet", "ip": "172.17.64.12", + "kavlan": false, "mac": "4c:d9:8f:2d:4d:4a", "management": true, "mountable": false, @@ -114,6 +140,10 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "performance": { + "core_flops": 0, + "node_flops": 0 + }, "processor": { "cache_l1": null, "cache_l1d": 32768, diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json index 7a76bf2294..26609ebd05 100644 --- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json +++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json @@ -22,6 +22,27 @@ "gpu_model": "RTX 2080 Ti", "gpu_vendor": "Nvidia" }, + "kavlan": { + "eth2": { + "kavlan-1": "192.168.204.13", + "kavlan-11": "10.7.220.13", + "kavlan-12": "10.11.220.13", + "kavlan-13": "10.15.220.13", + "kavlan-14": "10.19.220.13", + "kavlan-16": "10.27.220.13", + "kavlan-18": "10.35.220.13", + "kavlan-2": "192.168.220.13", + "kavlan-20": "10.43.220.13", + "kavlan-21": "10.47.220.13", + "kavlan-3": "192.168.236.13", + "kavlan-4": "10.16.12.13", + "kavlan-5": "10.16.76.13", + "kavlan-6": "10.16.140.13", + "kavlan-7": "10.16.204.13", + "kavlan-8": "10.17.12.13", + "kavlan-9": "10.17.76.13" + } + }, "main_memory": { "ram_size": 137438953472 }, @@ -36,6 +57,7 @@ "enabled": false, "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0", "interface": "Ethernet", + "kavlan": false, "mac": "f4:02:70:9a:4b:f0", "management": false, "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller", @@ -51,6 +73,7 @@ "enabled": false, "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0", "interface": "Ethernet", + "kavlan": false, "mac": "f4:02:70:9a:4b:f1", "management": false, "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller", @@ -67,6 +90,7 @@ "firmware_version": "6.80 0x80003d72 18.8.9", "interface": "Ethernet", "ip": "172.16.64.13", + "kavlan": true, "mac": "f8:f2:1e:60:57:60", "management": false, "model": "Ethernet Controller X710 for 10GbE SFP+", @@ -86,6 +110,7 @@ "enabled": false, "firmware_version": "6.80 0x80003d72 18.8.9", "interface": "Ethernet", + "kavlan": false, "mac": "f8:f2:1e:60:57:61", "management": false, "model": "Ethernet Controller X710 for 10GbE SFP+", @@ -99,6 +124,7 @@ "enabled": true, "interface": "Ethernet", "ip": "172.17.64.13", + "kavlan": false, "mac": "f4:02:70:9a:4c:00", "management": true, "mountable": false, @@ -114,6 +140,10 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "performance": { + "core_flops": 0, + "node_flops": 0 + }, "processor": { "cache_l1": null, "cache_l1d": 32768, diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json index b9ac2d9229..25beff1374 100644 --- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json +++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json @@ -22,6 +22,27 @@ "gpu_model": "RTX 2080 Ti", "gpu_vendor": "Nvidia" }, + "kavlan": { + "eth2": { + "kavlan-1": "192.168.204.2", + "kavlan-11": "10.7.220.2", + "kavlan-12": "10.11.220.2", + "kavlan-13": "10.15.220.2", + "kavlan-14": "10.19.220.2", + "kavlan-16": "10.27.220.2", + "kavlan-18": "10.35.220.2", + "kavlan-2": "192.168.220.2", + "kavlan-20": "10.43.220.2", + "kavlan-21": "10.47.220.2", + "kavlan-3": "192.168.236.2", + "kavlan-4": "10.16.12.2", + "kavlan-5": "10.16.76.2", + "kavlan-6": "10.16.140.2", + "kavlan-7": "10.16.204.2", + "kavlan-8": "10.17.12.2", + "kavlan-9": "10.17.76.2" + } + }, "main_memory": { "ram_size": 137438953472 }, @@ -36,6 +57,7 @@ "enabled": false, "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0", "interface": "Ethernet", + "kavlan": false, "mac": "f4:02:70:9a:48:d8", "management": false, "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller", @@ -51,6 +73,7 @@ "enabled": false, "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0", "interface": "Ethernet", + "kavlan": false, "mac": "f4:02:70:9a:48:d9", "management": false, "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller", @@ -67,6 +90,7 @@ "firmware_version": "6.80 0x80003d72 18.8.9", "interface": "Ethernet", "ip": "172.16.64.2", + "kavlan": true, "mac": "f8:f2:1e:60:3f:a0", "management": false, "model": "Ethernet Controller X710 for 10GbE SFP+", @@ -86,6 +110,7 @@ "enabled": false, "firmware_version": "6.80 0x80003d72 18.8.9", "interface": "Ethernet", + "kavlan": false, "mac": "f8:f2:1e:60:3f:a1", "management": false, "model": "Ethernet Controller X710 for 10GbE SFP+", @@ -99,6 +124,7 @@ "enabled": true, "interface": "Ethernet", "ip": "172.17.64.2", + "kavlan": false, "mac": "f4:02:70:9a:48:e8", "management": true, "mountable": false, @@ -114,6 +140,10 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "performance": { + "core_flops": 0, + "node_flops": 0 + }, "processor": { "cache_l1": null, "cache_l1d": 32768, diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json index 967514a9e1..475727c3d0 100644 --- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json +++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json @@ -22,6 +22,27 @@ "gpu_model": "RTX 2080 Ti", "gpu_vendor": "Nvidia" }, + "kavlan": { + "eth2": { + "kavlan-1": "192.168.204.3", + "kavlan-11": "10.7.220.3", + "kavlan-12": "10.11.220.3", + "kavlan-13": "10.15.220.3", + "kavlan-14": "10.19.220.3", + "kavlan-16": "10.27.220.3", + "kavlan-18": "10.35.220.3", + "kavlan-2": "192.168.220.3", + "kavlan-20": "10.43.220.3", + "kavlan-21": "10.47.220.3", + "kavlan-3": "192.168.236.3", + "kavlan-4": "10.16.12.3", + "kavlan-5": "10.16.76.3", + "kavlan-6": "10.16.140.3", + "kavlan-7": "10.16.204.3", + "kavlan-8": "10.17.12.3", + "kavlan-9": "10.17.76.3" + } + }, "main_memory": { "ram_size": 137438953472 }, @@ -36,6 +57,7 @@ "enabled": false, "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0", "interface": "Ethernet", + "kavlan": false, "mac": "f4:02:70:9a:49:72", "management": false, "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller", @@ -51,6 +73,7 @@ "enabled": false, "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0", "interface": "Ethernet", + "kavlan": false, "mac": "f4:02:70:9a:49:73", "management": false, "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller", @@ -67,6 +90,7 @@ "firmware_version": "6.80 0x80003d72 18.8.9", "interface": "Ethernet", "ip": "172.16.64.3", + "kavlan": true, "mac": "f8:f2:1e:60:41:90", "management": false, "model": "Ethernet Controller X710 for 10GbE SFP+", @@ -86,6 +110,7 @@ "enabled": false, "firmware_version": "6.80 0x80003d72 18.8.9", "interface": "Ethernet", + "kavlan": false, "mac": "f8:f2:1e:60:41:91", "management": false, "model": "Ethernet Controller X710 for 10GbE SFP+", @@ -99,6 +124,7 @@ "enabled": true, "interface": "Ethernet", "ip": "172.17.64.3", + "kavlan": false, "mac": "f4:02:70:9a:49:82", "management": true, "mountable": false, @@ -114,6 +140,10 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "performance": { + "core_flops": 0, + "node_flops": 0 + }, "processor": { "cache_l1": null, "cache_l1d": 32768, diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json index 6737f14571..e0c5fcb13b 100644 --- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json +++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json @@ -22,6 +22,27 @@ "gpu_model": "RTX 2080 Ti", "gpu_vendor": "Nvidia" }, + "kavlan": { + "eth2": { + "kavlan-1": "192.168.204.4", + "kavlan-11": "10.7.220.4", + "kavlan-12": "10.11.220.4", + "kavlan-13": "10.15.220.4", + "kavlan-14": "10.19.220.4", + "kavlan-16": "10.27.220.4", + "kavlan-18": "10.35.220.4", + "kavlan-2": "192.168.220.4", + "kavlan-20": "10.43.220.4", + "kavlan-21": "10.47.220.4", + "kavlan-3": "192.168.236.4", + "kavlan-4": "10.16.12.4", + "kavlan-5": "10.16.76.4", + "kavlan-6": "10.16.140.4", + "kavlan-7": "10.16.204.4", + "kavlan-8": "10.17.12.4", + "kavlan-9": "10.17.76.4" + } + }, "main_memory": { "ram_size": 137438953472 }, @@ -36,6 +57,7 @@ "enabled": false, "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0", "interface": "Ethernet", + "kavlan": false, "mac": "f4:02:70:9a:4b:56", "management": false, "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller", @@ -51,6 +73,7 @@ "enabled": false, "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0", "interface": "Ethernet", + "kavlan": false, "mac": "f4:02:70:9a:4b:57", "management": false, "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller", @@ -67,6 +90,7 @@ "firmware_version": "6.80 0x80003d72 18.8.9", "interface": "Ethernet", "ip": "172.16.64.4", + "kavlan": true, "mac": "f8:f2:1e:60:28:40", "management": false, "model": "Ethernet Controller X710 for 10GbE SFP+", @@ -86,6 +110,7 @@ "enabled": false, "firmware_version": "6.80 0x80003d72 18.8.9", "interface": "Ethernet", + "kavlan": false, "mac": "f8:f2:1e:60:28:41", "management": false, "model": "Ethernet Controller X710 for 10GbE SFP+", @@ -99,6 +124,7 @@ "enabled": true, "interface": "Ethernet", "ip": "172.17.64.4", + "kavlan": false, "mac": "f4:02:70:9a:4b:66", "management": true, "mountable": false, @@ -114,6 +140,10 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "performance": { + "core_flops": 0, + "node_flops": 0 + }, "processor": { "cache_l1": null, "cache_l1d": 32768, diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json index 055efac54c..0f50f2033d 100644 --- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json +++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json @@ -22,6 +22,27 @@ "gpu_model": "RTX 2080 Ti", "gpu_vendor": "Nvidia" }, + "kavlan": { + "eth2": { + "kavlan-1": "192.168.204.5", + "kavlan-11": "10.7.220.5", + "kavlan-12": "10.11.220.5", + "kavlan-13": "10.15.220.5", + "kavlan-14": "10.19.220.5", + "kavlan-16": "10.27.220.5", + "kavlan-18": "10.35.220.5", + "kavlan-2": "192.168.220.5", + "kavlan-20": "10.43.220.5", + "kavlan-21": "10.47.220.5", + "kavlan-3": "192.168.236.5", + "kavlan-4": "10.16.12.5", + "kavlan-5": "10.16.76.5", + "kavlan-6": "10.16.140.5", + "kavlan-7": "10.16.204.5", + "kavlan-8": "10.17.12.5", + "kavlan-9": "10.17.76.5" + } + }, "main_memory": { "ram_size": 137438953472 }, @@ -36,6 +57,7 @@ "enabled": false, "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0", "interface": "Ethernet", + "kavlan": false, "mac": "f4:02:70:9a:43:c6", "management": false, "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller", @@ -51,6 +73,7 @@ "enabled": false, "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0", "interface": "Ethernet", + "kavlan": false, "mac": "f4:02:70:9a:43:c7", "management": false, "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller", @@ -67,6 +90,7 @@ "firmware_version": "6.80 0x80003d72 18.8.9", "interface": "Ethernet", "ip": "172.16.64.5", + "kavlan": true, "mac": "f8:f2:1e:60:28:20", "management": false, "model": "Ethernet Controller X710 for 10GbE SFP+", @@ -86,6 +110,7 @@ "enabled": false, "firmware_version": "6.80 0x80003d72 18.8.9", "interface": "Ethernet", + "kavlan": false, "mac": "f8:f2:1e:60:28:21", "management": false, "model": "Ethernet Controller X710 for 10GbE SFP+", @@ -99,6 +124,7 @@ "enabled": true, "interface": "Ethernet", "ip": "172.17.64.5", + "kavlan": false, "mac": "f4:02:70:9a:43:d6", "management": true, "mountable": false, @@ -114,6 +140,10 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "performance": { + "core_flops": 0, + "node_flops": 0 + }, "processor": { "cache_l1": null, "cache_l1d": 32768, diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json index a1fe6c4d0f..e5e63f3348 100644 --- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json +++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json @@ -22,6 +22,27 @@ "gpu_model": "RTX 2080 Ti", "gpu_vendor": "Nvidia" }, + "kavlan": { + "eth2": { + "kavlan-1": "192.168.204.6", + "kavlan-11": "10.7.220.6", + "kavlan-12": "10.11.220.6", + "kavlan-13": "10.15.220.6", + "kavlan-14": "10.19.220.6", + "kavlan-16": "10.27.220.6", + "kavlan-18": "10.35.220.6", + "kavlan-2": "192.168.220.6", + "kavlan-20": "10.43.220.6", + "kavlan-21": "10.47.220.6", + "kavlan-3": "192.168.236.6", + "kavlan-4": "10.16.12.6", + "kavlan-5": "10.16.76.6", + "kavlan-6": "10.16.140.6", + "kavlan-7": "10.16.204.6", + "kavlan-8": "10.17.12.6", + "kavlan-9": "10.17.76.6" + } + }, "main_memory": { "ram_size": 137438953472 }, @@ -36,6 +57,7 @@ "enabled": false, "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0", "interface": "Ethernet", + "kavlan": false, "mac": "f4:02:70:9a:41:a0", "management": false, "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller", @@ -51,6 +73,7 @@ "enabled": false, "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0", "interface": "Ethernet", + "kavlan": false, "mac": "f4:02:70:9a:41:a1", "management": false, "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller", @@ -67,6 +90,7 @@ "firmware_version": "6.80 0x80003d72 18.8.9", "interface": "Ethernet", "ip": "172.16.64.6", + "kavlan": true, "mac": "f8:f2:1e:60:57:70", "management": false, "model": "Ethernet Controller X710 for 10GbE SFP+", @@ -86,6 +110,7 @@ "enabled": false, "firmware_version": "6.80 0x80003d72 18.8.9", "interface": "Ethernet", + "kavlan": false, "mac": "f8:f2:1e:60:57:71", "management": false, "model": "Ethernet Controller X710 for 10GbE SFP+", @@ -99,6 +124,7 @@ "enabled": true, "interface": "Ethernet", "ip": "172.17.64.6", + "kavlan": false, "mac": "f4:02:70:9a:41:b0", "management": true, "mountable": false, @@ -114,6 +140,10 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "performance": { + "core_flops": 0, + "node_flops": 0 + }, "processor": { "cache_l1": null, "cache_l1d": 32768, diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json index 508be689e0..eaf884a6c0 100644 --- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json +++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json @@ -22,6 +22,27 @@ "gpu_model": "RTX 2080 Ti", "gpu_vendor": "Nvidia" }, + "kavlan": { + "eth2": { + "kavlan-1": "192.168.204.7", + "kavlan-11": "10.7.220.7", + "kavlan-12": "10.11.220.7", + "kavlan-13": "10.15.220.7", + "kavlan-14": "10.19.220.7", + "kavlan-16": "10.27.220.7", + "kavlan-18": "10.35.220.7", + "kavlan-2": "192.168.220.7", + "kavlan-20": "10.43.220.7", + "kavlan-21": "10.47.220.7", + "kavlan-3": "192.168.236.7", + "kavlan-4": "10.16.12.7", + "kavlan-5": "10.16.76.7", + "kavlan-6": "10.16.140.7", + "kavlan-7": "10.16.204.7", + "kavlan-8": "10.17.12.7", + "kavlan-9": "10.17.76.7" + } + }, "main_memory": { "ram_size": 137438953472 }, @@ -36,6 +57,7 @@ "enabled": false, "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0", "interface": "Ethernet", + "kavlan": false, "mac": "f4:02:70:9a:42:92", "management": false, "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller", @@ -51,6 +73,7 @@ "enabled": false, "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0", "interface": "Ethernet", + "kavlan": false, "mac": "f4:02:70:9a:42:93", "management": false, "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller", @@ -67,6 +90,7 @@ "firmware_version": "6.80 0x80003d72 18.8.9", "interface": "Ethernet", "ip": "172.16.64.7", + "kavlan": true, "mac": "f8:f2:1e:60:26:80", "management": false, "model": "Ethernet Controller X710 for 10GbE SFP+", @@ -86,6 +110,7 @@ "enabled": false, "firmware_version": "6.80 0x80003d72 18.8.9", "interface": "Ethernet", + "kavlan": false, "mac": "f8:f2:1e:60:26:81", "management": false, "model": "Ethernet Controller X710 for 10GbE SFP+", @@ -99,6 +124,7 @@ "enabled": true, "interface": "Ethernet", "ip": "172.17.64.7", + "kavlan": false, "mac": "f4:02:70:9a:42:a2", "management": true, "mountable": false, @@ -114,6 +140,10 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "performance": { + "core_flops": 0, + "node_flops": 0 + }, "processor": { "cache_l1": null, "cache_l1d": 32768, diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json index eb26f5a5a9..b6e6dbfff9 100644 --- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json +++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json @@ -22,6 +22,27 @@ "gpu_model": "RTX 2080 Ti", "gpu_vendor": "Nvidia" }, + "kavlan": { + "eth2": { + "kavlan-1": "192.168.204.8", + "kavlan-11": "10.7.220.8", + "kavlan-12": "10.11.220.8", + "kavlan-13": "10.15.220.8", + "kavlan-14": "10.19.220.8", + "kavlan-16": "10.27.220.8", + "kavlan-18": "10.35.220.8", + "kavlan-2": "192.168.220.8", + "kavlan-20": "10.43.220.8", + "kavlan-21": "10.47.220.8", + "kavlan-3": "192.168.236.8", + "kavlan-4": "10.16.12.8", + "kavlan-5": "10.16.76.8", + "kavlan-6": "10.16.140.8", + "kavlan-7": "10.16.204.8", + "kavlan-8": "10.17.12.8", + "kavlan-9": "10.17.76.8" + } + }, "main_memory": { "ram_size": 137438953472 }, @@ -36,6 +57,7 @@ "enabled": false, "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0", "interface": "Ethernet", + "kavlan": false, "mac": "f4:02:70:9a:3f:fe", "management": false, "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller", @@ -51,6 +73,7 @@ "enabled": false, "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0", "interface": "Ethernet", + "kavlan": false, "mac": "f4:02:70:9a:3f:ff", "management": false, "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller", @@ -67,6 +90,7 @@ "firmware_version": "6.80 0x80003d72 18.8.9", "interface": "Ethernet", "ip": "172.16.64.8", + "kavlan": true, "mac": "f8:f2:1e:60:35:30", "management": false, "model": "Ethernet Controller X710 for 10GbE SFP+", @@ -86,6 +110,7 @@ "enabled": false, "firmware_version": "6.80 0x80003d72 18.8.9", "interface": "Ethernet", + "kavlan": false, "mac": "f8:f2:1e:60:35:31", "management": false, "model": "Ethernet Controller X710 for 10GbE SFP+", @@ -99,6 +124,7 @@ "enabled": true, "interface": "Ethernet", "ip": "172.17.64.8", + "kavlan": false, "mac": "f4:02:70:9a:40:0e", "management": true, "mountable": false, @@ -114,6 +140,10 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "performance": { + "core_flops": 0, + "node_flops": 0 + }, "processor": { "cache_l1": null, "cache_l1d": 32768, diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json index cfd8669a0e..e9026841e7 100644 --- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json +++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json @@ -22,6 +22,27 @@ "gpu_model": "RTX 2080 Ti", "gpu_vendor": "Nvidia" }, + "kavlan": { + "eth2": { + "kavlan-1": "192.168.204.9", + "kavlan-11": "10.7.220.9", + "kavlan-12": "10.11.220.9", + "kavlan-13": "10.15.220.9", + "kavlan-14": "10.19.220.9", + "kavlan-16": "10.27.220.9", + "kavlan-18": "10.35.220.9", + "kavlan-2": "192.168.220.9", + "kavlan-20": "10.43.220.9", + "kavlan-21": "10.47.220.9", + "kavlan-3": "192.168.236.9", + "kavlan-4": "10.16.12.9", + "kavlan-5": "10.16.76.9", + "kavlan-6": "10.16.140.9", + "kavlan-7": "10.16.204.9", + "kavlan-8": "10.17.12.9", + "kavlan-9": "10.17.76.9" + } + }, "main_memory": { "ram_size": 137438953472 }, @@ -36,6 +57,7 @@ "enabled": false, "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0", "interface": "Ethernet", + "kavlan": false, "mac": "f4:02:70:9a:47:ba", "management": false, "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller", @@ -51,6 +73,7 @@ "enabled": false, "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0", "interface": "Ethernet", + "kavlan": false, "mac": "f4:02:70:9a:47:bb", "management": false, "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller", @@ -67,6 +90,7 @@ "firmware_version": "6.80 0x80003d72 18.8.9", "interface": "Ethernet", "ip": "172.16.64.9", + "kavlan": true, "mac": "f8:f2:1e:60:21:80", "management": false, "model": "Ethernet Controller X710 for 10GbE SFP+", @@ -86,6 +110,7 @@ "enabled": false, "firmware_version": "6.80 0x80003d72 18.8.9", "interface": "Ethernet", + "kavlan": false, "mac": "f8:f2:1e:60:21:81", "management": false, "model": "Ethernet Controller X710 for 10GbE SFP+", @@ -99,6 +124,7 @@ "enabled": true, "interface": "Ethernet", "ip": "172.17.64.9", + "kavlan": false, "mac": "f4:02:70:9a:47:ca", "management": true, "mountable": false, @@ -114,6 +140,10 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "performance": { + "core_flops": 0, + "node_flops": 0 + }, "processor": { "cache_l1": null, "cache_l1d": 32768, diff --git a/input/grid5000/sites/nancy/clusters/graffiti/graffiti.yaml b/input/grid5000/sites/nancy/clusters/graffiti/graffiti.yaml index b81b9d77f3..f32f68dd6c 100644 --- a/input/grid5000/sites/nancy/clusters/graffiti/graffiti.yaml +++ b/input/grid5000/sites/nancy/clusters/graffiti/graffiti.yaml @@ -1,7 +1,7 @@ --- model: Dell PowerEdge T640 created_at: 2019-06-07 -kavlan: false +kavlan: true queues: - admin - testing @@ -15,6 +15,9 @@ nodes: queues: - admin - testing + performance: + core_flops: 0 + node_flops: 0 gpu: gpu: true gpu_count: 4 diff --git a/input/grid5000/vlans.yaml b/input/grid5000/vlans.yaml index 4c283102d0..3c3a812eaa 100644 --- a/input/grid5000/vlans.yaml +++ b/input/grid5000/vlans.yaml @@ -95,6 +95,7 @@ vlans: local nancy grisou eth4 0 0 9 100 local nancy grimani eth0 0 0 10 0 local nancy grele eth0 0 0 11 0 + local nancy graffiti eth2 0 0 12 0 local nantes econome eth0 0 0 0 0 local nantes ecotype eth0 0 0 1 0 local nantes ecotype eth1 0 0 2 0 @@ -140,6 +141,7 @@ vlans: global nancy graphique eth0 0 0 25 0 global nancy graoully eth0 0 0 26 0 global nancy grimani eth0 0 0 27 0 + global nancy graffiti eth2 0 0 28 0 global rennes paravance eth0 0 0 32 0 global rennes paravance eth1 0 0 32 100 global rennes parasilo eth0 0 0 33 0 @@ -189,6 +191,7 @@ vlans: routed nancy grisou eth4 0 16 9 100 routed nancy grimani eth0 0 16 10 0 routed nancy grele eth0 0 16 11 0 + routed nancy graffiti eth2 0 16 12 0 routed rennes parapide eth0 0 24 0 0 routed rennes parapluie eth1 0 24 1 0 routed rennes paranoia eth0 0 24 2 0 -- GitLab