[lille] - Fields added and modified, fix #4867 -

f0ea8ee8 · Vidal WATAT · 398ea022 · f0ea8ee8 · f0ea8ee8 · f0ea8ee8
Commit f0ea8ee8 authored Feb 25, 2013 by Vidal WATAT
75 changed files
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-1.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-1.json
@@ -27,7 +27,7 @@
      "mounted": true,
      "network_address": "chicon-1-eth0.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "vendor": "Broadcom",
      "version": "NetXtreme BCM5780"
    },
@@ -44,7 +44,7 @@
      "mounted": true,
      "network_address": "chicon-1.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "switch_port": "Gi3/34",
      "vendor": "Broadcom",
      "version": "NetXtreme BCM5780"
@@ -58,7 +58,7 @@
      "mountable": false,
      "network_address": "chicon-1-rsa.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "vendor": "IBM",
      "version": "1.18"
    },
@@ -74,7 +74,7 @@
      "mounted": true,
      "network_address": "chicon-1-myri0.lille.grid5000.fr",
      "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-myri",
      "vendor": "Myricom",
      "version": "10G-PCIE-8A-C"
    }

--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-10.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-10.json
@@ -27,7 +27,7 @@
      "mounted": true,
      "network_address": "chicon-10-eth0.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "vendor": "Broadcom",
      "version": "NetXtreme BCM5780"
    },
@@ -44,7 +44,7 @@
      "mounted": true,
      "network_address": "chicon-10.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "switch_port": "Gi4/3",
      "vendor": "Broadcom",
      "version": "NetXtreme BCM5780"
@@ -58,7 +58,7 @@
      "mountable": false,
      "network_address": "chicon-10-rsa.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "vendor": "IBM",
      "version": "1.18"
    },
@@ -74,7 +74,7 @@
      "mounted": true,
      "network_address": "chicon-10-myri0.lille.grid5000.fr",
      "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-myri",
      "vendor": "Myricom",
      "version": "10G-PCIE-8A-C"
    }

--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-11.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-11.json
@@ -27,7 +27,7 @@
      "mounted": true,
      "network_address": "chicon-11-eth0.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "vendor": "Broadcom",
      "version": "NetXtreme BCM5780"
    },
@@ -44,7 +44,7 @@
      "mounted": true,
      "network_address": "chicon-11.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "switch_port": "Gi4/4",
      "vendor": "Broadcom",
      "version": "NetXtreme BCM5780"
@@ -58,7 +58,7 @@
      "mountable": false,
      "network_address": "chicon-11-rsa.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "vendor": "IBM",
      "version": "1.18"
    },
@@ -74,7 +74,7 @@
      "mounted": true,
      "network_address": "chicon-11-myri0.lille.grid5000.fr",
      "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-myri",
      "vendor": "Myricom",
      "version": "10G-PCIE-8A-C"
    }

--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-12.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-12.json
@@ -27,7 +27,7 @@
      "mounted": true,
      "network_address": "chicon-12-eth0.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "vendor": "Broadcom",
      "version": "NetXtreme BCM5780"
    },
@@ -44,7 +44,7 @@
      "mounted": true,
      "network_address": "chicon-12.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "switch_port": "Gi4/5",
      "vendor": "Broadcom",
      "version": "NetXtreme BCM5780"
@@ -58,7 +58,7 @@
      "mountable": false,
      "network_address": "chicon-12-rsa.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "vendor": "IBM",
      "version": "1.18"
    },
@@ -74,7 +74,7 @@
      "mounted": true,
      "network_address": "chicon-12-myri0.lille.grid5000.fr",
      "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-myri",
      "vendor": "Myricom",
      "version": "10G-PCIE-8A-C"
    }

--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-13.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-13.json
@@ -27,7 +27,7 @@
      "mounted": true,
      "network_address": "chicon-13-eth0.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "vendor": "Broadcom",
      "version": "NetXtreme BCM5780"
    },
@@ -44,7 +44,7 @@
      "mounted": true,
      "network_address": "chicon-13.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "switch_port": "Gi4/6",
      "vendor": "Broadcom",
      "version": "NetXtreme BCM5780"
@@ -58,7 +58,7 @@
      "mountable": false,
      "network_address": "chicon-13-rsa.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "vendor": "IBM",
      "version": "1.18"
    },
@@ -74,7 +74,7 @@
      "mounted": true,
      "network_address": "chicon-13-myri0.lille.grid5000.fr",
      "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-myri",
      "vendor": "Myricom",
      "version": "10G-PCIE-8A-C"
    }

--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-14.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-14.json
@@ -27,7 +27,7 @@
      "mounted": true,
      "network_address": "chicon-14-eth0.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "vendor": "Broadcom",
      "version": "NetXtreme BCM5780"
    },
@@ -44,7 +44,7 @@
      "mounted": true,
      "network_address": "chicon-14.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "switch_port": "Gi4/7",
      "vendor": "Broadcom",
      "version": "NetXtreme BCM5780"
@@ -58,7 +58,7 @@
      "mountable": false,
      "network_address": "chicon-14-rsa.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "vendor": "IBM",
      "version": "1.18"
    },
@@ -74,7 +74,7 @@
      "mounted": true,
      "network_address": "chicon-14-myri0.lille.grid5000.fr",
      "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-myri",
      "vendor": "Myricom",
      "version": "10G-PCIE-8A-C"
    }

--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-15.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-15.json
@@ -27,7 +27,7 @@
      "mounted": true,
      "network_address": "chicon-15-eth0.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "vendor": "Broadcom",
      "version": "NetXtreme BCM5780"
    },
@@ -44,7 +44,7 @@
      "mounted": true,
      "network_address": "chicon-15.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "switch_port": "Gi4/8",
      "vendor": "Broadcom",
      "version": "NetXtreme BCM5780"
@@ -58,7 +58,7 @@
      "mountable": false,
      "network_address": "chicon-15-rsa.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "vendor": "IBM",
      "version": "1.18"
    },
@@ -74,7 +74,7 @@
      "mounted": true,
      "network_address": "chicon-15-myri0.lille.grid5000.fr",
      "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-myri",
      "vendor": "Myricom",
      "version": "10G-PCIE-8A-C"
    }

--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-16.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-16.json
@@ -27,7 +27,7 @@
      "mounted": true,
      "network_address": "chicon-16-eth0.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "vendor": "Broadcom",
      "version": "NetXtreme BCM5780"
    },
@@ -44,7 +44,7 @@
      "mounted": true,
      "network_address": "chicon-16.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "switch_port": "Gi4/9",
      "vendor": "Broadcom",
      "version": "NetXtreme BCM5780"
@@ -58,7 +58,7 @@
      "mountable": false,
      "network_address": "chicon-16-rsa.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "vendor": "IBM",
      "version": "1.18"
    },
@@ -74,7 +74,7 @@
      "mounted": true,
      "network_address": "chicon-16-myri0.lille.grid5000.fr",
      "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-myri",
      "vendor": "Myricom",
      "version": "10G-PCIE-8A-C"
    }

--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-17.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-17.json
@@ -27,7 +27,7 @@
      "mounted": true,
      "network_address": "chicon-17-eth0.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "vendor": "Broadcom",
      "version": "NetXtreme BCM5780"
    },
@@ -44,7 +44,7 @@
      "mounted": true,
      "network_address": "chicon-17.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "switch_port": "Gi4/10",
      "vendor": "Broadcom",
      "version": "NetXtreme BCM5780"
@@ -58,7 +58,7 @@
      "mountable": false,
      "network_address": "chicon-17-rsa.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "vendor": "IBM",
      "version": "1.18"
    },
@@ -74,7 +74,7 @@
      "mounted": true,
      "network_address": "chicon-17-myri0.lille.grid5000.fr",
      "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-myri",
      "vendor": "Myricom",
      "version": "10G-PCIE-8A-C"
    }

--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-18.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-18.json
@@ -27,7 +27,7 @@
      "mounted": true,
      "network_address": "chicon-18-eth0.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "vendor": "Broadcom",
      "version": "NetXtreme BCM5780"
    },
@@ -44,7 +44,7 @@
      "mounted": true,
      "network_address": "chicon-18.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "switch_port": "Gi4/11",
      "vendor": "Broadcom",
      "version": "NetXtreme BCM5780"
@@ -58,7 +58,7 @@
      "mountable": false,
      "network_address": "chicon-18-rsa.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "vendor": "IBM",
      "version": "1.18"
    },
@@ -74,7 +74,7 @@
      "mounted": true,
      "network_address": "chicon-18-myri0.lille.grid5000.fr",
      "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-myri",
      "vendor": "Myricom",
      "version": "10G-PCIE-8A-C"
    }

--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-19.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-19.json
@@ -27,7 +27,7 @@
      "mounted": true,
      "network_address": "chicon-19-eth0.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "vendor": "Broadcom",
      "version": "NetXtreme BCM5780"
    },
@@ -44,7 +44,7 @@
      "mounted": true,
      "network_address": "chicon-19.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "switch_port": "Gi4/12",
      "vendor": "Broadcom",
      "version": "NetXtreme BCM5780"
@@ -58,7 +58,7 @@
      "mountable": false,
      "network_address": "chicon-19-rsa.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "vendor": "IBM",
      "version": "1.18"
    },
@@ -74,7 +74,7 @@
      "mounted": true,
      "network_address": "chicon-19-myri0.lille.grid5000.fr",
      "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-myri",
      "vendor": "Myricom",
      "version": "10G-PCIE-8A-C"
    }

--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-2.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-2.json
@@ -27,7 +27,7 @@
      "mounted": true,
      "network_address": "chicon-2-eth0.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "vendor": "Broadcom",
      "version": "NetXtreme BCM5780"
    },
@@ -44,7 +44,7 @@
      "mounted": true,
      "network_address": "chicon-2.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "switch_port": "Gi3/35",
      "vendor": "Broadcom",
      "version": "NetXtreme BCM5780"
@@ -58,7 +58,7 @@
      "mountable": false,
      "network_address": "chicon-2-rsa.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "vendor": "IBM",
      "version": "1.18"
    },
@@ -74,7 +74,7 @@
      "mounted": true,
      "network_address": "chicon-2-myri0.lille.grid5000.fr",
      "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-myri",
      "vendor": "Myricom",
      "version": "10G-PCIE-8A-C"
    }

--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-20.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-20.json
@@ -27,7 +27,7 @@
      "mounted": true,
      "network_address": "chicon-20-eth0.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "vendor": "Broadcom",
      "version": "NetXtreme BCM5780"
    },
@@ -44,7 +44,7 @@
      "mounted": true,
      "network_address": "chicon-20.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "switch_port": "Gi4/13",
      "vendor": "Broadcom",
      "version": "NetXtreme BCM5780"
@@ -58,7 +58,7 @@
      "mountable": false,
      "network_address": "chicon-20-rsa.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "vendor": "IBM",
      "version": "1.18"
    },
@@ -74,7 +74,7 @@
      "mounted": true,
      "network_address": "chicon-20-myri0.lille.grid5000.fr",
      "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-myri",
      "vendor": "Myricom",
      "version": "10G-PCIE-8A-C"
    }

--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-21.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-21.json
@@ -27,7 +27,7 @@
      "mounted": true,
      "network_address": "chicon-21-eth0.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "vendor": "Broadcom",
      "version": "NetXtreme BCM5780"
    },
@@ -44,7 +44,7 @@
      "mounted": true,
      "network_address": "chicon-21.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "switch_port": "Gi4/14",
      "vendor": "Broadcom",
      "version": "NetXtreme BCM5780"
@@ -58,7 +58,7 @@
      "mountable": false,
      "network_address": "chicon-21-rsa.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "vendor": "IBM",
      "version": "1.18"
    },
@@ -74,7 +74,7 @@
      "mounted": true,
      "network_address": "chicon-21-myri0.lille.grid5000.fr",
      "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-myri",
      "vendor": "Myricom",
      "version": "10G-PCIE-8A-C"
    }

--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-22.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-22.json
@@ -27,7 +27,7 @@
      "mounted": true,
      "network_address": "chicon-22-eth0.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "vendor": "Broadcom",
      "version": "NetXtreme BCM5780"
    },
@@ -44,7 +44,7 @@
      "mounted": true,
      "network_address": "chicon-22.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "switch_port": "Gi4/15",
      "vendor": "Broadcom",
      "version": "NetXtreme BCM5780"
@@ -58,7 +58,7 @@
      "mountable": false,
      "network_address": "chicon-22-rsa.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "vendor": "IBM",
      "version": "1.18"
    },
@@ -74,7 +74,7 @@
      "mounted": true,
      "network_address": "chicon-22-myri0.lille.grid5000.fr",
      "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-myri",
      "vendor": "Myricom",
      "version": "10G-PCIE-8A-C"
    }

--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-23.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-23.json
@@ -27,7 +27,7 @@
      "mounted": true,
      "network_address": "chicon-23-eth0.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "vendor": "Broadcom",
      "version": "NetXtreme BCM5780"
    },
@@ -44,7 +44,7 @@
      "mounted": true,
      "network_address": "chicon-23.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "switch_port": "Gi4/16",
      "vendor": "Broadcom",
      "version": "NetXtreme BCM5780"
@@ -58,7 +58,7 @@
      "mountable": false,
      "network_address": "chicon-23-rsa.lille.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-lille",
      "vendor": "IBM",
      "version": "1.18"
    },
@@ -74,7 +74,7 @@
      "mounted": true,
      "network_address": "chicon-23-myri0.lille.grid5000.fr",
      "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-myri",
      "vendor": "Myricom",
      "version": "10G-PCIE-8A-C"
    }

--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-24.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-24.json
@@ -27,7 +27,7 @@