From b59de7ee6696a406bf798c3f9dad832026cbc776 Mon Sep 17 00:00:00 2001
From: Simon Delamare <simon.delamare@ens-lyon.fr>
Date: Tue, 19 Feb 2013 10:21:04 +0100
Subject: [PATCH] [network] Fix incorrect backbone links (#4825)
---
data/grid5000/network_equipments/renater-bordeaux.json | 2 +-
data/grid5000/network_equipments/renater-grenoble.json | 2 +-
data/grid5000/network_equipments/renater-lille.json | 4 ++--
data/grid5000/network_equipments/renater-luxembourg.json | 2 +-
data/grid5000/network_equipments/renater-lyon.json | 5 +----
data/grid5000/network_equipments/renater-marseille.json | 4 +---
data/grid5000/network_equipments/renater-nancy.json | 3 +--
data/grid5000/network_equipments/renater-paris.json | 5 +----
data/grid5000/network_equipments/renater-reims.json | 2 +-
data/grid5000/network_equipments/renater-rennes.json | 2 +-
data/grid5000/network_equipments/renater-sophia.json | 2 +-
data/grid5000/network_equipments/renater-toulouse.json | 2 +-
12 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/data/grid5000/network_equipments/renater-bordeaux.json b/data/grid5000/network_equipments/renater-bordeaux.json
index df38c04707e..9d261c24508 100644
--- a/data/grid5000/network_equipments/renater-bordeaux.json
+++ b/data/grid5000/network_equipments/renater-bordeaux.json
@@ -2,9 +2,9 @@
"kind": "virtual",
"linecards": [
{
+ "rate": 10000000000,
"ports": [
{
- "rate": 10000000000,
"uid": "renater-lyon"
},
{
diff --git a/data/grid5000/network_equipments/renater-grenoble.json b/data/grid5000/network_equipments/renater-grenoble.json
index 22e359d5064..f9364301003 100644
--- a/data/grid5000/network_equipments/renater-grenoble.json
+++ b/data/grid5000/network_equipments/renater-grenoble.json
@@ -2,9 +2,9 @@
"kind": "virtual",
"linecards": [
{
+ "rate": 10000000000,
"ports": [
{
- "rate": 10000000000,
"uid": "renater-lyon"
},
{
diff --git a/data/grid5000/network_equipments/renater-lille.json b/data/grid5000/network_equipments/renater-lille.json
index 7413470ca91..39fa7b12afe 100644
--- a/data/grid5000/network_equipments/renater-lille.json
+++ b/data/grid5000/network_equipments/renater-lille.json
@@ -2,13 +2,13 @@
"kind": "virtual",
"linecards": [
{
+ "rate": 10000000000,
"ports": [
{
- "rate": 10000000000,
"uid": "renater-paris"
},
{
- "rate": 10000000,
+ "rate": 1000000000,
"uid": "renater-reims"
},
{
diff --git a/data/grid5000/network_equipments/renater-luxembourg.json b/data/grid5000/network_equipments/renater-luxembourg.json
index b35504fc06d..3ba98cccba1 100644
--- a/data/grid5000/network_equipments/renater-luxembourg.json
+++ b/data/grid5000/network_equipments/renater-luxembourg.json
@@ -2,9 +2,9 @@
"kind": "virtual",
"linecards": [
{
+ "rate": 10000000000,
"ports": [
{
- "rate": 10000000000,
"uid": "renater-nancy"
},
{
diff --git a/data/grid5000/network_equipments/renater-lyon.json b/data/grid5000/network_equipments/renater-lyon.json
index c45e9aa465e..13b6739009d 100644
--- a/data/grid5000/network_equipments/renater-lyon.json
+++ b/data/grid5000/network_equipments/renater-lyon.json
@@ -2,21 +2,18 @@
"kind": "virtual",
"linecards": [
{
+ "rate": 10000000000,
"ports": [
{
- "rate": 10000000000,
"uid": "renater-paris"
},
{
- "rate": 10000000000,
"uid": "renater-marseille"
},
{
- "rate": 10000000000,
"uid": "renater-bordeaux"
},
{
- "rate": 10000000000,
"uid": "renater-grenoble"
},
{
diff --git a/data/grid5000/network_equipments/renater-marseille.json b/data/grid5000/network_equipments/renater-marseille.json
index 6da8bd6dd02..2602f988070 100644
--- a/data/grid5000/network_equipments/renater-marseille.json
+++ b/data/grid5000/network_equipments/renater-marseille.json
@@ -2,17 +2,15 @@
"kind": "virtual",
"linecards": [
{
+ "rate": 10000000000,
"ports": [
{
- "rate": 10000000000,
"uid": "renater-lyon"
},
{
- "rate": 10000000000,
"uid": "renater-toulouse"
},
{
- "rate": 10000000000,
"uid": "renater-sophia"
}
]
diff --git a/data/grid5000/network_equipments/renater-nancy.json b/data/grid5000/network_equipments/renater-nancy.json
index f6806566f56..4447ffb1569 100644
--- a/data/grid5000/network_equipments/renater-nancy.json
+++ b/data/grid5000/network_equipments/renater-nancy.json
@@ -2,13 +2,12 @@
"kind": "virtual",
"linecards": [
{
+ "rate": 10000000000,
"ports": [
{
- "rate": 10000000000,
"uid": "renater-paris"
},
{
- "rate": 10000000000,
"uid": "renater-luxembourg"
},
{
diff --git a/data/grid5000/network_equipments/renater-paris.json b/data/grid5000/network_equipments/renater-paris.json
index 91aa8b8da36..38fee7154e9 100644
--- a/data/grid5000/network_equipments/renater-paris.json
+++ b/data/grid5000/network_equipments/renater-paris.json
@@ -2,21 +2,18 @@
"kind": "virtual",
"linecards": [
{
+ "rate": 10000000000,
"ports": [
{
- "rate": 10000000000,
"uid": "renater-lille"
},
{
- "rate": 10000000000,
"uid": "renater-lyon"
},
{
- "rate": 10000000000,
"uid": "renater-nancy"
},
{
- "rate": 10000000000,
"uid": "renater-rennes"
}
]
diff --git a/data/grid5000/network_equipments/renater-reims.json b/data/grid5000/network_equipments/renater-reims.json
index 98dc9d37bcb..110136d9b7d 100644
--- a/data/grid5000/network_equipments/renater-reims.json
+++ b/data/grid5000/network_equipments/renater-reims.json
@@ -2,9 +2,9 @@
"kind": "virtual",
"linecards": [
{
+ "rate": 1000000000,
"ports": [
{
- "rate": 10000000,
"uid": "renater-lille"
},
{
diff --git a/data/grid5000/network_equipments/renater-rennes.json b/data/grid5000/network_equipments/renater-rennes.json
index 5ca69dac970..0086f66c57c 100644
--- a/data/grid5000/network_equipments/renater-rennes.json
+++ b/data/grid5000/network_equipments/renater-rennes.json
@@ -2,9 +2,9 @@
"kind": "virtual",
"linecards": [
{
+ "rate": 10000000000,
"ports": [
{
- "rate": 10000000000,
"uid": "renater-paris"
},
{
diff --git a/data/grid5000/network_equipments/renater-sophia.json b/data/grid5000/network_equipments/renater-sophia.json
index e3652087b9a..6a2fa87e5e0 100644
--- a/data/grid5000/network_equipments/renater-sophia.json
+++ b/data/grid5000/network_equipments/renater-sophia.json
@@ -2,9 +2,9 @@
"kind": "virtual",
"linecards": [
{
+ "rate": 10000000000,
"ports": [
{
- "rate": 10000000000,
"uid": "renater-marseille"
},
{
diff --git a/data/grid5000/network_equipments/renater-toulouse.json b/data/grid5000/network_equipments/renater-toulouse.json
index f231beba0ae..087c7564fa3 100644
--- a/data/grid5000/network_equipments/renater-toulouse.json
+++ b/data/grid5000/network_equipments/renater-toulouse.json
@@ -2,9 +2,9 @@
"kind": "virtual",
"linecards": [
{
+ "rate": 10000000000,
"ports": [
{
- "rate": 10000000000,
"uid": "renater-marseille"
},
{
--
GitLab