[grenoble] adonis - add ip6 for ib0, change bios release date, and disk model

data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json

@@ -5,7 +5,7 @@
     "smt_size": 8
   },
   "bios": {
-    "release_date": "(09/23/2009)",
+    "release_date": "05/20/2010",
     "vendor": "American Megatrends Inc.",
     "version": "R4222X52"
   },
@@ -67,13 +67,14 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:17:55",
       "interface": "InfiniBand",
       "ip": "172.18.18.1",
+      "ip6": "fe80::230:48ff:ffcc:1755",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-1-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428"
     },
     {
       "device": "bmc",
@@ -118,7 +119,7 @@
       "device": "sda",
       "driver": "ahci",
       "interface": "SATA",
-      "model": "WD2502ABYS-0",
+      "model": "WDC WD2502ABYS-0",
       "rev": 2.0,
       "size": "251059544064B",
       "vendor": "Western Digital"

data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json

@@ -5,7 +5,7 @@
     "smt_size": 8
   },
   "bios": {
-    "release_date": "(09/23/2009)",
+    "release_date": "05/20/2010",
     "vendor": "American Megatrends Inc.",
     "version": "R4222X52"
   },
@@ -67,13 +67,14 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:17:69",
       "interface": "InfiniBand",
       "ip": "172.18.18.10",
+      "ip6": "fe80::230:48ff:ffcc:1769",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-10-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428"
     },
     {
       "device": "bmc",
@@ -118,7 +119,7 @@
       "device": "sda",
       "driver": "ahci",
       "interface": "SATA",
-      "model": "WD2502ABYS-0",
+      "model": "WDC WD2502ABYS-0",
       "rev": 2.0,
       "size": "251059544064B",
       "vendor": "Western Digital"

data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json

@@ -5,7 +5,7 @@
     "smt_size": 8
   },
   "bios": {
-    "release_date": "(09/23/2009)",
+    "release_date": "05/20/2010",
     "vendor": "American Megatrends Inc.",
     "version": "R4222X52"
   },
@@ -67,13 +67,14 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:17:59",
       "interface": "InfiniBand",
       "ip": "172.18.18.2",
+      "ip6": "fe80::230:48ff:ffcc:1759",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-2-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428"
     },
     {
       "device": "bmc",
@@ -118,7 +119,7 @@
       "device": "sda",
       "driver": "ahci",
       "interface": "SATA",
-      "model": "WD2502ABYS-0",
+      "model": "WDC WD2502ABYS-0",
       "rev": 2.0,
       "size": "251059544064B",
       "vendor": "Western Digital"

data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json

@@ -5,7 +5,7 @@
     "smt_size": 8
   },
   "bios": {
-    "release_date": "(09/23/2009)",
+    "release_date": "05/20/2010",
     "vendor": "American Megatrends Inc.",
     "version": "R4222X52"
   },
@@ -67,13 +67,14 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:3d:49",
       "interface": "InfiniBand",
       "ip": "172.18.18.3",
+      "ip6": "fe80::230:48ff:ffcc:3d49",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-3-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428"
     },
     {
       "device": "bmc",
@@ -118,7 +119,7 @@
       "device": "sda",
       "driver": "ahci",
       "interface": "SATA",
-      "model": "WD2502ABYS-0",
+      "model": "WDC WD2502ABYS-0",
       "rev": 2.0,
       "size": "251059544064B",
       "vendor": "Western Digital"

data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json

@@ -5,7 +5,7 @@
     "smt_size": 8
   },
   "bios": {
-    "release_date": "(09/23/2009)",
+    "release_date": "05/20/2010",
     "vendor": "American Megatrends Inc.",
     "version": "R4222X52"
   },
@@ -67,13 +67,14 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:3d:45",
       "interface": "InfiniBand",
       "ip": "172.18.18.4",
+      "ip6": null,
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-4-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428"
     },
     {
       "device": "bmc",
@@ -118,7 +119,7 @@
       "device": "sda",
       "driver": "ahci",
       "interface": "SATA",
-      "model": "WD2502ABYS-0",
+      "model": "WDC WD2502ABYS-0",
       "rev": 2.0,
       "size": "251059544064B",
       "vendor": "Western Digital"

data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json

@@ -5,7 +5,7 @@
     "smt_size": 8
   },
   "bios": {
-    "release_date": "(09/23/2009)",
+    "release_date": "05/20/2010",
     "vendor": "American Megatrends Inc.",
     "version": "R4222X52"
   },
@@ -67,13 +67,14 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:14:65",
       "interface": "InfiniBand",
       "ip": "172.18.18.5",
+      "ip6": "fe80::230:48ff:ffcc:1465",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-5-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428"
     },
     {
       "device": "bmc",
@@ -118,7 +119,7 @@
       "device": "sda",
       "driver": "ahci",
       "interface": "SATA",
-      "model": "WD2502ABYS-0",
+      "model": "WDC WD2502ABYS-0",
       "rev": 2.0,
       "size": "251059544064B",
       "vendor": "Western Digital"

data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json

@@ -5,7 +5,7 @@
     "smt_size": 8
   },
   "bios": {
-    "release_date": "(09/23/2009)",
+    "release_date": "05/20/2010",
     "vendor": "American Megatrends Inc.",
     "version": "R4222X52"
   },
@@ -67,13 +67,14 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:42:65",
       "interface": "InfiniBand",
       "ip": "172.18.18.6",
+      "ip6": "fe80::230:48ff:ffcc:4265",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-6-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428"
     },
     {
       "device": "bmc",
@@ -118,7 +119,7 @@
       "device": "sda",
       "driver": "ahci",
       "interface": "SATA",
-      "model": "WD2502ABYS-0",
+      "model": "WDC WD2502ABYS-0",
       "rev": 2.0,
       "size": "251059544064B",
       "vendor": "Western Digital"

data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json

@@ -5,7 +5,7 @@
     "smt_size": 8
   },
   "bios": {
-    "release_date": "(09/23/2009)",
+    "release_date": "05/20/2010",
     "vendor": "American Megatrends Inc.",
     "version": "R4222X52"
   },
@@ -67,13 +67,14 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:3d:41",
       "interface": "InfiniBand",
       "ip": "172.18.18.7",
+      "ip6": "fe80::230:48ff:ffcc:3d41",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-7-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428"
     },
     {
       "device": "bmc",
@@ -118,7 +119,7 @@
       "device": "sda",
       "driver": "ahci",
       "interface": "SATA",
-      "model": "WD2502ABYS-0",
+      "model": "WDC WD2502ABYS-0",
       "rev": 2.0,
       "size": "251059544064B",
       "vendor": "Western Digital"

data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json

@@ -5,7 +5,7 @@
     "smt_size": 8
   },
   "bios": {
-    "release_date": "(09/23/2009)",
+    "release_date": "05/20/2010",
     "vendor": "American Megatrends Inc.",
     "version": "R4222X52"
   },
@@ -67,13 +67,14 @@
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:3d:51",
       "interface": "InfiniBand",
       "ip": "172.18.18.8",
+      "ip6": "fe80::230:48ff:ffcc:3d51",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-8-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428"
     },
     {
       "device": "bmc",
@@ -118,7 +119,7 @@
       "device": "sda",
       "driver": "ahci",
       "interface": "SATA",
-      "model": "WD2502ABYS-0",
+      "model": "WDC WD2502ABYS-0",
       "rev": 2.0,
       "size": "251059544064B",
       "vendor": "Western Digital"

data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json

@@ -5,7 +5,7 @@
     "smt_size": 8
   },
   "bios": {
-    "release_date": "(09/23/2009)",
+    "release_date": "05/20/2010",
     "vendor": "American Megatrends Inc.",
     "version": "R4222X52"
   },
@@ -52,7 +52,7 @@
       "driver": "igb",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:30:48:cb:cf:7f",
+      "mac": "00:25:90:4c:e9:85",
       "management": false,
       "mountable": false,
       "mounted": false,
@@ -64,16 +64,17 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "guid": null,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:25:90:ff:ff:2f:f1:49",
       "interface": "InfiniBand",
       "ip": "172.18.18.9",
+      "ip6": "fe80::225:90ff:ff2f:f149",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "adonis-9-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428"
     },
     {
       "device": "bmc",
@@ -118,7 +119,7 @@
       "device": "sda",
       "driver": "ahci",
       "interface": "SATA",
-      "model": "WD2502ABYS-0",
+      "model": "WDC WD2502ABYS-0",
       "rev": 2.0,
       "size": "251059544064B",
       "vendor": "Western Digital"

generators/input/sites/grenoble/clusters/adonis.rb

@@ -103,10 +103,11 @@ site :grenoble do |site_uid|
           :mountable        => lookup('adonis', node_uid, 'network_interfaces', 'ib0', 'mountable'),
           :mounted          => lookup('adonis', node_uid, 'network_interfaces', 'ib0', 'mounted'),
           :vendor           => 'Mellanox',
-          :version          => "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+          :version          => lookup('adonis', node_uid, 'network_interfaces', 'ib0', 'version'),
           :driver           => lookup('adonis', node_uid, 'network_interfaces', 'ib0', 'driver'),
           :network_address  => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
           :ip               => lookup('adonis', node_uid, 'network_interfaces', 'ib0', 'ip'),
+          :ip6              => lookup('adonis', node_uid, 'network_interfaces', 'ib0', 'ip6'),
           :guid             => lookup('adonis', node_uid, 'network_interfaces', 'ib0', 'guid')
         },
         {

generators/input/sites/grenoble/clusters/adonis.yaml

@@ -2,11 +2,11 @@
 adonis-1:
   bios:
     version: R4222X52
-    release_date: (09/23/2009)
+    release_date: 05/20/2010
     vendor: American Megatrends Inc.
   block_devices:
     sda:
-      model: WD2502ABYS-0
+      model: WDC WD2502ABYS-0
       device: sda
       size: 251059544064B
       rev: 2.0
@@ -81,11 +81,11 @@ adonis-1:
 adonis-2:
   bios:
     version: R4222X52
-    release_date: (09/23/2009)
+    release_date: 05/20/2010
     vendor: American Megatrends Inc.
   block_devices:
     sda:
-      model: WD2502ABYS-0
+      model: WDC WD2502ABYS-0
       device: sda
       size: 251059544064B
       rev: 2.0
@@ -160,7 +160,7 @@ adonis-2:
 adonis-3:
   bios:
     version: R4222X52
-    release_date: (09/23/2009)
+    release_date: 05/20/2010
     vendor: American Megatrends Inc.
   network_interfaces:
     ib0:
@@ -201,7 +201,7 @@ adonis-3:
       ip: 172.17.18.3
   block_devices:
     sda:
-      model: WD2502ABYS-0
+      model: WDC WD2502ABYS-0
       device: sda
       size: 251059544064B
       rev: 2.0
@@ -239,11 +239,11 @@ adonis-3:
 adonis-4:
   bios:
     version: R4222X52
-    release_date: (09/23/2009)
+    release_date: 05/20/2010
     vendor: American Megatrends Inc.
   block_devices:
     sda:
-      model: WD2502ABYS-0
+      model: WDC WD2502ABYS-0
       device: sda
       size: 251059544064B
       rev: 2.0
@@ -317,7 +317,7 @@ adonis-4:
 adonis-5:
   bios:
     version: R4222X52
-    release_date: (09/23/2009)
+    release_date: 05/20/2010
     vendor: American Megatrends Inc.
   network_interfaces:
     ib0:
@@ -358,7 +358,7 @@ adonis-5:
       ip: 172.17.18.5
   block_devices:
     sda:
-      model: WD2502ABYS-0
+      model: WDC WD2502ABYS-0
       device: sda
       size: 251059544064B
       rev: 2.0
@@ -396,7 +396,7 @@ adonis-5:
 adonis-6:
   bios:
     version: R4222X52
-    release_date: (09/23/2009)
+    release_date: 05/20/2010
     vendor: American Megatrends Inc.
   network_interfaces:
     ib0:
@@ -441,7 +441,7 @@ adonis-6:
     version: 6.0.6
   block_devices:
     sda:
-      model: WD2502ABYS-0
+      model: WDC WD2502ABYS-0
       device: sda
       size: 251059544064B
       rev: 2.0
@@ -475,11 +475,11 @@ adonis-6:
 adonis-7:
   bios:
     version: R4222X52
-    release_date: (09/23/2009)
+    release_date: 05/20/2010
     vendor: American Megatrends Inc.
   block_devices:
     sda:
-      model: WD2502ABYS-0
+      model: WDC WD2502ABYS-0
       device: sda
       size: 251059544064B
       rev: 2.0
@@ -554,7 +554,7 @@ adonis-7:
 adonis-8:
   bios:
     version: R4222X52
-    release_date: (09/23/2009)
+    release_date: 05/20/2010
     vendor: American Megatrends Inc.
   operating_system:
     kernel: 2.6.32-5-amd64
@@ -562,7 +562,7 @@ adonis-8:
     version: 6.0.6
   block_devices:
     sda:
-      model: WD2502ABYS-0
+      model: WDC WD2502ABYS-0
       device: sda
       size: 251059544064B
       rev: 2.0
@@ -633,12 +633,12 @@ adonis-8:
 adonis-9:
   bios:
     version: R4222X52
-    release_date: (09/23/2009)
+    release_date: 05/20/2010
     vendor: American Megatrends Inc.
   network_interfaces:
     ib0:
       mounted: true
-      guid:
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:25:90:ff:ff:2f:f1:49
       rate: 40000000000
       ip6: fe80::225:90ff:ff2f:f149
       management: false
@@ -663,7 +663,7 @@ adonis-9:
       switch_port: Gi3/19
     eth1:
       mounted: false
-      mac: 00:30:48:cb:cf:7f
+      mac: 00:25:90:4c:e9:85
       management: false
       enabled: false
       interface: Ethernet
@@ -678,7 +678,7 @@ adonis-9:
     version: 6.0.6
   block_devices:
     sda:
-      model: WD2502ABYS-0
+      model: WDC WD2502ABYS-0
       device: sda
       size: 251059544064B
       rev: 2.0
@@ -712,7 +712,7 @@ adonis-9:
 adonis-10:
   bios:
     version: R4222X52
-    release_date: (09/23/2009)
+    release_date: 05/20/2010
     vendor: American Megatrends Inc.
   operating_system:
     kernel: 2.6.32-5-amd64
@@ -757,7 +757,7 @@ adonis-10:
       ip: 172.17.18.10
   block_devices:
     sda:
-      model: WD2502ABYS-0
+      model: WDC WD2502ABYS-0
       device: sda
       size: 251059544064B
       rev: 2.0