[Grenoble] fix bug #4362 - Reference API: 'switch' property undocumented for...

[Grenoble] fix bug #4362 - Reference API: 'switch' property undocumented for some nodes' for genepi cluster, correct typo

[Grenoble] fix bug #4362 - Reference API: 'switch' property undocumented for...
[Grenoble] fix bug #4362 - Reference API: 'switch' property undocumented for some nodes' for genepi cluster, correct typo
32f907de · Elodie Bertoncello · 8346f7de · 32f907de · 32f907de · 32f907de
Commit 32f907de authored Jul 04, 2012 by Elodie Bertoncello
35 changed files
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json
@@ -69,8 +69,8 @@
      "mounted": true,
      "network_address": "genepi-1.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch_name": "gw",
+      "switch_port": "Gi4/22",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
    },

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json
@@ -69,8 +69,8 @@
      "mounted": true,
      "network_address": "genepi-10.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch_name": "gw",
+      "switch_port": "Gi3/37",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
    },

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json
@@ -69,8 +69,8 @@
      "mounted": true,
      "network_address": "genepi-11.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch_name": "gw",
+      "switch_port": "Gi4/9",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
    },

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json
@@ -69,8 +69,8 @@
      "mounted": true,
      "network_address": "genepi-12.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch_name": "gw",
+      "switch_port": "Gi3/38",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
    },

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json
@@ -69,8 +69,8 @@
      "mounted": true,
      "network_address": "genepi-13.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch_name": "gw",
+      "switch_port": "Gi4/17",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
    },

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json
@@ -69,8 +69,8 @@
      "mounted": true,
      "network_address": "genepi-14.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch_name": "gw",
+      "switch_port": "Gi3/29",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
    },

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json
@@ -69,8 +69,8 @@
      "mounted": true,
      "network_address": "genepi-15.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch_name": "gw",
+      "switch_port": "Gi4/7",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
    },

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json
@@ -69,8 +69,8 @@
      "mounted": true,
      "network_address": "genepi-16.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch_name": "gw",
+      "switch_port": "Gi3/25",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
    },

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json
@@ -69,8 +69,8 @@
      "mounted": true,
      "network_address": "genepi-17.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch_name": "gw",
+      "switch_port": "Gi4/6",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
    },

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json
@@ -69,8 +69,8 @@
      "mounted": true,
      "network_address": "genepi-18.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch_name": "gw",
+      "switch_port": "Gi3/27",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
    },

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json
@@ -69,8 +69,8 @@
      "mounted": true,
      "network_address": "genepi-19.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch_name": "gw",
+      "switch_port": "Gi4/16",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
    },

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json
@@ -69,8 +69,8 @@
      "mounted": true,
      "network_address": "genepi-2.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch_name": "gw",
+      "switch_port": "Gi3/42",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
    },

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json
@@ -69,8 +69,8 @@
      "mounted": true,
      "network_address": "genepi-20.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch_name": "gw",
+      "switch_port": "Gi3/31",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
    },

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json
@@ -69,8 +69,8 @@
      "mounted": true,
      "network_address": "genepi-21.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch_name": "gw",
+      "switch_port": "Gi4/10",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
    },

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json
@@ -69,8 +69,8 @@
      "mounted": true,
      "network_address": "genepi-22.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch_name": "gw",
+      "switch_port": "Gi3/32",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
    },

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json
@@ -69,8 +69,8 @@
      "mounted": true,
      "network_address": "genepi-23.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch_name": "gw",
+      "switch_port": "Gi4/14",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
    },

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json
@@ -69,8 +69,8 @@
      "mounted": true,
      "network_address": "genepi-24.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch_name": "gw",
+      "switch_port": "Gi3/30",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
    },

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json
@@ -69,8 +69,8 @@
      "mounted": true,
      "network_address": "genepi-25.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch_name": "gw",
+      "switch_port": "Gi4/15",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
    },

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json
@@ -69,8 +69,8 @@
      "mounted": true,
      "network_address": "genepi-26.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch_name": "gw",
+      "switch_port": "Gi4/8",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
    },

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.json
@@ -69,8 +69,8 @@
      "mounted": true,
      "network_address": "genepi-27.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch_name": "gw",
+      "switch_port": "Gi4/4",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
    },

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.json
@@ -69,8 +69,8 @@
      "mounted": true,
      "network_address": "genepi-28.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch_name": "gw",
+      "switch_port": "Gi3/33",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
    },

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json
@@ -69,8 +69,8 @@
      "mounted": true,
      "network_address": "genepi-29.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch_name": "gw",
+      "switch_port": "Gi4/3",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
    },

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json
@@ -69,8 +69,8 @@
      "mounted": true,
      "network_address": "genepi-3.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch_name": "gw",
+      "switch_port": "Gi4/21",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
    },

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json
@@ -69,8 +69,8 @@
      "mounted": true,
      "network_address": "genepi-30.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch_name": "gw",
+      "switch_port": "Gi3/28",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
    },

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json
@@ -69,8 +69,8 @@
      "mounted": true,
      "network_address": "genepi-31.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch_name": "gw",
+      "switch_port": "Gi4/13",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
    },

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json
@@ -69,8 +69,8 @@
      "mounted": true,
      "network_address": "genepi-32.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch_name": "gw",
+      "switch_port": "Gi3/34",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
    },

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json
@@ -69,8 +69,8 @@
      "mounted": true,
      "network_address": "genepi-33.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch_name": "gw",
+      "switch_port": "Gi4/5",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
    },

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.json
@@ -69,8 +69,8 @@
      "mounted": true,
      "network_address": "genepi-34.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch_name": "gw",
+      "switch_port": "Gi3/26",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
    },

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json
@@ -69,8 +69,8 @@
      "mounted": true,
      "network_address": "genepi-4.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch_name": "gw",
+      "switch_port": "Gi3/40",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
    },

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json
@@ -69,8 +69,8 @@
      "mounted": true,
      "network_address": "genepi-5.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch_name": "gw",
+      "switch_port": "Gi4/19",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
    },

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json
@@ -69,8 +69,8 @@
      "mounted": true,
      "network_address": "genepi-6.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch_name": "gw",
+      "switch_port": "Gi",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
    },

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json
@@ -69,8 +69,8 @@
      "mounted": true,
      "network_address": "genepi-7.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch_name": "gw",
+      "switch_port": "Gi4/20",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
    },

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json
@@ -69,8 +69,8 @@
      "mounted": true,
      "network_address": "genepi-8.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch_name": "gw",
+      "switch_port": "Gi3/39",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
    },

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json
@@ -69,8 +69,8 @@
      "mounted": true,
      "network_address": "genepi-9.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch_name": "gw",
+      "switch_port": "Gi4/18",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
    },

--- a/generators/input/sites/grenoble/clusters/genepi.rb
+++ b/generators/input/sites/grenoble/clusters/genepi.rb
@@ -94,8 +94,8 @@ site :grenoble do |site_uid|
          :vendor => "Intel",
          :version => "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)",
          :driver => "e1000e",
-          :switch => lookup('genepi', node_uid, 'network_interfaces', 'eth0', 'switch_name'),
-          :switch_port => lookup('genepi', node_uid, 'network_interfaces', 'eth0', 'switch_port')
+          :switch_name => lookup('genepi', node_uid, 'network_interfaces', 'eth1', 'switch_name'),
+          :switch_port => lookup('genepi', node_uid, 'network_interfaces', 'eth1', 'switch_port')
        },
        {
          :interface => 'Ethernet',