From d20e7d54da3d5933a43fbbb79ccf50edac82ce1f Mon Sep 17 00:00:00 2001
From: Sebastien Philippot <sebastien.philippot@inria.fr>
Date: Thu, 28 Sep 2017 15:49:17 +0200
Subject: [PATCH] [nancy] graphene-86 to retired - it is use by opensm
---
.../clusters/graphene/nodes/graphene-86.json | 220 ------------------
.../nancy/network_equipments/sgraphene3.json | 1 -
grid5000-all.json | 95 +++-----
.../nancy/clusters/graphene/graphene.yaml | 3 +-
.../sites/nancy/networks/sgraphene3.yaml | 1 -
5 files changed, 38 insertions(+), 282 deletions(-)
delete mode 100644 data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-86.json
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-86.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-86.json
deleted file mode 100644
index 800b59aa77f..00000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-86.json
+++ /dev/null
@@ -1,220 +0,0 @@
-{
- "architecture": {
- "nb_cores": 4,
- "nb_procs": 1,
- "nb_threads": 4,
- "platform_type": "x86_64"
- },
- "bios": {
- "release_date": "02/10/2011",
- "vendor": "American Megatrends Inc.",
- "version": "V7.04"
- },
- "chassis": {
- "manufacturer": "TYAN",
- "name": "S5501"
- },
- "gpu": {
- "gpu": false
- },
- "kavlan": {
- "eth0": {
- "kavlan-1": "192.168.194.86",
- "kavlan-11": "10.7.200.178",
- "kavlan-12": "10.11.200.178",
- "kavlan-13": "10.15.200.178",
- "kavlan-14": "10.19.200.178",
- "kavlan-16": "10.27.200.178",
- "kavlan-18": "10.35.200.178",
- "kavlan-19": "10.39.200.178",
- "kavlan-2": "192.168.210.86",
- "kavlan-20": "10.43.200.178",
- "kavlan-21": "10.47.200.178",
- "kavlan-3": "192.168.226.86",
- "kavlan-4": "10.16.2.86",
- "kavlan-5": "10.16.66.86",
- "kavlan-6": "10.16.130.86",
- "kavlan-7": "10.16.194.86",
- "kavlan-8": "10.17.2.86",
- "kavlan-9": "10.17.66.86"
- }
- },
- "main_memory": {
- "ram_size": 17179869184,
- "virtual_size": null
- },
- "monitoring": {
- "wattmeter": "shared"
- },
- "network_adapters": [
- {
- "bridged": true,
- "device": "eth0",
- "driver": "e1000e",
- "enabled": true,
- "interface": "Ethernet",
- "ip": "172.16.64.86",
- "kavlan": true,
- "mac": "00:e0:81:d5:08:0c",
- "management": false,
- "mountable": true,
- "mounted": true,
- "network_address": "graphene-86.nancy.grid5000.fr",
- "rate": 1000000000,
- "switch": "sgraphene3",
- "switch_port": "GigabitEthernet1/0/11",
- "vendor": "intel",
- "version": "82574L"
- },
- {
- "bridged": false,
- "device": "eth1",
- "driver": "e1000e",
- "enabled": false,
- "interface": "Ethernet",
- "kavlan": false,
- "mac": "00:e0:81:d5:08:0d",
- "management": false,
- "mountable": false,
- "mounted": false,
- "rate": 100000000,
- "vendor": "intel",
- "version": "82574L"
- },
- {
- "bridged": false,
- "device": "eth2",
- "driver": "e1000e",
- "enabled": false,
- "interface": "Ethernet",
- "kavlan": false,
- "mac": "00:e0:81:d5:08:0e",
- "management": false,
- "mountable": false,
- "mounted": false,
- "vendor": "intel",
- "version": "82574L"
- },
- {
- "device": "ib0",
- "driver": "mlx4_core",
- "enabled": true,
- "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:a1",
- "interface": "InfiniBand",
- "ip": "172.18.64.86",
- "ip6": "fe80::202:c903:b:93a1",
- "kavlan": false,
- "management": false,
- "mountable": true,
- "mounted": true,
- "network_address": "graphene-86-ib0.nancy.grid5000.fr",
- "rate": 20000000000,
- "switch": "sgrapheneib",
- "vendor": "Mellanox",
- "version": "MT26418"
- },
- {
- "device": "ib1",
- "driver": "mlx4_core",
- "enabled": false,
- "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:a2",
- "interface": "InfiniBand",
- "kavlan": false,
- "management": false,
- "mountable": false,
- "mounted": false,
- "rate": 10000000000,
- "vendor": "Mellanox",
- "version": "MT26418"
- },
- {
- "device": "bmc",
- "enabled": true,
- "interface": "Ethernet",
- "ip": "172.17.64.86",
- "kavlan": false,
- "mac": "00:e0:81:d5:08:0f",
- "management": true,
- "mountable": false,
- "mounted": false,
- "network_address": "graphene-86-bmc.nancy.grid5000.fr",
- "rate": 100000000,
- "switch": "sgraphene3-ipmi",
- "switch_port": "1/0/2",
- "vendor": "Tyan",
- "version": "AST2050"
- }
- ],
- "operating_system": {
- "cstate_driver": "intel_idle",
- "cstate_governor": "menu",
- "cstate_max_id": 2,
- "ht_enabled": false,
- "kernel": "3.16.0-4-amd64",
- "name": "debian",
- "pstate_driver": "acpi-cpufreq",
- "pstate_governor": "performance",
- "release": "Jessie",
- "turboboost_enabled": true,
- "version": 8.9
- },
- "performance": {
- "core_flops": 8024000000.0,
- "node_flops": 31010000000.0
- },
- "processor": {
- "cache_l1": null,
- "cache_l1d": 32768,
- "cache_l1i": 32768,
- "cache_l2": 262144,
- "cache_l3": 8388608,
- "clock_speed": 2550000000,
- "ht_capable": true,
- "instruction_set": "x86-64",
- "microarchitecture": "Lynnfield",
- "model": "Intel Xeon",
- "other_description": "Intel(R) Xeon(R) CPU X3440 @ 2.53GHz",
- "vendor": "Intel",
- "version": "X3440"
- },
- "sensors": {
- "power": {
- "available": true,
- "via": {
- "api": {
- "metric": "power"
- },
- "pdu": [
- {
- "uid": "graphene-pdu6"
- }
- ]
- }
- }
- },
- "storage_devices": [
- {
- "by_id": "node-was-not-available-to-retrieve-this-value",
- "device": "sda",
- "driver": "ahci",
- "interface": "SATA II",
- "model": "Hitachi HDS72103",
- "rev": "JPFOA3EA",
- "size": 320072933376,
- "storage": "HDD",
- "vendor": "Hitachi"
- }
- ],
- "supported_job_types": {
- "besteffort": true,
- "deploy": true,
- "max_walltime": 0,
- "queues": [
- "default",
- "admin"
- ],
- "virtual": "ivt"
- },
- "type": "node",
- "uid": "graphene-86"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgraphene3.json b/data/grid5000/sites/nancy/network_equipments/sgraphene3.json
index affdaaa759d..4e82e158349 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgraphene3.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgraphene3.json
@@ -40,7 +40,6 @@
"uid": "graphene-83"
},
{
- "uid": "graphene-86"
},
{
"uid": "graphene-85"
diff --git a/grid5000-all.json b/grid5000-all.json
index e0b4343de69..9ebdde5fa04 100644
--- a/grid5000-all.json
+++ b/grid5000-all.json
@@ -99778,39 +99778,48 @@
}
},
"main_memory": {
- "ram_size": 17179869184,
- "virtual_size": null
+ "ram_size": 17179869184
},
"monitoring": {
+ "metric": "power",
"wattmeter": "shared"
},
- "network_adapters": [
- {
+ "network_adapters": {
+ "bmc": {
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.17.64.86",
+ "mac": "00:e0:81:d5:08:0f",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "rate": 100000000,
+ "switch": "sgraphene3-ipmi",
+ "switch_port": "1/0/2",
+ "vendor": "Tyan",
+ "version": "AST2050"
+ },
+ "eth0": {
"bridged": true,
- "device": "eth0",
"driver": "e1000e",
"enabled": true,
"interface": "Ethernet",
"ip": "172.16.64.86",
- "kavlan": true,
"mac": "00:e0:81:d5:08:0c",
"management": false,
"mountable": true,
"mounted": true,
- "network_address": "graphene-86.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgraphene3",
- "switch_port": "GigabitEthernet1/0/11",
+ "switch_port": "Gi1/0/11",
"vendor": "intel",
"version": "82574L"
},
- {
+ "eth1": {
"bridged": false,
- "device": "eth1",
"driver": "e1000e",
"enabled": false,
"interface": "Ethernet",
- "kavlan": false,
"mac": "00:e0:81:d5:08:0d",
"management": false,
"mountable": false,
@@ -99819,13 +99828,11 @@
"vendor": "intel",
"version": "82574L"
},
- {
+ "eth2": {
"bridged": false,
- "device": "eth2",
"driver": "e1000e",
"enabled": false,
"interface": "Ethernet",
- "kavlan": false,
"mac": "00:e0:81:d5:08:0e",
"management": false,
"mountable": false,
@@ -99833,56 +99840,34 @@
"vendor": "intel",
"version": "82574L"
},
- {
- "device": "ib0",
+ "ib0": {
"driver": "mlx4_core",
"enabled": true,
"guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:a1",
"interface": "InfiniBand",
"ip": "172.18.64.86",
"ip6": "fe80::202:c903:b:93a1",
- "kavlan": false,
"management": false,
"mountable": true,
"mounted": true,
- "network_address": "graphene-86-ib0.nancy.grid5000.fr",
"rate": 20000000000,
"switch": "sgrapheneib",
"vendor": "Mellanox",
"version": "MT26418"
},
- {
- "device": "ib1",
+ "ib1": {
"driver": "mlx4_core",
"enabled": false,
"guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:a2",
"interface": "InfiniBand",
- "kavlan": false,
"management": false,
"mountable": false,
"mounted": false,
"rate": 10000000000,
"vendor": "Mellanox",
"version": "MT26418"
- },
- {
- "device": "bmc",
- "enabled": true,
- "interface": "Ethernet",
- "ip": "172.17.64.86",
- "kavlan": false,
- "mac": "00:e0:81:d5:08:0f",
- "management": true,
- "mountable": false,
- "mounted": false,
- "network_address": "graphene-86-bmc.nancy.grid5000.fr",
- "rate": 100000000,
- "switch": "sgraphene3-ipmi",
- "switch_port": "1/0/2",
- "vendor": "Tyan",
- "version": "AST2050"
}
- ],
+ },
"operating_system": {
"cstate_driver": "intel_idle",
"cstate_governor": "menu",
@@ -99896,12 +99881,17 @@
"turboboost_enabled": true,
"version": 8.9
},
+ "pdu": [
+ {
+ "port": 11,
+ "uid": "graphene-pdu6"
+ }
+ ],
"performance": {
"core_flops": 8024000000.0,
"node_flops": 31010000000.0
},
"processor": {
- "cache_l1": null,
"cache_l1d": 32768,
"cache_l1i": 32768,
"cache_l2": 262144,
@@ -99917,23 +99907,13 @@
},
"sensors": {
"power": {
- "available": true,
- "via": {
- "api": {
- "metric": "power"
- },
- "pdu": [
- {
- "uid": "graphene-pdu6"
- }
- ]
- }
+ "available": true
}
},
- "storage_devices": [
- {
+ "status": "retired",
+ "storage_devices": {
+ "sda": {
"by_id": "node-was-not-available-to-retrieve-this-value",
- "device": "sda",
"driver": "ahci",
"interface": "SATA II",
"model": "Hitachi HDS72103",
@@ -99942,7 +99922,7 @@
"storage": "HDD",
"vendor": "Hitachi"
}
- ],
+ },
"supported_job_types": {
"besteffort": true,
"deploy": true,
@@ -99952,9 +99932,7 @@
"admin"
],
"virtual": "ivt"
- },
- "type": "node",
- "uid": "graphene-86"
+ }
},
"graphene-87": {
"architecture": {
@@ -158513,7 +158491,6 @@
"ports": {
"1": "graphene-76",
"10": "graphene-83",
- "11": "graphene-86",
"12": "graphene-85",
"13": "graphene-88",
"14": "graphene-87",
diff --git a/input/grid5000/sites/nancy/clusters/graphene/graphene.yaml b/input/grid5000/sites/nancy/clusters/graphene/graphene.yaml
index a232e5d2a32..d9af73ec772 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/graphene.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/graphene.yaml
@@ -113,4 +113,5 @@ nodes:
graphene-96:
status: retired
-
+ graphene-86:
+ status: retired
diff --git a/input/grid5000/sites/nancy/networks/sgraphene3.yaml b/input/grid5000/sites/nancy/networks/sgraphene3.yaml
index ea25e019714..224f91af64d 100644
--- a/input/grid5000/sites/nancy/networks/sgraphene3.yaml
+++ b/input/grid5000/sites/nancy/networks/sgraphene3.yaml
@@ -35,7 +35,6 @@ sgraphene3:
10: graphene-83
9: graphene-84
12: graphene-85
- 11: graphene-86
14: graphene-87
13: graphene-88
16: graphene-89
--
GitLab