[grenoble] Bugfix : network_address set on adapter_0 instead of adapter_1

data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json

@@ -35,7 +35,6 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "network_address": "genepi-1.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
@@ -52,6 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
+      "network_address": "genepi-1.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "Gi4/22",

data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json

@@ -35,7 +35,6 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "network_address": "genepi-10.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
@@ -52,6 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
+      "network_address": "genepi-10.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "Gi3/37",

data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json

@@ -35,7 +35,6 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "network_address": "genepi-11.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
@@ -52,6 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
+      "network_address": "genepi-11.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "Gi4/9",

data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json

@@ -35,7 +35,6 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "network_address": "genepi-12.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
@@ -52,6 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
+      "network_address": "genepi-12.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "Gi3/38",

data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json

@@ -35,7 +35,6 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "network_address": "genepi-13.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
@@ -52,6 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
+      "network_address": "genepi-13.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "Gi4/17",

data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json

@@ -35,7 +35,6 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "network_address": "genepi-14.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
@@ -52,6 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
+      "network_address": "genepi-14.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "Gi3/29",

data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json

@@ -35,7 +35,6 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "network_address": "genepi-15.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
@@ -52,6 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
+      "network_address": "genepi-15.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "Gi4/7",

data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json

@@ -35,7 +35,6 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "network_address": "genepi-16.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
@@ -52,6 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
+      "network_address": "genepi-16.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "Gi3/25",

data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json

@@ -35,7 +35,6 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "network_address": "genepi-17.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
@@ -52,6 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
+      "network_address": "genepi-17.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "Gi4/6",

data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json

@@ -35,7 +35,6 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "network_address": "genepi-18.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
@@ -52,6 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
+      "network_address": "genepi-18.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "Gi3/27",

data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json

@@ -35,7 +35,6 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "network_address": "genepi-19.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
@@ -52,6 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
+      "network_address": "genepi-19.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "Gi4/16",

data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json

@@ -35,7 +35,6 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "network_address": "genepi-2.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
@@ -52,6 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
+      "network_address": "genepi-2.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "Gi3/42",

data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json

@@ -35,7 +35,6 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "network_address": "genepi-20.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
@@ -52,6 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
+      "network_address": "genepi-20.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "Gi3/31",

data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json

@@ -35,7 +35,6 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "network_address": "genepi-21.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
@@ -52,6 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
+      "network_address": "genepi-21.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "Gi4/10",

data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json

@@ -35,7 +35,6 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "network_address": "genepi-22.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
@@ -52,6 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
+      "network_address": "genepi-22.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "Gi3/32",

data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json

@@ -35,7 +35,6 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "network_address": "genepi-23.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
@@ -52,6 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
+      "network_address": "genepi-23.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "Gi4/14",

data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json

@@ -35,7 +35,6 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "network_address": "genepi-24.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
@@ -52,6 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
+      "network_address": "genepi-24.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "Gi3/30",

data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json

@@ -35,7 +35,6 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "network_address": "genepi-25.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
@@ -52,6 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
+      "network_address": "genepi-25.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "Gi4/15",

data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json

@@ -35,7 +35,6 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "network_address": "genepi-26.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
@@ -52,6 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
+      "network_address": "genepi-26.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "Gi4/8",

data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.json

@@ -35,7 +35,6 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "network_address": "genepi-27.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
@@ -52,6 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
+      "network_address": "genepi-27.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "Gi4/4",

data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.json

@@ -35,7 +35,6 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "network_address": "genepi-28.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
@@ -52,6 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
+      "network_address": "genepi-28.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "Gi3/33",

data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json

@@ -35,7 +35,6 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "network_address": "genepi-29.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
@@ -52,6 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
+      "network_address": "genepi-29.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "Gi4/3",

data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json

@@ -35,7 +35,6 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "network_address": "genepi-3.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
@@ -52,6 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
+      "network_address": "genepi-3.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "Gi4/21",

data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json

@@ -35,7 +35,6 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "network_address": "genepi-30.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
@@ -52,6 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
+      "network_address": "genepi-30.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "Gi3/28",

data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json

@@ -35,7 +35,6 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "network_address": "genepi-31.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
@@ -52,6 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
+      "network_address": "genepi-31.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "Gi4/13",

data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json

@@ -35,7 +35,6 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "network_address": "genepi-32.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
@@ -52,6 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
+      "network_address": "genepi-32.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "Gi3/34",

data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json

@@ -35,7 +35,6 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "network_address": "genepi-33.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
@@ -52,6 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
+      "network_address": "genepi-33.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "Gi4/5",

data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.json

@@ -35,7 +35,6 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "network_address": "genepi-34.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
@@ -52,6 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
+      "network_address": "genepi-34.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "Gi3/26",

data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json

@@ -35,7 +35,6 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "network_address": "genepi-4.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
@@ -52,6 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
+      "network_address": "genepi-4.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "Gi3/40",

data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json

@@ -35,7 +35,6 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "network_address": "genepi-5.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
@@ -52,6 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
+      "network_address": "genepi-5.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "Gi4/19",

data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json

@@ -35,7 +35,6 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "network_address": "genepi-6.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
@@ -52,6 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
+      "network_address": "genepi-6.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "Gi",

data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json

@@ -35,7 +35,6 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "network_address": "genepi-7.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
@@ -52,6 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
+      "network_address": "genepi-7.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "Gi4/20",

data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json

@@ -35,7 +35,6 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "network_address": "genepi-8.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
@@ -52,6 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
+      "network_address": "genepi-8.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "Gi3/39",

data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json

@@ -35,7 +35,6 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "network_address": "genepi-9.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
@@ -52,6 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
+      "network_address": "genepi-9.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-grenoble",
       "switch_port": "Gi4/18",

generators/input/sites/grenoble/clusters/genepi.rb

@@ -73,7 +73,6 @@ site :grenoble do |site_uid|
           :vendor           => 'Intel',
           :version          => "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)",
           :driver           => lookup('genepi', node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
           :mac              => lookup('genepi', node_uid, 'network_interfaces', 'eth0', 'mac')
         },
         {
@@ -89,6 +88,7 @@ site :grenoble do |site_uid|
           :version          => "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)",
           :ip               => lookup('genepi', node_uid, 'network_interfaces', 'eth1', 'ip'),
           :ip6              => lookup('genepi', node_uid, 'network_interfaces', 'eth1', 'ip6'),
+          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
           :switch           => lookup('genepi', node_uid, 'network_interfaces', 'eth1', 'switch_name'),
           :switch_port      => lookup('genepi', node_uid, 'network_interfaces', 'eth1', 'switch_port'),
           :driver           => lookup('genepi', node_uid, 'network_interfaces', 'eth1', 'driver'),