From e0a82e5749f432f07cf2e91c79532509b451aa9e Mon Sep 17 00:00:00 2001
From: Emile Morel <emile.morel@inria.fr>
Date: Tue, 24 Sep 2013 14:56:37 +0200
Subject: [PATCH] [Nancy] graphene - correct API informations

---
 .../clusters/graphene/nodes/graphene-124.json |  8 ++--
 .../clusters/graphene/nodes/graphene-131.json |  4 +-
 .../clusters/graphene/nodes/graphene-21.json  |  4 +-
 .../clusters/graphene/nodes/graphene-35.json  |  6 +--
 .../clusters/graphene/nodes/graphene-4.json   |  4 +-
 .../clusters/graphene/nodes/graphene-40.json  |  4 +-
 .../clusters/graphene/nodes/graphene-84.json  |  6 +--
 .../clusters/graphene/nodes/graphene-86.json  |  4 +-
 .../nancy/clusters/graphene_generated.yaml    | 38 ++++++++++---------
 9 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.json
index 7a71ddc9a7..81b791414a 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.json
@@ -72,15 +72,15 @@
       "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:bd",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:61",
       "interface": "InfiniBand",
       "ip": "172.18.64.124",
-      "ip6": null,
+      "ip6": "fe80::202:c903:2:7f61",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-124-ib0.nancy.grid5000.fr",
-      "rate": 2000000000,
+      "rate": 20000000000,
       "switch": "sgrapheneib",
       "vendor": "Mellanox",
       "version": "MT26418"
@@ -89,7 +89,7 @@
       "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:be",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:62",
       "interface": "InfiniBand",
       "management": false,
       "mountable": false,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.json
index b4c0daa5b2..d0223d229f 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.json
@@ -72,7 +72,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:02:c9:03:00:0b:91:4d",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:4d",
       "interface": "InfiniBand",
       "ip": "172.18.64.131",
       "ip6": "fe80::202:c903:b:914d",
@@ -89,7 +89,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": false,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:02:c9:03:00:0b:91:4e",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:4e",
       "interface": "InfiniBand",
       "management": false,
       "mountable": false,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.json
index 6d3e3f580d..61736a2cf5 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.json
@@ -72,7 +72,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:0004:53:6d",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:04:53:6d",
       "interface": "InfiniBand",
       "ip": "172.18.64.21",
       "ip6": "fe80::202:c903:4:536d",
@@ -89,7 +89,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": false,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:0004:53:6e",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:04:53:6e",
       "interface": "InfiniBand",
       "management": false,
       "mountable": false,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.json
index 00b906dd95..f25e3a28df 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.json
@@ -72,7 +72,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": false,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:c9",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:11",
       "interface": "InfiniBand",
       "ip": "172.18.64.35",
       "ip6": null,
@@ -80,7 +80,7 @@
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-35-ib0.nancy.grid5000.fr",
-      "rate": 30000000000,
+      "rate": 28000000000,
       "switch": "sgrapheneib",
       "vendor": "Mellanox",
       "version": "MT26418"
@@ -89,7 +89,7 @@
       "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:92:ca",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:12",
       "interface": "InfiniBand",
       "management": false,
       "mountable": false,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.json
index ea56287abf..be7f878062 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.json
@@ -72,7 +72,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:02:c9:03:00:0b:92:bd",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:bd",
       "interface": "InfiniBand",
       "ip": "172.18.64.4",
       "ip6": "fe80::202:c903:b:92bd",
@@ -89,7 +89,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": false,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:02:c9:03:00:0b:92:be",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:be",
       "interface": "InfiniBand",
       "management": false,
       "mountable": false,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-40.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-40.json
index 1b49ae4d43..42c310be94 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-40.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-40.json
@@ -72,7 +72,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:02:c9:03:00:0b:93:cd",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:cd",
       "interface": "InfiniBand",
       "ip": "172.18.64.40",
       "ip6": "fe80::202:c903:b:93cd",
@@ -89,7 +89,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": false,
-      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:02:c9:03:00:0b:93:ce",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:ce",
       "interface": "InfiniBand",
       "management": false,
       "mountable": false,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.json
index 8a733ccd11..dd0b59befa 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.json
@@ -71,16 +71,16 @@
     {
       "device": "ib0",
       "driver": "mlx4_core",
-      "enabled": false,
+      "enabled": true,
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:9d",
       "interface": "InfiniBand",
       "ip": "172.18.64.84",
-      "ip6": null,
+      "ip6": "fe80::202:c903:b:939d",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "graphene-84-ib0.nancy.grid5000.fr",
-      "rate": 30000000000,
+      "rate": 20000000000,
       "switch": "sgrapheneib",
       "vendor": "Mellanox",
       "version": "MT26418"
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-86.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-86.json
index 4375124883..6a6fa0efbf 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-86.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-86.json
@@ -5,9 +5,9 @@
     "smt_size": 4
   },
   "bios": {
-    "release_date": "02/18/2011",
+    "release_date": "02/10/2011",
     "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
+    "version": "V7.04"
   },
   "chassis": {
     "manufacturer": "TYAN Computer Corporation",
diff --git a/generators/input/sites/nancy/clusters/graphene_generated.yaml b/generators/input/sites/nancy/clusters/graphene_generated.yaml
index 7032d2917e..d22b54f719 100644
--- a/generators/input/sites/nancy/clusters/graphene_generated.yaml
+++ b/generators/input/sites/nancy/clusters/graphene_generated.yaml
@@ -290,7 +290,7 @@ graphene-4:
   network_interfaces:
     ib0:
       mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:02:c9:03:00:0b:92:bd
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:bd 
       rate: 20000000000
       ip6: fe80::202:c903:b:92bd
       management: false
@@ -302,7 +302,7 @@ graphene-4:
       mountable: true
     ib1:
       mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:02:c9:03:00:0b:92:be
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:be 
       rate: 28000000000
       management: false
       enabled: false
@@ -1867,7 +1867,7 @@ graphene-21:
   network_interfaces:
     ib0:
       mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:0004:53:6d
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:04:53:6d 
       rate: 20000000000
       ip6: fe80::202:c903:4:536d
       management: false
@@ -1879,7 +1879,7 @@ graphene-21:
       mountable: true
     ib1:
       mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:0004:53:6e
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:04:53:6e 
       rate: 28000000000
       management: false
       enabled: false
@@ -3180,8 +3180,8 @@ graphene-35:
   network_interfaces:
     ib0:
       mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:c9
-      rate: 30000000000
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:11 
+      rate: 28000000000
       management: false
       enabled: false
       interface: InfiniBand
@@ -3191,7 +3191,7 @@ graphene-35:
       mountable: true
     ib1:
       mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ca
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:12
       rate: 28000000000
       management: false
       enabled: false
@@ -3637,7 +3637,7 @@ graphene-40:
   network_interfaces:
     ib0:
       mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:02:c9:03:00:0b:93:cd
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:cd 
       rate: 20000000000
       ip6: fe80::202:c903:b:93cd
       management: false
@@ -3649,7 +3649,7 @@ graphene-40:
       mountable: true
     ib1:
       mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:02:c9:03:00:0b:93:ce
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:ce 
       rate: 28000000000
       management: false
       enabled: false
@@ -7730,12 +7730,13 @@ graphene-84:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:9d
-      rate: 30000000000
+      rate: 20000000000 
       management: false
-      enabled: false
+      enabled: true 
       interface: InfiniBand
       version: MT26418
       ip: 172.18.64.84
+      ip6: fe80::202:c903:b:939d 
       driver: mlx4_core
       mountable: true
     ib1:
@@ -7904,8 +7905,8 @@ graphene-85:
     product_name: S5393
 graphene-86:
   bios:
-    version: V7.01e
-    release_date: 02/18/2011
+    version: V7.04
+    release_date: 02/10/2011
     vendor: American Megatrends Inc.
   network_interfaces:
     ib0:
@@ -11444,18 +11445,19 @@ graphene-124:
   network_interfaces:
     ib0:
       mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:bd
-      rate: 2000000000
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:61 
+      rate: 20000000000
       management: false
       enabled: true
       interface: InfiniBand
       version: MT26418
       ip: 172.18.64.124
+      ip6: fe80::202:c903:2:7f61
       driver: mlx4_core
       mountable: true
     ib1:
       mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:be
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:62 
       rate: 28000000000
       management: false
       enabled: false
@@ -12101,7 +12103,7 @@ graphene-131:
   network_interfaces:
     ib0:
       mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:02:c9:03:00:0b:91:4d
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:4d 
       rate: 20000000000
       ip6: fe80::202:c903:b:914d
       management: false
@@ -12113,7 +12115,7 @@ graphene-131:
       mountable: true
     ib1:
       mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:02:c9:03:00:0b:91:4e
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:4e
       rate: 28000000000
       management: false
       enabled: false
-- 
GitLab