From b59c5e6f57ece5b95cccd3be2e806c33451c1fee Mon Sep 17 00:00:00 2001
From: Baptiste Jonglez <baptiste.jonglez@imag.fr>
Date: Mon, 7 Dec 2020 17:40:35 +0100
Subject: [PATCH] [grenoble] Update network topology

---
 .../network_equipments/sw-aci-333.json        | 60 +------------------
 .../sites/grenoble/networks/sw-aci-333.yaml   |  6 +-
 2 files changed, 6 insertions(+), 60 deletions(-)

diff --git a/data/grid5000/sites/grenoble/network_equipments/sw-aci-333.json b/data/grid5000/sites/grenoble/network_equipments/sw-aci-333.json
index 3c978b2b51..f11a3e5287 100644
--- a/data/grid5000/sites/grenoble/network_equipments/sw-aci-333.json
+++ b/data/grid5000/sites/grenoble/network_equipments/sw-aci-333.json
@@ -23,6 +23,9 @@
         {
         },
         {
+          "kind": "switch",
+          "snmp_name": "5",
+          "uid": "gw-new"
         },
         {
         },
@@ -60,63 +63,6 @@
           "kind": "channel",
           "snmp_name": "19",
           "uid": "TN-G5K-INT"
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-          "kind": "switch",
-          "snmp_name": "46",
-          "uid": "gw-new"
         }
       ],
       "rate": 10000000000,
diff --git a/input/grid5000/sites/grenoble/networks/sw-aci-333.yaml b/input/grid5000/sites/grenoble/networks/sw-aci-333.yaml
index ac04dc0788..2bf7bb3718 100644
--- a/input/grid5000/sites/grenoble/networks/sw-aci-333.yaml
+++ b/input/grid5000/sites/grenoble/networks/sw-aci-333.yaml
@@ -12,6 +12,9 @@ sw-aci-333:
       kind: switch
       rate: 10000000000
       ports:
+        5:
+          uid: gw-new
+          kind: switch
         17:
           uid: TN-G5K-INT
           kind: channel
@@ -21,9 +24,6 @@ sw-aci-333:
         19:
           uid: TN-G5K-INT
           kind: channel
-        46:
-          uid: gw-new
-          kind: switch
   channels:
     TN-G5K-INT:
       uid: gw
-- 
GitLab