From 719a48b62c1a6694bd12bb8a557b17a280d76385 Mon Sep 17 00:00:00 2001
From: Sebastien Badia <sebastien.badia@inria.fr>
Date: Thu, 21 Feb 2013 00:50:10 +0100
Subject: [PATCH] [nancy] - Add backplane values (refs: #4851)
---
.../nancy/network_equipments/gw-nancy.json | 14 ++++++++++-
.../nancy/network_equipments/sgraphene1.json | 1 +
.../nancy/network_equipments/sgraphene2.json | 1 +
.../nancy/network_equipments/sgraphene3.json | 1 +
.../nancy/network_equipments/sgraphene4.json | 1 +
.../nancy/network_equipments/sgriffon1.json | 1 +
.../nancy/network_equipments/sgriffon2.json | 1 +
.../nancy/network_equipments/sgriffon3.json | 1 +
.../nancy/network_equipments/stalc1.json | 1 +
.../nancy/network_equipments/stalc2.json | 1 +
.../nancy/network_equipments/stalc3.json | 1 +
.../nancy/network_equipments/stalc4.json | 1 +
.../input/sites/nancy/net-links/gw-nancy.yaml | 18 +++++++++++---
.../sites/nancy/net-links/sgraphene1.yaml | 24 +++++++++----------
.../sites/nancy/net-links/sgraphene2.yaml | 24 +++++++++----------
.../sites/nancy/net-links/sgraphene3.yaml | 24 +++++++++----------
.../sites/nancy/net-links/sgraphene4.yaml | 24 +++++++++----------
.../sites/nancy/net-links/sgriffon1.yaml | 24 +++++++++----------
.../sites/nancy/net-links/sgriffon2.yaml | 24 +++++++++----------
.../sites/nancy/net-links/sgriffon3.yaml | 24 +++++++++----------
.../input/sites/nancy/net-links/stalc1.yaml | 2 +-
.../input/sites/nancy/net-links/stalc2.yaml | 2 +-
.../input/sites/nancy/net-links/stalc3.yaml | 24 +++++++++----------
.../input/sites/nancy/net-links/stalc4.yaml | 2 +-
24 files changed, 138 insertions(+), 103 deletions(-)
diff --git a/data/grid5000/sites/nancy/network_equipments/gw-nancy.json b/data/grid5000/sites/nancy/network_equipments/gw-nancy.json
index bc274e812be..18c4538e1a6 100644
--- a/data/grid5000/sites/nancy/network_equipments/gw-nancy.json
+++ b/data/grid5000/sites/nancy/network_equipments/gw-nancy.json
@@ -1,4 +1,5 @@
{
+ "backplane_bps": 346000000000,
"channels": {
"naming_pattern": "Po%CHANNELID%"
},
@@ -8,7 +9,9 @@
},
{
+ "backplane_bps": 14400000000,
"kind": "other",
+ "model": "J8702A",
"naming_pattern": "%LINECARD:A%%PORT%",
"ports": [
{
@@ -124,7 +127,9 @@
"rate": 1000000000
},
{
+ "backplane_bps": 14400000000,
"kind": "switch",
+ "model": "J8708A",
"naming_pattern": "%LINECARD:A%%PORT%",
"ports": [
{
@@ -146,7 +151,9 @@
"rate": 1000000000
},
{
+ "backplane_bps": 14400000000,
"kind": "switch",
+ "model": "J8708A",
"naming_pattern": "%LINECARD:A%%PORT%",
"ports": [
{
@@ -168,7 +175,9 @@
"rate": 1000000000
},
{
+ "backplane_bps": 14400000000,
"kind": "switch",
+ "model": "J8708A",
"naming_pattern": "%LINECARD:A%%PORT%",
"ports": [
{
@@ -194,7 +203,9 @@
"rate": 1000000000
},
{
+ "backplane_bps": 14400000000,
"kind": "virtual",
+ "model": "J8707A",
"naming_pattern": "%LINECARD:A%%PORT%",
"ports": [
{
@@ -210,13 +221,14 @@
},
{
+ "kind": "virtual",
"uid": "renater-nancy"
}
],
"rate": 10000000000
}
],
- "model": "HP Procurve 5406zl",
+ "model": "HP Procurve 5406zl J8697A",
"routes": {
},
diff --git a/data/grid5000/sites/nancy/network_equipments/sgraphene1.json b/data/grid5000/sites/nancy/network_equipments/sgraphene1.json
index 3558a94a639..bd6b24c51ed 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgraphene1.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgraphene1.json
@@ -1,4 +1,5 @@
{
+ "backplane_bps": 176000000000,
"channels": {
"naming_pattern": "Po%CHANNELID%"
},
diff --git a/data/grid5000/sites/nancy/network_equipments/sgraphene2.json b/data/grid5000/sites/nancy/network_equipments/sgraphene2.json
index 4bd41b1866c..68f626632e2 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgraphene2.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgraphene2.json
@@ -1,4 +1,5 @@
{
+ "backplane_bps": 176000000000,
"channels": {
"naming_pattern": "Po%CHANNELID%"
},
diff --git a/data/grid5000/sites/nancy/network_equipments/sgraphene3.json b/data/grid5000/sites/nancy/network_equipments/sgraphene3.json
index 59bc65e8b98..62337a25428 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgraphene3.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgraphene3.json
@@ -1,4 +1,5 @@
{
+ "backplane_bps": 176000000000,
"channels": {
"naming_pattern": "Po%CHANNELID%"
},
diff --git a/data/grid5000/sites/nancy/network_equipments/sgraphene4.json b/data/grid5000/sites/nancy/network_equipments/sgraphene4.json
index b9709aa41d6..8ba62fc47ad 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgraphene4.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgraphene4.json
@@ -1,4 +1,5 @@
{
+ "backplane_bps": 176000000000,
"channels": {
"naming_pattern": "Po%CHANNELID%"
},
diff --git a/data/grid5000/sites/nancy/network_equipments/sgriffon1.json b/data/grid5000/sites/nancy/network_equipments/sgriffon1.json
index 1cd6f430d75..9fc730cec72 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgriffon1.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgriffon1.json
@@ -1,4 +1,5 @@
{
+ "backplane_bps": 176000000000,
"channels": {
"naming_pattern": "Po%CHANNELID%"
},
diff --git a/data/grid5000/sites/nancy/network_equipments/sgriffon2.json b/data/grid5000/sites/nancy/network_equipments/sgriffon2.json
index 0fe08603829..3c1e5a594d3 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgriffon2.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgriffon2.json
@@ -1,4 +1,5 @@
{
+ "backplane_bps": 176000000000,
"channels": {
"naming_pattern": "Po%CHANNELID%"
},
diff --git a/data/grid5000/sites/nancy/network_equipments/sgriffon3.json b/data/grid5000/sites/nancy/network_equipments/sgriffon3.json
index 7b924a5575d..0f98ad6c431 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgriffon3.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgriffon3.json
@@ -1,4 +1,5 @@
{
+ "backplane_bps": 176000000000,
"channels": {
"naming_pattern": "Po%CHANNELID%"
},
diff --git a/data/grid5000/sites/nancy/network_equipments/stalc1.json b/data/grid5000/sites/nancy/network_equipments/stalc1.json
index 02dfd40eee3..3b91267584d 100644
--- a/data/grid5000/sites/nancy/network_equipments/stalc1.json
+++ b/data/grid5000/sites/nancy/network_equipments/stalc1.json
@@ -1,4 +1,5 @@
{
+ "backplane_bps": 176000000000,
"channels": {
"naming_pattern": "Po%CHANNELID%"
},
diff --git a/data/grid5000/sites/nancy/network_equipments/stalc2.json b/data/grid5000/sites/nancy/network_equipments/stalc2.json
index 27b394c4958..5b80e526b42 100644
--- a/data/grid5000/sites/nancy/network_equipments/stalc2.json
+++ b/data/grid5000/sites/nancy/network_equipments/stalc2.json
@@ -1,4 +1,5 @@
{
+ "backplane_bps": 176000000000,
"channels": {
"naming_pattern": "Po%CHANNELID%"
},
diff --git a/data/grid5000/sites/nancy/network_equipments/stalc3.json b/data/grid5000/sites/nancy/network_equipments/stalc3.json
index 1d08e8e0183..644b29ed39e 100644
--- a/data/grid5000/sites/nancy/network_equipments/stalc3.json
+++ b/data/grid5000/sites/nancy/network_equipments/stalc3.json
@@ -1,4 +1,5 @@
{
+ "backplane_bps": 176000000000,
"channels": {
"naming_pattern": "Po%CHANNELID%"
},
diff --git a/data/grid5000/sites/nancy/network_equipments/stalc4.json b/data/grid5000/sites/nancy/network_equipments/stalc4.json
index 912d2f208db..97bcafa876a 100644
--- a/data/grid5000/sites/nancy/network_equipments/stalc4.json
+++ b/data/grid5000/sites/nancy/network_equipments/stalc4.json
@@ -1,4 +1,5 @@
{
+ "backplane_bps": 176000000000,
"channels": {
"naming_pattern": "Po%CHANNELID%"
},
diff --git a/generators/input/sites/nancy/net-links/gw-nancy.yaml b/generators/input/sites/nancy/net-links/gw-nancy.yaml
index e68d3536db9..e5bc4c788ff 100644
--- a/generators/input/sites/nancy/net-links/gw-nancy.yaml
+++ b/generators/input/sites/nancy/net-links/gw-nancy.yaml
@@ -1,6 +1,6 @@
---
gw-nancy:
- model: HP Procurve 5406zl
+ model: HP Procurve 5406zl J8697A
kind: router
site: nancy
snmp_community: public
@@ -11,10 +11,12 @@ gw-nancy:
addresses:
- 172.16.79.254
routes: {}
-
+ backplane_bps: 346000000000
linecards:
1:
naming_pattern: "%LINECARD:A%%PORT%"
+ backplane_bps: 14400000000
+ model: J8702A
kind: other
rate: 1000000000
ports:
@@ -98,6 +100,8 @@ gw-nancy:
uid: fgrelon1
2:
naming_pattern: "%LINECARD:A%%PORT%"
+ backplane_bps: 14400000000
+ model: J8708A
kind: switch
rate: 1000000000
ports:
@@ -105,6 +109,8 @@ gw-nancy:
4: sgriffon2
3:
naming_pattern: "%LINECARD:A%%PORT%"
+ backplane_bps: 14400000000
+ model: J8708A
kind: switch
rate: 1000000000
ports:
@@ -113,6 +119,8 @@ gw-nancy:
4: sgraphene4
4:
naming_pattern: "%LINECARD:A%%PORT%"
+ backplane_bps: 14400000000
+ model: J8708A
kind: switch
rate: 1000000000
ports:
@@ -130,9 +138,13 @@ gw-nancy:
uid: sgriffon1
5:
naming_pattern: "%LINECARD:A%%PORT%"
+ backplane_bps: 14400000000
+ model: J8707A
kind: virtual
rate: 10000000000
ports:
- 4: renater-nancy
+ 4:
+ uid: renater-nancy
+ kind: virtual
channels:
naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/nancy/net-links/sgraphene1.yaml b/generators/input/sites/nancy/net-links/sgraphene1.yaml
index 1822a4329bb..679cbe1e428 100644
--- a/generators/input/sites/nancy/net-links/sgraphene1.yaml
+++ b/generators/input/sites/nancy/net-links/sgraphene1.yaml
@@ -1,23 +1,23 @@
----
-sgraphene1:
+---
+sgraphene1:
model: 3com 4510G
kind: switch
site: nancy
snmp_community: public
- vlans:
+ vlans:
naming_pattern: Vlan-interface%VLANID%
- "1":
+ "1":
administrative: yes
- addresses:
+ addresses:
- 172.16.79.201
routes: {}
-
- linecards:
- 0:
+ backplane_bps: 176000000000
+ linecards:
+ 0:
naming_pattern: "GigabitEthernet1/%LINECARD%/%PORT%"
kind: node
rate: 10000000000
- ports:
+ ports:
2: graphene-1
1: graphene-2
4: graphene-3
@@ -57,11 +57,11 @@ sgraphene1:
38: graphene-37
37: graphene-38
40: graphene-39
- 1:
+ 1:
naming_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
kind: router
rate: 100000000
- ports:
+ ports:
2: gw-nancy
- channels:
+ channels:
naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/nancy/net-links/sgraphene2.yaml b/generators/input/sites/nancy/net-links/sgraphene2.yaml
index 61ba1aab318..cd2baa7255b 100644
--- a/generators/input/sites/nancy/net-links/sgraphene2.yaml
+++ b/generators/input/sites/nancy/net-links/sgraphene2.yaml
@@ -1,23 +1,23 @@
----
-sgraphene2:
+---
+sgraphene2:
model: 3com 4510G
kind: switch
site: nancy
snmp_community: public
- vlans:
+ vlans:
naming_pattern: Vlan-interface%VLANID%
- "1":
+ "1":
administrative: yes
- addresses:
+ addresses:
- 172.16.79.202
routes: {}
-
- linecards:
- 0:
+ backplane_bps: 176000000000
+ linecards:
+ 0:
naming_pattern: "GigabitEthernet1/%LINECARD%/%PORT%"
kind: node
rate: 10000000000
- ports:
+ ports:
2: graphene-41
1: graphene-40
3: graphene-42
@@ -53,11 +53,11 @@ sgraphene2:
33: graphene-72
34: graphene-73
35: graphene-74
- 1:
+ 1:
naming_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
kind: router
rate: 100000000
- ports:
+ ports:
2: gw-nancy
- channels:
+ channels:
naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/nancy/net-links/sgraphene3.yaml b/generators/input/sites/nancy/net-links/sgraphene3.yaml
index 3e9df9f1194..b7cbec233f5 100644
--- a/generators/input/sites/nancy/net-links/sgraphene3.yaml
+++ b/generators/input/sites/nancy/net-links/sgraphene3.yaml
@@ -1,23 +1,23 @@
----
-sgraphene3:
+---
+sgraphene3:
model: 3com 4510G
kind: switch
site: nancy
snmp_community: public
- vlans:
+ vlans:
naming_pattern: Vlan-interface%VLANID%
- "1":
+ "1":
administrative: yes
- addresses:
+ addresses:
- 172.16.79.203
routes: {}
-
- linecards:
- 0:
+ backplane_bps: 176000000000
+ linecards:
+ 0:
naming_pattern: "GigabitEthernet1/%LINECARD%/%PORT%"
kind: node
rate: 10000000000
- ports:
+ ports:
2: graphene-75
1: graphene-76
4: graphene-77
@@ -48,11 +48,11 @@ sgraphene3:
27: graphene-102
30: graphene-103
29: graphene-104
- 1:
+ 1:
naming_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
kind: router
rate: 100000000
- ports:
+ ports:
2: gw-nancy
- channels:
+ channels:
naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/nancy/net-links/sgraphene4.yaml b/generators/input/sites/nancy/net-links/sgraphene4.yaml
index 0cb228e21fa..2365527b221 100644
--- a/generators/input/sites/nancy/net-links/sgraphene4.yaml
+++ b/generators/input/sites/nancy/net-links/sgraphene4.yaml
@@ -1,23 +1,23 @@
----
-sgraphene4:
+---
+sgraphene4:
model: 3com 4510G
kind: switch
site: nancy
snmp_community: public
- vlans:
+ vlans:
naming_pattern: Vlan-interface%VLANID%
- "1":
+ "1":
administrative: yes
- addresses:
+ addresses:
- 172.16.79.204
routes: {}
-
- linecards:
- 0:
+ backplane_bps: 176000000000
+ linecards:
+ 0:
naming_pattern: "GigabitEthernet1/%LINECARD%/%PORT%"
kind: node
rate: 10000000000
- ports:
+ ports:
2: graphene-106
1: graphene-105
3: graphene-107
@@ -58,11 +58,11 @@ sgraphene4:
38: graphene-142
39: graphene-143
40: graphene-144
- 1:
+ 1:
naming_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
kind: router
rate: 100000000
- ports:
+ ports:
1: gw-nancy
- channels:
+ channels:
naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/nancy/net-links/sgriffon1.yaml b/generators/input/sites/nancy/net-links/sgriffon1.yaml
index 4439474251b..18886665008 100644
--- a/generators/input/sites/nancy/net-links/sgriffon1.yaml
+++ b/generators/input/sites/nancy/net-links/sgriffon1.yaml
@@ -1,23 +1,23 @@
----
-sgriffon1:
+---
+sgriffon1:
model: 3com 4500g
kind: switch
site: nancy
snmp_community: public
- vlans:
+ vlans:
naming_pattern: Vlan-interface%VLANID%
- "1":
+ "1":
administrative: yes
- addresses:
+ addresses:
- 172.16.79.205
routes: {}
-
- linecards:
- 0:
+ backplane_bps: 176000000000
+ linecards:
+ 0:
naming_pattern: "GigabitEthernet1/%LINECARD%/%PORT%"
kind: node
rate: 10000000000
- ports:
+ ports:
2: griffon-2
1: griffon-1
3: griffon-3
@@ -50,11 +50,11 @@ sgriffon1:
11: griffon-58
12: griffon-59
13: griffon-60
- 1:
+ 1:
naming_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
kind: router
rate: 100000000
- ports:
+ ports:
2: gw-nancy
- channels:
+ channels:
naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/nancy/net-links/sgriffon2.yaml b/generators/input/sites/nancy/net-links/sgriffon2.yaml
index 920d70ae59a..5709b686fa4 100644
--- a/generators/input/sites/nancy/net-links/sgriffon2.yaml
+++ b/generators/input/sites/nancy/net-links/sgriffon2.yaml
@@ -1,23 +1,23 @@
----
-sgriffon2:
+---
+sgriffon2:
model: 3com 4500g
kind: switch
site: nancy
snmp_community: public
- vlans:
+ vlans:
naming_pattern: Vlan-interface%VLANID%
- "1":
+ "1":
administrative: yes
- addresses:
+ addresses:
- 172.16.79.206
routes: {}
-
- linecards:
- 0:
+ backplane_bps: 176000000000
+ linecards:
+ 0:
naming_pattern: "GigabitEthernet1/%LINECARD%/%PORT%"
kind: node
rate: 10000000000
- ports:
+ ports:
2: griffon-31
1: griffon-30
3: griffon-32
@@ -46,11 +46,11 @@ sgriffon2:
41: griffon-55
42: griffon-56
43: griffon-57
- 1:
+ 1:
naming_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
kind: router
rate: 100000000
- ports:
+ ports:
1: gw-nancy
- channels:
+ channels:
naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/nancy/net-links/sgriffon3.yaml b/generators/input/sites/nancy/net-links/sgriffon3.yaml
index ad19ff2230b..656876312e5 100644
--- a/generators/input/sites/nancy/net-links/sgriffon3.yaml
+++ b/generators/input/sites/nancy/net-links/sgriffon3.yaml
@@ -1,23 +1,23 @@
----
-sgriffon3:
+---
+sgriffon3:
model: 3com 4500g
kind: switch
site: nancy
snmp_community: public
- vlans:
+ vlans:
naming_pattern: Vlan-interface%VLANID%
- "1":
+ "1":
administrative: yes
- addresses:
+ addresses:
- 172.16.79.207
routes: {}
-
- linecards:
- 0:
+ backplane_bps: 176000000000
+ linecards:
+ 0:
naming_pattern: "GigabitEthernet1/%LINECARD%/%PORT%"
kind: node
rate: 10000000000
- ports:
+ ports:
4: griffon-61
5: griffon-62
6: griffon-63
@@ -50,11 +50,11 @@ sgriffon3:
42: griffon-90
43: griffon-91
44: griffon-92
- 1:
+ 1:
naming_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
kind: router
rate: 10000000000
- ports:
+ ports:
1: gw-nancy
- channels:
+ channels:
naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/nancy/net-links/stalc1.yaml b/generators/input/sites/nancy/net-links/stalc1.yaml
index 89c4fdf04d3..8a98b7acb37 100644
--- a/generators/input/sites/nancy/net-links/stalc1.yaml
+++ b/generators/input/sites/nancy/net-links/stalc1.yaml
@@ -11,7 +11,7 @@ stalc1:
addresses:
- 172.16.79.224
routes: {}
-
+ backplane_bps: 176000000000
linecards:
0:
naming_pattern: "GigabitEthernet1/%LINECARD%/%PORT%"
diff --git a/generators/input/sites/nancy/net-links/stalc2.yaml b/generators/input/sites/nancy/net-links/stalc2.yaml
index 2c922db1736..8534a50d59d 100644
--- a/generators/input/sites/nancy/net-links/stalc2.yaml
+++ b/generators/input/sites/nancy/net-links/stalc2.yaml
@@ -11,7 +11,7 @@ stalc2:
addresses:
- 172.16.79.225
routes: {}
-
+ backplane_bps: 176000000000
linecards:
0:
naming_pattern: "GigabitEthernet1/%LINECARD%/%PORT%"
diff --git a/generators/input/sites/nancy/net-links/stalc3.yaml b/generators/input/sites/nancy/net-links/stalc3.yaml
index ca42db96f10..c34b1fa0b71 100644
--- a/generators/input/sites/nancy/net-links/stalc3.yaml
+++ b/generators/input/sites/nancy/net-links/stalc3.yaml
@@ -1,23 +1,23 @@
----
-stalc3:
+---
+stalc3:
model: 3com 4500G
kind: switch
site: nancy
snmp_community: public
- vlans:
+ vlans:
naming_pattern: Vlan-interface%VLANID%
- "1":
+ "1":
administrative: yes
- addresses:
+ addresses:
- 172.16.79.226
routes: {}
-
- linecards:
- 0:
+ backplane_bps: 176000000000
+ linecards:
+ 0:
naming_pattern: "GigabitEthernet1/%LINECARD%/%PORT%"
kind: node
rate: 10000000000
- ports:
+ ports:
2: talc-69
1: talc-68
3: talc-70
@@ -56,12 +56,12 @@ stalc3:
40: talc-103
41: talc-104
42: talc-133
- 1:
+ 1:
naming_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
kind: switch
rate: 10000000000
- ports:
+ ports:
1: stalc1
2: stalc4
- channels:
+ channels:
naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/nancy/net-links/stalc4.yaml b/generators/input/sites/nancy/net-links/stalc4.yaml
index c29e1d752c8..f18a41246de 100644
--- a/generators/input/sites/nancy/net-links/stalc4.yaml
+++ b/generators/input/sites/nancy/net-links/stalc4.yaml
@@ -11,7 +11,7 @@ stalc4:
addresses:
- 172.16.79.227
routes: {}
-
+ backplane_bps: 176000000000
linecards:
0:
naming_pattern: "GigabitEthernet1/%LINECARD%/%PORT%"
--
GitLab