From af313b16d15b05d1f6f79b7ef4040e6cda36904b Mon Sep 17 00:00:00 2001
From: Gaetan SIMO <gaetan.simo@inria.fr>
Date: Tue, 14 Aug 2012 08:54:33 +0200
Subject: [PATCH] [luxembourg] Adding renater-luxembourg as a virtual network
equipment
---
.../renater-luxembourg.json | 39 +++++++++++++++++++
.../network_equipments/ul-grid5000-sw01.json | 12 ++----
.../net-links/renater-luxembourg.yaml | 23 +++++++++++
.../net-links/ul-grid5000-sw01.yaml | 11 +-----
4 files changed, 68 insertions(+), 17 deletions(-)
create mode 100644 data/grid5000/sites/luxembourg/network_equipments/renater-luxembourg.json
create mode 100644 generators/input/sites/luxembourg/net-links/renater-luxembourg.yaml
diff --git a/data/grid5000/sites/luxembourg/network_equipments/renater-luxembourg.json b/data/grid5000/sites/luxembourg/network_equipments/renater-luxembourg.json
new file mode 100644
index 00000000000..4829c0c3c88
--- /dev/null
+++ b/data/grid5000/sites/luxembourg/network_equipments/renater-luxembourg.json
@@ -0,0 +1,39 @@
+{
+ "channels": {
+ "naming_pattern": "Po%CHANNELID%"
+ },
+ "kind": "virtual",
+ "linecards": [
+ {
+
+ },
+ {
+ "naming_pattern": "Te%LINECARD%/%PORT%",
+ "ports": [
+ {
+
+ },
+ {
+ "kind": "router",
+ "port": "Te5/4",
+ "uid": "ul-grid5000-sw01"
+ }
+ ],
+ "rate": 10000000000
+ }
+ ],
+ "model": "Cisco",
+ "routes": {
+
+ },
+ "site": "luxembourg",
+ "snmp_community": "public",
+ "type": "network_equipment",
+ "uid": "renater-luxembourg",
+ "vlans": {
+ "naming_pattern": "Vlan%VLANID%"
+ },
+ "weathermap": {
+ "use_cacti": "no"
+ }
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw01.json b/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw01.json
index 89fe3e3e9fc..2457061928a 100644
--- a/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw01.json
+++ b/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw01.json
@@ -464,31 +464,27 @@
},
{
+ "naming_pattern": "Gi%LINECARD%/%PORT%",
"ports": [
{
},
{
- "naming_pattern": "Gi%LINECARD%/%PORT%"
+
},
{
"kind": "switch",
- "naming_pattern": "Gi%LINECARD%/%PORT%",
"port": "Eth1/1",
"uid": "ul-grid5000-sw02"
},
{
- "naming_pattern": "Gi%LINECARD%/%PORT%"
+
},
{
- "kind": "router",
+ "kind": "virtual",
"naming_pattern": "Te%LINECARD%/%PORT%",
"rate": 10000000000,
"uid": "renater-luxembourg"
- },
- {
- "naming_pattern": "Te%LINECARD%/%PORT%",
- "rate": 10000000000
}
],
"rate": 1000000000
diff --git a/generators/input/sites/luxembourg/net-links/renater-luxembourg.yaml b/generators/input/sites/luxembourg/net-links/renater-luxembourg.yaml
new file mode 100644
index 00000000000..1788fc2c8d1
--- /dev/null
+++ b/generators/input/sites/luxembourg/net-links/renater-luxembourg.yaml
@@ -0,0 +1,23 @@
+---
+renater-luxembourg:
+ model: Cisco
+ kind: virtual
+ site: luxembourg
+ snmp_community: public
+ weathermap:
+ use_cacti: "no"
+ vlans:
+ naming_pattern: Vlan%VLANID%
+ routes: {}
+
+ linecards:
+ 1:
+ naming_pattern: Te%LINECARD%/%PORT%
+ rate: 10000000000
+ ports:
+ 1:
+ uid: ul-grid5000-sw01
+ port: Te5/4
+ kind: router
+ channels:
+ naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/luxembourg/net-links/ul-grid5000-sw01.yaml b/generators/input/sites/luxembourg/net-links/ul-grid5000-sw01.yaml
index f1f6ab41cb8..dad4feaa552 100644
--- a/generators/input/sites/luxembourg/net-links/ul-grid5000-sw01.yaml
+++ b/generators/input/sites/luxembourg/net-links/ul-grid5000-sw01.yaml
@@ -329,22 +329,15 @@ ul-grid5000-sw01:
48:
5:
rate: 1000000000
+ naming_pattern: Gi%LINECARD%/%PORT%
ports:
- 1:
- naming_pattern: Gi%LINECARD%/%PORT%
2:
uid: ul-grid5000-sw02
port: Eth1/1
kind: switch
- naming_pattern: Gi%LINECARD%/%PORT%
- 3:
- naming_pattern: Gi%LINECARD%/%PORT%
4:
uid: renater-luxembourg
- kind: router
- naming_pattern: Te%LINECARD%/%PORT%
- rate: 10000000000
- 5:
+ kind: virtual
naming_pattern: Te%LINECARD%/%PORT%
rate: 10000000000
channels:
--
GitLab