From 80d34b966f0ce45813031c5444d486ef73c8ea47 Mon Sep 17 00:00:00 2001
From: Vidal WATAT <vidal.watat@inria.fr>
Date: Thu, 8 Nov 2012 19:42:54 +0100
Subject: [PATCH] [Grenoble] network_golden_name, add renater link
---
.../sites/grenoble/network_equipments/blade-1.json | 10 +---------
.../sites/grenoble/network_equipments/blade-2.json | 10 +---------
.../sites/grenoble/network_equipments/blade-3.json | 10 +---------
.../sites/grenoble/network_equipments/blade-4.json | 10 +---------
.../{aspen.json => gw-grenoble.json} | 2 +-
generators/input/sites/grenoble/net-links/blade-1.yaml | 8 +-------
generators/input/sites/grenoble/net-links/blade-2.yaml | 8 +-------
generators/input/sites/grenoble/net-links/blade-3.yaml | 8 +-------
generators/input/sites/grenoble/net-links/blade-4.yaml | 8 +-------
.../net-links/{aspen.yaml => gw-grenoble.yaml} | 2 +-
10 files changed, 10 insertions(+), 66 deletions(-)
rename data/grid5000/sites/grenoble/network_equipments/{aspen.json => gw-grenoble.json} (99%)
rename generators/input/sites/grenoble/net-links/{aspen.yaml => gw-grenoble.yaml} (99%)
diff --git a/data/grid5000/sites/grenoble/network_equipments/blade-1.json b/data/grid5000/sites/grenoble/network_equipments/blade-1.json
index 452690bc568..5a20db9ac55 100644
--- a/data/grid5000/sites/grenoble/network_equipments/blade-1.json
+++ b/data/grid5000/sites/grenoble/network_equipments/blade-1.json
@@ -13,15 +13,7 @@
},
{
"port": "2:1",
- "uid": "aspen"
- },
- {
- "port": "2:2",
- "uid": "aspen"
- },
- {
- "port": "2:3",
- "uid": "aspen"
+ "uid": "gw-grenoble"
}
],
"rate": 1000000000
diff --git a/data/grid5000/sites/grenoble/network_equipments/blade-2.json b/data/grid5000/sites/grenoble/network_equipments/blade-2.json
index b955675e2ee..d846b1b515d 100644
--- a/data/grid5000/sites/grenoble/network_equipments/blade-2.json
+++ b/data/grid5000/sites/grenoble/network_equipments/blade-2.json
@@ -13,15 +13,7 @@
},
{
"port": "2:4",
- "uid": "aspen"
- },
- {
- "port": "2:5",
- "uid": "aspen"
- },
- {
- "port": "2:6",
- "uid": "aspen"
+ "uid": "gw-grenoble"
}
],
"rate": 1000000000
diff --git a/data/grid5000/sites/grenoble/network_equipments/blade-3.json b/data/grid5000/sites/grenoble/network_equipments/blade-3.json
index f5cfd662364..6c6ddb255f0 100644
--- a/data/grid5000/sites/grenoble/network_equipments/blade-3.json
+++ b/data/grid5000/sites/grenoble/network_equipments/blade-3.json
@@ -13,15 +13,7 @@
},
{
"port": "2:7",
- "uid": "aspen"
- },
- {
- "port": "2:8",
- "uid": "aspen"
- },
- {
- "port": "2:9",
- "uid": "aspen"
+ "uid": "gw-grenoble"
}
],
"rate": 1000000000
diff --git a/data/grid5000/sites/grenoble/network_equipments/blade-4.json b/data/grid5000/sites/grenoble/network_equipments/blade-4.json
index 090af79e5b1..751559aeb61 100644
--- a/data/grid5000/sites/grenoble/network_equipments/blade-4.json
+++ b/data/grid5000/sites/grenoble/network_equipments/blade-4.json
@@ -13,15 +13,7 @@
},
{
"port": "2:10",
- "uid": "aspen"
- },
- {
- "port": "2:11",
- "uid": "aspen"
- },
- {
- "port": "2:12",
- "uid": "aspen"
+ "uid": "gw-grenoble"
}
],
"rate": 1000000000
diff --git a/data/grid5000/sites/grenoble/network_equipments/aspen.json b/data/grid5000/sites/grenoble/network_equipments/gw-grenoble.json
similarity index 99%
rename from data/grid5000/sites/grenoble/network_equipments/aspen.json
rename to data/grid5000/sites/grenoble/network_equipments/gw-grenoble.json
index e98ec547ff5..ce1319be333 100644
--- a/data/grid5000/sites/grenoble/network_equipments/aspen.json
+++ b/data/grid5000/sites/grenoble/network_equipments/gw-grenoble.json
@@ -496,7 +496,7 @@
"site": "grenoble",
"snmp_community": "public",
"type": "network_equipment",
- "uid": "aspen",
+ "uid": "gw-grenoble",
"vlans": {
"1": {
"addresses": [
diff --git a/generators/input/sites/grenoble/net-links/blade-1.yaml b/generators/input/sites/grenoble/net-links/blade-1.yaml
index 41f1d22c1ab..64725bd6bd8 100644
--- a/generators/input/sites/grenoble/net-links/blade-1.yaml
+++ b/generators/input/sites/grenoble/net-links/blade-1.yaml
@@ -17,14 +17,8 @@ blade-1:
rate: 1000000000
ports:
1:
- uid: aspen
+ uid: gw-grenoble
port: "2:1"
- 2:
- uid: aspen
- port: "2:2"
- 3:
- uid: aspen
- port: "2:3"
1:
naming_pattern: "%LINECARD%/%PORT%"
kind: node
diff --git a/generators/input/sites/grenoble/net-links/blade-2.yaml b/generators/input/sites/grenoble/net-links/blade-2.yaml
index 5b1023d66e3..78e802962ea 100644
--- a/generators/input/sites/grenoble/net-links/blade-2.yaml
+++ b/generators/input/sites/grenoble/net-links/blade-2.yaml
@@ -17,14 +17,8 @@ blade-2:
rate: 1000000000
ports:
1:
- uid: aspen
+ uid: gw-grenoble
port: "2:4"
- 2:
- uid: aspen
- port: "2:5"
- 3:
- uid: aspen
- port: "2:6"
1:
naming_pattern: "%LINECARD%/%PORT%"
kind: node
diff --git a/generators/input/sites/grenoble/net-links/blade-3.yaml b/generators/input/sites/grenoble/net-links/blade-3.yaml
index 646c853050d..825121fd23a 100644
--- a/generators/input/sites/grenoble/net-links/blade-3.yaml
+++ b/generators/input/sites/grenoble/net-links/blade-3.yaml
@@ -17,14 +17,8 @@ blade-3:
rate: 1000000000
ports:
1:
- uid: aspen
+ uid: gw-grenoble
port: "2:7"
- 2:
- uid: aspen
- port: "2:8"
- 3:
- uid: aspen
- port: "2:9"
1:
naming_pattern: "%LINECARD%/%PORT%"
kind: node
diff --git a/generators/input/sites/grenoble/net-links/blade-4.yaml b/generators/input/sites/grenoble/net-links/blade-4.yaml
index 0435605d7ab..ed7f96f3be7 100644
--- a/generators/input/sites/grenoble/net-links/blade-4.yaml
+++ b/generators/input/sites/grenoble/net-links/blade-4.yaml
@@ -17,14 +17,8 @@ blade-4:
rate: 1000000000
ports:
1:
- uid: aspen
+ uid: gw-grenoble
port: "2:10"
- 2:
- uid: aspen
- port: "2:11"
- 3:
- uid: aspen
- port: "2:12"
1:
naming_pattern: "%LINECARD%/%PORT%"
kind: node
diff --git a/generators/input/sites/grenoble/net-links/aspen.yaml b/generators/input/sites/grenoble/net-links/gw-grenoble.yaml
similarity index 99%
rename from generators/input/sites/grenoble/net-links/aspen.yaml
rename to generators/input/sites/grenoble/net-links/gw-grenoble.yaml
index 1ed84415f01..f988a0ee059 100644
--- a/generators/input/sites/grenoble/net-links/aspen.yaml
+++ b/generators/input/sites/grenoble/net-links/gw-grenoble.yaml
@@ -1,5 +1,5 @@
---
-aspen:
+gw-grenoble:
model: ExtremeNetworks
kind: router
site: grenoble
--
GitLab