From 2038d2c6a81ada2dcf5c5c6d06e7461f86623a96 Mon Sep 17 00:00:00 2001 From: Pascal Morillon <pascal.morillon@irisa.fr> Date: Wed, 24 Jun 2015 16:57:28 +0200 Subject: [PATCH] [rennes] Fixes new network architecture --- .../sites/rennes/network_equipments/bigdata-sw.json | 2 +- .../network_equipments/{gw-rennes.json => c6509.json} | 8 ++++---- .../sites/rennes/network_equipments/parasilo-sw-1.json | 8 ++++++-- .../sites/rennes/network_equipments/paravance-sw-1.json | 4 ++-- .../sites/rennes/network_equipments/paravance-sw-2.json | 4 ++-- generators/input/sites/rennes/net-links/bigdata-sw.yaml | 2 +- .../sites/rennes/net-links/{gw-rennes.yaml => c6509.yaml} | 7 +++---- .../input/sites/rennes/net-links/parasilo-sw-1.yaml | 7 +++++-- .../input/sites/rennes/net-links/paravance-sw-1.yaml | 4 ++-- .../input/sites/rennes/net-links/paravance-sw-2.yaml | 4 ++-- 10 files changed, 28 insertions(+), 22 deletions(-) rename data/grid5000/sites/rennes/network_equipments/{gw-rennes.json => c6509.json} (99%) rename generators/input/sites/rennes/net-links/{gw-rennes.yaml => c6509.yaml} (98%) diff --git a/data/grid5000/sites/rennes/network_equipments/bigdata-sw.json b/data/grid5000/sites/rennes/network_equipments/bigdata-sw.json index f5594dd40be..6f6dc2fe87f 100644 --- a/data/grid5000/sites/rennes/network_equipments/bigdata-sw.json +++ b/data/grid5000/sites/rennes/network_equipments/bigdata-sw.json @@ -13,7 +13,7 @@ { "kind": "router", "port": "1:3", - "uid": "gw-rennes" + "uid": "c6509" }, { diff --git a/data/grid5000/sites/rennes/network_equipments/gw-rennes.json b/data/grid5000/sites/rennes/network_equipments/c6509.json similarity index 99% rename from data/grid5000/sites/rennes/network_equipments/gw-rennes.json rename to data/grid5000/sites/rennes/network_equipments/c6509.json index afda20e36c7..5a9163dd3d1 100644 --- a/data/grid5000/sites/rennes/network_equipments/gw-rennes.json +++ b/data/grid5000/sites/rennes/network_equipments/c6509.json @@ -4,7 +4,7 @@ "naming_pattern": "Po%CHANNELID%", "snmp_pattern": "Port-channel%CHANNELID%" }, - "kind": "router", + "kind": "switch", "linecards": [ { @@ -19,10 +19,10 @@ }, { - "uid": "renater-rennes" + }, { - "kind": "switch", + "kind": "router", "uid": "parasilo-sw-1" }, { @@ -898,7 +898,7 @@ "site": "rennes", "snmp_community": "privkavlan", "type": "network_equipment", - "uid": "gw-rennes", + "uid": "c6509", "vlans": { "naming_pattern": "Vlan%VLANID%", "vlan100": { diff --git a/data/grid5000/sites/rennes/network_equipments/parasilo-sw-1.json b/data/grid5000/sites/rennes/network_equipments/parasilo-sw-1.json index a7cc231d96f..3b49d7ebd2b 100644 --- a/data/grid5000/sites/rennes/network_equipments/parasilo-sw-1.json +++ b/data/grid5000/sites/rennes/network_equipments/parasilo-sw-1.json @@ -6,7 +6,7 @@ "naming_pattern": "Po%CHANNELID%", "snmp_pattern": "port-channel%CHANNELID%" }, - "kind": "switch", + "kind": "router", "linecards": [ { @@ -371,7 +371,11 @@ }, { "kind": "router", - "uid": "gw-rennes" + "uid": "c6509" + }, + { + "kind": "virtual", + "uid": "renater-rennes" } ], "rate": 10000000000, diff --git a/data/grid5000/sites/rennes/network_equipments/paravance-sw-1.json b/data/grid5000/sites/rennes/network_equipments/paravance-sw-1.json index 0b86fd3a0c7..6917e1bacab 100644 --- a/data/grid5000/sites/rennes/network_equipments/paravance-sw-1.json +++ b/data/grid5000/sites/rennes/network_equipments/paravance-sw-1.json @@ -257,12 +257,12 @@ "uid": "paravance-24" }, { - "kind": "switch", + "kind": "router", "rate": 40000000000, "uid": "parasilo-sw-1" }, { - "kind": "switch", + "kind": "router", "rate": 40000000000, "uid": "parasilo-sw-1" } diff --git a/data/grid5000/sites/rennes/network_equipments/paravance-sw-2.json b/data/grid5000/sites/rennes/network_equipments/paravance-sw-2.json index 8af91f45b37..4b9aa4b006a 100644 --- a/data/grid5000/sites/rennes/network_equipments/paravance-sw-2.json +++ b/data/grid5000/sites/rennes/network_equipments/paravance-sw-2.json @@ -263,12 +263,12 @@ }, { - "kind": "switch", + "kind": "router", "rate": 40000000000, "uid": "parasilo-sw-1" }, { - "kind": "switch", + "kind": "router", "rate": 40000000000, "uid": "parasilo-sw-1" } diff --git a/generators/input/sites/rennes/net-links/bigdata-sw.yaml b/generators/input/sites/rennes/net-links/bigdata-sw.yaml index dac8b7347c2..389c58b564c 100644 --- a/generators/input/sites/rennes/net-links/bigdata-sw.yaml +++ b/generators/input/sites/rennes/net-links/bigdata-sw.yaml @@ -22,7 +22,7 @@ bigdata-sw: port: eth0 ports: 0: - uid: gw-rennes + uid: c6509 kind: router port: "1:3" 11: diff --git a/generators/input/sites/rennes/net-links/gw-rennes.yaml b/generators/input/sites/rennes/net-links/c6509.yaml similarity index 98% rename from generators/input/sites/rennes/net-links/gw-rennes.yaml rename to generators/input/sites/rennes/net-links/c6509.yaml index e4e2056566d..1d81a3bce49 100644 --- a/generators/input/sites/rennes/net-links/gw-rennes.yaml +++ b/generators/input/sites/rennes/net-links/c6509.yaml @@ -1,7 +1,7 @@ --- -gw-rennes: +c6509: model: Cisco WS-C6509-E - kind: router + kind: switch site: rennes snmp_community: privkavlan backplane_bps: 720000000000 @@ -70,10 +70,9 @@ gw-rennes: backplane_bps: 40000000000 model: WS-X6704-10GE ports: - 1: renater-rennes 2: uid: parasilo-sw-1 - kind: switch + kind: router 3: uid: bigdata-sw kind: switch diff --git a/generators/input/sites/rennes/net-links/parasilo-sw-1.yaml b/generators/input/sites/rennes/net-links/parasilo-sw-1.yaml index 88057e07b25..a2425e5953d 100644 --- a/generators/input/sites/rennes/net-links/parasilo-sw-1.yaml +++ b/generators/input/sites/rennes/net-links/parasilo-sw-1.yaml @@ -1,7 +1,7 @@ --- parasilo-sw-1: model: Nexus 56128P - kind: switch + kind: router site: rennes snmp_community: public routes: {} @@ -259,8 +259,11 @@ parasilo-sw-1: kind: node port: eth0 23: - uid: gw-rennes + uid: c6509 kind: router + 24: + uid: renater-rennes + kind: virtual channels: naming_pattern: Po%CHANNELID% snmp_pattern: port-channel%CHANNELID% diff --git a/generators/input/sites/rennes/net-links/paravance-sw-1.yaml b/generators/input/sites/rennes/net-links/paravance-sw-1.yaml index 09d58c560b0..727866f7226 100644 --- a/generators/input/sites/rennes/net-links/paravance-sw-1.yaml +++ b/generators/input/sites/rennes/net-links/paravance-sw-1.yaml @@ -208,11 +208,11 @@ paravance-sw-1: 49: uid: parasilo-sw-1 rate: 40000000000 - kind: switch + kind: router 50: uid: parasilo-sw-1 rate: 40000000000 - kind: switch + kind: router 2: naming_pattern: "Ethernet%LINECARD%/%PORT%" snmp_pattern: "Ethernet%LINECARD%/%PORT%" diff --git a/generators/input/sites/rennes/net-links/paravance-sw-2.yaml b/generators/input/sites/rennes/net-links/paravance-sw-2.yaml index 59a3a261d70..7909907a611 100644 --- a/generators/input/sites/rennes/net-links/paravance-sw-2.yaml +++ b/generators/input/sites/rennes/net-links/paravance-sw-2.yaml @@ -208,11 +208,11 @@ paravance-sw-2: 51: uid: parasilo-sw-1 rate: 40000000000 - kind: switch + kind: router 52: uid: parasilo-sw-1 rate: 40000000000 - kind: switch + kind: router 2: naming_pattern: "Ethernet%LINECARD%/%PORT%" snmp_pattern: "Ethernet%LINECARD%/%PORT%" -- GitLab