Merge branch 'master' of ssh://git.grid5000.fr/srv/git/repos/reference-repository

472c3fa2 · Gaetan SIMO · c00bb04b · ca94583a · 472c3fa2 · 472c3fa2
Commit 472c3fa2 authored Apr 13, 2011 by Gaetan SIMO
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-1.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-1.json
@@ -15,7 +15,7 @@
      "enabled": true,
      "interface": "Ethernet",
      "ip": "138.96.21.1",
-      "mac": null,
+      "mac": "00:14:4f:20:90:18",
      "management": false,
      "mountable": true,
      "mounted": true,
@@ -29,7 +29,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:90:19",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"
@@ -39,7 +39,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:90:1a",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"
@@ -49,7 +49,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:90:1b",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"

--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-10.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-10.json
@@ -15,7 +15,7 @@
      "enabled": true,
      "interface": "Ethernet",
      "ip": "138.96.21.10",
-      "mac": null,
+      "mac": "00:14:4f:20:8d:ac",
      "management": false,
      "mountable": true,
      "mounted": true,
@@ -29,7 +29,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:8d:ad",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"
@@ -39,7 +39,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:8d:b2",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"
@@ -49,7 +49,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:8d:b3",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"

--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-11.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-11.json
@@ -15,7 +15,7 @@
      "enabled": true,
      "interface": "Ethernet",
      "ip": "138.96.21.11",
-      "mac": null,
+      "mac": "00:14:4f:8d:13:98",
      "management": false,
      "mountable": true,
      "mounted": true,
@@ -29,7 +29,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:8d:13:99",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"
@@ -39,7 +39,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:8d:13:9a",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"
@@ -49,7 +49,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:8d:13:9b",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"

--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-12.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-12.json
@@ -15,7 +15,7 @@
      "enabled": true,
      "interface": "Ethernet",
      "ip": "138.96.21.12",
-      "mac": null,
+      "mac": "00:14:4f:1f:cc:00",
      "management": false,
      "mountable": true,
      "mounted": true,
@@ -29,7 +29,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:cc:01",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"
@@ -39,7 +39,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:cc:06",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"
@@ -49,7 +49,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:cc:07",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"

--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-13.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-13.json
@@ -15,7 +15,7 @@
      "enabled": true,
      "interface": "Ethernet",
      "ip": "138.96.21.13",
-      "mac": null,
+      "mac": "00:14:4f:20:c9:68",
      "management": false,
      "mountable": true,
      "mounted": true,
@@ -29,7 +29,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:c9:69",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"
@@ -39,7 +39,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:c9:6a",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"
@@ -49,7 +49,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:c9:6b",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"

--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-14.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-14.json
@@ -15,7 +15,7 @@
      "enabled": true,
      "interface": "Ethernet",
      "ip": "138.96.21.14",
-      "mac": null,
+      "mac": "00:14:4f:20:c9:1c",
      "management": false,
      "mountable": true,
      "mounted": true,
@@ -29,7 +29,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:c9:1d",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"
@@ -39,7 +39,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:c9:1e",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"
@@ -49,7 +49,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:c9:1f",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"

--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-15.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-15.json
@@ -15,7 +15,7 @@
      "enabled": true,
      "interface": "Ethernet",
      "ip": "138.96.21.15",
-      "mac": null,
+      "mac": "00:14:4f:20:8b:26",
      "management": false,
      "mountable": true,
      "mounted": true,
@@ -29,7 +29,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:8b:27",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"
@@ -39,7 +39,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:8b:2c",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"
@@ -49,7 +49,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:8b:2d",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"

--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-16.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-16.json
@@ -15,7 +15,7 @@
      "enabled": true,
      "interface": "Ethernet",
      "ip": "138.96.21.16",
-      "mac": null,
+      "mac": "00:14:4f:20:a8:ea",
      "management": false,
      "mountable": true,
      "mounted": true,
@@ -29,7 +29,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:a8:eb",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"
@@ -39,7 +39,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:a8:f0",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"
@@ -49,7 +49,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:a8:f1",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"

--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-17.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-17.json
@@ -15,7 +15,7 @@
      "enabled": true,
      "interface": "Ethernet",
      "ip": "138.96.21.17",
-      "mac": null,
+      "mac": "00:14:4f:1f:fc:24",
      "management": false,
      "mountable": true,
      "mounted": true,
@@ -29,7 +29,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:fc:25",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"
@@ -39,7 +39,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:fc:2a",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"
@@ -49,7 +49,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:fc:2b",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"

--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-18.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-18.json
@@ -15,7 +15,7 @@
      "enabled": true,
      "interface": "Ethernet",
      "ip": "138.96.21.18",
-      "mac": null,
+      "mac": "00:14:4f:20:ca:78",
      "management": false,
      "mountable": true,
      "mounted": true,
@@ -29,7 +29,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:ca:79",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"
@@ -39,7 +39,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:ca:7e",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"
@@ -49,7 +49,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:ca:7f",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"

--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-19.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-19.json
@@ -15,7 +15,7 @@
      "enabled": true,
      "interface": "Ethernet",
      "ip": "138.96.21.19",
-      "mac": null,
+      "mac": "00:14:4f:20:b7:5c",
      "management": false,
      "mountable": true,
      "mounted": true,
@@ -29,7 +29,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:b7:5d",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"
@@ -39,7 +39,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:b7:5e",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"
@@ -49,7 +49,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:b7:5f",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"

--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-2.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-2.json
@@ -15,7 +15,7 @@
      "enabled": true,
      "interface": "Ethernet",
      "ip": "138.96.21.2",
-      "mac": null,
+      "mac": "00:14:4f:20:89:60",
      "management": false,
      "mountable": true,
      "mounted": true,
@@ -29,7 +29,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:89:61",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"
@@ -39,7 +39,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:89:66",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"
@@ -49,7 +49,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:89:67",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"

--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-20.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-20.json
@@ -15,7 +15,7 @@
      "enabled": true,
      "interface": "Ethernet",
      "ip": "138.96.21.20",
-      "mac": null,
+      "mac": "00:14:4f:20:8a:98",
      "management": false,
      "mountable": true,
      "mounted": true,
@@ -29,7 +29,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:8a:99",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"
@@ -39,7 +39,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:8a:9e",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"
@@ -49,7 +49,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:8a:9f",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"

--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-21.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-21.json
@@ -15,7 +15,7 @@
      "enabled": true,
      "interface": "Ethernet",
      "ip": "138.96.21.21",
-      "mac": null,
+      "mac": "00:14:4f:20:8c:00",
      "management": false,
      "mountable": true,
      "mounted": true,
@@ -29,7 +29,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:8c:01",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"
@@ -39,7 +39,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:8c:06",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"
@@ -49,7 +49,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:8c:07",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"

--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-22.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-22.json
@@ -15,7 +15,7 @@
      "enabled": true,
      "interface": "Ethernet",
      "ip": "138.96.21.22",
-      "mac": null,
+      "mac": "00:14:4f:20:b7:28",
      "management": false,
      "mountable": true,
      "mounted": true,
@@ -29,7 +29,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:b7:29",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"
@@ -39,7 +39,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:b7:2a",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"
@@ -49,7 +49,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:b7:2b",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"

--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-23.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-23.json
@@ -15,7 +15,7 @@
      "enabled": true,
      "interface": "Ethernet",
      "ip": "138.96.21.23",
-      "mac": null,
+      "mac": "00:14:4f:20:ac:ac",
      "management": false,
      "mountable": true,
      "mounted": true,
@@ -29,7 +29,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:ac:ad",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"
@@ -39,7 +39,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:ac:b2",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"
@@ -49,7 +49,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:ac:b3",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"

--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-24.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-24.json
@@ -15,7 +15,7 @@
      "enabled": true,
      "interface": "Ethernet",
      "ip": "138.96.21.24",
-      "mac": null,
+      "mac": "00:14:4f:1f:fc:ec",
      "management": false,
      "mountable": true,
      "mounted": true,
@@ -29,7 +29,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:fc:ed",
      "rate": 1000000000,
      "vendor": "Intel Corporation",
      "version": "82546EB"
@@ -39,7 +39,7 @@
      "driver": "e1000",
      "enabled": false,
      "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:fc:f2",
      "rate": 1000000000,