From 2755b8dd35f90557ac3bb20b37af0e4bd258de1d Mon Sep 17 00:00:00 2001 From: Hyacinthe Cartiaux <hyacinthe.cartiaux@uni.lu> Date: Wed, 27 Feb 2013 19:13:05 +0100 Subject: [PATCH] [luxembourg] backplane values and precise network equipment model names --- .../network_equipments/gw-luxembourg.json | 18 ++++++++++++++- .../network_equipments/ul-grid5000-sw02.json | 4 ++-- .../luxembourg/net-links/gw-luxembourg.yaml | 13 ++++++++++- .../net-links/ul-grid5000-sw02.yaml | 23 ++++++++++--------- 4 files changed, 43 insertions(+), 15 deletions(-) diff --git a/data/grid5000/sites/luxembourg/network_equipments/gw-luxembourg.json b/data/grid5000/sites/luxembourg/network_equipments/gw-luxembourg.json index ef28ff22ed7..72542ac6f54 100644 --- a/data/grid5000/sites/luxembourg/network_equipments/gw-luxembourg.json +++ b/data/grid5000/sites/luxembourg/network_equipments/gw-luxembourg.json @@ -1,5 +1,5 @@ { - "backplane_bps": null, + "backplane_bps": 720000000000, "channels": { "1": [ { @@ -39,6 +39,7 @@ }, { + "backplane_bps": 40000000000, "naming_pattern": "Gi%LINECARD%/%PORT%", "ports": [ { @@ -270,6 +271,7 @@ "rate": 1000000000 }, { + "backplane_bps": 40000000000, "naming_pattern": "Gi%LINECARD%/%PORT%", "ports": [ { @@ -495,12 +497,26 @@ "rate": 1000000000 }, { + "backplane_bps": 40000000000, + "naming_pattern": "Te%LINECARD%/%PORT%", + "ports": [ + { + + }, + { + }, + { + + } + ], + "rate": 10000000000 }, { }, { + "backplane_bps": 40000000000, "naming_pattern": "Gi%LINECARD%/%PORT%", "ports": [ { diff --git a/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw02.json b/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw02.json index 313a83c977e..cde9e820cf3 100644 --- a/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw02.json +++ b/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw02.json @@ -1,5 +1,5 @@ { - "backplane_bps": null, + "backplane_bps": 1040000000000, "channels": { "naming_pattern": "Po%CHANNELID%" }, @@ -192,7 +192,7 @@ "rate": 10000000000 } ], - "model": "Nexus 5000", + "model": "cisco N5K-C5020P-BF", "routes": { }, diff --git a/generators/input/sites/luxembourg/net-links/gw-luxembourg.yaml b/generators/input/sites/luxembourg/net-links/gw-luxembourg.yaml index 46073e0a82b..5bf6cea85e6 100644 --- a/generators/input/sites/luxembourg/net-links/gw-luxembourg.yaml +++ b/generators/input/sites/luxembourg/net-links/gw-luxembourg.yaml @@ -4,6 +4,7 @@ gw-luxembourg: kind: router site: luxembourg snmp_community: public + backplane_bps: 720000000000 vlans: naming_pattern: Vlan%VLANID% "30": @@ -31,6 +32,7 @@ gw-luxembourg: linecards: 1: naming_pattern: Gi%LINECARD%/%PORT% + backplane_bps: 40000000000 rate: 1000000000 ports: 1: @@ -192,6 +194,7 @@ gw-luxembourg: 48: 2: naming_pattern: Gi%LINECARD%/%PORT% + backplane_bps: 40000000000 rate: 1000000000 ports: 1: @@ -339,9 +342,17 @@ gw-luxembourg: port: eth0 kind: other 48: + 3: + naming_pattern: Te%LINECARD%/%PORT% + rate: 10000000000 + backplane_bps: 40000000000 + ports: + 1: + 2: 5: - rate: 1000000000 naming_pattern: Gi%LINECARD%/%PORT% + rate: 1000000000 + backplane_bps: 40000000000 ports: 2: uid: ul-grid5000-sw02 diff --git a/generators/input/sites/luxembourg/net-links/ul-grid5000-sw02.yaml b/generators/input/sites/luxembourg/net-links/ul-grid5000-sw02.yaml index 576ce4d5123..c35b3ac290d 100644 --- a/generators/input/sites/luxembourg/net-links/ul-grid5000-sw02.yaml +++ b/generators/input/sites/luxembourg/net-links/ul-grid5000-sw02.yaml @@ -1,32 +1,33 @@ --- -ul-grid5000-sw02: - model: Nexus 5000 +ul-grid5000-sw02: + model: cisco N5K-C5020P-BF kind: switch site: luxembourg snmp_community: public - weathermap: + backplane_bps: 1040000000000 + weathermap: use_cacti: "yes" - vlans: + vlans: naming_pattern: Vlan%VLANID% "50": - administrative: yes + administrative: yes addresses: - 172.17.191.253 routes: {} - linecards: - 0: + linecards: + 0: naming_pattern: "mgmt%PORT%" rate: 100000000 - ports: + ports: 0: uid: gw-luxembourg port: Gi1/46 kind: router - 1: + 1: naming_pattern: "Ethernet%LINECARD%/%PORT%" rate: 10000000000 - ports: + ports: 1: uid: gw-luxembourg port: Gi5/2 @@ -136,6 +137,6 @@ ul-grid5000-sw02: 38: 39: 40: - channels: + channels: naming_pattern: Po%CHANNELID% -- GitLab