diff --git a/data/grid5000/sites/lille/network_equipments/sw-chiclet-1.json b/data/grid5000/sites/lille/network_equipments/sw-chiclet-1.json
index 596b813720ec8d9f9ff164d8751d1f3c9936eb71..083c3785008891ffd9b51121a2b126930543ad29 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-chiclet-1.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-chiclet-1.json
@@ -117,9 +117,15 @@
         {
         },
         {
+          "aggregation": "lacp",
+          "kind": "switch",
+          "port": "Ethernet1/52",
           "uid": "lacp-sw-chiclet-2"
         },
         {
+          "aggregation": "lacp",
+          "kind": "switch",
+          "port": "Ethernet1/51",
           "uid": "lacp-sw-chiclet-2"
         }
       ],
diff --git a/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json b/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json
index b5464fcde7680e2eaed0c2fd4014fe6119925282..b4dc26d3a3f2258edcf509a7d720bc88f4f0162d 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json
@@ -115,16 +115,28 @@
         {
         },
         {
-          "uid": "lacp sw-chiclet-1"
+          "aggregation": "lacp",
+          "kind": "switch",
+          "port": "Ethernet1/54",
+          "uid": "lacp-sw-chiclet-1"
         },
         {
-          "uid": "lacp sw-chiclet-1"
+          "aggregation": "lacp",
+          "kind": "switch",
+          "port": "Ethernet1/53",
+          "uid": "lacp-sw-chiclet-1"
         },
         {
-          "uid": "lacp sw-chiclet-3"
+          "aggregation": "lacp",
+          "kind": "switch",
+          "port": "Ethernet1/53",
+          "uid": "lacp-sw-chiclet-3"
         },
         {
-          "uid": "lacp sw-chiclet-3"
+          "aggregation": "lacp",
+          "kind": "switch",
+          "port": "Ethernet1/54",
+          "uid": "lacp-sw-chiclet-3"
         }
       ],
       "rate": 10000000000,
diff --git a/data/grid5000/sites/lille/network_equipments/sw-chiclet-3.json b/data/grid5000/sites/lille/network_equipments/sw-chiclet-3.json
index 2bcf1d658fe676926c69eb6acba74834785068b0..0dde5ce0ed7ab3adcf719b64ddf7f497d89268fd 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-chiclet-3.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-chiclet-3.json
@@ -140,10 +140,16 @@
         {
         },
         {
-          "uid": "lacp sw-chiclet-2"
+          "aggregation": "lacp",
+          "kind": "switch",
+          "port": "Ethernet1/53",
+          "uid": "lacp-sw-chiclet-2"
         },
         {
-          "uid": "lacp sw-chiclet-2"
+          "aggregation": "lacp",
+          "kind": "switch",
+          "port": "Ethernet1/54",
+          "uid": "lacp-sw-chiclet-2"
         }
       ],
       "rate": 10000000000,
diff --git a/grid5000-all.json b/grid5000-all.json
index b510bd90025f568c61687632f8fea220846ef50f..742e2f50f346009e830e5a0a04b9dd333c744156 100644
--- a/grid5000-all.json
+++ b/grid5000-all.json
@@ -27905,8 +27905,18 @@
               "kind": "virtual",
               "port": "eth0",
               "ports": {
-                "53": "lacp-sw-chiclet-2",
-                "54": "lacp-sw-chiclet-2"
+                "53": {
+                  "aggregation": "lacp",
+                  "kind": "switch",
+                  "port": "Ethernet1/52",
+                  "uid": "lacp-sw-chiclet-2"
+                },
+                "54": {
+                  "aggregation": "lacp",
+                  "kind": "switch",
+                  "port": "Ethernet1/51",
+                  "uid": "lacp-sw-chiclet-2"
+                }
               },
               "rate": 10000000000,
               "snmp_pattern": "Ethernet%LINECARD%/%PORT%"
@@ -27939,10 +27949,30 @@
               "ports": {
                 "33": "renater5-FON",
                 "35": "labo",
-                "51": "lacp sw-chiclet-1",
-                "52": "lacp sw-chiclet-1",
-                "53": "lacp sw-chiclet-3",
-                "54": "lacp sw-chiclet-3"
+                "51": {
+                  "aggregation": "lacp",
+                  "kind": "switch",
+                  "port": "Ethernet1/54",
+                  "uid": "lacp-sw-chiclet-1"
+                },
+                "52": {
+                  "aggregation": "lacp",
+                  "kind": "switch",
+                  "port": "Ethernet1/53",
+                  "uid": "lacp-sw-chiclet-1"
+                },
+                "53": {
+                  "aggregation": "lacp",
+                  "kind": "switch",
+                  "port": "Ethernet1/53",
+                  "uid": "lacp-sw-chiclet-3"
+                },
+                "54": {
+                  "aggregation": "lacp",
+                  "kind": "switch",
+                  "port": "Ethernet1/54",
+                  "uid": "lacp-sw-chiclet-3"
+                }
               },
               "rate": 10000000000,
               "snmp_pattern": "Ethernet%LINECARD%/%PORT%"
@@ -28070,8 +28100,18 @@
                 "3": "chetemi-3",
                 "4": "chetemi-4",
                 "5": "chetemi-5",
-                "53": "lacp sw-chiclet-2",
-                "54": "lacp sw-chiclet-2",
+                "53": {
+                  "aggregation": "lacp",
+                  "kind": "switch",
+                  "port": "Ethernet1/53",
+                  "uid": "lacp-sw-chiclet-2"
+                },
+                "54": {
+                  "aggregation": "lacp",
+                  "kind": "switch",
+                  "port": "Ethernet1/54",
+                  "uid": "lacp-sw-chiclet-2"
+                },
                 "6": "chetemi-6",
                 "7": "chetemi-7",
                 "8": "chetemi-8",
diff --git a/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml b/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml
index b352de7f20b906ffa3c4b918bd22b077df48d757..631c35d4bbec5aacf05725925b5725552639e9b8 100644
--- a/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml
+++ b/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml
@@ -19,5 +19,13 @@ sw-chiclet-1:
       rate: 10000000000
       port: eth0
       ports:
-        53: lacp-sw-chiclet-2
-        54: lacp-sw-chiclet-2
+        53:
+          uid: lacp-sw-chiclet-2
+          kind: switch
+          port: Ethernet1/52
+          aggregation: lacp
+        54:
+          uid: lacp-sw-chiclet-2
+          kind: switch
+          port: Ethernet1/51
+          aggregation: lacp
diff --git a/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml b/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml
index 8e9966ac15c9a1fa3addacc6453d3470654c3d4e..c8ac2a34cbe9026af95067d13468e56418e6dd82 100644
--- a/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml
+++ b/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml
@@ -72,7 +72,23 @@ sw-chiclet-2:
       ports:
         33: renater5-FON
         35: labo
-        51: lacp sw-chiclet-1
-        52: lacp sw-chiclet-1
-        53: lacp sw-chiclet-3
-        54: lacp sw-chiclet-3
+        51:
+          uid: lacp-sw-chiclet-1
+          kind: switch
+          port: Ethernet1/54
+          aggregation: lacp
+        52:
+          uid: lacp-sw-chiclet-1
+          kind: switch
+          port: Ethernet1/53
+          aggregation: lacp
+        53:
+          uid: lacp-sw-chiclet-3
+          kind: switch
+          port: Ethernet1/53
+          aggregation: lacp
+        54:
+          uid: lacp-sw-chiclet-3
+          kind: switch
+          port: Ethernet1/54
+          aggregation: lacp
diff --git a/input/grid5000/sites/lille/networks/sw-chiclet-3.yaml b/input/grid5000/sites/lille/networks/sw-chiclet-3.yaml
index dc95070245ccab9f9e966bd96e1c98e5353b6164..79f1ac50898e865dc2fc1c56f9f6bd657a95a237 100644
--- a/input/grid5000/sites/lille/networks/sw-chiclet-3.yaml
+++ b/input/grid5000/sites/lille/networks/sw-chiclet-3.yaml
@@ -42,5 +42,13 @@ sw-chiclet-3:
           22: chifflet-6
           23: chifflet-7
           24: chifflet-8
-          53: lacp sw-chiclet-2
-          54: lacp sw-chiclet-2
+          53:
+            uid: lacp-sw-chiclet-2
+            kind: switch
+            port: Ethernet1/53
+            aggregation: lacp
+          54:
+            uid: lacp-sw-chiclet-2
+            kind: switch
+            port: Ethernet1/54
+            aggregation: lacp