From 922a5c83fffb4f3765ef58a6e4de97967ec4cec4 Mon Sep 17 00:00:00 2001
From: Elodie Bertoncello <elodie.bertoncello@inria.fr>
Date: Tue, 24 Sep 2013 14:07:46 +0200
Subject: [PATCH] [grenoble] correct API information
---
.../clusters/adonis/nodes/adonis-4.json | 4 ++--
.../grenoble/clusters/edel/nodes/edel-1.json | 10 ++++-----
.../grenoble/clusters/edel/nodes/edel-2.json | 6 ++---
.../grenoble/clusters/edel/nodes/edel-33.json | 6 ++---
.../grenoble/clusters/adonis_generated.yaml | 3 ++-
.../grenoble/clusters/edel_generated.yaml | 22 +++++++++----------
6 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
index b793e9a33b4..03c6c13bae4 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
@@ -31,7 +31,7 @@
"enabled": true,
"interface": "Ethernet",
"ip": "172.16.18.4",
- "ip6": "fe80::230:48ff:ffcc:3d45",
+ "ip6": "fe80::230:48ff:fecd:c0ac",
"mac": "00:30:48:cd:c0:ac",
"management": false,
"mountable": true,
@@ -64,7 +64,7 @@
"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,
+ "ip6": "fe80::230:48ff:ffcc:3d45",
"management": false,
"mountable": true,
"mounted": true,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
index 653ccac24b8..86487e6a240 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
@@ -62,10 +62,10 @@
"device": "ib0",
"driver": "mlx4_core",
"enabled": true,
- "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:5e:d8",
+ "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:5f:9e",
"interface": "InfiniBand",
"ip": "172.18.17.1",
- "ip6": "fe80::a00:3800:137:5ed8",
+ "ip6": "fe80::a00:3800:137:5f9e",
"management": false,
"mountable": true,
"mounted": true,
@@ -145,9 +145,9 @@
"device": "sda",
"driver": "ahci",
"interface": "SATA",
- "model": "C200-MTFDBAA060M",
- "rev": 5.0,
- "size": 60022480896,
+ "model": "C300-MTFDDAA064M",
+ "rev": 7.0,
+ "size": 64023257088,
"vendor": null
}
],
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
index ee5f5659217..489b6b6b29c 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
@@ -145,9 +145,9 @@
"device": "sda",
"driver": "ahci",
"interface": "SATA",
- "model": "C200-MTFDBAA060M",
- "rev": 5.0,
- "size": 60022480896,
+ "model": "C400-MTFDDAA064M",
+ "rev": 40,
+ "size": 64023257088,
"vendor": null
}
],
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
index 8e3e4679310..0565a0ae56b 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
@@ -145,9 +145,9 @@
"device": "sda",
"driver": "ahci",
"interface": "SATA",
- "model": "C200-MTFDBAA060M",
- "rev": 5.0,
- "size": 60022480896,
+ "model": "C400-MTFDDAA064M",
+ "rev": 40.0,
+ "size": 64023257088,
"vendor": null
}
],
diff --git a/generators/input/sites/grenoble/clusters/adonis_generated.yaml b/generators/input/sites/grenoble/clusters/adonis_generated.yaml
index 8256de1f814..9d505b02e9b 100644
--- a/generators/input/sites/grenoble/clusters/adonis_generated.yaml
+++ b/generators/input/sites/grenoble/clusters/adonis_generated.yaml
@@ -247,13 +247,14 @@ adonis-4:
interface: InfiniBand
version: MT26428
ip: 172.18.18.4
+ ip6: fe80::230:48ff:ffcc:3d45
driver: mlx4_core
mountable: true
eth0:
mounted: true
rate: 1000000000
mac: 00:30:48:cd:c0:ac
- ip6: fe80::230:48ff:ffcc:3d45
+ ip6: fe80::230:48ff:fecd:c0ac
management: false
enabled: true
interface: Ethernet
diff --git a/generators/input/sites/grenoble/clusters/edel_generated.yaml b/generators/input/sites/grenoble/clusters/edel_generated.yaml
index 6669369eb84..2582525be6f 100644
--- a/generators/input/sites/grenoble/clusters/edel_generated.yaml
+++ b/generators/input/sites/grenoble/clusters/edel_generated.yaml
@@ -7,9 +7,9 @@ edel-1:
network_interfaces:
ib0:
mounted: true
- guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:5e:d8
+ guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:5f:9e
rate: 40000000000
- ip6: fe80::a00:3800:137:5ed8
+ ip6: fe80::a00:3800:137:5f9e
management: false
enabled: true
interface: InfiniBand
@@ -51,10 +51,10 @@ edel-1:
ip: 172.17.17.1
block_devices:
sda:
- model: C200-MTFDBAA060M
+ model: C300-MTFDDAA064M
device: sda
- size: 60022480896
- rev: 5.0
+ size: 64023257088
+ rev: 7.0
supported_job_types:
virtual: ivt
chassis:
@@ -134,10 +134,10 @@ edel-2:
ip: 172.17.17.2
block_devices:
sda:
- model: C200-MTFDBAA060M
+ model: C400-MTFDDAA064M
device: sda
- size: 60022480896
- rev: 5.0
+ size: 64023257088
+ rev: 40
supported_job_types:
virtual: ivt
chassis:
@@ -2591,10 +2591,10 @@ edel-33:
ip: 172.17.17.33
block_devices:
sda:
- model: C200-MTFDBAA060M
+ model: C400-MTFDDAA064M
device: sda
- size: 60022480896
- rev: 5.0
+ size: 64023257088
+ rev: 40.0
supported_job_types:
virtual: ivt
chassis:
--
GitLab