diff --git a/data/grid5000/sites/bordeaux/network_equipments/sbordeplage1.json b/data/grid5000/sites/bordeaux/network_equipments/sbordeplage1.json index 9c056d6f696138844535378ac9ef62159a2032ab..fdebe1833b51c71afd2bc3a2125688196578becd 100644 --- a/data/grid5000/sites/bordeaux/network_equipments/sbordeplage1.json +++ b/data/grid5000/sites/bordeaux/network_equipments/sbordeplage1.json @@ -70,6 +70,6 @@ "naming_pattern": "Vlan%VLANID%" }, "weathermap": { - + "use_cacti": "no" } } \ No newline at end of file diff --git a/data/grid5000/sites/bordeaux/network_equipments/sbordeplage2.json b/data/grid5000/sites/bordeaux/network_equipments/sbordeplage2.json index 34418496efdad15d53edd6bf9f162da973d23a63..2b87c55f78c736580ebe9ac2b85cf8dad050be56 100644 --- a/data/grid5000/sites/bordeaux/network_equipments/sbordeplage2.json +++ b/data/grid5000/sites/bordeaux/network_equipments/sbordeplage2.json @@ -160,6 +160,6 @@ "naming_pattern": "Vlan%VLANID%" }, "weathermap": { - + "use_cacti": "no" } } \ No newline at end of file diff --git a/data/grid5000/sites/bordeaux/network_equipments/sborderline.json b/data/grid5000/sites/bordeaux/network_equipments/sborderline.json index ca72bb5b37ec62840c895cebc34192660e4ac2fc..d501180f0a5a44849af1c6066f70fe07babeb353 100644 --- a/data/grid5000/sites/bordeaux/network_equipments/sborderline.json +++ b/data/grid5000/sites/bordeaux/network_equipments/sborderline.json @@ -67,6 +67,6 @@ "naming_pattern": "Vlan%VLANID%" }, "weathermap": { - + "use_cacti": "no" } } \ No newline at end of file diff --git a/data/grid5000/sites/bordeaux/network_equipments/st-bordemer.json b/data/grid5000/sites/bordeaux/network_equipments/st-bordemer.json index 5a5d25659602f795779aa0edcc8cbf773dfcec01..ef900bceb599ed757ba645f3e14012a06e3e5afb 100644 --- a/data/grid5000/sites/bordeaux/network_equipments/st-bordemer.json +++ b/data/grid5000/sites/bordeaux/network_equipments/st-bordemer.json @@ -5,27 +5,89 @@ "kind": "switch", "linecards": [ { - "kind": "router", - "naming_pattern": "%LINECARD%/%PORT%", - "ports": [ - { - "uid": "gw-bdx" - } - ], - "rate": 10000000000 + }, { - "kind": "switch", - "naming_pattern": "%LINECARD%/%PORT%", + "kind": "router", + "naming_pattern": "Gi%LINECARD%/0/%PORT%", "ports": [ { }, { - "uid": "sbordeplage1" + + }, + { + + }, + { + + }, + { + + }, + { + }, { - "uid": "sbordeplage2" + + }, + { + + }, + { + + }, + { + + }, + { + + }, + { + + }, + { + + }, + { + + }, + { + + }, + { + + }, + { + + }, + { + + }, + { + + }, + { + + }, + { + + }, + { + + }, + { + + }, + { + + }, + { + + }, + { + "uid": "gw-bdx" } ], "rate": 1000000000 @@ -40,6 +102,12 @@ "type": "network_equipment", "uid": "st-bordemer", "vlans": { + "100": { + "addresses": [ + "172.16.15.200" + ], + "administrative": true + }, "naming_pattern": "Vlan%VLANID%" }, "weathermap": { diff --git a/generators/input/sites/bordeaux/net-links/sbordeplage1.yaml b/generators/input/sites/bordeaux/net-links/sbordeplage1.yaml index 495744b0327e69aebdb338e8f9d321ec62d15294..040a0a8438fa6e5ec0362870b8a3833fd2501039 100644 --- a/generators/input/sites/bordeaux/net-links/sbordeplage1.yaml +++ b/generators/input/sites/bordeaux/net-links/sbordeplage1.yaml @@ -4,6 +4,8 @@ sbordeplage1: kind: switch site: bordeaux snmp_community: public + weathermap: + use_cacti: "no" vlans: naming_pattern: Vlan%VLANID% routes: {} diff --git a/generators/input/sites/bordeaux/net-links/sbordeplage2.yaml b/generators/input/sites/bordeaux/net-links/sbordeplage2.yaml index 5f70fb481210aeb52aa9257a3e8a9b03d8f7dc7b..e79d6dbd9d3bfe1e3040ad6d7f10b11de68dd8dc 100644 --- a/generators/input/sites/bordeaux/net-links/sbordeplage2.yaml +++ b/generators/input/sites/bordeaux/net-links/sbordeplage2.yaml @@ -4,6 +4,8 @@ sbordeplage2: kind: switch site: bordeaux snmp_community: public + weathermap: + use_cacti: "no" vlans: naming_pattern: Vlan%VLANID% routes: {} diff --git a/generators/input/sites/bordeaux/net-links/sborderline.yaml b/generators/input/sites/bordeaux/net-links/sborderline.yaml index 6da8bf176904950cee54e107b08d77f6db24fc23..cd788f66ab0e51c4087fa4b3d370a8f14784d4a2 100644 --- a/generators/input/sites/bordeaux/net-links/sborderline.yaml +++ b/generators/input/sites/bordeaux/net-links/sborderline.yaml @@ -4,6 +4,8 @@ sborderline: kind: switch site: bordeaux snmp_community: public + weathermap: + use_cacti: "no" vlans: naming_pattern: Vlan%VLANID% routes: {} diff --git a/generators/input/sites/bordeaux/net-links/st-bordemer.yaml b/generators/input/sites/bordeaux/net-links/st-bordemer.yaml index 862bdd7290901db4a01015298807363855f501dc..18dc6e815d2991d214a5f15d04307286db81686c 100644 --- a/generators/input/sites/bordeaux/net-links/st-bordemer.yaml +++ b/generators/input/sites/bordeaux/net-links/st-bordemer.yaml @@ -6,21 +6,18 @@ st-bordemer: snmp_community: public vlans: naming_pattern: Vlan%VLANID% + "100": + administrative: yes + addresses: + - 172.16.15.200 routes: {} linecards: - 0: - naming_pattern: "%LINECARD%/%PORT%" - kind: router - rate: 10000000000 - ports: - 0: gw-bdx 1: - naming_pattern: "%LINECARD%/%PORT%" - kind: switch + naming_pattern: "Gi%LINECARD%/0/%PORT%" + kind: router rate: 1000000000 ports: - 1: sbordeplage1 - 2: sbordeplage2 + 25: gw-bdx channels: naming_pattern: Po%CHANNELID%