From 982cf001c842f3d6eea8052afa4e9dd8130d18f4 Mon Sep 17 00:00:00 2001
From: Pascal Morillon <pascal.morillon@irisa.fr>
Date: Tue, 21 Apr 2015 16:28:38 +0200
Subject: [PATCH] [rennes] Fixes network links

---
 .../sites/rennes/network_equipments/parasilo-sw-1.json    | 8 ++++----
 .../sites/rennes/network_equipments/paravance-sw-1.json   | 4 ++--
 .../sites/rennes/network_equipments/paravance-sw-2.json   | 4 ++--
 .../input/sites/rennes/net-links/parasilo-sw-1.yaml       | 8 ++++----
 .../input/sites/rennes/net-links/paravance-sw-1.yaml      | 4 ++--
 .../input/sites/rennes/net-links/paravance-sw-2.yaml      | 4 ++--
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/data/grid5000/sites/rennes/network_equipments/parasilo-sw-1.json b/data/grid5000/sites/rennes/network_equipments/parasilo-sw-1.json
index 35391d135f..5e7ee31f5e 100644
--- a/data/grid5000/sites/rennes/network_equipments/parasilo-sw-1.json
+++ b/data/grid5000/sites/rennes/network_equipments/parasilo-sw-1.json
@@ -260,22 +260,22 @@
         {
           "kind": "switch",
           "rate": 40000000000,
-          "uid": "paravance-sw2"
+          "uid": "paravance-sw-2"
         },
         {
           "kind": "switch",
           "rate": 40000000000,
-          "uid": "paravance-sw2"
+          "uid": "paravance-sw-2"
         },
         {
           "kind": "switch",
           "rate": 40000000000,
-          "uid": "paravance-sw1"
+          "uid": "paravance-sw-1"
         },
         {
           "kind": "switch",
           "rate": 40000000000,
-          "uid": "paravance-sw1"
+          "uid": "paravance-sw-1"
         }
       ],
       "rate": 10000000000,
diff --git a/data/grid5000/sites/rennes/network_equipments/paravance-sw-1.json b/data/grid5000/sites/rennes/network_equipments/paravance-sw-1.json
index bdca3281d5..497c9be2f5 100644
--- a/data/grid5000/sites/rennes/network_equipments/paravance-sw-1.json
+++ b/data/grid5000/sites/rennes/network_equipments/paravance-sw-1.json
@@ -259,12 +259,12 @@
         {
           "kind": "switch",
           "rate": 40000000000,
-          "uid": "parasilo-sw1"
+          "uid": "parasilo-sw-1"
         },
         {
           "kind": "switch",
           "rate": 40000000000,
-          "uid": "parasilo-sw1"
+          "uid": "parasilo-sw-1"
         }
       ],
       "rate": 10000000000,
diff --git a/data/grid5000/sites/rennes/network_equipments/paravance-sw-2.json b/data/grid5000/sites/rennes/network_equipments/paravance-sw-2.json
index a2d6971f5d..9d1aa1149e 100644
--- a/data/grid5000/sites/rennes/network_equipments/paravance-sw-2.json
+++ b/data/grid5000/sites/rennes/network_equipments/paravance-sw-2.json
@@ -265,12 +265,12 @@
         {
           "kind": "switch",
           "rate": 40000000000,
-          "uid": "parasilo-sw1"
+          "uid": "parasilo-sw-1"
         },
         {
           "kind": "switch",
           "rate": 40000000000,
-          "uid": "parasilo-sw1"
+          "uid": "parasilo-sw-1"
         }
       ],
       "rate": 10000000000,
diff --git a/generators/input/sites/rennes/net-links/parasilo-sw-1.yaml b/generators/input/sites/rennes/net-links/parasilo-sw-1.yaml
index 033f100e51..ee85eb9521 100644
--- a/generators/input/sites/rennes/net-links/parasilo-sw-1.yaml
+++ b/generators/input/sites/rennes/net-links/parasilo-sw-1.yaml
@@ -206,19 +206,19 @@ parasilo-sw-1:
           kind: node
           port: eth0
         49:
-          uid: paravance-sw2
+          uid: paravance-sw-2
           rate: 40000000000
           kind: switch
         50:
-          uid: paravance-sw2
+          uid: paravance-sw-2
           rate: 40000000000
           kind: switch
         51:
-          uid: paravance-sw1
+          uid: paravance-sw-1
           rate: 40000000000
           kind: switch
         52:
-          uid: paravance-sw1
+          uid: paravance-sw-1
           rate: 40000000000
           kind: switch
     2:
diff --git a/generators/input/sites/rennes/net-links/paravance-sw-1.yaml b/generators/input/sites/rennes/net-links/paravance-sw-1.yaml
index 204a046dd1..553aefcdff 100644
--- a/generators/input/sites/rennes/net-links/paravance-sw-1.yaml
+++ b/generators/input/sites/rennes/net-links/paravance-sw-1.yaml
@@ -206,11 +206,11 @@ paravance-sw-1:
           kind: node
           port: eth0
         49:
-          uid: parasilo-sw1
+          uid: parasilo-sw-1
           rate: 40000000000
           kind: switch
         50:
-          uid: parasilo-sw1
+          uid: parasilo-sw-1
           rate: 40000000000
           kind: switch
     2:
diff --git a/generators/input/sites/rennes/net-links/paravance-sw-2.yaml b/generators/input/sites/rennes/net-links/paravance-sw-2.yaml
index 4ccea723fb..5d93216e20 100644
--- a/generators/input/sites/rennes/net-links/paravance-sw-2.yaml
+++ b/generators/input/sites/rennes/net-links/paravance-sw-2.yaml
@@ -206,11 +206,11 @@ paravance-sw-2:
           kind: node
           port: eth0
         51:
-          uid: parasilo-sw1
+          uid: parasilo-sw-1
           rate: 40000000000
           kind: switch
         52:
-          uid: parasilo-sw1
+          uid: parasilo-sw-1
           rate: 40000000000
           kind: switch
     2:
-- 
GitLab