[rennes] Fixes network links

982cf001 · Pascal Morillon · 44567699 · 982cf001 · 982cf001 · 982cf001
Commit 982cf001 authored Apr 21, 2015 by Pascal Morillon
6 changed files
--- 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,

--- 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,

--- 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,

--- 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:

--- 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:

--- 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: