From 06f4987c08dac8865ed6a0f1745ebfd7810ea876 Mon Sep 17 00:00:00 2001
From: Simon Delamare <simon.delamare@ens-lyon.fr>
Date: Mon, 16 Apr 2012 16:42:29 +0200
Subject: [PATCH] [network_equipments] lyon - corrections for bug #4243
---
data/grid5000/sites/lyon/lyon.json | 16 -------------
.../sites/lyon/network_equipments/gw.json | 16 +++++++++----
generators/input/lyon-network-equipments.yaml | 24 +++++++++++++++++++
3 files changed, 36 insertions(+), 20 deletions(-)
diff --git a/data/grid5000/sites/lyon/lyon.json b/data/grid5000/sites/lyon/lyon.json
index 4fc089c2b96..5bc4f3335a2 100755
--- a/data/grid5000/sites/lyon/lyon.json
+++ b/data/grid5000/sites/lyon/lyon.json
@@ -1,20 +1,4 @@
{
-<<<<<<< HEAD
- "compilation_server": false,
- "description": "Lyon Grid'5000 Site",
- "email_contact": "lyon-staff@lists.grid5000.fr",
- "latitude": 45.7667,
- "location": "Lyon, France",
- "longitude": 4.8333,
- "name": "Lyon",
- "security_contact": "lyon-staff@lists.grid5000.fr",
- "sys_admin_contact": "lyon-staff@lists.grid5000.fr",
- "type": "site",
- "uid": "lyon",
- "user_support_contact": "lyon-staff@lists.grid5000.fr",
- "web": "https://www.grid5000.fr/mediawiki/index.php/Lyon:Home"
-=======
"type": "site",
"uid": "lyon"
->>>>>>> network API generator scripts revisited and improved.
}
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/network_equipments/gw.json b/data/grid5000/sites/lyon/network_equipments/gw.json
index 698a8579097..8ccf4c92b84 100644
--- a/data/grid5000/sites/lyon/network_equipments/gw.json
+++ b/data/grid5000/sites/lyon/network_equipments/gw.json
@@ -203,7 +203,9 @@
"uid": "sagittaire-39"
},
{
-
+ "kind": "node",
+ "rate": 1000000000,
+ "uid": "sagittaire-40"
},
{
"kind": "node",
@@ -318,7 +320,9 @@
"uid": "sagittaire-61"
},
{
-
+ "kind": "node",
+ "rate": 1000000000,
+ "uid": "sagittaire-62"
},
{
"kind": "node",
@@ -356,7 +360,9 @@
"uid": "sagittaire-69"
},
{
-
+ "kind": "node",
+ "rate": 1000000000,
+ "uid": "sagittaire-70"
},
{
"kind": "node",
@@ -431,7 +437,9 @@
"uid": "capricorne-4"
},
{
-
+ "kind": "node",
+ "rate": 1000000000,
+ "uid": "capricorne-5"
},
{
"kind": "node",
diff --git a/generators/input/lyon-network-equipments.yaml b/generators/input/lyon-network-equipments.yaml
index 29418c4a11e..76ba303bcd1 100644
--- a/generators/input/lyon-network-equipments.yaml
+++ b/generators/input/lyon-network-equipments.yaml
@@ -310,6 +310,12 @@ gw:
trunked: false
uid: capricorne-56
kind: node
+ - linecard: 3
+ port: 5
+ rate: 1000000000
+ trunked: false
+ uid: capricorne-5
+ kind: node
- linecard: 3
port: 6
rate: 1000000000
@@ -532,6 +538,12 @@ gw:
trunked: false
uid: sagittaire-3
kind: node
+ - linecard: 1
+ port: 40
+ rate: 1000000000
+ trunked: false
+ uid: sagittaire-40
+ kind: node
- linecard: 1
port: 41
rate: 1000000000
@@ -670,6 +682,12 @@ gw:
trunked: false
uid: sagittaire-61
kind: node
+ - linecard: 2
+ port: 14
+ rate: 1000000000
+ trunked: false
+ uid: sagittaire-62
+ kind: node
- linecard: 2
port: 15
rate: 1000000000
@@ -718,6 +736,12 @@ gw:
trunked: false
uid: sagittaire-6
kind: node
+ - linecard: 2
+ port: 22
+ rate: 1000000000
+ trunked: false
+ uid: sagittaire-70
+ kind: node
- linecard: 2
port: 23
rate: 1000000000
--
GitLab