From ae133f7f185d2c5f2a8257d97920e9bd9dfa7a3e Mon Sep 17 00:00:00 2001
From: Sebastien Badia <sebastien.badia@inria.fr>
Date: Sat, 28 Jan 2012 00:44:52 +0100
Subject: [PATCH] [lille] Switch to refget sctuct for chinqchint/chicon

---
 .gitignore                             |    0
 README.wiki                            |    0
 generators/input/lille-chicon.rb       |   16 +-
 generators/input/lille-chicon.yaml     |  599 ++++++++------
 generators/input/lille-chinqchint.rb   |   16 +-
 generators/input/lille-chinqchint.yaml | 1048 +++++++++++++++---------
 6 files changed, 1024 insertions(+), 655 deletions(-)
 mode change 100755 => 100644 .gitignore
 mode change 100755 => 100644 README.wiki

diff --git a/.gitignore b/.gitignore
old mode 100755
new mode 100644
diff --git a/README.wiki b/README.wiki
old mode 100755
new mode 100644
diff --git a/generators/input/lille-chicon.rb b/generators/input/lille-chicon.rb
index 07b367655f..3e6b382f97 100644
--- a/generators/input/lille-chicon.rb
+++ b/generators/input/lille-chicon.rb
@@ -39,7 +39,7 @@ site :lille do |site_uid|
         network_adapters [{
           :interface => 'Ethernet',
           :rate => 1.G,
-          :mac => lookup('lille-chicon',"#{node_uid}", 'mac_eth0'),
+          :mac => lookup('lille-chicon',"#{node_uid}", 'network_interfaces', 'eth0', 'mac'),
           :vendor => 'Broadcom',
           :version => 'NetXtreme BCM5780',
           :enabled => true,
@@ -49,12 +49,12 @@ site :lille do |site_uid|
           :mounted => true,
           :device => 'eth0',
           :network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr",
-          :ip => lookup('lille-chicon',"#{node_uid}", 'ip_eth0'),
+          :ip => lookup('lille-chicon',"#{node_uid}", 'network_interfaces', 'eth0', 'ip'),
           :switch => 'gw'
         },{
           :interface => 'Ethernet',
           :rate => 1.G,
-          :mac => lookup('lille-chicon',"#{node_uid}", 'mac_eth1'),
+          :mac => lookup('lille-chicon',"#{node_uid}", 'network_interfaces', 'eth1', 'mac'),
           :vendor => 'Broadcom',
           :version => 'NetXtreme BCM5780',
           :enabled => true,
@@ -64,20 +64,20 @@ site :lille do |site_uid|
           :mounted => true,
           :device => 'eth1',
           :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip => lookup('lille-chicon',"#{node_uid}", 'ip_eth1'),
+          :ip => lookup('lille-chicon',"#{node_uid}", 'network_interfaces', 'eth1', 'ip'),
           :switch => 'gw',
-          :switch_port => lookup('lille-chicon', "#{node_uid}", 'switch_port')
+          :switch_port => lookup('lille-chicon',"#{node_uid}", 'network_interfaces', 'eth1', 'switch_port')
         },{
           :interface => 'Ethernet',
           :rate => 1.G,
-          :mac => lookup('lille-chicon',"#{node_uid}", 'mac_mgt'),
+          :mac => lookup('lille-chicon',"#{node_uid}", 'network_interfaces', 'bmc', 'mac'),
           :vendor => 'IBM',
           :version => '1.18',
           :enabled => true,
           :management => true,
           :mountable => false,
           :network_address => "#{node_uid}-rsa.#{site_uid}.grid5000.fr",
-          :ip => lookup('lille-chicon',"#{node_uid}", 'ip_mgt'),
+          :ip => lookup('lille-chicon',"#{node_uid}", 'network_interfaces', 'bmc', 'ip'),
           :switch => 'gw'
         },{
           :interface => 'Myrinet',
@@ -92,7 +92,7 @@ site :lille do |site_uid|
           :mounted => true,
           :device => 'myri0',
           :network_address => "#{node_uid}-myri0.#{site_uid}.grid5000.fr",
-          :ip => lookup('lille-chicon',"#{node_uid}", 'ip_myri0'),
+          :ip => lookup('lille-chicon',"#{node_uid}", 'network_interfaces', 'myri0', 'ip'),
           :switch => nil
         }]
       end
diff --git a/generators/input/lille-chicon.yaml b/generators/input/lille-chicon.yaml
index 875223ad01..88a488b68e 100644
--- a/generators/input/lille-chicon.yaml
+++ b/generators/input/lille-chicon.yaml
@@ -1,261 +1,390 @@
----
 chicon-1:
-  mac_eth0: 00:11:25:c4:d4:a0
-  ip_eth0: 192.168.160.74
-  mac_eth1: 00:11:25:c4:d4:a1
-  ip_eth1: 192.168.159.74
-  mac_myri0: 00:60:dd:47:49:df
-  ip_myri0: 192.168.162.74
-  ip_mgt: 192.168.158.74
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi3/34
+  network_interfaces:
+    bmc:
+      mac: 00:19:A9:9F:48:C0
+      ip: 192.168.158.74
+    eth0:
+      mac: 00:11:25:c4:d4:a0
+      ip: 192.168.160.74
+    eth1:
+      mac: 00:11:25:c4:d4:a1
+      ip: 192.168.159.74
+      switch_port: Gi3/34
+    myri0:
+      mac: 00:60:dd:47:49:df
+      ip: 192.168.162.74
 chicon-2:
-  mac_eth0: 00:11:25:c4:d9:c4
-  ip_eth0: 192.168.160.75
-  mac_eth1: 00:11:25:c4:d9:c5
-  ip_eth1: 192.168.159.75
-  mac_myri0: 00:60:dd:47:4b:3f
-  ip_myri0: 192.168.162.75
-  ip_mgt: 192.168.158.75
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi3/35
+  network_interfaces:
+    bmc:
+      mac: 00:19:A9:9F:48:C0
+      ip: 192.168.158.75
+    eth0:
+      mac: 00:11:25:c4:d9:c4
+      ip: 192.168.160.75
+    eth1:
+      mac: 00:11:25:c4:d9:c5
+      ip: 192.168.159.75
+      switch_port: Gi3/35
+    myri0:
+      mac: 00:60:dd:47:4b:3f
+      ip: 192.168.162.75
 chicon-3:
-  mac_eth0: 00:11:25:c4:d9:d8
-  ip_eth0: 192.168.160.76
-  mac_eth1: 00:11:25:c4:d9:d9
-  ip_eth1: 192.168.159.76
-  mac_myri0: 00:60:dd:47:4b:46
-  ip_myri0: 192.168.162.76
-  ip_mgt: 192.168.158.76
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi3/36
+  network_interfaces:
+    bmc:
+      mac: 00:19:A9:9F:48:C0
+      ip: 192.168.158.76
+    eth0:
+      mac: 00:11:25:c4:d9:d8
+      ip: 192.168.160.76
+    eth1:
+      mac: 00:11:25:c4:d9:d9
+      ip: 192.168.159.76
+      switch_port: Gi3/36
+    myri0:
+      mac: 00:60:dd:47:4b:46
+      ip: 192.168.162.76
 chicon-4:
-  mac_eth0: 00:11:25:c4:d9:ba
-  ip_eth0: 192.168.160.77
-  mac_eth1: 00:11:25:c4:d9:bb
-  ip_eth1: 192.168.159.77
-  mac_myri0: 00:60:dd:47:4b:9e
-  ip_myri0: 192.168.162.77
-  ip_mgt: 192.168.158.77
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi3/37
+  network_interfaces:
+    bmc:
+      mac: 00:19:A9:9F:48:C0
+      ip: 192.168.158.77
+    eth0:
+      mac: 00:11:25:c4:d9:ba
+      ip: 192.168.160.77
+    eth1:
+      mac: 00:11:25:c4:d9:bb
+      ip: 192.168.159.77
+      switch_port: Gi3/37
+    myri0:
+      mac: 00:60:dd:47:4b:9e
+      ip: 192.168.162.77
 chicon-5:
-  mac_eth0: 00:11:25:c4:d9:ac
-  ip_eth0: 192.168.160.78
-  mac_eth1: 00:11:25:c4:d9:ad
-  ip_eth1: 192.168.159.78
-  mac_myri0: 00:60:dd:47:4b:44
-  ip_myri0: 192.168.162.78
-  ip_mgt: 192.168.158.78
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi3/38
+  network_interfaces:
+    bmc:
+      mac: 00:19:A9:9F:48:C0
+      ip: 192.168.158.78
+    eth0:
+      mac: 00:11:25:c4:d9:ac
+      ip: 192.168.160.78
+    eth1:
+      mac: 00:11:25:c4:d9:ad
+      ip: 192.168.159.78
+      switch_port: Gi3/38
+    myri0:
+      mac: 00:60:dd:47:4b:44
+      ip: 192.168.162.78
 chicon-6:
-  mac_eth0: 00:11:25:c4:c7:72
-  ip_eth0: 192.168.160.79
-  mac_eth1: 00:11:25:c4:c7:73
-  ip_eth1: 192.168.159.79
-  mac_myri0: 00:60:dd:47:4b:99
-  ip_myri0: 192.168.162.79
-  ip_mgt: 192.168.158.79
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi3/39
+  network_interfaces:
+    bmc:
+      mac: 00:19:A9:9F:48:C0
+      ip: 192.168.158.79
+    eth0:
+      mac: 00:11:25:c4:c7:72
+      ip: 192.168.160.79
+    eth1:
+      mac: 00:11:25:c4:c7:73
+      ip: 192.168.159.79
+      switch_port: Gi3/39
+    myri0:
+      mac: 00:60:dd:47:4b:99
+      ip: 192.168.162.79
 chicon-7:
-  mac_eth0: 00:11:25:c4:d9:c2
-  ip_eth0: 192.168.160.80
-  mac_eth1: 00:11:25:c4:d9:c3
-  ip_eth1: 192.168.159.80
-  mac_myri0: 00:60:dd:47:4c:de
-  ip_myri0: 192.168.162.80
-  ip_mgt: 192.168.158.80
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi3/40
+  network_interfaces:
+    bmc:
+      mac: 00:19:A9:9F:48:C0
+      ip: 192.168.158.80
+    eth0:
+      mac: 00:11:25:c4:d9:c2
+      ip: 192.168.160.80
+    eth1:
+      mac: 00:11:25:c4:d9:c3
+      ip: 192.168.159.80
+      switch_port: Gi3/40
+    myri0:
+      mac: 00:60:dd:47:4c:de
+      ip: 192.168.162.80
 chicon-8:
-  mac_eth0: 00:11:25:c4:d5:94
-  ip_eth0: 192.168.160.81
-  mac_eth1: 00:11:25:c4:d5:95
-  ip_eth1: 192.168.159.81
-  mac_myri0: 00:60:dd:47:4c:db
-  ip_myri0: 192.168.162.81
-  ip_mgt: 192.168.158.81
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi4/1
+  network_interfaces:
+    bmc:
+      mac: 00:19:A9:9F:48:C0
+      ip: 192.168.158.81
+    eth0:
+      mac: 00:11:25:c4:d5:94
+      ip: 192.168.160.81
+    eth1:
+      mac: 00:11:25:c4:d5:95
+      ip: 192.168.159.81
+      switch_port: Gi4/1
+    myri0:
+      mac: 00:60:dd:47:4c:db
+      ip: 192.168.162.81
 chicon-9:
-  mac_eth0: 00:11:25:c4:d9:b0
-  ip_eth0: 192.168.160.82
-  mac_eth1: 00:11:25:c4:d9:b1
-  ip_eth1: 192.168.159.82
-  mac_myri0: 00:60:dd:47:4b:40
-  ip_myri0: 192.168.162.82
-  ip_mgt: 192.168.158.82
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi4/2
+  network_interfaces:
+    bmc:
+      mac: 00:19:A9:9F:48:C0
+      ip: 192.168.158.82
+    eth0:
+      mac: 00:11:25:c4:d9:b0
+      ip: 192.168.160.82
+    eth1:
+      mac: 00:11:25:c4:d9:b1
+      ip: 192.168.159.82
+      switch_port: Gi4/2
+    myri0:
+      mac: 00:60:dd:47:4b:40
+      ip: 192.168.162.82
 chicon-10:
-  mac_eth0: 00:11:25:c4:d9:c8
-  ip_eth0: 192.168.160.83
-  mac_eth1: 00:11:25:c4:d9:c9
-  ip_eth1: 192.168.159.83
-  mac_myri0: 00:60:dd:47:49:ea
-  ip_myri0: 192.168.162.83
-  ip_mgt: 192.168.158.83
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi4/3
+  network_interfaces:
+    bmc:
+      mac: 00:19:A9:9F:48:C0
+      ip: 192.168.158.83
+    eth0:
+      mac: 00:11:25:c4:d9:c8
+      ip: 192.168.160.83
+    eth1:
+      mac: 00:11:25:c4:d9:c9
+      ip: 192.168.159.83
+      switch_port: Gi4/3
+    myri0:
+      mac: 00:60:dd:47:49:ea
+      ip: 192.168.162.83
 chicon-11:
-  mac_eth0: 00:11:25:c4:d9:9c
-  ip_eth0: 192.168.160.84
-  mac_eth1: 00:11:25:c4:d9:9d
-  ip_eth1: 192.168.159.84
-  mac_myri0: 00:60:dd:47:4c:df
-  ip_myri0: 192.168.162.84
-  ip_mgt: 192.168.158.84
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi4/4
+  network_interfaces:
+    bmc:
+      mac: 00:19:A9:9F:48:C0
+      ip: 192.168.158.84
+    eth0:
+      mac: 00:11:25:c4:d9:9c
+      ip: 192.168.160.84
+    eth1:
+      mac: 00:11:25:c4:d9:9d
+      ip: 192.168.159.84
+      switch_port: Gi4/4
+    myri0:
+      mac: 00:60:dd:47:4c:df
+      ip: 192.168.162.84
 chicon-12:
-  mac_eth0: 00:11:25:c4:d9:a2
-  ip_eth0: 192.168.160.85
-  mac_eth1: 00:11:25:c4:d9:a3
-  ip_eth1: 192.168.159.85
-  mac_myri0: 00:60:dd:47:49:a5
-  ip_myri0: 192.168.162.85
-  ip_mgt: 192.168.158.85
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi4/5
+  network_interfaces:
+    bmc:
+      mac: 00:19:A9:9F:48:C0
+      ip: 192.168.158.85
+    eth0:
+      mac: 00:11:25:c4:d9:a2
+      ip: 192.168.160.85
+    eth1:
+      mac: 00:11:25:c4:d9:a3
+      ip: 192.168.159.85
+      switch_port: Gi4/5
+    myri0:
+      mac: 00:60:dd:47:49:a5
+      ip: 192.168.162.85
 chicon-13:
-  mac_eth0: 00:11:25:c4:d9:ae
-  ip_eth0: 192.168.160.86
-  mac_eth1: 00:11:25:c4:d9:af
-  ip_eth1: 192.168.159.86
-  mac_myri0: 00:60:dd:47:49:de
-  ip_myri0: 192.168.162.86
-  ip_mgt: 192.168.158.86
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi4/6
+  network_interfaces:
+    bmc:
+      mac: 00:19:A9:9F:48:C0
+      ip: 192.168.158.86
+    eth0:
+      mac: 00:11:25:c4:d9:ae
+      ip: 192.168.160.86
+    eth1:
+      mac: 00:11:25:c4:d9:af
+      ip: 192.168.159.86
+      switch_port: Gi4/6
+    myri0:
+      mac: 00:60:dd:47:49:de
+      ip: 192.168.162.86
 chicon-14:
-  mac_eth0: 00:11:25:c4:f5:7e
-  ip_eth0: 192.168.160.87
-  mac_eth1: 00:11:25:c4:f5:7f
-  ip_eth1: 192.168.159.87
-  mac_myri0: 00:60:dd:47:49:b1
-  ip_myri0: 192.168.162.87
-  ip_mgt: 192.168.158.87
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi4/7
+  network_interfaces:
+    bmc:
+      mac: 00:19:A9:9F:48:C0
+      ip: 192.168.158.87
+    eth0:
+      mac: 00:11:25:c4:f5:7e
+      ip: 192.168.160.87
+    eth1:
+      mac: 00:11:25:c4:f5:7f
+      ip: 192.168.159.87
+      switch_port: Gi4/7
+    myri0:
+      mac: 00:60:dd:47:49:b1
+      ip: 192.168.162.87
 chicon-15:
-  mac_eth0: 00:11:25:c4:d9:d6
-  ip_eth0: 192.168.160.88
-  mac_eth1: 00:11:25:c4:d9:d7
-  ip_eth1: 192.168.159.88
-  mac_myri0: 00:60:dd:47:4b:bc
-  ip_myri0: 192.168.162.88
-  ip_mgt: 192.168.158.88
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi4/8
+  network_interfaces:
+    bmc:
+      mac: 00:19:A9:9F:48:C0
+      ip: 192.168.158.88
+    eth0:
+      mac: 00:11:25:c4:d9:d6
+      ip: 192.168.160.88
+    eth1:
+      mac: 00:11:25:c4:d9:d7
+      ip: 192.168.159.88
+      switch_port: Gi4/8
+    myri0:
+      mac: 00:60:dd:47:4b:bc
+      ip: 192.168.162.88
 chicon-16:
-  mac_eth0: 00:11:25:c4:d8:62
-  ip_eth0: 192.168.160.89
-  mac_eth1: 00:11:25:c4:d8:63
-  ip_eth1: 192.168.159.89
-  mac_myri0: 00:60:dd:47:49:99
-  ip_myri0: 192.168.162.89
-  ip_mgt: 192.168.158.89
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi4/9
+  network_interfaces:
+    bmc:
+      mac: 00:19:A9:9F:48:C0
+      ip: 192.168.158.89
+    eth0:
+      mac: 00:11:25:c4:d8:62
+      ip: 192.168.160.89
+    eth1:
+      mac: 00:11:25:c4:d8:63
+      ip: 192.168.159.89
+      switch_port: Gi4/9
+    myri0:
+      mac: 00:60:dd:47:49:99
+      ip: 192.168.162.89
 chicon-17:
-  mac_eth0: 00:11:25:c4:e0:d8
-  ip_eth0: 192.168.160.90
-  mac_eth1: 00:11:25:c4:e0:d9
-  ip_eth1: 192.168.159.90
-  mac_myri0: 00:60:dd:47:49:ae
-  ip_myri0: 192.168.162.90
-  ip_mgt: 192.168.158.90
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi4/10
+  network_interfaces:
+    bmc:
+      mac: 00:19:A9:9F:48:C0
+      ip: 192.168.158.90
+    eth0:
+      mac: 00:11:25:c4:e0:d8
+      ip: 192.168.160.90
+    eth1:
+      mac: 00:11:25:c4:e0:d9
+      ip: 192.168.159.90
+      switch_port: Gi4/10
+    myri0:
+      mac: 00:60:dd:47:49:ae
+      ip: 192.168.162.90
 chicon-18:
-  mac_eth0: 00:11:25:c4:d9:cc
-  ip_eth0: 192.168.160.91
-  mac_eth1: 00:11:25:c4:d9:cd
-  ip_eth1: 192.168.159.91
-  mac_myri0: 00:60:dd:47:49:b3
-  ip_myri0: 192.168.162.91
-  ip_mgt: 192.168.158.91
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi4/11
+  network_interfaces:
+    bmc:
+      mac: 00:19:A9:9F:48:C0
+      ip: 192.168.158.91
+    eth0:
+      mac: 00:11:25:c4:d9:cc
+      ip: 192.168.160.91
+    eth1:
+      mac: 00:11:25:c4:d9:cd
+      ip: 192.168.159.91
+      switch_port: Gi4/11
+    myri0:
+      mac: 00:60:dd:47:49:b3
+      ip: 192.168.162.91
 chicon-19:
-  mac_eth0: 00:11:25:c4:d5:c6
-  ip_eth0: 192.168.160.92
-  mac_eth1: 00:11:25:c4:d5:c7
-  ip_eth1: 192.168.159.92
-  mac_myri0: 00:60:dd:47:49:a0
-  ip_myri0: 192.168.162.92
-  ip_mgt: 192.168.158.92
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi4/12
+  network_interfaces:
+    bmc:
+      mac: 00:19:A9:9F:48:C0
+      ip: 192.168.158.92
+    eth0:
+      mac: 00:11:25:c4:d5:c6
+      ip: 192.168.160.92
+    eth1:
+      mac: 00:11:25:c4:d5:c7
+      ip: 192.168.159.92
+      switch_port: Gi4/12
+    myri0:
+      mac: 00:60:dd:47:49:a0
+      ip: 192.168.162.92
 chicon-20:
-  mac_eth0: 00:11:25:c4:d9:d0
-  ip_eth0: 192.168.160.93
-  mac_eth1: 00:11:25:c4:d9:d1
-  ip_eth1: 192.168.159.93
-  mac_myri0: 00:60:dd:47:49:9b
-  ip_myri0: 192.168.162.93
-  ip_mgt: 192.168.158.93
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi4/13
+  network_interfaces:
+    bmc:
+      mac: 00:19:A9:9F:48:C0
+      ip: 192.168.158.93
+    eth0:
+      mac: 00:11:25:c4:d9:d0
+      ip: 192.168.160.93
+    eth1:
+      mac: 00:11:25:c4:d9:d1
+      ip: 192.168.159.93
+      switch_port: Gi4/13
+    myri0:
+      mac: 00:60:dd:47:49:9b
+      ip: 192.168.162.93
 chicon-21:
-  mac_eth0: 00:11:25:c4:d9:9e
-  ip_eth0: 192.168.160.94
-  mac_eth1: 00:11:25:c4:d9:9f
-  ip_eth1: 192.168.159.94
-  mac_myri0: 00:60:dd:47:49:a7
-  ip_myri0: 192.168.162.94
-  ip_mgt: 192.168.158.94
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi4/14
+  network_interfaces:
+    bmc:
+      mac: 00:19:A9:9F:48:C0
+      ip: 192.168.158.94
+    eth0:
+      mac: 00:11:25:c4:d9:9e
+      ip: 192.168.160.94
+    eth1:
+      mac: 00:11:25:c4:d9:9f
+      ip: 192.168.159.94
+      switch_port: Gi4/14
+    myri0:
+      mac: 00:60:dd:47:49:a7
+      ip: 192.168.162.94
 chicon-22:
-  mac_eth0: 00:11:25:c4:f2:f4
-  ip_eth0: 192.168.160.95
-  mac_eth1: 00:11:25:c4:f2:f5
-  ip_eth1: 192.168.159.95
-  mac_myri0: 00:60:dd:47:49:a9
-  ip_myri0: 192.168.162.95
-  ip_mgt: 192.168.158.95
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi4/15
+  network_interfaces:
+    bmc:
+      mac: 00:19:A9:9F:48:C0
+      ip: 192.168.158.95
+    eth0:
+      mac: 00:11:25:c4:f2:f4
+      ip: 192.168.160.95
+    eth1:
+      mac: 00:11:25:c4:f2:f5
+      ip: 192.168.159.95
+      switch_port: Gi4/15
+    myri0:
+      mac: 00:60:dd:47:49:a9
+      ip: 192.168.162.95
 chicon-23:
-  mac_eth0: 00:11:25:c4:c4:dc
-  ip_eth0: 192.168.160.96
-  mac_eth1: 00:11:25:c4:c4:dd
-  ip_eth1: 192.168.159.96
-  mac_myri0: 00:60:dd:47:49:a8
-  ip_myri0: 192.168.162.96
-  ip_mgt: 192.168.158.96
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi4/16
+  network_interfaces:
+    bmc:
+      mac: 00:19:A9:9F:48:C0
+      ip: 192.168.158.96
+    eth0:
+      mac: 00:11:25:c4:c4:dc
+      ip: 192.168.160.96
+    eth1:
+      mac: 00:11:25:c4:c4:dd
+      ip: 192.168.159.96
+      switch_port: Gi4/16
+    myri0:
+      mac: 00:60:dd:47:49:a8
+      ip: 192.168.162.96
 chicon-24:
-  mac_eth0: 00:11:25:c4:d9:9a
-  ip_eth0: 192.168.160.97
-  mac_eth1: 00:11:25:c4:d9:9b
-  ip_eth1: 192.168.159.97
-  mac_myri0: 00:60:dd:47:49:b0
-  ip_myri0: 192.168.162.97
-  ip_mgt: 192.168.158.97
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi4/17
+  network_interfaces:
+    bmc:
+      mac: 00:19:A9:9F:48:C0
+      ip: 192.168.158.97
+    eth0:
+      mac: 00:11:25:c4:d9:9a
+      ip: 192.168.160.97
+    eth1:
+      mac: 00:11:25:c4:d9:9b
+      ip: 192.168.159.97
+      switch_port: Gi4/17
+    myri0:
+      mac: 00:60:dd:47:49:b0
+      ip: 192.168.162.97
 chicon-25:
-  mac_eth0: 00:11:25:c4:d5:ba
-  ip_eth0: 192.168.160.98
-  mac_eth1: 00:11:25:c4:d5:bb
-  ip_eth1: 192.168.159.98
-  mac_myri0: 00:60:dd:47:4b:b9
-  ip_myri0: 192.168.162.98
-  ip_mgt: 192.168.158.98
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi4/18
+  network_interfaces:
+    bmc:
+      mac: 00:19:A9:9F:48:C0
+      ip: 192.168.158.98
+    eth0:
+      mac: 00:11:25:c4:d5:ba
+      ip: 192.168.160.98
+    eth1:
+      mac: 00:11:25:c4:d5:bb
+      ip: 192.168.159.98
+      switch_port: Gi4/18
+    myri0:
+      mac: 00:60:dd:47:4b:b9
+      ip: 192.168.162.98
 chicon-26:
-  mac_eth0: 00:11:25:c4:d5:b4
-  ip_eth0: 192.168.160.99
-  mac_eth1: 00:11:25:c4:d5:b5
-  ip_eth1: 192.168.159.99
-  mac_myri0: 00:60:dd:47:4c:8c
-  ip_myri0: 192.168.162.99
-  ip_mgt: 192.168.158.99
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi4/19
+  network_interfaces:
+    bmc:
+      mac: 00:19:A9:9F:48:C0
+      ip: 192.168.158.99
+    eth0:
+      mac: 00:11:25:c4:d5:b4
+      ip: 192.168.160.99
+    eth1:
+      mac: 00:11:25:c4:d5:b5
+      ip: 192.168.159.99
+      switch_port: Gi4/19
+    myri0:
+      mac: 00:60:dd:47:4c:8c
+      ip: 192.168.162.99
diff --git a/generators/input/lille-chinqchint.rb b/generators/input/lille-chinqchint.rb
index 508370db1e..55debabf5c 100644
--- a/generators/input/lille-chinqchint.rb
+++ b/generators/input/lille-chinqchint.rb
@@ -39,7 +39,7 @@ site :lille do |site_uid|
         network_adapters [{
           :interface => 'Ethernet',
           :rate => 1.G,
-          :mac => lookup('lille-chinqchint',"#{node_uid}", 'mac_eth0'),
+          :mac => lookup('lille-chinqchint',"#{node_uid}",'network_interfaces', 'eth0', 'mac'),
           :vendor => 'Intel',
           :version => '80003ES2LAN',
           :enabled => true,
@@ -49,12 +49,12 @@ site :lille do |site_uid|
           :mounted => true,
           :device => 'eth0',
           :network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr",
-          :ip => lookup('lille-chinqchint',"#{node_uid}", 'ip_eth0'),
+          :ip => lookup('lille-chinqchint',"#{node_uid}",'network_interfaces', 'eth0', 'ip'),
           :switch => 'gw'
         },{
           :interface => 'Ethernet',
           :rate => 1.G,
-          :mac => lookup('lille-chinqchint',"#{node_uid}", 'mac_eth1'),
+          :mac => lookup('lille-chinqchint',"#{node_uid}",'network_interfaces', 'eth1', 'mac'),
           :vendor => 'Intel',
           :version => '80003ES2LAN',
           :enabled => true,
@@ -64,20 +64,20 @@ site :lille do |site_uid|
           :mounted => true,
           :device => 'eth1',
           :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip => lookup('lille-chinqchint',"#{node_uid}", 'ip_eth1'),
+          :ip => lookup('lille-chinqchint',"#{node_uid}",'network_interfaces', 'eth1', 'ip'),
           :switch => 'gw',
-          :switch_port => lookup('lille-chinqchint', "#{node_uid}", 'switch_port')
+          :switch_port => lookup('lille-chinqchint',"#{node_uid}",'network_interfaces', 'eth1', 'switch_port'),
         },{
           :interface => 'Ethernet',
           :rate => 1.G,
-          :mac => lookup('lille-chinqchint',"#{node_uid}", 'mac_mgt'),
+          :mac => lookup('lille-chinqchint',"#{node_uid}",'network_interfaces', 'bmc', 'mac'),
           :vendor => 'Peppercon',
           :version => '1.46',
           :enabled => true,
           :management => true,
           :mountable => false,
           :network_address => "#{node_uid}-ipmi.#{site_uid}.grid5000.fr",
-          :ip => lookup('lille-chinqchint',"#{node_uid}", 'ip_mgt'),
+          :ip => lookup('lille-chinqchint',"#{node_uid}",'network_interfaces', 'bmc', 'ip'),
           :switch => 'gw'
         },{
           :interface => 'Myrinet',
@@ -92,7 +92,7 @@ site :lille do |site_uid|
           :mounted => true,
           :device => 'myri0',
           :network_address => "#{node_uid}-myri0.#{site_uid}.grid5000.fr",
-          :ip => lookup('lille-chinqchint',"#{node_uid}", 'ip_myri0'),
+          :ip => lookup('lille-chinqchint',"#{node_uid}",'network_interfaces', 'myri0', 'ip'),
           :switch => nil
         }]
       end
diff --git a/generators/input/lille-chinqchint.yaml b/generators/input/lille-chinqchint.yaml
index 8f721a656c..0a8ca58cd3 100644
--- a/generators/input/lille-chinqchint.yaml
+++ b/generators/input/lille-chinqchint.yaml
@@ -1,450 +1,690 @@
----
 chinqchint-1:
-  mac_eth0: 00:30:48:7c:7c:86
-  ip_eth0: 192.168.160.100
-  mac_eth1: 00:30:48:7c:7c:87
-  ip_eth1: 192.168.159.100
-  mac_myri0: 00:60:dd:47:4d:4a
-  ip_myri0: 192.168.162.100
-  ip_mgt: 192.168.161.100
-  mac_mgt: 00:30:48:96:07:E5
-  switch_port: Gi2/1
+  network_interfaces:
+    bmc:
+      mac: 00:30:48:96:07:E5
+      ip: 192.168.161.100
+    eth0:
+      mac: 00:30:48:7c:7c:86
+      ip: 192.168.160.100
+    eth1:
+      mac: 00:30:48:7c:7c:87
+      ip: 192.168.159.100
+      switch_port: Gi2/1
+    myri0:
+      mac: 00:60:dd:47:4d:4a
+      ip: 192.168.162.100
 chinqchint-2:
-  mac_eth0: 00:30:48:7c:7f:22
-  ip_eth0: 192.168.160.101
-  mac_eth1: 00:30:48:7c:7f:23
-  ip_eth1: 192.168.159.101
-  mac_myri0: 00:60:dd:47:4b:b8
-  ip_myri0: 192.168.162.101
-  ip_mgt: 192.168.161.101
-  mac_mgt: 00:30:48:96:25:67
-  switch_port: Gi2/2
+  network_interfaces:
+    bmc:
+      mac: 00:30:48:96:25:67
+      ip: 192.168.161.101
+    eth0:
+      mac: 00:30:48:7c:7f:22
+      ip: 192.168.160.101
+    eth1:
+      mac: 00:30:48:7c:7f:23
+      ip: 192.168.159.101
+      switch_port: Gi2/2
+    myri0:
+      mac: 00:60:dd:47:4b:b8
+      ip: 192.168.162.101
 chinqchint-3:
-  mac_eth0: 00:30:48:7b:fd:0e
-  ip_eth0: 192.168.160.102
-  mac_eth1: 00:30:48:7b:fd:0f
-  ip_eth1: 192.168.159.102
-  mac_myri0: 00:60:dd:47:4c:bb
-  ip_myri0: 192.168.162.102
-  ip_mgt: 192.168.161.102
-  mac_mgt: 00:30:48:94:4A:7E
-  switch_port: Gi2/3
+  network_interfaces:
+    bmc:
+      mac: 00:30:48:94:4A:7E
+      ip: 192.168.161.102
+    eth0:
+      mac: 00:30:48:7b:fd:0e
+      ip: 192.168.160.102
+    eth1:
+      mac: 00:30:48:7b:fd:0f
+      ip: 192.168.159.102
+      switch_port: Gi2/3
+    myri0:
+      mac: 00:60:dd:47:4c:bb
+      ip: 192.168.162.102
 chinqchint-4:
-  mac_eth0: 00:30:48:7d:2f:1a
-  ip_eth0: 192.168.160.103
-  mac_eth1: 00:30:48:7d:2f:1b
-  ip_eth1: 192.168.159.103
-  mac_myri0: 00:60:dd:47:4c:b8
-  ip_myri0: 192.168.162.103
-  ip_mgt: 192.168.161.103
-  mac_mgt: 00:30:48:94:44:21
-  switch_port: Gi2/4
+  network_interfaces:
+    bmc:
+      mac: 00:30:48:94:44:21
+      ip: 192.168.161.103
+    eth0:
+      mac: 00:30:48:7d:2f:1a
+      ip: 192.168.160.103
+    eth1:
+      mac: 00:30:48:7d:2f:1b
+      ip: 192.168.159.103
+      switch_port: Gi2/4
+    myri0:
+      mac: 00:60:dd:47:4c:b8
+      ip: 192.168.162.103
 chinqchint-5:
-  mac_eth0: 00:30:48:7c:6e:be
-  ip_eth0: 192.168.160.104
-  mac_eth1: 00:30:48:7c:6e:bf
-  ip_eth1: 192.168.159.104
-  mac_myri0: 00:60:dd:47:49:e7
-  ip_myri0: 192.168.162.104
-  ip_mgt: 192.168.161.104
-  mac_mgt: 00:30:48:96:25:DD
-  switch_port: Gi2/41
+  network_interfaces:
+    bmc:
+      mac: 00:30:48:96:25:DD
+      ip: 192.168.161.104
+    eth0:
+      mac: 00:30:48:7c:6e:be
+      ip: 192.168.160.104
+    eth1:
+      mac: 00:30:48:7c:6e:bf
+      ip: 192.168.159.104
+      switch_port: Gi2/41
+    myri0:
+      mac: 00:60:dd:47:49:e7
+      ip: 192.168.162.104
 chinqchint-6:
-  mac_eth0: 00:30:48:7c:6e:bc
-  ip_eth0: 192.168.160.105
-  mac_eth1: 00:30:48:7c:6e:bd
-  ip_eth1: 192.168.159.105
-  mac_myri0: 00:60:dd:47:49:cb
-  ip_myri0: 192.168.162.105
-  ip_mgt: 192.168.161.105
-  mac_mgt: 00:30:48:96:25:E0
-  switch_port: Gi2/6
+  network_interfaces:
+    bmc:
+      mac: 00:30:48:96:25:E0
+      ip: 192.168.161.105
+    eth0:
+      mac: 00:30:48:7c:6e:bc
+      ip: 192.168.160.105
+    eth1:
+      mac: 00:30:48:7c:6e:bd
+      ip: 192.168.159.105
+      switch_port: Gi2/6
+    myri0:
+      mac: 00:60:dd:47:49:cb
+      ip: 192.168.162.105
 chinqchint-7:
-  mac_eth0: 00:30:48:7c:3d:d4
-  ip_eth0: 192.168.160.106
-  mac_eth1: 00:30:48:7c:3d:d5
-  ip_eth1: 192.168.159.106
-  mac_myri0: 00:60:dd:47:4c:d5
-  ip_myri0: 192.168.162.106
-  ip_mgt: 192.168.161.106
-  mac_mgt: 00:30:48:96:07:FA
-  switch_port: Gi2/7
+  network_interfaces:
+    bmc:
+      mac: 00:30:48:96:07:FA
+      ip: 192.168.161.106
+    eth0:
+      mac: 00:30:48:7c:3d:d4
+      ip: 192.168.160.106
+    eth1:
+      mac: 00:30:48:7c:3d:d5
+      ip: 192.168.159.106
+      switch_port: Gi2/7
+    myri0:
+      mac: 00:60:dd:47:4c:d5
+      ip: 192.168.162.106
 chinqchint-8:
-  mac_eth0: 00:30:48:7c:3d:d6
-  ip_eth0: 192.168.160.107
-  mac_eth1: 00:30:48:7c:3d:d7
-  ip_eth1: 192.168.159.107
-  mac_myri0: 00:60:dd:47:49:cc
-  ip_myri0: 192.168.162.107
-  ip_mgt: 192.168.161.107
-  mac_mgt: 00:30:48:96:07:E4
-  switch_port: Gi2/8
+  network_interfaces:
+    bmc:
+      mac: 00:30:48:96:07:E4
+      ip: 192.168.161.107
+    eth0:
+      mac: 00:30:48:7c:3d:d6
+      ip: 192.168.160.107
+    eth1:
+      mac: 00:30:48:7c:3d:d7
+      ip: 192.168.159.107
+      switch_port: Gi2/8
+    myri0:
+      mac: 00:60:dd:47:49:cc
+      ip: 192.168.162.107
 chinqchint-9:
-  mac_eth0: 00:30:48:7c:81:06
-  ip_eth0: 192.168.160.108
-  mac_eth1: 00:30:48:7c:81:07
-  ip_eth1: 192.168.159.108
-  mac_myri0: 00:60:dd:47:4c:6f
-  ip_myri0: 192.168.162.108
-  ip_mgt: 192.168.161.108
-  mac_mgt: 00:30:48:94:1B:E2
-  switch_port: Gi2/9
+  network_interfaces:
+    bmc:
+      mac: 00:30:48:94:1B:E2
+      ip: 192.168.161.108
+    eth0:
+      mac: 00:30:48:7c:81:06
+      ip: 192.168.160.108
+    eth1:
+      mac: 00:30:48:7c:81:07
+      ip: 192.168.159.108
+      switch_port: Gi2/9
+    myri0:
+      mac: 00:60:dd:47:4c:6f
+      ip: 192.168.162.108
 chinqchint-10:
-  mac_eth0: 00:30:48:7c:81:08
-  ip_eth0: 192.168.160.109
-  mac_eth1: 00:30:48:7c:81:09
-  ip_eth1: 192.168.159.109
-  mac_myri0: 00:60:dd:47:4d:35
-  ip_myri0: 192.168.162.109
-  ip_mgt: 192.168.161.109
-  mac_mgt: 00:30:48:94:2D:7A
-  switch_port: Gi2/10
+  network_interfaces:
+    bmc:
+      mac: 00:30:48:94:2D:7A
+      ip: 192.168.161.109
+    eth0:
+      mac: 00:30:48:7c:81:08
+      ip: 192.168.160.109
+    eth1:
+      mac: 00:30:48:7c:81:09
+      ip: 192.168.159.109
+      switch_port: Gi2/10
+    myri0:
+      mac: 00:60:dd:47:4d:35
+      ip: 192.168.162.109
 chinqchint-11:
-  mac_eth0: 00:30:48:7c:67:b0
-  ip_eth0: 192.168.160.110
-  mac_eth1: 00:30:48:7c:67:b1
-  ip_eth1: 192.168.159.110
-  mac_myri0: 00:60:dd:47:4d:30
-  ip_myri0: 192.168.162.110
-  ip_mgt: 192.168.161.110
-  switch_port: Gi2/11
+  network_interfaces:
+    bmc:
+      mac: 
+      ip: 192.168.161.110
+    eth0:
+      mac: 00:30:48:7c:67:b0
+      ip: 192.168.160.110
+    eth1:
+      mac: 00:30:48:7c:67:b1
+      ip: 192.168.159.110
+      switch_port: Gi2/11
+    myri0:
+      mac: 00:60:dd:47:4d:30
+      ip: 192.168.162.110
 chinqchint-12:
-  mac_eth0: 00:30:48:7c:6e:b8
-  ip_eth0: 192.168.160.111
-  mac_eth1: 00:30:48:7c:6e:b9
-  ip_eth1: 192.168.159.111
-  mac_myri0: 00:60:dd:47:4c:6c
-  ip_myri0: 192.168.162.111
-  ip_mgt: 192.168.161.111
-  switch_port: Gi2/12
+  network_interfaces:
+    bmc:
+      mac: 
+      ip: 192.168.161.111
+    eth0:
+      mac: 00:30:48:7c:6e:b8
+      ip: 192.168.160.111
+    eth1:
+      mac: 00:30:48:7c:6e:b9
+      ip: 192.168.159.111
+      switch_port: Gi2/12
+    myri0:
+      mac: 00:60:dd:47:4c:6c
+      ip: 192.168.162.111
 chinqchint-13:
-  mac_eth0: 00:30:48:7c:00:86
-  ip_eth0: 192.168.160.112
-  mac_eth1: 00:30:48:7c:00:87
-  ip_eth1: 192.168.159.112
-  mac_myri0: 00:60:dd:47:49:8d
-  ip_myri0: 192.168.162.112
-  ip_mgt: 192.168.161.112
-  mac_mgt: 00:30:48:94:36:4C
-  switch_port: Gi2/13
+  network_interfaces:
+    bmc:
+      mac: 00:30:48:94:36:4C
+      ip: 192.168.161.112
+    eth0:
+      mac: 00:30:48:7c:00:86
+      ip: 192.168.160.112
+    eth1:
+      mac: 00:30:48:7c:00:87
+      ip: 192.168.159.112
+      switch_port: Gi2/13
+    myri0:
+      mac: 00:60:dd:47:49:8d
+      ip: 192.168.162.112
 chinqchint-14:
-  mac_eth0: 00:30:48:7c:00:74
-  ip_eth0: 192.168.160.113
-  mac_eth1: 00:30:48:7c:00:75
-  ip_eth1: 192.168.159.113
-  mac_myri0: 00:60:dd:47:49:8a
-  ip_myri0: 192.168.162.113
-  ip_mgt: 192.168.161.113
-  mac_mgt: 00:30:48:94:35:DE
+  network_interfaces:
+    bmc:
+      mac: 00:30:48:94:35:DE
+      ip: 192.168.161.113
+    eth0:
+      mac: 00:30:48:7c:00:74
+      ip: 192.168.160.113
+    eth1:
+      mac: 00:30:48:7c:00:75
+      ip: 192.168.159.113
+      switch_port: 
+    myri0:
+      mac: 00:60:dd:47:49:8a
+      ip: 192.168.162.113
 chinqchint-15:
-  mac_eth0: 00:30:48:7c:7f:9e
-  ip_eth0: 192.168.160.114
-  mac_eth1: 00:30:48:7c:7f:9f
-  ip_eth1: 192.168.159.114
-  mac_myri0: 00:60:dd:47:4d:34
-  ip_myri0: 192.168.162.114
-  ip_mgt: 192.168.161.114
-  mac_mgt: 00:30:48:96:25:B9
-  switch_port: Gi2/15
+  network_interfaces:
+    bmc:
+      mac: 00:30:48:96:25:B9
+      ip: 192.168.161.114
+    eth0:
+      mac: 00:30:48:7c:7f:9e
+      ip: 192.168.160.114
+    eth1:
+      mac: 00:30:48:7c:7f:9f
+      ip: 192.168.159.114
+      switch_port: Gi2/15
+    myri0:
+      mac: 00:60:dd:47:4d:34
+      ip: 192.168.162.114
 chinqchint-16:
-  mac_eth0: 00:30:48:7c:80:fe
-  ip_eth0: 192.168.160.115
-  mac_eth1: 00:30:48:7c:80:ff
-  ip_eth1: 192.168.159.115
-  mac_myri0: 00:60:dd:47:4d:32
-  ip_myri0: 192.168.162.115
-  ip_mgt: 192.168.161.115
-  mac_mgt: 00:30:48:96:24:E1
-  switch_port: Gi2/16
+  network_interfaces:
+    bmc:
+      mac: 00:30:48:96:24:E1
+      ip: 192.168.161.115
+    eth0:
+      mac: 00:30:48:7c:80:fe
+      ip: 192.168.160.115
+    eth1:
+      mac: 00:30:48:7c:80:ff
+      ip: 192.168.159.115
+      switch_port: Gi2/16
+    myri0:
+      mac: 00:60:dd:47:4d:32
+      ip: 192.168.162.115
 chinqchint-17:
-  mac_eth0: 00:30:48:7c:6f:5c
-  ip_eth0: 192.168.160.116
-  mac_eth1: 00:30:48:7c:6f:5d
-  ip_eth1: 192.168.159.116
-  mac_myri0: 00:60:dd:47:49:85
-  ip_myri0: 192.168.162.116
-  ip_mgt: 192.168.161.116
-  mac_mgt: 00:30:48:96:26:5A
-  switch_port: Gi2/17
+  network_interfaces:
+    bmc:
+      mac: 00:30:48:96:26:5A
+      ip: 192.168.161.116
+    eth0:
+      mac: 00:30:48:7c:6f:5c
+      ip: 192.168.160.116
+    eth1:
+      mac: 00:30:48:7c:6f:5d
+      ip: 192.168.159.116
+      switch_port: Gi2/17
+    myri0:
+      mac: 00:60:dd:47:49:85
+      ip: 192.168.162.116
 chinqchint-18:
-  mac_eth0: 00:30:48:7c:67:de
-  ip_eth0: 192.168.160.117
-  mac_eth1: 00:30:48:7c:67:df
-  ip_eth1: 192.168.159.117
-  mac_myri0: 00:60:dd:47:4d:31
-  ip_myri0: 192.168.162.117
-  ip_mgt: 192.168.161.117
-  mac_mgt: 00:30:48:96:25:76
-  switch_port: Gi2/18
+  network_interfaces:
+    bmc:
+      mac: 00:30:48:96:25:76
+      ip: 192.168.161.117
+    eth0:
+      mac: 00:30:48:7c:67:de
+      ip: 192.168.160.117
+    eth1:
+      mac: 00:30:48:7c:67:df
+      ip: 192.168.159.117
+      switch_port: Gi2/18
+    myri0:
+      mac: 00:60:dd:47:4d:31
+      ip: 192.168.162.117
 chinqchint-19:
-  mac_eth0: 00:30:48:7c:6f:0c
-  ip_eth0: 192.168.160.118
-  mac_eth1: 00:30:48:7c:6f:0d
-  ip_eth1: 192.168.159.118
-  mac_myri0: 00:60:dd:47:49:eb
-  ip_myri0: 192.168.162.118
-  ip_mgt: 192.168.161.118
-  mac_mgt: 00:30:48:96:25:DE
-  switch_port: Gi2/19
+  network_interfaces:
+    bmc:
+      mac: 00:30:48:96:25:DE
+      ip: 192.168.161.118
+    eth0:
+      mac: 00:30:48:7c:6f:0c
+      ip: 192.168.160.118
+    eth1:
+      mac: 00:30:48:7c:6f:0d
+      ip: 192.168.159.118
+      switch_port: Gi2/19
+    myri0:
+      mac: 00:60:dd:47:49:eb
+      ip: 192.168.162.118
 chinqchint-20:
-  mac_eth0: 00:30:48:7c:67:bc
-  ip_eth0: 192.168.160.119
-  mac_eth1: 00:30:48:7c:67:bd
-  ip_eth1: 192.168.159.119
-  mac_myri0: 00:60:dd:47:49:86
-  ip_myri0: 192.168.162.119
-  ip_mgt: 192.168.161.119
-  mac_mgt: 00:30:48:96:25:C7
-  switch_port: Gi2/20
+  network_interfaces:
+    bmc:
+      mac: 00:30:48:96:25:C7
+      ip: 192.168.161.119
+    eth0:
+      mac: 00:30:48:7c:67:bc
+      ip: 192.168.160.119
+    eth1:
+      mac: 00:30:48:7c:67:bd
+      ip: 192.168.159.119
+      switch_port: Gi2/20
+    myri0:
+      mac: 00:60:dd:47:49:86
+      ip: 192.168.162.119
 chinqchint-21:
-  mac_eth0: 00:30:48:7c:70:a6
-  ip_eth0: 192.168.160.120
-  mac_eth1: 00:30:48:7c:70:a7
-  ip_eth1: 192.168.159.120
-  mac_myri0: 00:60:dd:47:49:ee
-  ip_myri0: 192.168.162.120
-  ip_mgt: 192.168.161.120
-  mac_mgt: 00:30:48:94:4A:34
-  switch_port: Gi2/21
+  network_interfaces:
+    bmc:
+      mac: 00:30:48:94:4A:34
+      ip: 192.168.161.120
+    eth0:
+      mac: 00:30:48:7c:70:a6
+      ip: 192.168.160.120
+    eth1:
+      mac: 00:30:48:7c:70:a7
+      ip: 192.168.159.120
+      switch_port: Gi2/21
+    myri0:
+      mac: 00:60:dd:47:49:ee
+      ip: 192.168.162.120
 chinqchint-22:
-  mac_eth0: 00:30:48:7c:3d:da
-  ip_eth0: 192.168.160.121
-  mac_eth1: 00:30:48:7c:3d:db
-  ip_eth1: 192.168.159.121
-  mac_myri0: 00:60:dd:47:49:e3
-  ip_myri0: 192.168.162.121
-  ip_mgt: 192.168.161.121
-  mac_mgt: 00:30:48:94:4B:02
-  switch_port: Gi2/22
+  network_interfaces:
+    bmc:
+      mac: 00:30:48:94:4B:02
+      ip: 192.168.161.121
+    eth0:
+      mac: 00:30:48:7c:3d:da
+      ip: 192.168.160.121
+    eth1:
+      mac: 00:30:48:7c:3d:db
+      ip: 192.168.159.121
+      switch_port: Gi2/22
+    myri0:
+      mac: 00:60:dd:47:49:e3
+      ip: 192.168.162.121
 chinqchint-23:
-  mac_eth0: 00:30:48:7c:80:f8
-  ip_eth0: 192.168.160.122
-  mac_eth1: 00:30:48:7c:80:f9
-  ip_eth1: 192.168.159.122
-  mac_myri0: 00:60:dd:47:49:f2
-  ip_myri0: 192.168.162.122
-  ip_mgt: 192.168.161.122
-  mac_mgt: 00:30:48:94:2C:9C
-  switch_port: Gi2/23
+  network_interfaces:
+    bmc:
+      mac: 00:30:48:94:2C:9C
+      ip: 192.168.161.122
+    eth0:
+      mac: 00:30:48:7c:80:f8
+      ip: 192.168.160.122
+    eth1:
+      mac: 00:30:48:7c:80:f9
+      ip: 192.168.159.122
+      switch_port: Gi2/23
+    myri0:
+      mac: 00:60:dd:47:49:f2
+      ip: 192.168.162.122
 chinqchint-24:
-  mac_eth0: 00:30:48:7c:80:e8
-  ip_eth0: 192.168.160.123
-  mac_eth1: 00:30:48:7c:80:e9
-  ip_eth1: 192.168.159.123
-  mac_myri0: 00:60:dd:47:49:f1
-  ip_myri0: 192.168.162.123
-  ip_mgt: 192.168.161.123
-  mac_mgt: 00:30:48:94:2D:76
-  switch_port: Gi2/24
+  network_interfaces:
+    bmc:
+      mac: 00:30:48:94:2D:76
+      ip: 192.168.161.123
+    eth0:
+      mac: 00:30:48:7c:80:e8
+      ip: 192.168.160.123
+    eth1:
+      mac: 00:30:48:7c:80:e9
+      ip: 192.168.159.123
+      switch_port: Gi2/24
+    myri0:
+      mac: 00:60:dd:47:49:f1
+      ip: 192.168.162.123
 chinqchint-25:
-  mac_eth0: 00:30:48:7c:81:0a
-  ip_eth0: 192.168.160.124
-  mac_eth1: 00:30:48:7c:81:0b
-  ip_eth1: 192.168.159.124
-  mac_myri0: 00:60:dd:47:49:f0
-  ip_myri0: 192.168.162.124
-  ip_mgt: 192.168.161.124
-  mac_mgt: 00:30:48:9B:1A:CF
-  switch_port: Gi2/25
+  network_interfaces:
+    bmc:
+      mac: 00:30:48:9B:1A:CF
+      ip: 192.168.161.124
+    eth0:
+      mac: 00:30:48:7c:81:0a
+      ip: 192.168.160.124
+    eth1:
+      mac: 00:30:48:7c:81:0b
+      ip: 192.168.159.124
+      switch_port: Gi2/25
+    myri0:
+      mac: 00:60:dd:47:49:f0
+      ip: 192.168.162.124
 chinqchint-26:
-  mac_eth0: 00:30:48:7c:80:ea
-  ip_eth0: 192.168.160.125
-  mac_eth1: 00:30:48:7c:80:eb
-  ip_eth1: 192.168.159.125
-  mac_myri0: 00:60:dd:47:4b:ab
-  ip_myri0: 192.168.162.125
-  ip_mgt: 192.168.161.125
-  mac_mgt: 00:30:48:96:26:54
-  switch_port: Gi2/26
+  network_interfaces:
+    bmc:
+      mac: 00:30:48:96:26:54
+      ip: 192.168.161.125
+    eth0:
+      mac: 00:30:48:7c:80:ea
+      ip: 192.168.160.125
+    eth1:
+      mac: 00:30:48:7c:80:eb
+      ip: 192.168.159.125
+      switch_port: Gi2/26
+    myri0:
+      mac: 00:60:dd:47:4b:ab
+      ip: 192.168.162.125
 chinqchint-27:
-  mac_eth0: 00:30:48:7c:6e:b4
-  ip_eth0: 192.168.160.126
-  mac_eth1: 00:30:48:7c:6e:b5
-  ip_eth1: 192.168.159.126
-  mac_myri0: 00:60:dd:47:49:ec
-  ip_myri0: 192.168.162.126
-  ip_mgt: 192.168.161.126
-  mac_mgt: 00:30:48:96:25:63
-  switch_port: Gi2/27
+  network_interfaces:
+    bmc:
+      mac: 00:30:48:96:25:63
+      ip: 192.168.161.126
+    eth0:
+      mac: 00:30:48:7c:6e:b4
+      ip: 192.168.160.126
+    eth1:
+      mac: 00:30:48:7c:6e:b5
+      ip: 192.168.159.126
+      switch_port: Gi2/27
+    myri0:
+      mac: 00:60:dd:47:49:ec
+      ip: 192.168.162.126
 chinqchint-28:
-  mac_eth0: 00:30:48:7c:6e:da
-  ip_eth0: 192.168.160.127
-  mac_eth1: 00:30:48:7c:6e:db
-  ip_eth1: 192.168.159.127
-  mac_myri0: 00:60:dd:47:49:e5
-  ip_myri0: 192.168.162.127
-  ip_mgt: 192.168.161.127
-  mac_mgt: 00:30:48:96:26:B2
-  switch_port: Gi2/28
+  network_interfaces:
+    bmc:
+      mac: 00:30:48:96:26:B2
+      ip: 192.168.161.127
+    eth0:
+      mac: 00:30:48:7c:6e:da
+      ip: 192.168.160.127
+    eth1:
+      mac: 00:30:48:7c:6e:db
+      ip: 192.168.159.127
+      switch_port: Gi2/28
+    myri0:
+      mac: 00:60:dd:47:49:e5
+      ip: 192.168.162.127
 chinqchint-29:
-  mac_eth0: 00:30:48:7c:81:2a
-  ip_eth0: 192.168.160.128
-  mac_eth1: 00:30:48:7c:81:2b
-  ip_eth1: 192.168.159.128
-  mac_myri0: 00:60:dd:47:4d:45
-  ip_myri0: 192.168.162.128
-  ip_mgt: 192.168.161.128
-  mac_mgt: 00:30:48:94:37:D3
-  switch_port: Gi2/29
+  network_interfaces:
+    bmc:
+      mac: 00:30:48:94:37:D3
+      ip: 192.168.161.128
+    eth0:
+      mac: 00:30:48:7c:81:2a
+      ip: 192.168.160.128
+    eth1:
+      mac: 00:30:48:7c:81:2b
+      ip: 192.168.159.128
+      switch_port: Gi2/29
+    myri0:
+      mac: 00:60:dd:47:4d:45
+      ip: 192.168.162.128
 chinqchint-30:
-  mac_eth0: 00:30:48:7c:bb:fa
-  ip_eth0: 192.168.160.129
-  mac_eth1: 00:30:48:7c:bb:fb
-  ip_eth1: 192.168.159.129
-  mac_myri0: 00:60:dd:47:4b:b0
-  ip_myri0: 192.168.162.129
-  ip_mgt: 192.168.161.129
-  switch_port: Gi2/30
+  network_interfaces:
+    bmc:
+      mac: 
+      ip: 192.168.161.129
+    eth0:
+      mac: 00:30:48:7c:bb:fa
+      ip: 192.168.160.129
+    eth1:
+      mac: 00:30:48:7c:bb:fb
+      ip: 192.168.159.129
+      switch_port: Gi2/30
+    myri0:
+      mac: 00:60:dd:47:4b:b0
+      ip: 192.168.162.129
 chinqchint-31:
-  mac_eth0: 00:30:48:7b:f9:7a
-  ip_eth0: 192.168.160.130
-  mac_eth1: 00:30:48:7b:f9:7b
-  ip_eth1: 192.168.159.130
-  mac_myri0: 00:60:dd:47:49:e1
-  ip_myri0: 192.168.162.130
-  ip_mgt: 192.168.161.130
-  switch_port: Gi2/31
+  network_interfaces:
+    bmc:
+      mac: 
+      ip: 192.168.161.130
+    eth0:
+      mac: 00:30:48:7b:f9:7a
+      ip: 192.168.160.130
+    eth1:
+      mac: 00:30:48:7b:f9:7b
+      ip: 192.168.159.130
+      switch_port: Gi2/31
+    myri0:
+      mac: 00:60:dd:47:49:e1
+      ip: 192.168.162.130
 chinqchint-32:
-  mac_eth0: 00:30:48:7b:f9:76
-  ip_eth0: 192.168.160.131
-  mac_eth1: 00:30:48:7b:f9:77
-  ip_eth1: 192.168.159.131
-  mac_myri0: 00:60:dd:47:49:e9
-  ip_myri0: 192.168.162.131
-  ip_mgt: 192.168.161.131
-  switch_port: Gi2/32
+  network_interfaces:
+    bmc:
+      mac: 
+      ip: 192.168.161.131
+    eth0:
+      mac: 00:30:48:7b:f9:76
+      ip: 192.168.160.131
+    eth1:
+      mac: 00:30:48:7b:f9:77
+      ip: 192.168.159.131
+      switch_port: Gi2/32
+    myri0:
+      mac: 00:60:dd:47:49:e9
+      ip: 192.168.162.131
 chinqchint-33:
-  mac_eth0: 00:30:48:7a:56:32
-  ip_eth0: 192.168.160.132
-  mac_eth1: 00:30:48:7a:56:33
-  ip_eth1: 192.168.159.132
-  mac_myri0: 00:60:dd:47:49:e0
-  ip_myri0: 192.168.162.132
-  ip_mgt: 192.168.161.132
-  switch_port: Gi2/33
+  network_interfaces:
+    bmc:
+      mac: 
+      ip: 192.168.161.132
+    eth0:
+      mac: 00:30:48:7a:56:32
+      ip: 192.168.160.132
+    eth1:
+      mac: 00:30:48:7a:56:33
+      ip: 192.168.159.132
+      switch_port: Gi2/33
+    myri0:
+      mac: 00:60:dd:47:49:e0
+      ip: 192.168.162.132
 chinqchint-34:
-  mac_eth0: 00:30:48:7a:5f:16
-  ip_eth0: 192.168.160.133
-  mac_eth1: 00:30:48:7a:5f:17
-  ip_eth1: 192.168.159.133
-  mac_myri0: 00:60:dd:47:49:b8
-  ip_myri0: 192.168.162.133
-  ip_mgt: 192.168.161.133
-  switch_port: Gi2/34
+  network_interfaces:
+    bmc:
+      mac: 
+      ip: 192.168.161.133
+    eth0:
+      mac: 00:30:48:7a:5f:16
+      ip: 192.168.160.133
+    eth1:
+      mac: 00:30:48:7a:5f:17
+      ip: 192.168.159.133
+      switch_port: Gi2/34
+    myri0:
+      mac: 00:60:dd:47:49:b8
+      ip: 192.168.162.133
 chinqchint-35:
-  mac_eth0: 00:30:48:7c:3d:f4
-  ip_eth0: 192.168.160.134
-  mac_eth1: 00:30:48:7c:3d:f5
-  ip_eth1: 192.168.159.134
-  mac_myri0: 00:60:dd:47:49:e2
-  ip_myri0: 192.168.162.134
-  ip_mgt: 192.168.161.134
-  switch_port: Gi2/35
+  network_interfaces:
+    bmc:
+      mac: 
+      ip: 192.168.161.134
+    eth0:
+      mac: 00:30:48:7c:3d:f4
+      ip: 192.168.160.134
+    eth1:
+      mac: 00:30:48:7c:3d:f5
+      ip: 192.168.159.134
+      switch_port: Gi2/35
+    myri0:
+      mac: 00:60:dd:47:49:e2
+      ip: 192.168.162.134
 chinqchint-36:
-  mac_eth0: 00:30:48:7d:2d:04
-  ip_eth0: 192.168.160.135
-  mac_eth1: 00:30:48:7d:2d:05
-  ip_eth1: 192.168.159.135
-  mac_myri0: 00:60:dd:47:49:b7
-  ip_myri0: 192.168.162.135
-  ip_mgt: 192.168.161.135
-  switch_port: Gi2/36
+  network_interfaces:
+    bmc:
+      mac: 
+      ip: 192.168.161.135
+    eth0:
+      mac: 00:30:48:7d:2d:04
+      ip: 192.168.160.135
+    eth1:
+      mac: 00:30:48:7d:2d:05
+      ip: 192.168.159.135
+      switch_port: Gi2/36
+    myri0:
+      mac: 00:60:dd:47:49:b7
+      ip: 192.168.162.135
 chinqchint-37:
-  mac_eth0: 00:30:48:7c:81:04
-  ip_eth0: 192.168.160.136
-  mac_eth1: 00:30:48:7c:81:05
-  ip_eth1: 192.168.159.136
-  mac_myri0: 00:60:dd:47:49:e4
-  ip_myri0: 192.168.162.136
-  ip_mgt: 192.168.161.136
-  switch_port: Gi2/37
+  network_interfaces:
+    bmc:
+      mac: 
+      ip: 192.168.161.136
+    eth0:
+      mac: 00:30:48:7c:81:04
+      ip: 192.168.160.136
+    eth1:
+      mac: 00:30:48:7c:81:05
+      ip: 192.168.159.136
+      switch_port: Gi2/37
+    myri0:
+      mac: 00:60:dd:47:49:e4
+      ip: 192.168.162.136
 chinqchint-38:
-  mac_eth0: 00:30:48:7c:7c:80
-  ip_eth0: 192.168.160.137
-  mac_eth1: 00:30:48:7c:7c:81
-  ip_eth1: 192.168.159.137
-  mac_myri0: 00:60:dd:47:4b:b2
-  ip_myri0: 192.168.162.137
-  ip_mgt: 192.168.161.137
-  mac_mgt: 00:30:48:94:1C:9A
-  switch_port: Gi2/38
+  network_interfaces:
+    bmc:
+      mac: 00:30:48:94:1C:9A
+      ip: 192.168.161.137
+    eth0:
+      mac: 00:30:48:7c:7c:80
+      ip: 192.168.160.137
+    eth1:
+      mac: 00:30:48:7c:7c:81
+      ip: 192.168.159.137
+      switch_port: Gi2/38
+    myri0:
+      mac: 00:60:dd:47:4b:b2
+      ip: 192.168.162.137
 chinqchint-39:
-  mac_eth0: 00:30:48:7d:0f:14
-  ip_eth0: 192.168.160.138
-  mac_eth1: 00:30:48:7d:0f:15
-  ip_eth1: 192.168.159.138
-  mac_myri0: 00:60:dd:47:4b:b1
-  ip_myri0: 192.168.162.138
-  ip_mgt: 192.168.161.138
-  mac_mgt: 00:30:48:94:2F:6E
-  switch_port: Gi2/39
+  network_interfaces:
+    bmc:
+      mac: 00:30:48:94:2F:6E
+      ip: 192.168.161.138
+    eth0:
+      mac: 00:30:48:7d:0f:14
+      ip: 192.168.160.138
+    eth1:
+      mac: 00:30:48:7d:0f:15
+      ip: 192.168.159.138
+      switch_port: Gi2/39
+    myri0:
+      mac: 00:60:dd:47:4b:b1
+      ip: 192.168.162.138
 chinqchint-40:
-  mac_eth0: 00:30:48:7d:35:74
-  ip_eth0: 192.168.160.139
-  mac_eth1: 00:30:48:7d:35:75
-  ip_eth1: 192.168.159.139
-  mac_myri0: 00:60:dd:47:4b:af
-  ip_myri0: 192.168.162.139
-  ip_mgt: 192.168.161.139
-  mac_mgt: 00:30:48:94:4B:4C
-  switch_port: Gi2/40
+  network_interfaces:
+    bmc:
+      mac: 00:30:48:94:4B:4C
+      ip: 192.168.161.139
+    eth0:
+      mac: 00:30:48:7d:35:74
+      ip: 192.168.160.139
+    eth1:
+      mac: 00:30:48:7d:35:75
+      ip: 192.168.159.139
+      switch_port: Gi2/40
+    myri0:
+      mac: 00:60:dd:47:4b:af
+      ip: 192.168.162.139
 chinqchint-41:
-  mac_eth0: 00:30:48:7a:5b:de
-  ip_eth0: 192.168.160.140
-  mac_eth1: 00:30:48:7a:5b:df
-  ip_eth1: 192.168.159.140
-  mac_myri0: 00:60:dd:47:4d:48
-  ip_myri0: 192.168.162.140
-  ip_mgt: 192.168.161.140
-  mac_mgt: 00:30:48:96:07:EF
-  switch_port: Gi3/1
+  network_interfaces:
+    bmc:
+      mac: 00:30:48:96:07:EF
+      ip: 192.168.161.140
+    eth0:
+      mac: 00:30:48:7a:5b:de
+      ip: 192.168.160.140
+    eth1:
+      mac: 00:30:48:7a:5b:df
+      ip: 192.168.159.140
+      switch_port: Gi3/1
+    myri0:
+      mac: 00:60:dd:47:4d:48
+      ip: 192.168.162.140
 chinqchint-42:
-  mac_eth0: 00:30:48:7a:5c:e4
-  ip_eth0: 192.168.160.141
-  mac_eth1: 00:30:48:7a:5c:e5
-  ip_eth1: 192.168.159.141
-  mac_myri0: 00:60:dd:47:4c:c0
-  ip_myri0: 192.168.162.141
-  ip_mgt: 192.168.161.141
-  mac_mgt: 00:30:48:96:07:F1
-  switch_port: Gi3/2
+  network_interfaces:
+    bmc:
+      mac: 00:30:48:96:07:F1
+      ip: 192.168.161.141
+    eth0:
+      mac: 00:30:48:7a:5c:e4
+      ip: 192.168.160.141
+    eth1:
+      mac: 00:30:48:7a:5c:e5
+      ip: 192.168.159.141
+      switch_port: Gi3/2
+    myri0:
+      mac: 00:60:dd:47:4c:c0
+      ip: 192.168.162.141
 chinqchint-43:
-  mac_eth0: 00:30:48:7c:6e:e8
-  ip_eth0: 192.168.160.142
-  mac_eth1: 00:30:48:7c:6e:e9
-  ip_eth1: 192.168.159.142
-  mac_myri0: 00:60:dd:47:4b:ba
-  ip_myri0: 192.168.162.142
-  ip_mgt: 192.168.161.142
-  mac_mgt: 00:30:48:96:25:E1
-  switch_port: Gi3/3
+  network_interfaces:
+    bmc:
+      mac: 00:30:48:96:25:E1
+      ip: 192.168.161.142
+    eth0:
+      mac: 00:30:48:7c:6e:e8
+      ip: 192.168.160.142
+    eth1:
+      mac: 00:30:48:7c:6e:e9
+      ip: 192.168.159.142
+      switch_port: Gi3/3
+    myri0:
+      mac: 00:60:dd:47:4b:ba
+      ip: 192.168.162.142
 chinqchint-44:
-  mac_eth0: 00:30:48:7c:66:ec
-  ip_eth0: 192.168.160.143
-  mac_eth1: 00:30:48:7c:66:ed
-  ip_eth1: 192.168.159.143
-  mac_myri0: 00:60:dd:47:4b:b6
-  ip_myri0: 192.168.162.143
-  ip_mgt: 192.168.161.143
-  mac_mgt: 00:30:48:96:25:D1
-  switch_port: Gi3/4
+  network_interfaces:
+    bmc:
+      mac: 00:30:48:96:25:D1
+      ip: 192.168.161.143
+    eth0:
+      mac: 00:30:48:7c:66:ec
+      ip: 192.168.160.143
+    eth1:
+      mac: 00:30:48:7c:66:ed
+      ip: 192.168.159.143
+      switch_port: Gi3/4
+    myri0:
+      mac: 00:60:dd:47:4b:b6
+      ip: 192.168.162.143
 chinqchint-45:
-  mac_eth0: 00:30:48:7c:70:a0
-  ip_eth0: 192.168.160.144
-  mac_eth1: 00:30:48:7c:70:a1
-  ip_eth1: 192.168.159.144
-  mac_myri0: 00:60:dd:47:4b:b4
-  ip_myri0: 192.168.162.144
-  ip_mgt: 192.168.161.144
-  mac_mgt: 00:30:48:96:25:65
-  switch_port: Gi3/5
+  network_interfaces:
+    bmc:
+      mac: 00:30:48:96:25:65
+      ip: 192.168.161.144
+    eth0:
+      mac: 00:30:48:7c:70:a0
+      ip: 192.168.160.144
+    eth1:
+      mac: 00:30:48:7c:70:a1
+      ip: 192.168.159.144
+      switch_port: Gi3/5
+    myri0:
+      mac: 00:60:dd:47:4b:b4
+      ip: 192.168.162.144
 chinqchint-46:
-  mac_eth0: 00:30:48:7c:6f:82
-  ip_eth0: 192.168.160.145
-  mac_eth1: 00:30:48:7c:6f:83
-  ip_eth1: 192.168.159.145
-  mac_myri0: 00:60:dd:47:4d:49
-  ip_myri0: 192.168.162.145
-  ip_mgt: 192.168.161.145
-  mac_mgt: 00:30:48:96:08:02
-  switch_port: Gi3/41
+  network_interfaces:
+    bmc:
+      mac: 00:30:48:96:08:02
+      ip: 192.168.161.145
+    eth0:
+      mac: 00:30:48:7c:6f:82
+      ip: 192.168.160.145
+    eth1:
+      mac: 00:30:48:7c:6f:83
+      ip: 192.168.159.145
+      switch_port: Gi3/41
+    myri0:
+      mac: 00:60:dd:47:4d:49
+      ip: 192.168.162.145
-- 
GitLab