diff --git a/generators/input/grenoble.yaml b/generators/input/grenoble.yaml
index 21d463eee063523eeb5619469210d9151a3c3f09..47aa6afe07acc7714ee78103a6913eaabc3b4638 100644
--- a/generators/input/grenoble.yaml
+++ b/generators/input/grenoble.yaml
@@ -3,7 +3,6 @@ adonis-10:
   ip_eth0: 172.16.16.140
   mac_eth1: 00:30:48:cc:83:11
   ip_eth1: ""
-  mac_ib0: 48:ff:ff:cc:17:68
   ip_ib0: 172.16.18.140
   ip_mgt: 192.168.2.140
   mac_mgt: 00:30:48:cc:ad:df
@@ -12,9 +11,7 @@ adonis-11:
   ip_eth0: 172.16.16.141
   mac_eth1: 00:30:48:da:6f:67
   ip_eth1: ""
-  mac_ib0: c9:03:00:07:bf:e2
   ip_ib0: 172.16.18.141
-  mac_ib1: c9:03:00:07:bf:e2
   ip_ib1: ""
   ip_mgt: 192.168.2.141
   mac_mgt: 00:30:48:da:77:38
@@ -23,9 +20,7 @@ adonis-12:
   ip_eth0: 172.16.16.142
   mac_eth1: 00:25:90:01:eb:fd
   ip_eth1: ""
-  mac_ib0: c9:03:00:01:57:0c
   ip_ib0: 172.16.18.142
-  mac_ib1: c9:03:00:01:57:0c
   ip_ib1: ""
   ip_mgt: 192.168.2.142
   mac_mgt: 00:25:90:01:e7:fb
@@ -34,7 +29,6 @@ adonis-1:
   ip_eth0: 172.16.16.131
   mac_eth1: 00:30:48:cc:7f:d9
   ip_eth1: ""
-  mac_ib0: 48:ff:ff:cc:17:54
   ip_ib0: 172.16.18.131
   ip_mgt: 192.168.2.131
   mac_mgt: 00:30:48:cc:b0:58
@@ -43,7 +37,6 @@ adonis-2:
   ip_eth0: 172.16.16.132
   mac_eth1: 00:30:48:cc:7f:db
   ip_eth1: ""
-  mac_ib0: 48:ff:ff:cc:17:58
   ip_ib0: 172.16.18.132
   ip_mgt: 192.168.2.132
   mac_mgt: 00:30:48:cc:b0:59
@@ -52,7 +45,6 @@ adonis-3:
   ip_eth0: 172.16.16.133
   mac_eth1: 00:30:48:cd:c6:a5
   ip_eth1: ""
-  mac_ib0: 48:ff:ff:cc:3d:48
   ip_ib0: 172.16.18.133
   ip_mgt: 192.168.2.133
   mac_mgt: 00:30:48:cc:b5:f6
@@ -61,7 +53,6 @@ adonis-4:
   ip_eth0: 172.16.16.134
   mac_eth1: 00:30:48:cd:c0:ad
   ip_eth1: ""
-  mac_ib0: 48:ff:ff:cc:3d:44
   ip_ib0: 172.16.18.134
   ip_mgt: 192.168.2.134
   mac_mgt: 00:30:48:cc:b6:6c
@@ -70,7 +61,6 @@ adonis-5:
   ip_eth0: 172.16.16.135
   mac_eth1: 00:30:48:cc:7e:0b
   ip_eth1: ""
-  mac_ib0: 48:ff:ff:cc:14:64
   ip_ib0: 172.16.18.135
   ip_mgt: 192.168.2.135
   mac_mgt: 00:30:48:cc:af:61
@@ -79,7 +69,6 @@ adonis-6:
   ip_eth0: 172.16.16.136
   mac_eth1: 00:30:48:cc:7a:bd
   ip_eth1: ""
-  mac_ib0: 48:ff:ff:cc:42:64
   ip_ib0: 172.16.18.136
   ip_mgt: 192.168.2.136
   mac_mgt: 00:30:48:cc:ad:f2
@@ -88,7 +77,6 @@ adonis-7:
   ip_eth0: 172.16.16.137
   mac_eth1: 00:30:48:cd:c6:81
   ip_eth1: ""
-  mac_ib0: 48:ff:ff:cc:3d:40
   ip_ib0: 172.16.18.137
   ip_mgt: 192.168.2.137
   mac_mgt: 00:30:48:cc:b5:e4
@@ -97,7 +85,6 @@ adonis-8:
   ip_eth0: 172.16.16.138
   mac_eth1: 00:30:48:cd:c0:af
   ip_eth1: ""
-  mac_ib0: 48:ff:ff:cc:3d:50
   ip_ib0: 172.16.18.138
   ip_mgt: 192.168.2.138
   mac_mgt: 00:30:48:cc:b6:6d
@@ -106,18 +93,33 @@ adonis-9:
   ip_eth0: 172.16.16.139
   mac_eth1: 00:30:48:cb:cf:7f
   ip_eth1: ""
-  mac_ib0: 48:ff:ff:cc:17:dc
   ip_ib0: 172.16.18.139
   ip_mgt: 192.168.2.139
   mac_mgt: 00:30:48:cc:ac:d1
+edel-10:
+  mac_eth0: 08:00:38:35:ab:94
+  ip_eth0: 172.16.16.60
+  mac_eth1: 08:00:38:35:ab:95
+  ip_eth1: ""
+  ip_ib0: 172.16.18.60
+  ip_ib1: ""
+  ip_mgt: 192.168.2.60
+  mac_mgt: ""
+edel-11
+  mac_eth0: 08:00:38:35:ab:90
+  ip_eth0: 172.16.16.61
+  mac_eth1: 08:00:38:35:ab:91
+  ip_eth1: ""
+  ip_ib0: 172.16.18.61
+  ip_ib1: ""
+  ip_mgt: 192.168.2.61
+  mac_mgt: ""
 edel-12:
   mac_eth0: 08:00:38:35:ac:3c
   ip_eth0: 172.16.16.62
   mac_eth1: 08:00:38:35:ac:3d
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:ca:5a
   ip_ib0: 172.16.18.62
-  mac_ib1: 38:00:01:35:ca:5a
   ip_ib1: ""
   ip_mgt: 192.168.2.62
   mac_mgt: 08:00:38:35:a4:1e
@@ -126,9 +128,7 @@ edel-13:
   ip_eth0: 172.16.16.63
   mac_eth1: 08:00:38:35:ab:dd
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c9:ca
   ip_ib0: 172.16.18.63
-  mac_ib1: 38:00:01:35:c9:ca
   ip_ib1: ""
   ip_mgt: 192.168.2.63
   mac_mgt: 08:00:38:35:a3:ee
@@ -137,9 +137,7 @@ edel-14:
   ip_eth0: 172.16.16.64
   mac_eth1: 08:00:38:35:ab:ad
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c9:82
   ip_ib0: 172.16.18.64
-  mac_ib1: 38:00:01:35:c9:82
   ip_ib1: ""
   ip_mgt: 192.168.2.64
   mac_mgt: 08:00:38:35:a3:d6
@@ -148,9 +146,7 @@ edel-15:
   ip_eth0: 172.16.16.65
   mac_eth1: 08:00:38:35:ab:fd
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c9:fa
   ip_ib0: 172.16.18.65
-  mac_ib1: 38:00:01:35:c9:fa
   ip_ib1: ""
   ip_mgt: 192.168.2.65
   mac_mgt: 08:00:38:35:a3:fe
@@ -159,9 +155,7 @@ edel-16:
   ip_eth0: 172.16.16.66
   mac_eth1: 08:00:38:35:ac:0d
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:ca:12
   ip_ib0: 172.16.18.66
-  mac_ib1: 38:00:01:35:ca:12
   ip_ib1: ""
   ip_mgt: 192.168.2.66
   mac_mgt: 08:00:38:35:a4:06
@@ -170,9 +164,7 @@ edel-17:
   ip_eth0: 172.16.16.67
   mac_eth1: 08:00:38:35:ab:9f
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c9:6d
   ip_ib0: 172.16.18.67
-  mac_ib1: 38:00:01:35:c9:6d
   ip_ib1: ""
   ip_mgt: 192.168.2.67
   mac_mgt: 08:00:38:35:a3:cf
@@ -181,9 +173,7 @@ edel-18:
   ip_eth0: 172.16.16.68
   mac_eth1: 08:00:38:35:ab:83
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c9:43
   ip_ib0: 172.16.18.68
-  mac_ib1: 38:00:01:35:c9:43
   ip_ib1: ""
   ip_mgt: 192.168.2.68
   mac_mgt: 08:00:38:35:a3:c1
@@ -192,9 +182,7 @@ edel-19:
   ip_eth0: 172.16.16.69
   mac_eth1: 08:00:38:35:ab:d1
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c9:b8
   ip_ib0: 172.16.18.69
-  mac_ib1: 38:00:01:35:c9:b8
   ip_ib1: ""
   ip_mgt: 192.168.2.69
   mac_mgt: 08:00:38:35:a3:e8
@@ -203,9 +191,7 @@ edel-20:
   ip_eth0: 172.16.16.70
   mac_eth1: 08:00:38:35:ab:79
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c9:34
   ip_ib0: 172.16.18.70
-  mac_ib1: 38:00:01:35:c9:34
   ip_ib1: ""
   ip_mgt: 192.168.2.70
   mac_mgt: 08:00:38:35:a3:bc
@@ -214,9 +200,7 @@ edel-21:
   ip_eth0: 172.16.16.71
   mac_eth1: 08:00:38:35:ac:4b
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:ca:6f
   ip_ib0: 172.16.18.71
-  mac_ib1: 38:00:01:35:ca:6f
   ip_ib1: ""
   ip_mgt: 192.168.2.71
   mac_mgt: 08:00:38:35:a4:25
@@ -225,9 +209,7 @@ edel-22:
   ip_eth0: 172.16.16.72
   mac_eth1: 08:00:38:35:ab:9d
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c9:6a
   ip_ib0: 172.16.18.72
-  mac_ib1: 38:00:01:35:c9:6a
   ip_ib1: ""
   ip_mgt: 192.168.2.72
   mac_mgt: 08:00:38:35:a3:ce
@@ -236,31 +218,43 @@ edel-23:
   ip_eth0: 172.16.16.73
   mac_eth1: 08:00:38:35:ab:d7
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c9:c1
   ip_ib0: 172.16.18.73
-  mac_ib1: 38:00:01:35:c9:c1
   ip_ib1: ""
   ip_mgt: 192.168.2.73
   mac_mgt: 08:00:38:35:a3:eb
+edel-24:
+  mac_eth0: 08:00:38:35:ac:26 
+  ip_eth0: 172.16.16.74
+  mac_eth1: 08:00:38:35:ac:27
+  ip_eth1: ""
+  ip_ib0: 172.16.18.74
+  ip_ib1: ""
+  ip_mgt: 192.168.2.74
+  mac_mgt: ""
 edel-25:
   mac_eth0: 08:00:38:35:aa:b8
   ip_eth0: 172.16.16.75
   mac_eth1: 08:00:38:35:aa:b9
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c8:14
   ip_ib0: 172.16.18.75
-  mac_ib1: 38:00:01:35:c8:14
   ip_ib1: ""
   ip_mgt: 192.168.2.75
   mac_mgt: 08:00:38:35:a3:5c
+edel-26:
+  mac_eth0: 08:00:38:35:ab:54
+  ip_eth0: 172.16.16.76
+  mac_eth1: 08:00:38:35:ab:55
+  ip_eth1: ""
+  ip_ib0: 172.16.18.76
+  ip_ib1: ""
+  ip_mgt: 192.168.2.76
+  mac_mgt: ""
 edel-27:
   mac_eth0: 08:00:38:35:ac:3e
   ip_eth0: 172.16.16.77
   mac_eth1: 08:00:38:35:ac:3f
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:ca:5d
   ip_ib0: 172.16.18.77
-  mac_ib1: 38:00:01:35:ca:5d
   ip_ib1: ""
   ip_mgt: 192.168.2.77
   mac_mgt: 08:00:38:35:a4:1f
@@ -269,9 +263,7 @@ edel-28:
   ip_eth0: 172.16.16.78
   mac_eth1: 08:00:38:35:ac:49
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:ca:6c
   ip_ib0: 172.16.18.78
-  mac_ib1: 38:00:01:35:ca:6c
   ip_ib1: ""
   ip_mgt: 192.168.2.78
   mac_mgt: 08:00:38:35:a4:24
@@ -280,9 +272,7 @@ edel-29:
   ip_eth0: 172.16.16.79
   mac_eth1: 08:00:38:35:ab:bf
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c9:9d
   ip_ib0: 172.16.18.79
-  mac_ib1: 38:00:01:35:c9:9d
   ip_ib1: ""
   ip_mgt: 192.168.2.79
   mac_mgt: 08:00:38:35:a3:df
@@ -291,9 +281,7 @@ edel-30:
   ip_eth0: 172.16.16.80
   mac_eth1: 08:00:38:35:ab:bb
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c9:97
   ip_ib0: 172.16.18.80
-  mac_ib1: 38:00:01:35:c9:97
   ip_ib1: ""
   ip_mgt: 192.168.2.80
   mac_mgt: 08:00:38:35:a3:dd
@@ -302,9 +290,7 @@ edel-31:
   ip_eth0: 172.16.16.81
   mac_eth1: 08:00:38:35:af:3f
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:ce:dd
   ip_ib0: 172.16.18.81
-  mac_ib1: 38:00:01:35:ce:dd
   ip_ib1: ""
   ip_mgt: 192.168.2.81
   mac_mgt: 08:00:38:35:a5:9f
@@ -313,9 +299,7 @@ edel-32:
   ip_eth0: 172.16.16.82
   mac_eth1: 08:00:38:35:ab:47
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c8:e9
   ip_ib0: 172.16.18.82
-  mac_ib1: 38:00:01:35:c8:e9
   ip_ib1: ""
   ip_mgt: 192.168.2.82
   mac_mgt: 08:00:38:35:a3:a3
@@ -324,9 +308,7 @@ edel-33:
   ip_eth0: 172.16.16.83
   mac_eth1: 08:00:38:35:ac:4d
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:ca:72
   ip_ib0: 172.16.18.83
-  mac_ib1: 38:00:01:35:ca:72
   ip_ib1: ""
   ip_mgt: 192.168.2.83
   mac_mgt: 08:00:38:35:a4:26
@@ -335,9 +317,7 @@ edel-34:
   ip_eth0: 172.16.16.84
   mac_eth1: 08:00:38:35:ab:a3
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c9:73
   ip_ib0: 172.16.18.84
-  mac_ib1: 38:00:01:35:c9:73
   ip_ib1: ""
   ip_mgt: 192.168.2.84
   mac_mgt: 08:00:38:35:a3:d1
@@ -346,9 +326,7 @@ edel-35:
   ip_eth0: 172.16.16.85
   mac_eth1: 08:00:38:35:ab:63
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c9:13
   ip_ib0: 172.16.18.85
-  mac_ib1: 38:00:01:35:c9:13
   ip_ib1: ""
   ip_mgt: 192.168.2.85
   mac_mgt: 08:00:38:35:a3:b1
@@ -357,9 +335,7 @@ edel-36:
   ip_eth0: 172.16.16.86
   mac_eth1: 08:00:38:35:ab:e7
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c9:d9
   ip_ib0: 172.16.18.86
-  mac_ib1: 38:00:01:35:c9:d9
   ip_ib1: ""
   ip_mgt: 192.168.2.86
   mac_mgt: 08:00:38:35:a3:f3
@@ -368,9 +344,7 @@ edel-37:
   ip_eth0: 172.16.16.87
   mac_eth1: 08:00:38:35:aa:65
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c7:96
   ip_ib0: 172.16.18.87
-  mac_ib1: 38:00:01:35:c7:96
   ip_ib1: ""
   ip_mgt: 192.168.2.87
   mac_mgt: 08:00:38:35:a3:32
@@ -379,9 +353,7 @@ edel-38:
   ip_eth0: 172.16.16.88
   mac_eth1: 08:00:38:35:ab:d3
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c9:bb
   ip_ib0: 172.16.18.88
-  mac_ib1: 38:00:01:35:c9:bb
   ip_ib1: ""
   ip_mgt: 192.168.2.88
   mac_mgt: 08:00:38:35:a3:e9
@@ -390,9 +362,7 @@ edel-39:
   ip_eth0: 172.16.16.89
   mac_eth1: 08:00:38:35:ac:2b
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:ca:3f
   ip_ib0: 172.16.18.89
-  mac_ib1: 38:00:01:35:ca:3f
   ip_ib1: ""
   ip_mgt: 192.168.2.89
   mac_mgt: 08:00:38:35:a4:15
@@ -401,9 +371,7 @@ edel-3:
   ip_eth0: 172.16.16.53
   mac_eth1: 08:00:38:35:ab:8d
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c9:52
   ip_ib0: 172.16.18.53
-  mac_ib1: 38:00:01:35:c9:52
   ip_ib1: ""
   ip_mgt: 192.168.2.53
   mac_mgt: 08:00:38:35:a3:c6
@@ -412,9 +380,7 @@ edel-40:
   ip_eth0: 172.16.16.90
   mac_eth1: 08:00:38:35:ab:a9
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c9:7c
   ip_ib0: 172.16.18.90
-  mac_ib1: 38:00:01:35:c9:7c
   ip_ib1: ""
   ip_mgt: 192.168.2.90
   mac_mgt: 08:00:38:35:a3:d4
@@ -423,20 +389,25 @@ edel-41:
   ip_eth0: 172.16.16.91
   mac_eth1: 08:00:38:35:ac:37
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:ca:51
   ip_ib0: 172.16.18.91
-  mac_ib1: 38:00:01:35:ca:51
   ip_ib1: ""
   ip_mgt: 192.168.2.91
   mac_mgt: 08:00:38:35:a4:1b
+edel-42:
+  mac_eth0: 08:00:38:35:ad:be
+  ip_eth0: 172.16.16.92
+  mac_eth1: ""
+  ip_eth1: ""
+  ip_ib0: 172.16.18.92
+  ip_ib1: ""
+  ip_mgt: 192.168.2.92
+  mac_mgt: ""
 edel-43:
   mac_eth0: 08:00:38:35:ab:d4
   ip_eth0: 172.16.16.93
   mac_eth1: 08:00:38:35:ab:d5
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c9:be
   ip_ib0: 172.16.18.93
-  mac_ib1: 38:00:01:35:c9:be
   ip_ib1: ""
   ip_mgt: 192.168.2.93
   mac_mgt: 08:00:38:35:a3:ea
@@ -445,9 +416,7 @@ edel-44:
   ip_eth0: 172.16.16.94
   mac_eth1: 08:00:38:35:ab:ab
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c9:7f
   ip_ib0: 172.16.18.94
-  mac_ib1: 38:00:01:35:c9:7f
   ip_ib1: ""
   ip_mgt: 192.168.2.94
   mac_mgt: 08:00:38:35:a3:d5
@@ -456,9 +425,7 @@ edel-45:
   ip_eth0: 172.16.16.95
   mac_eth1: 08:00:38:35:ac:23
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:ca:33
   ip_ib0: 172.16.18.95
-  mac_ib1: 38:00:01:35:ca:33
   ip_ib1: ""
   ip_mgt: 192.168.2.95
   mac_mgt: 08:00:38:35:a4:11
@@ -467,9 +434,7 @@ edel-46:
   ip_eth0: 172.16.16.96
   mac_eth1: 08:00:38:35:ab:4b
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c8:ef
   ip_ib0: 172.16.18.96
-  mac_ib1: 38:00:01:35:c8:ef
   ip_ib1: ""
   ip_mgt: 192.168.2.96
   mac_mgt: 08:00:38:35:a3:a5
@@ -478,9 +443,7 @@ edel-47:
   ip_eth0: 172.16.16.97
   mac_eth1: 08:00:38:35:ab:bd
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c9:9a
   ip_ib0: 172.16.18.97
-  mac_ib1: 38:00:01:35:c9:9a
   ip_ib1: ""
   ip_mgt: 192.168.2.97
   mac_mgt: 08:00:38:35:a3:de
@@ -489,9 +452,7 @@ edel-48:
   ip_eth0: 172.16.16.98
   mac_eth1: 08:00:38:35:ab:71
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c9:28
   ip_ib0: 172.16.18.98
-  mac_ib1: 38:00:01:35:c9:28
   ip_ib1: ""
   ip_mgt: 192.168.2.98
   mac_mgt: 08:00:38:35:a3:b8
@@ -500,20 +461,25 @@ edel-49:
   ip_eth0: 172.16.16.99
   mac_eth1: 08:00:38:35:ab:b7
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c9:91
   ip_ib0: 172.16.18.99
-  mac_ib1: 38:00:01:35:c9:91
   ip_ib1: ""
   ip_mgt: 192.168.2.99
   mac_mgt: 08:00:38:35:a3:db
+edel-50:
+  mac_eth0: 08:00:38:35:ac:10 
+  ip_eth0: 172.16.16.100
+  mac_eth1: 08:00:38:35:ac:11
+  ip_eth1: ""
+  ip_ib0: 172.16.18.100
+  ip_ib1: ""
+  ip_mgt: 172.16.18.100
+  mac_mgt: ""
 edel-51:
   mac_eth0: 08:00:38:35:ac:40
   ip_eth0: 172.16.16.101
   mac_eth1: 08:00:38:35:ac:41
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:ca:60
   ip_ib0: 172.16.18.101
-  mac_ib1: 38:00:01:35:ca:60
   ip_ib1: ""
   ip_mgt: 192.168.2.101
   mac_mgt: 08:00:38:35:a4:20
@@ -522,9 +488,7 @@ edel-52:
   ip_eth0: 172.16.16.102
   mac_eth1: 08:00:38:35:ac:1b
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:ca:27
   ip_ib0: 172.16.18.102
-  mac_ib1: 38:00:01:35:ca:27
   ip_ib1: ""
   ip_mgt: 192.168.2.102
   mac_mgt: 08:00:38:35:a4:0d
@@ -533,9 +497,7 @@ edel-53:
   ip_eth0: 172.16.16.103
   mac_eth1: 08:00:38:35:ac:35
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:ca:4e
   ip_ib0: 172.16.18.103
-  mac_ib1: 38:00:01:35:ca:4e
   ip_ib1: ""
   ip_mgt: 192.168.2.103
   mac_mgt: 08:00:38:35:a4:1a
@@ -544,9 +506,7 @@ edel-54:
   ip_eth0: 172.16.16.104
   mac_eth1: 08:00:38:35:ac:3b
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:ca:57
   ip_ib0: 172.16.18.104
-  mac_ib1: 38:00:01:35:ca:57
   ip_ib1: ""
   ip_mgt: 192.168.2.104
   mac_mgt: 08:00:38:35:a4:1d
@@ -555,9 +515,7 @@ edel-55:
   ip_eth0: 172.16.16.105
   mac_eth1: 08:00:38:35:ab:e9
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c9:dc
   ip_ib0: 172.16.18.105
-  mac_ib1: 38:00:01:35:c9:dc
   ip_ib1: ""
   ip_mgt: 192.168.2.105
   mac_mgt: 08:00:38:35:a3:f4
@@ -566,9 +524,7 @@ edel-56:
   ip_eth0: 172.16.16.106
   mac_eth1: 08:00:38:35:ac:01
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:ca:00
   ip_ib0: 172.16.18.106
-  mac_ib1: 38:00:01:35:ca:00
   ip_ib1: ""
   ip_mgt: 192.168.2.106
   mac_mgt: 08:00:38:35:a4:00
@@ -577,9 +533,7 @@ edel-57:
   ip_eth0: 172.16.16.107
   mac_eth1: 08:00:38:35:ab:af
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c9:85
   ip_ib0: 172.16.18.107
-  mac_ib1: 38:00:01:35:c9:85
   ip_ib1: ""
   ip_mgt: 192.168.2.107
   mac_mgt: 08:00:38:35:a3:d7
@@ -588,9 +542,7 @@ edel-58:
   ip_eth0: 172.16.16.108
   mac_eth1: 08:00:38:35:ac:09
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:ca:0c
   ip_ib0: 172.16.18.108
-  mac_ib1: 38:00:01:35:ca:0c
   ip_ib1: ""
   ip_mgt: 192.168.2.108
   mac_mgt: 08:00:38:35:a4:04
@@ -599,9 +551,7 @@ edel-59:
   ip_eth0: 172.16.16.109
   mac_eth1: 08:00:38:35:ab:5b
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c9:07
   ip_ib0: 172.16.18.109
-  mac_ib1: 38:00:01:35:c9:07
   ip_ib1: ""
   ip_mgt: 192.168.2.109
   mac_mgt: 08:00:38:35:a3:ad
@@ -610,9 +560,7 @@ edel-5:
   ip_eth0: 172.16.16.55
   mac_eth1: 08:00:38:35:ab:93
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c9:5b
   ip_ib0: 172.16.18.55
-  mac_ib1: 38:00:01:35:c9:5b
   ip_ib1: ""
   ip_mgt: 192.168.2.55
   mac_mgt: 08:00:38:35:a3:c9
@@ -621,9 +569,7 @@ edel-60:
   ip_eth0: 172.16.16.110
   mac_eth1: 08:00:38:35:ac:25
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:ca:36
   ip_ib0: 172.16.18.110
-  mac_ib1: 38:00:01:35:ca:36
   ip_ib1: ""
   ip_mgt: 192.168.2.110
   mac_mgt: 08:00:38:35:a4:12
@@ -632,9 +578,7 @@ edel-61:
   ip_eth0: 172.16.16.111
   mac_eth1: 08:00:38:35:ab:5d
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c9:0a
   ip_ib0: 172.16.18.111
-  mac_ib1: 38:00:01:35:c9:0a
   ip_ib1: ""
   ip_mgt: 192.168.2.111
   mac_mgt: 08:00:38:35:a3:ae
@@ -643,9 +587,7 @@ edel-62:
   ip_eth0: 172.16.16.112
   mac_eth1: 08:00:38:35:ab:db
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c9:c7
   ip_ib0: 172.16.18.112
-  mac_ib1: 38:00:01:35:c9:c7
   ip_ib1: ""
   ip_mgt: 192.168.2.112
   mac_mgt: 08:00:38:35:a3:ed
@@ -654,9 +596,7 @@ edel-63:
   ip_eth0: 172.16.16.113
   mac_eth1: 08:00:38:35:ab:b3
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c9:8b
   ip_ib0: 172.16.18.113
-  mac_ib1: 38:00:01:35:c9:8b
   ip_ib1: ""
   ip_mgt: 192.168.2.113
   mac_mgt: 08:00:38:35:a3:d9
@@ -665,20 +605,25 @@ edel-64:
   ip_eth0: 172.16.16.114
   mac_eth1: 08:00:38:35:aa:21
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c7:30
   ip_ib0: 172.16.18.114
-  mac_ib1: 38:00:01:35:c7:30
   ip_ib1: ""
   ip_mgt: 192.168.2.114
   mac_mgt: 08:00:38:35:a3:10
+edel-65:
+  mac_eth0: 08:00:38:35:ab:e4
+  ip_eth0: 172.16.16.115
+  mac_eth1: 08:00:38:35:ab:e5
+  ip_eth1: ""
+  ip_ib0: 172.16.18.115
+  ip_ib1: ""
+  ip_mgt: 192.168.2.115
+  mac_mgt: ""
 edel-66:
   mac_eth0: 08:00:38:35:ac:14
   ip_eth0: 172.16.16.116
   mac_eth1: 08:00:38:35:ac:15
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:ca:1e
   ip_ib0: 172.16.18.116
-  mac_ib1: 38:00:01:35:ca:1e
   ip_ib1: ""
   ip_mgt: 192.168.2.116
   mac_mgt: 08:00:38:35:a4:0a
@@ -687,9 +632,7 @@ edel-67:
   ip_eth0: 172.16.16.117
   mac_eth1: 08:00:38:35:ab:fb
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c9:f7
   ip_ib0: 172.16.18.117
-  mac_ib1: 38:00:01:35:c9:f7
   ip_ib1: ""
   ip_mgt: 192.168.2.117
   mac_mgt: 08:00:38:35:a3:fd
@@ -698,20 +641,25 @@ edel-68:
   ip_eth0: 172.16.16.118
   mac_eth1: 08:00:38:35:ab:b1
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c9:88
   ip_ib0: 172.16.18.118
-  mac_ib1: 38:00:01:35:c9:88
   ip_ib1: ""
   ip_mgt: 192.168.2.118
   mac_mgt: 08:00:38:35:a3:d8
+edel-69:
+  mac_eth0: 08:00:38:35:ac:68
+  ip_eth0: 172.16.16.119
+  mac_eth1: 08:00:38:35:ac:69
+  ip_eth1: ""
+  ip_ib0: 172.16.18.119
+  ip_ib1: ""
+  ip_mgt: 192.168.2.119
+  mac_mgt: ""
 edel-6:
   mac_eth0: 08:00:38:35:ac:54
   ip_eth0: 172.16.16.56
   mac_eth1: 08:00:38:35:ac:55
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:ca:7e
   ip_ib0: 172.16.18.56
-  mac_ib1: 38:00:01:35:ca:7e
   ip_ib1: ""
   ip_mgt: 192.168.2.56
   mac_mgt: 08:00:38:35:a4:2a
@@ -720,20 +668,25 @@ edel-70:
   ip_eth0: 172.16.16.120
   mac_eth1: 08:00:38:35:ac:67
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:ca:99
   ip_ib0: 172.16.18.120
-  mac_ib1: 38:00:01:35:ca:99
   ip_ib1: ""
   ip_mgt: 192.168.2.120
   mac_mgt: 08:00:38:35:a4:33
+edel-71:
+  mac_eth0: 08:00:38:35:ab:66
+  ip_eth0: 172.16.16.121
+  mac_eth1: 08:00:38:35:ab:67
+  ip_eth1: ""
+  ip_ib0: 172.16.18.121
+  ip_ib1: ""
+  ip_mgt: 192.168.2.121
+  mac_mgt: ""
 edel-72:
   mac_eth0: 08:00:38:35:ab:50
   ip_eth0: 172.16.16.122
   mac_eth1: 08:00:38:35:ab:51
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c8:f8
   ip_ib0: 172.16.18.122
-  mac_ib1: 38:00:01:35:c8:f8
   ip_ib1: ""
   ip_mgt: 192.168.2.122
   mac_mgt: 08:00:38:35:a3:a8
@@ -742,9 +695,7 @@ edel-7:
   ip_eth0: 172.16.16.57
   mac_eth1: 08:00:38:35:ab:41
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c8:e0
   ip_ib0: 172.16.18.57
-  mac_ib1: 38:00:01:35:c8:e0
   ip_ib1: ""
   ip_mgt: 192.168.2.57
   mac_mgt: 08:00:38:35:a3:a0
@@ -753,9 +704,7 @@ edel-8:
   ip_eth0: 172.16.16.58
   mac_eth1: 08:00:38:35:ab:57
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c9:01
   ip_ib0: 172.16.18.58
-  mac_ib1: 38:00:01:35:c9:01
   ip_ib1: ""
   ip_mgt: 192.168.2.58
   mac_mgt: 08:00:38:35:a3:ab
@@ -764,9 +713,7 @@ edel-9:
   ip_eth0: 172.16.16.59
   mac_eth1: 08:00:38:35:ab:d9
   ip_eth1: ""
-  mac_ib0: 38:00:01:35:c9:c4
   ip_ib0: 172.16.18.59
-  mac_ib1: 38:00:01:35:c9:c4
   ip_ib1: ""
   ip_mgt: 192.168.2.59
   mac_mgt: 08:00:38:35:a3:ec
@@ -775,9 +722,7 @@ genepi-10:
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:41:fd
   ip_eth1: 172.16.16.10
-  mac_ib0: c9:03:00:01:59:a4
   ip_ib0: 172.16.18.10
-  mac_ib1: ""
   ip_ib1: ""
   ip_mgt: 192.168.1.110
   mac_mgt: 00:30:48:96:d4:2d
@@ -786,20 +731,25 @@ genepi-11:
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:42:07
   ip_eth1: 172.16.16.11
-  mac_ib0: c9:03:00:01:54:30
   ip_ib0: 172.16.18.11
-  mac_ib1: ""
   ip_ib1: ""
   ip_mgt: 192.168.1.111
   mac_mgt: 00:30:48:96:d6:90
+genepi-12:
+  mac_eth0: 00:30:48:7e:a3:d4
+  ip_eth0: ""
+  mac_eth1: 00:30:48:7e:a3:d5
+  ip_eth1: 172.16.16.12
+  ip_ib0: 172.16.18.12
+  ip_ib1: ""
+  ip_mgt: 192.168.1.112
+  mac_mgt: ""
 genepi-13:
   mac_eth0: 00:30:48:7f:3e:c6
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:3e:c7
   ip_eth1: 172.16.16.13
-  mac_ib0: c9:03:00:01:55:c8
   ip_ib0: 172.16.18.13
-  mac_ib1: ""
   ip_ib1: ""
   ip_mgt: 192.168.1.113
   mac_mgt: 00:30:48:96:d4:9a
@@ -808,9 +758,7 @@ genepi-14:
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:41:f3
   ip_eth1: 172.16.16.14
-  mac_ib0: c9:03:00:01:55:cc
   ip_ib0: 172.16.18.14
-  mac_ib1: ""
   ip_ib1: ""
   ip_mgt: 192.168.1.114
   mac_mgt: 00:30:48:96:d3:40
@@ -819,9 +767,7 @@ genepi-15:
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:3e:f3
   ip_eth1: 172.16.16.15
-  mac_ib0: c9:03:00:01:55:d8
   ip_ib0: 172.16.18.15
-  mac_ib1: ""
   ip_ib1: ""
   ip_mgt: 192.168.1.115
   mac_mgt: 00:30:48:96:d3:2f
@@ -830,9 +776,7 @@ genepi-16:
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:3e:b9
   ip_eth1: 172.16.16.16
-  mac_ib0: c9:03:00:01:55:e8
   ip_ib0: 172.16.18.16
-  mac_ib1: ""
   ip_ib1: ""
   ip_mgt: 192.168.1.116
   mac_mgt: 00:30:48:96:d4:37
@@ -841,9 +785,7 @@ genepi-17:
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:8a:8d
   ip_eth1: 172.16.16.17
-  mac_ib0: c9:03:00:01:55:e0
   ip_ib0: 172.16.18.17
-  mac_ib1: ""
   ip_ib1: ""
   ip_mgt: 192.168.1.117
   mac_mgt: 00:30:48:96:d2:42
@@ -852,9 +794,7 @@ genepi-18:
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:85:fb
   ip_eth1: 172.16.16.18
-  mac_ib0: c9:03:00:01:55:d4
   ip_ib0: 172.16.18.18
-  mac_ib1: ""
   ip_ib1: ""
   ip_mgt: 192.168.1.118
   mac_mgt: 00:30:48:96:d3:4d
@@ -863,9 +803,7 @@ genepi-19:
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:8a:8b
   ip_eth1: 172.16.16.19
-  mac_ib0: c9:03:00:01:56:5c
   ip_ib0: 172.16.18.19
-  mac_ib1: ""
   ip_ib1: ""
   ip_mgt: 192.168.1.119
   mac_mgt: 00:30:48:96:d1:f5
@@ -874,9 +812,7 @@ genepi-1:
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:85:bf
   ip_eth1: 172.16.16.1
-  mac_ib0: c9:03:00:01:58:b8
   ip_ib0: 172.16.18.1
-  mac_ib1: ""
   ip_ib1: ""
   ip_mgt: 192.168.1.101
   mac_mgt: 00:30:48:96:d6:b5
@@ -885,9 +821,7 @@ genepi-20:
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:8a:87
   ip_eth1: 172.16.16.20
-  mac_ib0: c9:03:00:01:55:e4
   ip_ib0: 172.16.18.20
-  mac_ib1: ""
   ip_ib1: ""
   ip_mgt: 192.168.1.120
   mac_mgt: 00:30:48:96:d3:bf
@@ -896,20 +830,25 @@ genepi-21:
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:3e:f1
   ip_eth1: 172.16.16.21
-  mac_ib0: c9:03:00:01:55:d0
   ip_ib0: 172.16.18.21
-  mac_ib1: ""
   ip_ib1: ""
   ip_mgt: 192.168.1.121
   mac_mgt: 00:30:48:96:d3:56
+genepi-22:
+  mac_eth0: 00:30:48:7f:41:f4
+  ip_eth0: ""
+  mac_eth1: 00:30:48:7f:41:f5
+  ip_eth1: 172.16.16.22
+  ip_ib0: 172.16.18.22
+  ip_ib1: ""
+  ip_mgt: 192.168.1.122
+  mac_mgt: ""
 genepi-23:
   mac_eth0: 00:30:48:7f:29:dc
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:29:dd
   ip_eth1: 172.16.16.23
-  mac_ib0: c9:03:00:01:56:30
   ip_ib0: 172.16.18.23
-  mac_ib1: ""
   ip_ib1: ""
   ip_mgt: 192.168.1.123
   mac_mgt: 00:30:48:96:d2:d1
@@ -918,9 +857,7 @@ genepi-24:
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:29:df
   ip_eth1: 172.16.16.24
-  mac_ib0: c9:03:00:01:5b:00
   ip_ib0: 172.16.18.24
-  mac_ib1: ""
   ip_ib1: ""
   ip_mgt: 192.168.1.124
   mac_mgt: 00:30:48:96:d6:ff
@@ -929,9 +866,7 @@ genepi-25:
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:41:5b
   ip_eth1: 172.16.16.25
-  mac_ib0: c9:03:00:01:56:00
   ip_ib0: 172.16.18.25
-  mac_ib1: ""
   ip_ib1: ""
   ip_mgt: 192.168.1.125
   mac_mgt: 00:30:48:96:d3:2d
@@ -940,9 +875,7 @@ genepi-26:
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:41:5d
   ip_eth1: 172.16.16.26
-  mac_ib0: c9:03:00:01:57:fc
   ip_ib0: 172.16.18.26
-  mac_ib1: ""
   ip_ib1: ""
   ip_mgt: 192.168.1.126
   mac_mgt: 00:30:48:96:d6:08
@@ -951,9 +884,7 @@ genepi-27:
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:41:4f
   ip_eth1: 172.16.16.27
-  mac_ib0: c9:03:00:01:57:30
   ip_ib0: 172.16.18.27
-  mac_ib1: ""
   ip_ib1: ""
   ip_mgt: 192.168.1.127
   mac_mgt: 00:30:48:96:d3:1f
@@ -962,9 +893,7 @@ genepi-28:
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:41:5f
   ip_eth1: 172.16.16.28
-  mac_ib0: c9:03:00:01:56:58
   ip_ib0: 172.16.18.28
-  mac_ib1: ""
   ip_ib1: ""
   ip_mgt: 192.168.1.128
 genepi-29:
@@ -972,9 +901,7 @@ genepi-29:
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:29:ed
   ip_eth1: 172.16.16.29
-  mac_ib0: c9:03:00:01:55:b4
   ip_ib0: 172.16.18.29
-  mac_ib1: ""
   ip_ib1: ""
   ip_mgt: 192.168.1.129
   mac_mgt: 00:30:48:96:d2:db
@@ -983,9 +910,7 @@ genepi-2:
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:91:63
   ip_eth1: 172.16.16.2
-  mac_ib0: c9:03:00:01:58:d4
   ip_ib0: 172.16.18.2
-  mac_ib1: ""
   ip_ib1: ""
   ip_mgt: 192.168.1.102
   mac_mgt: 00:30:48:96:d1:e2
@@ -994,20 +919,25 @@ genepi-30:
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:29:db
   ip_eth1: 172.16.16.30
-  mac_ib0: c9:03:00:01:56:60
   ip_ib0: 172.16.18.30
-  mac_ib1: ""
   ip_ib1: ""
   ip_mgt: 192.168.1.130
   mac_mgt: 00:30:48:96:d4:2f
+genepi-31:
+  mac_eth0: ""
+  ip_eth0: ""
+  mac_eth1: 00:30:48:7F:41:57 
+  ip_eth1: 172.16.16.31
+  ip_ib0: ""
+  ip_ib1: ""
+  ip_mgt: 192.168.1.131
+  mac_mgt: ""
 genepi-32:
   mac_eth0: 00:30:48:7f:41:50
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:41:51
   ip_eth1: 172.16.16.32
-  mac_ib0: c9:03:00:01:55:ec
   ip_ib0: 172.16.18.32
-  mac_ib1: ""
   ip_ib1: ""
   ip_mgt: 192.168.1.132
   mac_mgt: 00:30:48:96:d7:84
@@ -1016,9 +946,7 @@ genepi-33:
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:29:ef
   ip_eth1: 172.16.16.33
-  mac_ib0: c9:03:00:01:58:04
   ip_ib0: 172.16.18.33
-  mac_ib1: ""
   ip_ib1: ""
   ip_mgt: 192.168.1.133
   mac_mgt: 00:30:48:96:d2:dc
@@ -1027,9 +955,7 @@ genepi-34:
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:29:41
   ip_eth1: 172.16.16.34
-  mac_ib0: c9:03:00:01:56:54
   ip_ib0: 172.16.18.34
-  mac_ib1: ""
   ip_ib1: ""
   ip_mgt: 192.168.1.134
   mac_mgt: 00:30:48:96:d2:dd
@@ -1038,20 +964,43 @@ genepi-3:
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:3f:0b
   ip_eth1: 172.16.16.3
-  mac_ib0: c9:03:00:01:59:a8
   ip_ib0: 172.16.18.3
-  mac_ib1: ""
   ip_ib1: ""
   ip_mgt: 192.168.1.103
   mac_mgt: 00:30:48:96:d3:44
+genepi-4:
+  mac_eth0: 00:30:48:7f:44:8c 
+  ip_eth0: ""
+  mac_eth1: 00:30:48:7F:44:8D
+  ip_eth1: 172.16.16.4
+  ip_ib0: 172.16.18.4
+  ip_ib1: ""
+  ip_mgt: 192.168.1.104
+  mac_mgt: ""
+genepi-5:
+  mac_eth0: 00:30:48:c1:b4:a6
+  ip_eth0: ""
+  mac_eth1: 00:30:48:c1:b4:a7
+  ip_eth1: 172.16.16.5
+  ip_ib0: 172.16.18.5
+  ip_ib1: ""
+  ip_mgt: 192.168.1.105:
+  mac_mgt: ""
+genepi-6:
+  mac_eth0: ""
+  ip_eth0: ""
+  mac_eth1: 00:30:48:7F:29:F3
+  ip_eth1: 172.16.16.6
+  ip_ib0: 172.16.18.6
+  ip_ib1: ""
+  ip_mgt: 192.168.1.106
+  mac_mgt: ""
 genepi-7:
   mac_eth0: 00:30:48:7f:29:e0
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:29:e1
   ip_eth1: 172.16.16.7
-  mac_ib0: c9:03:00:01:59:ac
   ip_ib0: 172.16.18.7
-  mac_ib1: ""
   ip_ib1: ""
   ip_mgt: 192.168.1.107
   mac_mgt: 00:30:48:96:d1:d2
@@ -1060,9 +1009,7 @@ genepi-8:
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:29:e3
   ip_eth1: 172.16.16.8
-  mac_ib0: c9:03:00:01:5b:18
   ip_ib0: 172.16.18.8
-  mac_ib1: ""
   ip_ib1: ""
   ip_mgt: 192.168.1.108
   mac_mgt: 00:30:48:96:d6:94
@@ -1071,9 +1018,7 @@ genepi-9:
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:3e:eb
   ip_eth1: 172.16.16.9
-  mac_ib0: c9:03:00:01:5b:14
   ip_ib0: 172.16.18.9
-  mac_ib1: ""
   ip_ib1: ""
   ip_mgt: 192.168.1.109
   mac_mgt: 00:30:48:96:d4:8e