[Lille] Ajout du mapping interface ethernet / port switch sur les cluster chti...

[Lille] Ajout du mapping interface ethernet / port switch sur les cluster chti chicon et chinqchint bis

[Lille] Ajout du mapping interface ethernet / port switch sur les cluster chti...
[Lille] Ajout du mapping interface ethernet / port switch sur les cluster chti chicon et chinqchint bis
128dd280 · Patrick Stefanescu · Patrick Stefanescu · a5d737f6 · 128dd280 · 128dd280
Commit 128dd280 authored Jan 13, 2010 by Patrick Stefanescu Committed by Patrick Stefanescu Jan 13, 2010
20 changed files
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-1.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-1.json
@@ -9,6 +9,16 @@
    "virtual_size": null
  },
  "network_adapters": [
+    {
+      "driver": "tg3",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.74",
+      "network_address": "chicon-1.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": "Gi3\/34"
+    },
    {
      "enabled": true,
      "interface": "Myrinet 10G",
@@ -18,15 +28,6 @@
      "switch": null,
      "vendor": "Myrinet",
      "version": "10G-PCIE-8A-C"
-    },
-    {
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.74",
-      "network_address": "chicon-1.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch1"
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-10.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-10.json
@@ -9,6 +9,16 @@
    "virtual_size": null
  },
  "network_adapters": [
+    {
+      "driver": "tg3",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.83",
+      "network_address": "chicon-10.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": "Gi4\/3"
+    },
    {
      "enabled": true,
      "interface": "Myrinet 10G",
@@ -18,15 +28,6 @@
      "switch": null,
      "vendor": "Myrinet",
      "version": "10G-PCIE-8A-C"
-    },
-    {
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.83",
-      "network_address": "chicon-10.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch1"
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-11.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-11.json
@@ -9,6 +9,16 @@
    "virtual_size": null
  },
  "network_adapters": [
+    {
+      "driver": "tg3",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.84",
+      "network_address": "chicon-11.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": "Gi4\/4"
+    },
    {
      "enabled": true,
      "interface": "Myrinet 10G",
@@ -18,15 +28,6 @@
      "switch": null,
      "vendor": "Myrinet",
      "version": "10G-PCIE-8A-C"
-    },
-    {
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.84",
-      "network_address": "chicon-11.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch1"
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-12.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-12.json
@@ -9,6 +9,16 @@
    "virtual_size": null
  },
  "network_adapters": [
+    {
+      "driver": "tg3",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.85",
+      "network_address": "chicon-12.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": "Gi4\/5"
+    },
    {
      "enabled": true,
      "interface": "Myrinet 10G",
@@ -18,15 +28,6 @@
      "switch": null,
      "vendor": "Myrinet",
      "version": "10G-PCIE-8A-C"
-    },
-    {
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.85",
-      "network_address": "chicon-12.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch1"
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-13.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-13.json
@@ -9,6 +9,16 @@
    "virtual_size": null
  },
  "network_adapters": [
+    {
+      "driver": "tg3",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.86",
+      "network_address": "chicon-13.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": "Gi4\/6"
+    },
    {
      "enabled": true,
      "interface": "Myrinet 10G",
@@ -18,15 +28,6 @@
      "switch": null,
      "vendor": "Myrinet",
      "version": "10G-PCIE-8A-C"
-    },
-    {
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.86",
-      "network_address": "chicon-13.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch1"
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-14.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-14.json
@@ -9,6 +9,16 @@
    "virtual_size": null
  },
  "network_adapters": [
+    {
+      "driver": "tg3",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.87",
+      "network_address": "chicon-14.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": "Gi4\/7"
+    },
    {
      "enabled": true,
      "interface": "Myrinet 10G",
@@ -18,15 +28,6 @@
      "switch": null,
      "vendor": "Myrinet",
      "version": "10G-PCIE-8A-C"
-    },
-    {
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.87",
-      "network_address": "chicon-14.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch1"
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-15.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-15.json
@@ -9,6 +9,16 @@
    "virtual_size": null
  },
  "network_adapters": [
+    {
+      "driver": "tg3",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.88",
+      "network_address": "chicon-15.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": "Gi4\/8"
+    },
    {
      "enabled": true,
      "interface": "Myrinet 10G",
@@ -18,15 +28,6 @@
      "switch": null,
      "vendor": "Myrinet",
      "version": "10G-PCIE-8A-C"
-    },
-    {
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.88",
-      "network_address": "chicon-15.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch1"
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-16.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-16.json
@@ -9,6 +9,16 @@
    "virtual_size": null
  },
  "network_adapters": [
+    {
+      "driver": "tg3",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.89",
+      "network_address": "chicon-16.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": "Gi4\/9"
+    },
    {
      "enabled": true,
      "interface": "Myrinet 10G",
@@ -18,15 +28,6 @@
      "switch": null,
      "vendor": "Myrinet",
      "version": "10G-PCIE-8A-C"
-    },
-    {
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.89",
-      "network_address": "chicon-16.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch1"
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-17.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-17.json
@@ -9,6 +9,16 @@
    "virtual_size": null
  },
  "network_adapters": [
+    {
+      "driver": "tg3",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.90",
+      "network_address": "chicon-17.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": "Gi4\/10"
+    },
    {
      "enabled": true,
      "interface": "Myrinet 10G",
@@ -18,15 +28,6 @@
      "switch": null,
      "vendor": "Myrinet",
      "version": "10G-PCIE-8A-C"
-    },
-    {
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.90",
-      "network_address": "chicon-17.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch1"
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-18.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-18.json
@@ -9,6 +9,16 @@
    "virtual_size": null
  },
  "network_adapters": [
+    {
+      "driver": "tg3",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.91",
+      "network_address": "chicon-18.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": "Gi4\/11"
+    },
    {
      "enabled": true,
      "interface": "Myrinet 10G",
@@ -18,15 +28,6 @@
      "switch": null,
      "vendor": "Myrinet",
      "version": "10G-PCIE-8A-C"
-    },
-    {
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.91",
-      "network_address": "chicon-18.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch1"
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-19.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-19.json
@@ -9,6 +9,16 @@
    "virtual_size": null
  },
  "network_adapters": [
+    {
+      "driver": "tg3",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.92",
+      "network_address": "chicon-19.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": "Gi4\/12"
+    },
    {
      "enabled": true,
      "interface": "Myrinet 10G",
@@ -18,15 +28,6 @@
      "switch": null,
      "vendor": "Myrinet",
      "version": "10G-PCIE-8A-C"
-    },
-    {
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.92",
-      "network_address": "chicon-19.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch1"
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-2.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-2.json
@@ -9,6 +9,16 @@
    "virtual_size": null
  },
  "network_adapters": [
+    {
+      "driver": "tg3",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.75",
+      "network_address": "chicon-2.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": "Gi3\/35"
+    },
    {
      "enabled": true,
      "interface": "Myrinet 10G",
@@ -18,15 +28,6 @@
      "switch": null,
      "vendor": "Myrinet",
      "version": "10G-PCIE-8A-C"
-    },
-    {
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.75",
-      "network_address": "chicon-2.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch1"
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-20.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-20.json
@@ -9,6 +9,16 @@
    "virtual_size": null
  },
  "network_adapters": [
+    {
+      "driver": "tg3",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.93",
+      "network_address": "chicon-20.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": "Gi4\/13"
+    },
    {
      "enabled": true,
      "interface": "Myrinet 10G",
@@ -18,15 +28,6 @@
      "switch": null,
      "vendor": "Myrinet",
      "version": "10G-PCIE-8A-C"
-    },
-    {
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.93",
-      "network_address": "chicon-20.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch1"
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-21.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-21.json
@@ -9,6 +9,16 @@
    "virtual_size": null
  },
  "network_adapters": [
+    {
+      "driver": "tg3",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.94",
+      "network_address": "chicon-21.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": "Gi4\/14"
+    },
    {
      "enabled": true,
      "interface": "Myrinet 10G",
@@ -18,15 +28,6 @@
      "switch": null,
      "vendor": "Myrinet",
      "version": "10G-PCIE-8A-C"
-    },
-    {
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.94",
-      "network_address": "chicon-21.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch1"
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-22.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-22.json
@@ -9,6 +9,16 @@
    "virtual_size": null
  },
  "network_adapters": [
+    {
+      "driver": "tg3",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.95",
+      "network_address": "chicon-22.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": "Gi4\/15"
+    },
    {
      "enabled": true,
      "interface": "Myrinet 10G",
@@ -18,15 +28,6 @@
      "switch": null,
      "vendor": "Myrinet",
      "version": "10G-PCIE-8A-C"
-    },
-    {
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.95",
-      "network_address": "chicon-22.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch1"
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-23.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-23.json
@@ -9,6 +9,16 @@
    "virtual_size": null
  },
  "network_adapters": [
+    {
+      "driver": "tg3",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.96",
+      "network_address": "chicon-23.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": "Gi4\/16"
+    },
    {
      "enabled": true,
      "interface": "Myrinet 10G",
@@ -18,15 +28,6 @@
      "switch": null,
      "vendor": "Myrinet",
      "version": "10G-PCIE-8A-C"
-    },
-    {
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.96",
-      "network_address": "chicon-23.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch1"
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-24.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-24.json
@@ -9,6 +9,16 @@
    "virtual_size": null
  },
  "network_adapters": [
+    {
+      "driver": "tg3",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.97",
+      "network_address": "chicon-24.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": "Gi4\/17"
+    },
    {
      "enabled": true,
      "interface": "Myrinet 10G",
@@ -18,15 +28,6 @@
      "switch": null,
      "vendor": "Myrinet",
      "version": "10G-PCIE-8A-C"
-    },
-    {
-      "driver": "tg3",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "192.168.159.97",
-      "network_address": "chicon-24.lille.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch1"
    }
  ],
  "operating_system": {

--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-25.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-25.json
@@ -9,6 +9,16 @@
    "virtual_size": null
  },
  "network_adapters": [
+    {
+      "driver": "tg3",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.98",
+      "network_address": "chicon-25.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": "Gi4\/18"
+    },
    {
      "enabled": true,
      "interface": "Myrinet 10G",
@@ -18,15 +28,6 @@
      "switch": null,