From 32fc411fa93224f6d8574a1e9b1b5f05a432adff Mon Sep 17 00:00:00 2001
From: Tina Rakotoarivelo <tina.rakotoarivelo@inria.fr>
Date: Mon, 13 Aug 2012 17:59:07 +0200
Subject: [PATCH] [Toulouse] Add IP of c6500-grid5000
---
.../sites/toulouse/network_equipments/c6500-grid5000.json | 6 ++++++
data/grid5000/sites/toulouse/network_equipments/r4.json | 2 +-
.../input/sites/toulouse/net-links/c6500-grid5000.yaml | 4 ++++
generators/input/sites/toulouse/net-links/r4.yaml | 3 +++
4 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/data/grid5000/sites/toulouse/network_equipments/c6500-grid5000.json b/data/grid5000/sites/toulouse/network_equipments/c6500-grid5000.json
index 654577eb4e9..fb3e0c45b3a 100644
--- a/data/grid5000/sites/toulouse/network_equipments/c6500-grid5000.json
+++ b/data/grid5000/sites/toulouse/network_equipments/c6500-grid5000.json
@@ -188,6 +188,12 @@
"type": "network_equipment",
"uid": "c6500-grid5000",
"vlans": {
+ "100": {
+ "addresses": [
+ "172.16.127.254"
+ ],
+ "administrative": true
+ },
"naming_pattern": "Vlan%VLANID%"
},
"weathermap": {
diff --git a/data/grid5000/sites/toulouse/network_equipments/r4.json b/data/grid5000/sites/toulouse/network_equipments/r4.json
index 5c6a2c0a33d..03e1b0d1b07 100644
--- a/data/grid5000/sites/toulouse/network_equipments/r4.json
+++ b/data/grid5000/sites/toulouse/network_equipments/r4.json
@@ -58,6 +58,6 @@
"naming_pattern": "Vlan%VLANID%"
},
"weathermap": {
-
+ "use_cacti": "no"
}
}
\ No newline at end of file
diff --git a/generators/input/sites/toulouse/net-links/c6500-grid5000.yaml b/generators/input/sites/toulouse/net-links/c6500-grid5000.yaml
index 504bac0a9f4..a02d37c70dc 100644
--- a/generators/input/sites/toulouse/net-links/c6500-grid5000.yaml
+++ b/generators/input/sites/toulouse/net-links/c6500-grid5000.yaml
@@ -8,6 +8,10 @@ c6500-grid5000:
vlans:
naming_pattern: Vlan%VLANID%
+ "100":
+ administrative: yes
+ addresses:
+ - 172.16.127.254
linecards:
1:
kind: switch
diff --git a/generators/input/sites/toulouse/net-links/r4.yaml b/generators/input/sites/toulouse/net-links/r4.yaml
index d71e7bb3916..6564b75b51c 100644
--- a/generators/input/sites/toulouse/net-links/r4.yaml
+++ b/generators/input/sites/toulouse/net-links/r4.yaml
@@ -4,6 +4,9 @@ r4:
kind: switch
site: toulouse
snmp_community: public
+ weathermap:
+ use_cacti: "no"
+
routes: {}
vlans:
--
GitLab