From 4568d729267a7410b6d2a185b6495190bd33c5fa Mon Sep 17 00:00:00 2001
From: Nicolas Perrin <nicolas.perrin@inria.fr>
Date: Thu, 27 Jun 2024 08:14:23 +0200
Subject: [PATCH] [rennes][network] swdc-c003-01-02-rba is now sw-1-c003 with
 direct link to gw

---
 .../clusters/abacus12/nodes/abacus12-1.json   |  2 +-
 .../clusters/abacus14/nodes/abacus14-1.json   |  2 +-
 .../clusters/abacus16/nodes/abacus16-1.json   |  2 +-
 .../clusters/abacus9/nodes/abacus9-1.json     |  2 +-
 .../clusters/roazhon13/nodes/roazhon13-1.json |  2 +-
 .../clusters/roazhon13/nodes/roazhon13-2.json |  2 +-
 .../clusters/roazhon13/nodes/roazhon13-5.json |  2 +-
 .../clusters/roazhon13/nodes/roazhon13-6.json |  2 +-
 .../clusters/roazhon13/nodes/roazhon13-7.json |  2 +-
 .../clusters/roazhon13/nodes/roazhon13-8.json |  2 +-
 .../clusters/roazhon3/nodes/roazhon3-1.json   |  2 +-
 .../clusters/roazhon7/nodes/roazhon7-1.json   |  2 +-
 .../clusters/roazhon7/nodes/roazhon7-2.json   |  2 +-
 .../clusters/roazhon7/nodes/roazhon7-3.json   |  2 +-
 .../clusters/roazhon7/nodes/roazhon7-4.json   |  2 +-
 .../clusters/roazhon8/nodes/roazhon8-1.json   |  2 +-
 .../clusters/roazhon8/nodes/roazhon8-2.json   |  2 +-
 .../clusters/roazhon8/nodes/roazhon8-3.json   |  2 +-
 .../clusters/roazhon8/nodes/roazhon8-4.json   |  2 +-
 .../clusters/roazhon9/nodes/roazhon9-1.json   |  2 +-
 .../clusters/roazhon9/nodes/roazhon9-2.json   |  2 +-
 .../clusters/roazhon9/nodes/roazhon9-3.json   |  2 +-
 .../clusters/roazhon9/nodes/roazhon9-4.json   |  2 +-
 .../sites/rennes/network_equipments/gw.json   |  8 +++--
 ...w-dell-c003-01-rba.json => sw-1-c003.json} | 29 +++++--------------
 .../swdc-c003-01-02-rba.json                  | 12 --------
 .../sites/rennes/networks/gw-rennes.yaml      |  6 +++-
 ...w-dell-c003-01-rba.yaml => sw-1-c003.yaml} | 22 +++++---------
 .../rennes/networks/swdc-c003-01-02-rba.yaml  | 11 -------
 29 files changed, 48 insertions(+), 86 deletions(-)
 rename data/grid5000/sites/rennes/network_equipments/{sw-dell-c003-01-rba.json => sw-1-c003.json} (88%)
 rename input/grid5000/sites/rennes/networks/{sw-dell-c003-01-rba.yaml => sw-1-c003.yaml} (78%)

diff --git a/data/grid5000/sites/rennes/clusters/abacus12/nodes/abacus12-1.json b/data/grid5000/sites/rennes/clusters/abacus12/nodes/abacus12-1.json
index 8d0be47ac49..32924190ae9 100644
--- a/data/grid5000/sites/rennes/clusters/abacus12/nodes/abacus12-1.json
+++ b/data/grid5000/sites/rennes/clusters/abacus12/nodes/abacus12-1.json
@@ -164,7 +164,7 @@
       "rate": 10000000000,
       "sriov": false,
       "sriov_totalvfs": 0,
-      "switch": "sw-dell-c003-01-rba",
+      "switch": "sw-1-c003",
       "switch_port": "Eth1/1/1",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/abacus14/nodes/abacus14-1.json b/data/grid5000/sites/rennes/clusters/abacus14/nodes/abacus14-1.json
index 32dc2c5b2de..3e03022cbda 100644
--- a/data/grid5000/sites/rennes/clusters/abacus14/nodes/abacus14-1.json
+++ b/data/grid5000/sites/rennes/clusters/abacus14/nodes/abacus14-1.json
@@ -183,7 +183,7 @@
       "rate": 10000000000,
       "sriov": false,
       "sriov_totalvfs": 0,
-      "switch": "sw-dell-c003-01-rba",
+      "switch": "sw-1-c003",
       "switch_port": "Eth1/1/17",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/abacus16/nodes/abacus16-1.json b/data/grid5000/sites/rennes/clusters/abacus16/nodes/abacus16-1.json
index a0071eb0c63..e54e9090524 100644
--- a/data/grid5000/sites/rennes/clusters/abacus16/nodes/abacus16-1.json
+++ b/data/grid5000/sites/rennes/clusters/abacus16/nodes/abacus16-1.json
@@ -183,7 +183,7 @@
       "rate": 10000000000,
       "sriov": false,
       "sriov_totalvfs": 0,
-      "switch": "sw-dell-c003-01-rba",
+      "switch": "sw-1-c003",
       "switch_port": "Eth1/1/18",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/abacus9/nodes/abacus9-1.json b/data/grid5000/sites/rennes/clusters/abacus9/nodes/abacus9-1.json
index 36d11086041..81e36418c2d 100644
--- a/data/grid5000/sites/rennes/clusters/abacus9/nodes/abacus9-1.json
+++ b/data/grid5000/sites/rennes/clusters/abacus9/nodes/abacus9-1.json
@@ -183,7 +183,7 @@
       "rate": 10000000000,
       "sriov": false,
       "sriov_totalvfs": 0,
-      "switch": "sw-dell-c003-01-rba",
+      "switch": "sw-1-c003",
       "switch_port": "Eth1/1/16",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-1.json b/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-1.json
index 5f55b5c2db1..2d53c4075cb 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-1.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-1.json
@@ -111,7 +111,7 @@
       "rate": 10000000000,
       "sriov": false,
       "sriov_totalvfs": 0,
-      "switch": "sw-dell-c003-01-rba",
+      "switch": "sw-1-c003",
       "switch_port": "Eth1/1/23",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-2.json b/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-2.json
index ea63867818b..cb620a705f0 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-2.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-2.json
@@ -111,7 +111,7 @@
       "rate": 10000000000,
       "sriov": false,
       "sriov_totalvfs": 0,
-      "switch": "sw-dell-c003-01-rba",
+      "switch": "sw-1-c003",
       "switch_port": "Eth1/1/24",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-5.json b/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-5.json
index 762d1496e40..720d9cc555a 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-5.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-5.json
@@ -111,7 +111,7 @@
       "rate": 10000000000,
       "sriov": false,
       "sriov_totalvfs": 0,
-      "switch": "sw-dell-c003-01-rba",
+      "switch": "sw-1-c003",
       "switch_port": "Eth1/1/21",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-6.json b/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-6.json
index a2af342962d..31d3227ab25 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-6.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-6.json
@@ -111,7 +111,7 @@
       "rate": 10000000000,
       "sriov": false,
       "sriov_totalvfs": 0,
-      "switch": "sw-dell-c003-01-rba",
+      "switch": "sw-1-c003",
       "switch_port": "Eth1/1/19",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-7.json b/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-7.json
index ae97fb6427b..782796addf3 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-7.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-7.json
@@ -111,7 +111,7 @@
       "rate": 10000000000,
       "sriov": false,
       "sriov_totalvfs": 0,
-      "switch": "sw-dell-c003-01-rba",
+      "switch": "sw-1-c003",
       "switch_port": "Eth1/1/20",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-8.json b/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-8.json
index b618860ec3c..9e145bd1934 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-8.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-8.json
@@ -111,7 +111,7 @@
       "rate": 10000000000,
       "sriov": false,
       "sriov_totalvfs": 0,
-      "switch": "sw-dell-c003-01-rba",
+      "switch": "sw-1-c003",
       "switch_port": "Eth1/1/22",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/roazhon3/nodes/roazhon3-1.json b/data/grid5000/sites/rennes/clusters/roazhon3/nodes/roazhon3-1.json
index 269cad13412..c684544645d 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon3/nodes/roazhon3-1.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon3/nodes/roazhon3-1.json
@@ -131,7 +131,7 @@
       "rate": 10000000000,
       "sriov": false,
       "sriov_totalvfs": 0,
-      "switch": "sw-dell-c003-01-rba",
+      "switch": "sw-1-c003",
       "switch_port": "Eth1/1/2",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/roazhon7/nodes/roazhon7-1.json b/data/grid5000/sites/rennes/clusters/roazhon7/nodes/roazhon7-1.json
index 23fba7dc114..eb30449b7be 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon7/nodes/roazhon7-1.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon7/nodes/roazhon7-1.json
@@ -91,7 +91,7 @@
       "rate": 10000000000,
       "sriov": true,
       "sriov_totalvfs": 63,
-      "switch": "sw-dell-c003-01-rba",
+      "switch": "sw-1-c003",
       "switch_port": "Eth1/1/8",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/roazhon7/nodes/roazhon7-2.json b/data/grid5000/sites/rennes/clusters/roazhon7/nodes/roazhon7-2.json
index 4da6f7c6e8f..f16f52e6af7 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon7/nodes/roazhon7-2.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon7/nodes/roazhon7-2.json
@@ -91,7 +91,7 @@
       "rate": 10000000000,
       "sriov": true,
       "sriov_totalvfs": 63,
-      "switch": "sw-dell-c003-01-rba",
+      "switch": "sw-1-c003",
       "switch_port": "Eth1/1/11",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/roazhon7/nodes/roazhon7-3.json b/data/grid5000/sites/rennes/clusters/roazhon7/nodes/roazhon7-3.json
index 125939e0fd0..e11d8e56e9d 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon7/nodes/roazhon7-3.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon7/nodes/roazhon7-3.json
@@ -91,7 +91,7 @@
       "rate": 10000000000,
       "sriov": true,
       "sriov_totalvfs": 63,
-      "switch": "sw-dell-c003-01-rba",
+      "switch": "sw-1-c003",
       "switch_port": "Eth1/1/13",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/roazhon7/nodes/roazhon7-4.json b/data/grid5000/sites/rennes/clusters/roazhon7/nodes/roazhon7-4.json
index 21d08a7fede..68edbc9487a 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon7/nodes/roazhon7-4.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon7/nodes/roazhon7-4.json
@@ -91,7 +91,7 @@
       "rate": 10000000000,
       "sriov": true,
       "sriov_totalvfs": 63,
-      "switch": "sw-dell-c003-01-rba",
+      "switch": "sw-1-c003",
       "switch_port": "Eth1/1/12",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/roazhon8/nodes/roazhon8-1.json b/data/grid5000/sites/rennes/clusters/roazhon8/nodes/roazhon8-1.json
index 0473b103dad..ebf1df5ad87 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon8/nodes/roazhon8-1.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon8/nodes/roazhon8-1.json
@@ -91,7 +91,7 @@
       "rate": 10000000000,
       "sriov": true,
       "sriov_totalvfs": 63,
-      "switch": "sw-dell-c003-01-rba",
+      "switch": "sw-1-c003",
       "switch_port": "Eth1/1/7",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/roazhon8/nodes/roazhon8-2.json b/data/grid5000/sites/rennes/clusters/roazhon8/nodes/roazhon8-2.json
index d64191b32af..9df01f502bb 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon8/nodes/roazhon8-2.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon8/nodes/roazhon8-2.json
@@ -91,7 +91,7 @@
       "rate": 10000000000,
       "sriov": true,
       "sriov_totalvfs": 63,
-      "switch": "sw-dell-c003-01-rba",
+      "switch": "sw-1-c003",
       "switch_port": "Eth1/1/10",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/roazhon8/nodes/roazhon8-3.json b/data/grid5000/sites/rennes/clusters/roazhon8/nodes/roazhon8-3.json
index 5cefec80350..601e9fcd8a8 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon8/nodes/roazhon8-3.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon8/nodes/roazhon8-3.json
@@ -91,7 +91,7 @@
       "rate": 10000000000,
       "sriov": true,
       "sriov_totalvfs": 63,
-      "switch": "sw-dell-c003-01-rba",
+      "switch": "sw-1-c003",
       "switch_port": "Eth1/1/14",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/roazhon8/nodes/roazhon8-4.json b/data/grid5000/sites/rennes/clusters/roazhon8/nodes/roazhon8-4.json
index 3f4ab4ae1db..377b08491a2 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon8/nodes/roazhon8-4.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon8/nodes/roazhon8-4.json
@@ -91,7 +91,7 @@
       "rate": 10000000000,
       "sriov": true,
       "sriov_totalvfs": 63,
-      "switch": "sw-dell-c003-01-rba",
+      "switch": "sw-1-c003",
       "switch_port": "Eth1/1/9",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/roazhon9/nodes/roazhon9-1.json b/data/grid5000/sites/rennes/clusters/roazhon9/nodes/roazhon9-1.json
index f01f69af466..7b0ca68f134 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon9/nodes/roazhon9-1.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon9/nodes/roazhon9-1.json
@@ -131,7 +131,7 @@
       "rate": 10000000000,
       "sriov": false,
       "sriov_totalvfs": 0,
-      "switch": "sw-dell-c003-01-rba",
+      "switch": "sw-1-c003",
       "switch_port": "Eth1/1/6",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/roazhon9/nodes/roazhon9-2.json b/data/grid5000/sites/rennes/clusters/roazhon9/nodes/roazhon9-2.json
index b6cd1b38768..bac57547a1e 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon9/nodes/roazhon9-2.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon9/nodes/roazhon9-2.json
@@ -131,7 +131,7 @@
       "rate": 10000000000,
       "sriov": false,
       "sriov_totalvfs": 0,
-      "switch": "sw-dell-c003-01-rba",
+      "switch": "sw-1-c003",
       "switch_port": "Eth1/1/5",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/roazhon9/nodes/roazhon9-3.json b/data/grid5000/sites/rennes/clusters/roazhon9/nodes/roazhon9-3.json
index 4fbb6e28fc6..3bfbffc282f 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon9/nodes/roazhon9-3.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon9/nodes/roazhon9-3.json
@@ -131,7 +131,7 @@
       "rate": 10000000000,
       "sriov": false,
       "sriov_totalvfs": 0,
-      "switch": "sw-dell-c003-01-rba",
+      "switch": "sw-1-c003",
       "switch_port": "Eth1/1/3",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/roazhon9/nodes/roazhon9-4.json b/data/grid5000/sites/rennes/clusters/roazhon9/nodes/roazhon9-4.json
index 0c37415282b..aeedfb1667f 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon9/nodes/roazhon9-4.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon9/nodes/roazhon9-4.json
@@ -131,7 +131,7 @@
       "rate": 10000000000,
       "sriov": false,
       "sriov_totalvfs": 0,
-      "switch": "sw-dell-c003-01-rba",
+      "switch": "sw-1-c003",
       "switch_port": "Eth1/1/4",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/network_equipments/gw.json b/data/grid5000/sites/rennes/network_equipments/gw.json
index 1f79b34713e..3ecebcf5163 100644
--- a/data/grid5000/sites/rennes/network_equipments/gw.json
+++ b/data/grid5000/sites/rennes/network_equipments/gw.json
@@ -146,12 +146,16 @@
         {
         },
         {
+          "kind": "switch",
+          "rate": 1000000000,
+          "snmp_name": "1/1/43",
+          "uid": "sw-adm-1"
         },
         {
           "kind": "switch",
-          "rate": 1000000000,
+          "rate": 10000000000,
           "snmp_name": "1/1/44",
-          "uid": "sw-adm-1"
+          "uid": "sw-1-c003"
         },
         {
           "kind": "switch",
diff --git a/data/grid5000/sites/rennes/network_equipments/sw-dell-c003-01-rba.json b/data/grid5000/sites/rennes/network_equipments/sw-1-c003.json
similarity index 88%
rename from data/grid5000/sites/rennes/network_equipments/sw-dell-c003-01-rba.json
rename to data/grid5000/sites/rennes/network_equipments/sw-1-c003.json
index acba4fd2dd0..f9a74f260e8 100644
--- a/data/grid5000/sites/rennes/network_equipments/sw-dell-c003-01-rba.json
+++ b/data/grid5000/sites/rennes/network_equipments/sw-1-c003.json
@@ -1,12 +1,5 @@
 {
-  "channels": {
-    "port-channel1242": {
-      "kind": "switch",
-      "port": "port-channel1242",
-      "rate": 10000000000,
-      "uid": "swdc-c003-01-02-rba"
-    }
-  },
+  "ip": "172.17.111.230",
   "kind": "switch",
   "linecards": [
     {
@@ -162,29 +155,21 @@
         {
         },
         {
-        },
-        {
-        },
-        {
-          "kind": "channel",
-          "snmp_name": "Eth1/1/29",
-          "uid": "port-channel1242"
-        },
-        {
-          "kind": "channel",
-          "snmp_name": "Eth1/1/30",
-          "uid": "port-channel1242"
+          "kind": "router",
+          "port": "1/1/43",
+          "snmp_name": "Eth1/1/27",
+          "uid": "gw"
         }
       ],
       "rate": 10000000000,
       "snmp_pattern": "Eth%LINECARD%/1/%PORT%"
     }
   ],
-  "managed_by_us": false,
+  "managed_by_us": true,
   "model": "S4128F-ON",
   "site": "rennes",
   "snmp_community": "none",
   "type": "network_equipment",
-  "uid": "sw-dell-c003-01-rba",
+  "uid": "sw-1-c003",
   "warranty": "N/A"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/network_equipments/swdc-c003-01-02-rba.json b/data/grid5000/sites/rennes/network_equipments/swdc-c003-01-02-rba.json
index 06c5017806b..b1d3ef77562 100644
--- a/data/grid5000/sites/rennes/network_equipments/swdc-c003-01-02-rba.json
+++ b/data/grid5000/sites/rennes/network_equipments/swdc-c003-01-02-rba.json
@@ -1,11 +1,5 @@
 {
   "channels": {
-    "port-channel1242": {
-      "kind": "switch",
-      "port": "port-channel1242",
-      "rate": 10000000000,
-      "uid": "sw-dell-c003-01-rba"
-    },
     "port-channel51": {
       "kind": "switch",
       "port": "port-channel51",
@@ -3230,14 +3224,8 @@
         {
         },
         {
-          "kind": "channel",
-          "snmp_name": "Eth1/1601",
-          "uid": "port-channel1242"
         },
         {
-          "kind": "channel",
-          "snmp_name": "Eth1/1602",
-          "uid": "port-channel1242"
         },
         {
         },
diff --git a/input/grid5000/sites/rennes/networks/gw-rennes.yaml b/input/grid5000/sites/rennes/networks/gw-rennes.yaml
index 729d7d0c867..f5405ae6dd5 100644
--- a/input/grid5000/sites/rennes/networks/gw-rennes.yaml
+++ b/input/grid5000/sites/rennes/networks/gw-rennes.yaml
@@ -90,10 +90,14 @@ gw:
         36:
           uid: lag2
           kind: channel
-        44:
+        43:
           uid: sw-adm-1
           kind: switch
           rate: 1000000000
+        44:
+          uid: sw-1-c003
+          kind: switch
+          rate: 10000000000
         45:
           uid: parasilo-sw-1
           kind: switch
diff --git a/input/grid5000/sites/rennes/networks/sw-dell-c003-01-rba.yaml b/input/grid5000/sites/rennes/networks/sw-1-c003.yaml
similarity index 78%
rename from input/grid5000/sites/rennes/networks/sw-dell-c003-01-rba.yaml
rename to input/grid5000/sites/rennes/networks/sw-1-c003.yaml
index 63b10fbd23e..caa1ba11c7a 100644
--- a/input/grid5000/sites/rennes/networks/sw-dell-c003-01-rba.yaml
+++ b/input/grid5000/sites/rennes/networks/sw-1-c003.yaml
@@ -1,9 +1,10 @@
 ---
-sw-dell-c003-01-rba:
+sw-1-c003:
   model: S4128F-ON
   warranty: N/A
   kind: switch
-  managed_by_us: false
+  managed_by_us: true
+  ip: 172.17.111.230
   snmp_community: none
   site: rennes
   linecards:
@@ -59,16 +60,7 @@ sw-dell-c003-01-rba:
           uid: roazhon13-1
         24:
           uid: roazhon13-2
-        29:
-          uid: port-channel1242
-          kind: channel
-        30:
-          uid: port-channel1242
-          kind: channel
-
-  channels:
-    port-channel1242:
-      uid: swdc-c003-01-02-rba
-      kind: switch
-      port: port-channel1242
-      rate: 10000000000
+        27:
+          uid: gw
+          kind: router
+          port: 1/1/43
diff --git a/input/grid5000/sites/rennes/networks/swdc-c003-01-02-rba.yaml b/input/grid5000/sites/rennes/networks/swdc-c003-01-02-rba.yaml
index 1fd9c86903d..f53e99a152f 100644
--- a/input/grid5000/sites/rennes/networks/swdc-c003-01-02-rba.yaml
+++ b/input/grid5000/sites/rennes/networks/swdc-c003-01-02-rba.yaml
@@ -19,12 +19,6 @@ swdc-c003-01-02-rba:
         3:
           uid: port-channel51
           kind: channel
-        16_01: # physically on interface 1/16 of swdc-c003-01-rba only
-          uid: port-channel1242
-          kind: channel
-        16_02: # physically on interface 1/16 of swdc-c003-02-rba only
-          uid: port-channel1242
-          kind: channel
         25_01: # physically on interface 1/25 of swdc-c003-01-rba only
           uid: roazhon10-2
         25_02: # physically on interface 1/25 of swdc-c003-02-rba only
@@ -91,8 +85,3 @@ swdc-c003-01-02-rba:
       kind: switch
       port: port-channel51
       rate: 20000000000
-    port-channel1242:
-      uid: sw-dell-c003-01-rba
-      kind: switch
-      port: port-channel1242
-      rate: 10000000000
-- 
GitLab