Merge branch 'master' into dev

9bfb4c14 · Jérémie Gaidamour · 16390ab7 · b4de401e · 9bfb4c14 · 9bfb4c14
Commit 9bfb4c14 authored Mar 15, 2016 by Jérémie Gaidamour
75 changed files
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.json
@@ -55,8 +55,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -71,8 +69,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -87,8 +83,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -103,8 +97,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -119,8 +111,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {

--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.json
@@ -55,8 +55,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -71,8 +69,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -87,8 +83,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -103,8 +97,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -119,8 +111,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {

--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.json
@@ -55,8 +55,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -71,8 +69,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -87,8 +83,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -103,8 +97,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -119,8 +111,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {

--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.json
@@ -55,8 +55,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -71,8 +69,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -87,8 +83,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -103,8 +97,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -119,8 +111,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {

--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.json
@@ -55,8 +55,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -71,8 +69,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -87,8 +83,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -103,8 +97,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -119,8 +111,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {

--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.json
@@ -55,8 +55,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -71,8 +69,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -87,8 +83,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -103,8 +97,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -119,8 +111,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {

--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.json
@@ -55,8 +55,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -71,8 +69,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -87,8 +83,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -103,8 +97,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -119,8 +111,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {

--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.json
@@ -55,8 +55,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -71,8 +69,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -87,8 +83,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -103,8 +97,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -119,8 +111,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {

--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.json
@@ -55,8 +55,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -71,8 +69,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -87,8 +83,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -103,8 +97,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -119,8 +111,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {

--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.json
@@ -55,8 +55,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -71,8 +69,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -87,8 +83,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -103,8 +97,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -119,8 +111,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {

--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.json
@@ -55,8 +55,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -71,8 +69,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -87,8 +83,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -103,8 +97,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -119,8 +111,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {

--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json
@@ -55,8 +55,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -71,8 +69,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -87,8 +83,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -103,8 +97,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -119,8 +111,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {

--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json
@@ -55,8 +55,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -71,8 +69,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -87,8 +83,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -103,8 +97,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {
@@ -119,8 +111,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
      "vendor": "Intel Corporation"
    },
    {

--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json
@@ -55,8 +55,6 @@
      "mountable": false,
      "mounted": false,
      "rate": 10000000000,