diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.json
index 79d33fbd9b9381a4d256c9555e407f952396ca10..da468991b901a43c495af54506f85079c7453828 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.json
@@ -27,7 +27,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "granduc-1-bmc.luxembourg.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi2/1"
     },
     {
       "bridged": true,
@@ -43,15 +45,22 @@
       "network_address": "granduc-1.luxembourg.grid5000.fr",
       "rate": 1000000000,
       "switch": "C6506E",
-      "switch_port": null
+      "switch_port": "Gi2/1"
     },
     {
       "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
+      "ip": "172.16.176.101",
       "mac": "00:19:b9:f0:01:ca",
-      "rate": 1000000000
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "granduc-1-eth1.luxembourg.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi1/24"
     },
     {
       "device": "eth2",
@@ -65,7 +74,8 @@
       "mounted": true,
       "network_address": "granduc-1-eth2.luxembourg.grid5000.fr",
       "rate": 10000000000,
-      "switch": "C5020"
+      "switch": "C5020",
+      "switch_port": "Eth1/2"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.json
index 5ccb26f2ccaef499699193f731cfcd7ea50b65b1..6e274addcffe9ba13898f32c5cf3df2cbd73a63f 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.json
@@ -27,7 +27,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "granduc-10-bmc.luxembourg.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi2/10"
     },
     {
       "bridged": true,
@@ -43,15 +45,22 @@
       "network_address": "granduc-10.luxembourg.grid5000.fr",
       "rate": 1000000000,
       "switch": "C6506E",
-      "switch_port": null
+      "switch_port": "Gi2/10"
     },
     {
       "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
+      "ip": "172.16.176.110",
       "mac": "00:22:19:6d:85:0c",
-      "rate": 1000000000
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "granduc-10-eth1.luxembourg.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi1/33"
     },
     {
       "device": "eth2",
@@ -65,7 +74,8 @@
       "mounted": true,
       "network_address": "granduc-10-eth2.luxembourg.grid5000.fr",
       "rate": 10000000000,
-      "switch": "C5020"
+      "switch": "C5020",
+      "switch_port": "Eth1/11"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.json
index da1392805e3a4962e6aed190e6cc660e1338ac4a..625f731534d3f7a3d49727767ce853aea79f9f73 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.json
@@ -27,7 +27,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "granduc-11-bmc.luxembourg.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi2/11"
     },
     {
       "bridged": true,
@@ -43,15 +45,22 @@
       "network_address": "granduc-11.luxembourg.grid5000.fr",
       "rate": 1000000000,
       "switch": "C6506E",
-      "switch_port": null
+      "switch_port": "Gi2/11"
     },
     {
       "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
+      "ip": "172.16.176.111",
       "mac": "00:19:b9:f2:0f:48",
-      "rate": 1000000000
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "granduc-11-eth1.luxembourg.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi1/34"
     },
     {
       "device": "eth2",
@@ -65,7 +74,8 @@
       "mounted": true,
       "network_address": "granduc-11-eth2.luxembourg.grid5000.fr",
       "rate": 10000000000,
-      "switch": "C5020"
+      "switch": "C5020",
+      "switch_port": "Eth1/12"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.json
index ff3b402a4a23b8b2a8de7f6a56d5c73de687906d..365e34cae8cc7680c93b3cac83387910fb32282b 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.json
@@ -27,7 +27,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "granduc-12-bmc.luxembourg.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi2/12"
     },
     {
       "bridged": true,
@@ -43,15 +45,22 @@
       "network_address": "granduc-12.luxembourg.grid5000.fr",
       "rate": 1000000000,
       "switch": "C6506E",
-      "switch_port": null
+      "switch_port": "Gi2/12"
     },
     {
       "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
+      "ip": "172.16.176.112",
       "mac": "00:19:b9:f2:0e:12",
-      "rate": 1000000000
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "granduc-12-eth1.luxembourg.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi2/24"
     },
     {
       "device": "eth2",
@@ -65,7 +74,8 @@
       "mounted": true,
       "network_address": "granduc-12-eth2.luxembourg.grid5000.fr",
       "rate": 10000000000,
-      "switch": "C5020"
+      "switch": "C5020",
+      "switch_port": "Eth1/13"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.json
index 67de7ffa25d6254756147983a8cf205d2cd36dd9..f2481fe713134ebb078e3b1af93d15b2f912891f 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.json
@@ -27,7 +27,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "granduc-13-bmc.luxembourg.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi2/13"
     },
     {
       "bridged": true,
@@ -43,15 +45,22 @@
       "network_address": "granduc-13.luxembourg.grid5000.fr",
       "rate": 1000000000,
       "switch": "C6506E",
-      "switch_port": null
+      "switch_port": "Gi2/13"
     },
     {
       "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
+      "ip": "172.16.176.113",
       "mac": "00:19:b9:f2:0e:58",
-      "rate": 1000000000
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "granduc-13-eth1.luxembourg.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi2/25"
     },
     {
       "device": "eth2",
@@ -65,7 +74,8 @@
       "mounted": true,
       "network_address": "granduc-13-eth2.luxembourg.grid5000.fr",
       "rate": 10000000000,
-      "switch": "C5020"
+      "switch": "C5020",
+      "switch_port": "Eth1/14"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.json
index 01d2c11fa2f903f96b6fb8cfb0c6e49f466b2348..2587ef01c5972cdf94fd634bfda31ca5d7dba908 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.json
@@ -27,7 +27,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "granduc-14-bmc.luxembourg.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi2/14"
     },
     {
       "bridged": true,
@@ -43,15 +45,22 @@
       "network_address": "granduc-14.luxembourg.grid5000.fr",
       "rate": 1000000000,
       "switch": "C6506E",
-      "switch_port": null
+      "switch_port": "Gi2/14"
     },
     {
       "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
+      "ip": "172.16.176.114",
       "mac": "00:19:b9:f2:03:bd",
-      "rate": 1000000000
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "granduc-14-eth1.luxembourg.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi2/26"
     },
     {
       "device": "eth2",
@@ -65,7 +74,8 @@
       "mounted": true,
       "network_address": "granduc-14-eth2.luxembourg.grid5000.fr",
       "rate": 10000000000,
-      "switch": "C5020"
+      "switch": "C5020",
+      "switch_port": "Eth1/15"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.json
index d807496db0d91c00506034ebee3ad63e150317ee..a0532514e862a8484b1027570d21eda167811297 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.json
@@ -27,7 +27,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "granduc-15-bmc.luxembourg.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi2/15"
     },
     {
       "bridged": true,
@@ -43,15 +45,22 @@
       "network_address": "granduc-15.luxembourg.grid5000.fr",
       "rate": 1000000000,
       "switch": "C6506E",
-      "switch_port": null
+      "switch_port": "Gi2/15"
     },
     {
       "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
+      "ip": "172.16.176.115",
       "mac": "00:19:b9:f2:0e:30",
-      "rate": 1000000000
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "granduc-15-eth1.luxembourg.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi2/27"
     },
     {
       "device": "eth2",
@@ -65,7 +74,8 @@
       "mounted": true,
       "network_address": "granduc-15-eth2.luxembourg.grid5000.fr",
       "rate": 10000000000,
-      "switch": "C5020"
+      "switch": "C5020",
+      "switch_port": "Eth1/16"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.json
index 28ab53ece5d17bdd6de037c01b31276cd9fc41b7..a9755e10f2747b8a5e1777a117fb45c07f4d1b0e 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.json
@@ -27,7 +27,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "granduc-16-bmc.luxembourg.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi2/16"
     },
     {
       "bridged": true,
@@ -43,15 +45,22 @@
       "network_address": "granduc-16.luxembourg.grid5000.fr",
       "rate": 1000000000,
       "switch": "C6506E",
-      "switch_port": null
+      "switch_port": "Gi2/16"
     },
     {
       "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
+      "ip": "172.16.176.116",
       "mac": "00:19:b9:f2:0f:4d",
-      "rate": 1000000000
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "granduc-16-eth1.luxembourg.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi2/28"
     },
     {
       "device": "eth2",
@@ -65,7 +74,8 @@
       "mounted": true,
       "network_address": "granduc-16-eth2.luxembourg.grid5000.fr",
       "rate": 10000000000,
-      "switch": "C5020"
+      "switch": "C5020",
+      "switch_port": null
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.json
index d8d92ab7a654f1e0758dbbd111792dc105eb8484..d1130f45b4ab4a8b3588c99224615eccdfb8c79c 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.json
@@ -27,7 +27,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "granduc-17-bmc.luxembourg.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi2/17"
     },
     {
       "bridged": true,
@@ -43,15 +45,22 @@
       "network_address": "granduc-17.luxembourg.grid5000.fr",
       "rate": 1000000000,
       "switch": "C6506E",
-      "switch_port": null
+      "switch_port": "Gi2/17"
     },
     {
       "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
+      "ip": "172.16.176.117",
       "mac": "00:19:b9:de:b9:1e",
-      "rate": 1000000000
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "granduc-17-eth1.luxembourg.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi2/29"
     },
     {
       "device": "eth2",
@@ -65,7 +74,8 @@
       "mounted": true,
       "network_address": "granduc-17-eth2.luxembourg.grid5000.fr",
       "rate": 10000000000,
-      "switch": "C5020"
+      "switch": "C5020",
+      "switch_port": "Eth1/18"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.json
index 509a45cb78ad7be2d1207d05541735b1456521a8..639c2f3199cbb9a84350c1ae26b108ef83b73375 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.json
@@ -27,7 +27,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "granduc-18-bmc.luxembourg.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi2/18"
     },
     {
       "bridged": true,
@@ -43,15 +45,22 @@
       "network_address": "granduc-18.luxembourg.grid5000.fr",
       "rate": 1000000000,
       "switch": "C6506E",
-      "switch_port": null
+      "switch_port": "Gi2/18"
     },
     {
       "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
+      "ip": "172.16.176.118",
       "mac": "00:19:b9:f3:ba:b2",
-      "rate": 1000000000
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "granduc-18-eth1.luxembourg.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi2/30"
     },
     {
       "device": "eth2",
@@ -65,7 +74,8 @@
       "mounted": true,
       "network_address": "granduc-18-eth2.luxembourg.grid5000.fr",
       "rate": 10000000000,
-      "switch": "C5020"
+      "switch": "C5020",
+      "switch_port": "Eth1/19"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.json
index 6405123a4a7a2bf419cffc1f7037c29ae8110240..fd7b2bfb5f8ac779c19679c0e51bae04cb22a619 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.json
@@ -27,7 +27,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "granduc-19-bmc.luxembourg.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi2/19"
     },
     {
       "bridged": true,
@@ -43,15 +45,22 @@
       "network_address": "granduc-19.luxembourg.grid5000.fr",
       "rate": 1000000000,
       "switch": "C6506E",
-      "switch_port": null
+      "switch_port": "Gi2/19"
     },
     {
       "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
+      "ip": "172.16.176.119",
       "mac": "00:19:b9:f2:0e:df",
-      "rate": 1000000000
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "granduc-19-eth1.luxembourg.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi2/31"
     },
     {
       "device": "eth2",
@@ -65,7 +74,8 @@
       "mounted": true,
       "network_address": "granduc-19-eth2.luxembourg.grid5000.fr",
       "rate": 10000000000,
-      "switch": "C5020"
+      "switch": "C5020",
+      "switch_port": "Eth1/20"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.json
index a9ca8420b0af1cd01679de10ead6c1cad058b50f..94a659c999c844545424b8a483b97570e79a0845 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.json
@@ -27,7 +27,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "granduc-2-bmc.luxembourg.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi2/2"
     },
     {
       "bridged": true,
@@ -43,15 +45,22 @@
       "network_address": "granduc-2.luxembourg.grid5000.fr",
       "rate": 1000000000,
       "switch": "C6506E",
-      "switch_port": null
+      "switch_port": "Gi2/2"
     },
     {
       "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
+      "ip": "172.16.176.102",
       "mac": "00:19:b9:f0:01:d9",
-      "rate": 1000000000
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "granduc-2-eth1.luxembourg.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi1/25"
     },
     {
       "device": "eth2",
@@ -65,7 +74,8 @@
       "mounted": true,
       "network_address": "granduc-2-eth2.luxembourg.grid5000.fr",
       "rate": 10000000000,
-      "switch": "C5020"
+      "switch": "C5020",
+      "switch_port": "Eth1/3"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.json
index 07fed1873cbb9213d6aefe7c091111ebab23f53f..4165dd8edd16b69e445415f61aac5b9656ae1eca 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.json
@@ -27,7 +27,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "granduc-20-bmc.luxembourg.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi2/20"
     },
     {
       "bridged": true,
@@ -43,15 +45,22 @@
       "network_address": "granduc-20.luxembourg.grid5000.fr",
       "rate": 1000000000,
       "switch": "C6506E",
-      "switch_port": null
+      "switch_port": "Gi2/20"
     },
     {
       "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
+      "ip": "172.16.176.120",
       "mac": "00:19:b9:f2:08:cc",
-      "rate": 1000000000
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "granduc-20-eth1.luxembourg.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi2/32"
     },
     {
       "device": "eth2",
@@ -65,7 +74,8 @@
       "mounted": true,
       "network_address": "granduc-20-eth2.luxembourg.grid5000.fr",
       "rate": 10000000000,
-      "switch": "C5020"
+      "switch": "C5020",
+      "switch_port": "Eth1/21"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.json
index 747eacffee1608bb694dc8e5e8e31f5061da326a..9fee1eb7d7c9afaf979eb744f38e75c6bbece0ee 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.json
@@ -27,7 +27,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "granduc-21-bmc.luxembourg.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi2/21"
     },
     {
       "bridged": true,
@@ -43,15 +45,22 @@
       "network_address": "granduc-21.luxembourg.grid5000.fr",
       "rate": 1000000000,
       "switch": "C6506E",
-      "switch_port": null
+      "switch_port": "Gi2/21"
     },
     {
       "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
+      "ip": "172.16.176.121",
       "mac": "00:19:b9:f3:c2:7f",
-      "rate": 1000000000
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "granduc-21-eth1.luxembourg.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi2/33"
     },
     {
       "device": "eth2",
@@ -65,7 +74,8 @@
       "mounted": true,
       "network_address": "granduc-21-eth2.luxembourg.grid5000.fr",
       "rate": 10000000000,
-      "switch": "C5020"
+      "switch": "C5020",
+      "switch_port": "Eth1/22"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.json
index 5c9ddb9afc59242160eb6e8f204452eee3516ee6..a62b2ef04d114333184db89edd8dfec61e9dca18 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.json
@@ -27,7 +27,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "granduc-22-bmc.luxembourg.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi2/22"
     },
     {
       "bridged": true,
@@ -43,15 +45,22 @@
       "network_address": "granduc-22.luxembourg.grid5000.fr",
       "rate": 1000000000,
       "switch": "C6506E",
-      "switch_port": null
+      "switch_port": "Gi2/22"
     },
     {
       "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
+      "ip": "172.16.176.122",
       "mac": "00:19:b9:f3:ba:a8",
-      "rate": 1000000000
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "granduc-22-eth1.luxembourg.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi2/34"
     },
     {
       "device": "eth2",
@@ -65,7 +74,8 @@
       "mounted": true,
       "network_address": "granduc-22-eth2.luxembourg.grid5000.fr",
       "rate": 10000000000,
-      "switch": "C5020"
+      "switch": "C5020",
+      "switch_port": "Eth1/23"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.json
index 5044a9df2513f98455cdca0e4c7f3b9f0dee2c10..e248197fe0068813cd85b539ebd37324801ad9ad 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.json
@@ -27,7 +27,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "granduc-3-bmc.luxembourg.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi2/3"
     },
     {
       "bridged": true,
@@ -43,15 +45,22 @@
       "network_address": "granduc-3.luxembourg.grid5000.fr",
       "rate": 1000000000,
       "switch": "C6506E",
-      "switch_port": null
+      "switch_port": "Gi2/3"
     },
     {
       "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
+      "ip": "172.16.176.103",
       "mac": "00:19:b9:f2:0e:85",
-      "rate": 1000000000
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "granduc-3-eth1.luxembourg.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi1/26"
     },
     {
       "device": "eth2",
@@ -65,7 +74,8 @@
       "mounted": true,
       "network_address": "granduc-3-eth2.luxembourg.grid5000.fr",
       "rate": 10000000000,
-      "switch": "C5020"
+      "switch": "C5020",
+      "switch_port": "Eth1/4"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.json
index 8d7fb92d10f51fe4290f442863d39e6f04dd5191..faac96a8571537ac6fae197b10c8caa575148fe3 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.json
@@ -27,7 +27,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "granduc-4-bmc.luxembourg.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi2/4"
     },
     {
       "bridged": true,
@@ -43,15 +45,22 @@
       "network_address": "granduc-4.luxembourg.grid5000.fr",
       "rate": 1000000000,
       "switch": "C6506E",
-      "switch_port": null
+      "switch_port": "Gi2/4"
     },
     {
       "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
+      "ip": "172.16.176.104",
       "mac": "00:19:b9:f2:0a:e8",
-      "rate": 1000000000
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "granduc-4-eth1.luxembourg.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi1/27"
     },
     {
       "device": "eth2",
@@ -65,7 +74,8 @@
       "mounted": true,
       "network_address": "granduc-4-eth2.luxembourg.grid5000.fr",
       "rate": 10000000000,
-      "switch": "C5020"
+      "switch": "C5020",
+      "switch_port": "Eth1/5"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.json
index 520645de59b6e487699ee9c2532ee3ae572c7557..d302bc44253c4d0a40c5a1277fda42e726dec4ab 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.json
@@ -27,7 +27,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "granduc-5-bmc.luxembourg.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi2/5"
     },
     {
       "bridged": true,
@@ -43,15 +45,22 @@
       "network_address": "granduc-5.luxembourg.grid5000.fr",
       "rate": 1000000000,
       "switch": "C6506E",
-      "switch_port": null
+      "switch_port": "Gi2/5"
     },
     {
       "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
+      "ip": "172.16.176.105",
       "mac": "00:19:b9:f1:f8:0b",
-      "rate": 1000000000
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "granduc-5-eth1.luxembourg.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi1/28"
     },
     {
       "device": "eth2",
@@ -65,7 +74,8 @@
       "mounted": true,
       "network_address": "granduc-5-eth2.luxembourg.grid5000.fr",
       "rate": 10000000000,
-      "switch": "C5020"
+      "switch": "C5020",
+      "switch_port": "Eth1/6"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.json
index 0d35f33c20af3bc3f4d3db86479a5d1d786edeaa..3ec261ffda850d77938406c11b4cf180b94ed080 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.json
@@ -27,7 +27,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "granduc-6-bmc.luxembourg.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi2/6"
     },
     {
       "bridged": true,
@@ -43,15 +45,22 @@
       "network_address": "granduc-6.luxembourg.grid5000.fr",
       "rate": 1000000000,
       "switch": "C6506E",
-      "switch_port": null
+      "switch_port": "Gi2/6"
     },
     {
       "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
+      "ip": "172.16.176.106",
       "mac": "00:19:b9:f2:0c:82",
-      "rate": 1000000000
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "granduc-6-eth1.luxembourg.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi1/29"
     },
     {
       "device": "eth2",
@@ -65,7 +74,8 @@
       "mounted": true,
       "network_address": "granduc-6-eth2.luxembourg.grid5000.fr",
       "rate": 10000000000,
-      "switch": "C5020"
+      "switch": "C5020",
+      "switch_port": "Eth1/7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.json
index 9b84fda063cd73cd811b13a0fa5de6975a4026cd..16d38c5b17d15834d30ae51fdca192b9c19a7b86 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.json
@@ -27,7 +27,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "granduc-7-bmc.luxembourg.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi2/7"
     },
     {
       "bridged": true,
@@ -43,15 +45,22 @@
       "network_address": "granduc-7.luxembourg.grid5000.fr",
       "rate": 1000000000,
       "switch": "C6506E",
-      "switch_port": null
+      "switch_port": "Gi2/7"
     },
     {
       "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
+      "ip": "172.16.176.107",
       "mac": "00:19:b9:f2:0e:71",
-      "rate": 1000000000
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "granduc-7-eth1.luxembourg.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi1/30"
     },
     {
       "device": "eth2",
@@ -65,7 +74,8 @@
       "mounted": true,
       "network_address": "granduc-7-eth2.luxembourg.grid5000.fr",
       "rate": 10000000000,
-      "switch": "C5020"
+      "switch": "C5020",
+      "switch_port": "Eth1/8"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.json
index e592bff2f70c66d85ac129b3081a8855ae7e85fa..3e149432308e88f9310eb45d849d2a0cb968848a 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.json
@@ -27,7 +27,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "granduc-8-bmc.luxembourg.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi2/8"
     },
     {
       "bridged": true,
@@ -43,15 +45,22 @@
       "network_address": "granduc-8.luxembourg.grid5000.fr",
       "rate": 1000000000,
       "switch": "C6506E",
-      "switch_port": null
+      "switch_port": "Gi2/8"
     },
     {
       "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
+      "ip": "172.16.176.108",
       "mac": "00:19:b9:ee:11:4c",
-      "rate": 1000000000
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "granduc-8-eth1.luxembourg.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi1/31"
     },
     {
       "device": "eth2",
@@ -65,7 +74,8 @@
       "mounted": true,
       "network_address": "granduc-8-eth2.luxembourg.grid5000.fr",
       "rate": 10000000000,
-      "switch": "C5020"
+      "switch": "C5020",
+      "switch_port": "Eth1/9"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.json
index 2253d95e79200082cf30e5d7e632838241eecf74..15d7f04574dae4d52d4a7419127bf63bc3d7d72f 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.json
@@ -27,7 +27,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "granduc-9-bmc.luxembourg.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi2/9"
     },
     {
       "bridged": true,
@@ -43,15 +45,22 @@
       "network_address": "granduc-9.luxembourg.grid5000.fr",
       "rate": 1000000000,
       "switch": "C6506E",
-      "switch_port": null
+      "switch_port": "Gi2/9"
     },
     {
       "device": "eth1",
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
+      "ip": "172.16.176.109",
       "mac": "00:19:b9:f1:fc:4b",
-      "rate": 1000000000
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "granduc-9-eth1.luxembourg.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "C6506E",
+      "switch_port": "Gi1/32"
     },
     {
       "device": "eth2",
@@ -65,7 +74,8 @@
       "mounted": true,
       "network_address": "granduc-9-eth2.luxembourg.grid5000.fr",
       "rate": 10000000000,
-      "switch": "C5020"
+      "switch": "C5020",
+      "switch_port": "Eth1/10"
     }
   ],
   "operating_system": {
diff --git a/generators/input/sites/luxembourg/clusters/granduc.rb b/generators/input/sites/luxembourg/clusters/granduc.rb
index e4514516aa501a5cca94eee6cd1b4743d4219b7b..80dbeb0a4abe38d1d72dbaeae36417a82ec2cd38 100644
--- a/generators/input/sites/luxembourg/clusters/granduc.rb
+++ b/generators/input/sites/luxembourg/clusters/granduc.rb
@@ -44,16 +44,18 @@ site :luxembourg do |site_uid|
           :rev        => lookup('granduc', node_uid, 'block_devices', 'sda', 'rev')
         }]
         network_adapters [{
-           :interface        => 'Ethernet',
-           :rate             => 1.G,
-           :enabled          => true,
-           :management       => true,
-           :mountable        => false,
-           :mounted          => false,
-           :device           => "bmc",
-           :network_address  => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-           :ip               => lookup('granduc', node_uid, 'network_interfaces', 'bmc', 'ip'),
-           :mac              => lookup('granduc', node_uid, 'network_interfaces', 'bmc', 'mac')
+          :interface        => 'Ethernet',
+          :rate             => 1.G,
+          :enabled          => true,
+          :management       => true,
+          :mountable        => false,
+          :mounted          => false,
+          :device           => "bmc",
+          :network_address  => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
+          :ip               => lookup('granduc', node_uid, 'network_interfaces', 'bmc', 'ip'),
+          :switch           => "C6506E",
+          :switch_port      => lookup('granduc', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
+          :mac              => lookup('granduc', node_uid, 'network_interfaces', 'bmc', 'mac')
          },
          {
           :interface        => 'Ethernet',
@@ -75,8 +77,15 @@ site :luxembourg do |site_uid|
           :interface        => 'Ethernet',
           :rate             => 1.G,
           :enabled          => false,
+          :management       => false,
           :device           => "eth1",
+          :mountable        => true,
+          :mounted          => false,
           :driver           => "bnx2",
+          :network_address  => "#{node_uid}-eth1.#{site_uid}.grid5000.fr",
+          :ip               => lookup('granduc', node_uid, 'network_interfaces', 'eth1', 'ip'),
+          :switch           => "C6506E",
+          :switch_port      => lookup('granduc', node_uid, 'network_interfaces', 'eth1', 'switch_port'),
           :mac              => lookup('granduc', node_uid, 'network_interfaces', 'eth1', 'mac')
         },
         {
@@ -89,6 +98,7 @@ site :luxembourg do |site_uid|
           :device           => "eth2",
           :driver           => "ixgbe",
           :switch           => "C5020",
+          :switch_port      => lookup('granduc', node_uid, 'network_interfaces', 'eth2', 'switch_port'),
           :network_address  => "#{node_uid}-eth2.#{site_uid}.grid5000.fr",
           :ip               => lookup('granduc', node_uid, 'network_interfaces', 'eth2', 'ip'),
           :mac              => lookup('granduc', node_uid, 'network_interfaces', 'eth2', 'mac')
diff --git a/generators/input/sites/luxembourg/clusters/granduc.yaml b/generators/input/sites/luxembourg/clusters/granduc.yaml
index e079990671f70388e5535967b9718473f0826dbe..c6adc6938934c56f60ff50505b9c5de4e2589d53 100644
--- a/generators/input/sites/luxembourg/clusters/granduc.yaml
+++ b/generators/input/sites/luxembourg/clusters/granduc.yaml
@@ -14,16 +14,19 @@ granduc-1:
     bmc:
       mac: 00:1c:23:c8:69:c2
       ip: 172.17.176.1
+      switch_port: Gi1/1
     eth0:
       mac: 00:19:b9:f0:01:c8
       ip: 172.16.176.1
-      switch_port:
+      switch_port: Gi2/1
     eth1:
       mac: 00:19:b9:f0:01:ca
-      ip: 172.18.176.1
+      ip: 172.16.176.101
+      switch_port: Gi1/24
     eth2:
       mac: 00:1b:21:34:e1:4b
       ip: 192.168.14.1
+      switch_port: Eth1/2
   chassis:
     serial_number: 2QV963J
     manufacturer: Dell Inc.
@@ -43,16 +46,19 @@ granduc-2:
     bmc:
       mac: 00:1c:23:c8:69:aa
       ip: 172.17.176.2
+      switch_port: Gi1/2
     eth0:
       mac: 00:19:b9:f0:01:d7
       ip: 172.16.176.2
-      switch_port:
+      switch_port: Gi2/2
     eth1:
       mac: 00:19:b9:f0:01:d9
-      ip: 172.18.176.2
+      ip: 172.16.176.102
+      switch_port: Gi1/25
     eth2:
       mac: 00:1b:21:34:e1:35
       ip: 192.168.14.2
+      switch_port: Eth1/3
   chassis:
     serial_number: 1QV963J
     manufacturer: Dell Inc.
@@ -72,16 +78,19 @@ granduc-3:
     bmc:
       mac: 00:1c:23:d6:c3:0a
       ip: 172.17.176.3
+      switch_port: Gi1/3
     eth0:
       mac: 00:19:b9:f2:0e:83
       ip: 172.16.176.3
-      switch_port:
+      switch_port: Gi2/3
     eth1:
       mac: 00:19:b9:f2:0e:85
-      ip: 172.18.176.3
+      ip: 172.16.176.103
+      switch_port: Gi1/26
     eth2:
       mac: 00:1b:21:3c:87:cb
       ip: 192.168.14.3
+      switch_port: Eth1/4
   chassis:
     serial_number: 3R2593J
     manufacturer: Dell Inc.
@@ -101,16 +110,19 @@ granduc-4:
     bmc:
       mac: 00:1c:23:d6:c3:06
       ip: 172.17.176.4
+      switch_port: Gi1/4
     eth0:
       mac: 00:19:b9:f2:0a:e6
       ip: 172.16.176.4
-      switch_port:
+      switch_port: Gi2/4
     eth1:
       mac: 00:19:b9:f2:0a:e8
-      ip: 172.18.176.4
+      ip: 172.16.176.104
+      switch_port: Gi1/27
     eth2:
       mac: 00:1b:21:3d:12:e9 
       ip: 192.168.14.4
+      switch_port: Eth1/5
   chassis:
     serial_number: FQ2593J
     manufacturer: Dell Inc.
@@ -130,16 +142,19 @@ granduc-5:
     bmc:
       mac: 00:1c:23:d3:42:46
       ip: 172.17.176.5
+      switch_port: Gi1/5
     eth0:
       mac: 00:19:b9:f1:f8:09
       ip: 172.16.176.5
-      switch_port:
+      switch_port: Gi2/5
     eth1:
       mac: 00:19:b9:f1:f8:0b
-      ip: 172.18.176.5
+      ip: 172.16.176.105
+      switch_port: Gi1/28
     eth2:
       mac: 00:1b:21:3d:12:d1
       ip: 192.168.14.5
+      switch_port: Eth1/6
   chassis:
     serial_number: 99N983J
     manufacturer: Dell Inc.
@@ -159,16 +174,19 @@ granduc-6:
     bmc:
       mac: 00:1c:23:d6:c3:08
       ip: 172.17.176.6
+      switch_port: Gi1/6
     eth0:
       mac: 00:19:b9:f2:0c:80
       ip: 172.16.176.6
+      switch_port: Gi2/6
     eth1:
       mac: 00:19:b9:f2:0c:82
-      ip: 172.18.176.6
-      switch_port:
+      ip: 172.16.176.106
+      switch_port: Gi1/29
     eth2:
       mac: 00:1b:21:3d:13:ab
       ip: 192.168.14.6
+      switch_port: Eth1/7
   chassis:
     serial_number: BQ2593J
     manufacturer: Dell Inc.
@@ -188,16 +206,19 @@ granduc-7:
     bmc:
       mac: 00:1c:23:d3:42:2c
       ip: 172.17.176.7
+      switch_port: Gi1/7
     eth0:
       mac: 00:19:b9:f2:0e:6f
       ip: 172.16.176.7
-      switch_port:
+      switch_port: Gi2/7
     eth1:
       mac: 00:19:b9:f2:0e:71
-      ip: 172.18.176.7
+      ip: 172.16.176.107
+      switch_port: Gi1/30
     eth2:
       mac: 00:1b:21:34:e1:5f
       ip: 192.168.14.7
+      switch_port: Eth1/8
   chassis:
     serial_number: 49N983J
     manufacturer: Dell Inc.
@@ -217,16 +238,19 @@ granduc-8:
     bmc:
       mac: 00:1c:23:d3:08:7a
       ip: 172.17.176.8
+      switch_port: Gi1/8
     eth0:
       mac: 00:19:b9:ee:11:4a
       ip: 172.16.176.8
-      switch_port:
+      switch_port: Gi2/8
     eth1:
       mac: 00:19:b9:ee:11:4c
-      ip: 172.18.176.8
+      ip: 172.16.176.108
+      switch_port: Gi1/31
     eth2:
       mac: 00:1b:21:34:e1:8d
       ip: 192.168.14.8
+      switch_port: Eth1/9
   chassis:
     serial_number: 59N983J
     manufacturer: Dell Inc.
@@ -246,16 +270,19 @@ granduc-9:
     bmc:
       mac: 00:1c:23:d3:42:88
       ip: 172.17.176.9
+      switch_port: Gi1/9
     eth0:
       mac: 00:19:b9:f1:fc:49
       ip: 172.16.176.9
-      switch_port:
+      switch_port: Gi2/9
     eth1:
       mac: 00:19:b9:f1:fc:4b
-      ip: 172.18.176.9
+      ip: 172.16.176.109
+      switch_port: Gi1/32
     eth2:
       mac: 00:1b:21:3d:14:31
       ip: 192.168.14.9
+      switch_port: Eth1/10
   chassis:
     serial_number: 89N983J
     manufacturer: Dell Inc.
@@ -275,16 +302,19 @@ granduc-10:
     bmc:
       mac: 00:1c:23:d3:42:56
       ip: 172.17.176.10
+      switch_port: Gi1/10
     eth0:
       mac: 00:22:19:6d:85:0a
       ip: 172.16.176.10
-      switch_port:
+      switch_port: Gi2/10
     eth1:
       mac: 00:22:19:6d:85:0c
-      ip: 172.18.176.10
+      ip: 172.16.176.110
+      switch_port: Gi1/33
     eth2:
       mac: 00:1b:21:34:e1:3d
       ip: 192.168.14.10
+      switch_port: Eth1/11
   chassis:
     serial_number: 79N983J
     manufacturer: Dell Inc.
@@ -304,16 +334,19 @@ granduc-11:
     bmc:
       mac: 00:1c:23:d3:57:59
       ip: 172.17.176.11
+      switch_port: Gi1/11
     eth0:
       mac: 00:19:b9:f2:0f:46
       ip: 172.16.176.11
-      switch_port:
+      switch_port: Gi2/11
     eth1:
       mac: 00:19:b9:f2:0f:48
-      ip: 172.18.176.11
+      ip: 172.16.176.111
+      switch_port: Gi1/34
     eth2:
       mac: 00:1b:21:34:e1:27
       ip: 192.168.14.11
+      switch_port: Eth1/12
   chassis:
     serial_number: 30W883J
     manufacturer: Dell Inc.
@@ -333,15 +366,19 @@ granduc-12:
     bmc:
       mac: 00:1c:23:d3:57:5f
       ip: 172.17.176.12
+      switch_port: Gi1/12
     eth0:
       mac: 00:19:b9:f2:0e:10
       ip: 172.16.176.12
+      switch_port: Gi2/12
     eth1:
       mac: 00:19:b9:f2:0e:12
-      ip: 172.18.176.12
+      ip: 172.16.176.112
+      switch_port: Gi2/24
     eth2:
       mac: 00:1b:21:34:e1:1c
       ip: 192.168.14.12
+      switch_port: Eth1/13
   chassis:
     serial_number: 50W883J
     manufacturer: Dell Inc.
@@ -361,16 +398,19 @@ granduc-13:
     bmc:
       mac: 00:1c:23:d3:57:75
       ip: 172.17.176.13
+      switch_port: Gi1/13
     eth0:
       mac: 00:19:b9:f2:0e:56
       ip: 172.16.176.13
-      switch_port:
+      switch_port: Gi2/13
     eth1:
       mac: 00:19:b9:f2:0e:58
-      ip: 172.18.176.13
+      ip: 172.16.176.113
+      switch_port: Gi2/25
     eth2:
       mac: 00:1b:21:3d:13:af
       ip: 192.168.14.13
+      switch_port: Eth1/14
   chassis:
     serial_number: 40W883J
     manufacturer: Dell Inc.
@@ -390,16 +430,19 @@ granduc-14:
     bmc:
       mac: 00:1c:23:d3:57:3b
       ip: 172.17.176.14
+      switch_port: Gi1/14
     eth0:
       mac: 00:19:b9:f2:03:bb
       ip: 172.16.176.14
-      switch_port:
+      switch_port: Gi2/14
     eth1:
       mac: 00:19:b9:f2:03:bd
-      ip: 172.18.176.14
+      ip: 172.16.176.114
+      switch_port: Gi2/26
     eth2:
       mac: 00:1b:21:3d:11:f7
       ip: 192.168.14.14
+      switch_port: Eth1/15
   chassis:
     serial_number: 10W883J
     manufacturer: Dell Inc.
@@ -419,16 +462,19 @@ granduc-15:
     bmc:
       mac: 00:1c:23:d3:57:37
       ip: 172.17.176.15
+      switch_port: Gi1/15
     eth0:
       mac: 00:19:b9:f2:0e:2e
       ip: 172.16.176.15
-      switch_port:
+      switch_port: Gi2/15
     eth1:
       mac: 00:19:b9:f2:0e:30
-      ip: 172.18.176.15
+      ip: 172.16.176.115
+      switch_port: Gi2/27
     eth2:
       mac: 00:1b:21:34:e0:f1
       ip: 192.168.14.15
+      switch_port: Eth1/16
   chassis:
     serial_number: 60W883J
     manufacturer: Dell Inc.
@@ -448,13 +494,15 @@ granduc-16:
     bmc:
       mac: 00:1c:23:d3:57:67
       ip: 172.17.176.16
+      switch_port: Gi1/16
     eth0:
       mac: 00:19:b9:f2:0f:4b
       ip: 172.16.176.16
-      switch_port:
+      switch_port: Gi2/16
     eth1:
       mac: 00:19:b9:f2:0f:4d
-      ip: 172.18.176.16
+      ip: 172.16.176.116
+      switch_port: Gi2/28
     eth2:
       mac: 00:1b:21:34:e1:1a
       ip: 192.168.14.16
@@ -477,16 +525,19 @@ granduc-17:
     bmc:
       mac: 00:1c:23:d3:57:89
       ip: 172.17.176.17
+      switch_port: Gi1/17
     eth0:
       mac: 00:19:b9:de:b9:1c
       ip: 172.16.176.17
-      switch_port:
+      switch_port: Gi2/17
     eth1:
       mac: 00:19:b9:de:b9:1e
-      ip: 172.18.176.17
+      ip: 172.16.176.117
+      switch_port: Gi2/29
     eth2:
       mac: 00:1b:21:3c:87:71
       ip: 192.168.14.17
+      switch_port: Eth1/18
   chassis:
     serial_number: 20W883J
     manufacturer: Dell Inc.
@@ -506,16 +557,19 @@ granduc-18:
     bmc:
       mac: 00:1c:23:d6:c4:ea
       ip: 172.17.176.18
+      switch_port: Gi1/18
     eth0:
       mac: 00:19:b9:f3:ba:b0
       ip: 172.16.176.18
-      switch_port:
+      switch_port: Gi2/18
     eth1:
       mac: 00:19:b9:f3:ba:b2
-      ip: 172.18.176.18
+      ip: 172.16.176.118
+      switch_port: Gi2/30
     eth2:
       mac: 00:1b:21:34:e1:07
       ip: 192.168.14.18
+      switch_port: Eth1/19
   chassis:
     serial_number: GQ2593J
     manufacturer: Dell Inc.
@@ -535,16 +589,19 @@ granduc-19:
     bmc:
       mac: 00:1c:23:d3:42:4e
       ip: 172.17.176.19
+      switch_port: Gi1/19
     eth0:
       mac: 00:19:b9:f2:0e:dd
       ip: 172.16.176.19
-      switch_port:
+      switch_port: Gi2/19
     eth1:
       mac: 00:19:b9:f2:0e:df
-      ip: 172.18.176.19
+      ip: 172.16.176.119
+      switch_port: Gi2/31
     eth2:
       mac: 00:1b:21:3d:13:9b
       ip: 192.168.14.19
+      switch_port: Eth1/20
   chassis:
     serial_number: 69N983J
     manufacturer: Dell Inc.
@@ -564,16 +621,19 @@ granduc-20:
     bmc:
       mac: 00:1c:23:d3:42:6c
       ip: 172.17.176.20
+      switch_port: Gi1/20
     eth0:
       mac: 00:19:b9:f2:08:ca
       ip: 172.16.176.20
-      switch_port:
+      switch_port: Gi2/20
     eth1:
       mac: 00:19:b9:f2:08:cc
-      ip: 172.18.176.20
+      ip: 172.16.176.120
+      switch_port: Gi2/32
     eth2:
       mac: 00:1b:21:3d:13:27
       ip: 192.168.14.20
+      switch_port: Eth1/21
   chassis:
     serial_number: 39N983J
     manufacturer: Dell Inc.
@@ -593,16 +653,19 @@ granduc-21:
     bmc:
       mac: 00:1c:23:d6:c3:0c
       ip: 172.17.176.21
+      switch_port: Gi1/21
     eth0:
       mac: 00:19:b9:f3:c2:7d
       ip: 172.16.176.21
-      switch_port:
+      switch_port: Gi2/21
     eth1:
       mac: 00:19:b9:f3:c2:7f
-      ip: 172.18.176.21
+      ip: 172.16.176.121
+      switch_port: Gi2/33
     eth2:
       mac: 00:1b:21:3d:13:7d
       ip: 192.168.14.21
+      switch_port: Eth1/22
   chassis:
     serial_number: 1R2593J
     manufacturer: Dell Inc.
@@ -622,16 +685,19 @@ granduc-22:
     bmc:
       mac: 00:1c:23:d6:c3:32
       ip: 172.17.176.22
+      switch_port: Gi1/22
     eth0:
       mac: 00:19:b9:f3:ba:a6
       ip: 172.16.176.22
-      switch_port:
+      switch_port: Gi2/22
     eth1:
       mac: 00:19:b9:f3:ba:a8
-      ip: 172.18.176.22
+      ip: 172.16.176.122
+      switch_port: Gi2/34
     eth2:
       mac: 00:1b:21:34:e0:e7
       ip: 192.168.14.22
+      switch_port: Eth1/23
   chassis:
     serial_number: HQ2593J
     manufacturer: Dell Inc.