From 7a4b13cef532d0bfc05afa423310a5f21bc28571 Mon Sep 17 00:00:00 2001
From: Vidal WATAT <vidal.watat@inria.fr>
Date: Tue, 6 Nov 2012 19:12:30 +0100
Subject: [PATCH] [lille] Network_golden_naming , change router name to gw
---
.../lille/network_equipments/gw-lille-6k.json | 553 ------------------
.../lille/network_equipments/sw-admin1.json | 4 +-
.../lille/network_equipments/sw-admin2.json | 4 +-
.../lille/network_equipments/sw-admin3.json | 4 +-
.../lille/network_equipments/sw-admin4.json | 4 +-
.../lille/network_equipments/sw-admin5.json | 2 +-
.../input/sites/lille/net-links/gw-lille.yaml | 255 ++++++++
7 files changed, 264 insertions(+), 562 deletions(-)
delete mode 100644 data/grid5000/sites/lille/network_equipments/gw-lille-6k.json
create mode 100644 generators/input/sites/lille/net-links/gw-lille.yaml
diff --git a/data/grid5000/sites/lille/network_equipments/gw-lille-6k.json b/data/grid5000/sites/lille/network_equipments/gw-lille-6k.json
deleted file mode 100644
index 43b444c45dd..00000000000
--- a/data/grid5000/sites/lille/network_equipments/gw-lille-6k.json
+++ /dev/null
@@ -1,553 +0,0 @@
-{
- "channels": {
- "naming_pattern": "Po%CHANNELID%"
- },
- "kind": "router",
- "linecards": [
- {
-
- },
- {
- "kind": "renater",
- "naming_pattern": "Te%LINECARD%/%PORT%",
- "ports": [
- {
-
- },
- {
- "uid": "renater-lille"
- }
- ],
- "rate": 10000000000
- },
- {
- "kind": "node",
- "naming_pattern": "Gi%LINECARD%/%PORT%",
- "port": "eth1",
- "ports": [
- {
-
- },
- {
- "uid": "chinqchint-1"
- },
- {
- "uid": "chinqchint-2"
- },
- {
- "uid": "chinqchint-3"
- },
- {
- "uid": "chinqchint-4"
- },
- {
-
- },
- {
- "uid": "chinqchint-6"
- },
- {
- "uid": "chinqchint-7"
- },
- {
- "uid": "chinqchint-8"
- },
- {
- "uid": "chinqchint-9"
- },
- {
- "uid": "chinqchint-10"
- },
- {
- "uid": "chinqchint-11"
- },
- {
- "uid": "chinqchint-12"
- },
- {
- "uid": "chinqchint-13"
- },
- {
- "uid": "chinqchint-14"
- },
- {
- "uid": "chinqchint-15"
- },
- {
- "uid": "chinqchint-16"
- },
- {
- "uid": "chinqchint-17"
- },
- {
- "uid": "chinqchint-18"
- },
- {
- "uid": "chinqchint-19"
- },
- {
- "uid": "chinqchint-20"
- },
- {
- "uid": "chinqchint-21"
- },
- {
- "uid": "chinqchint-22"
- },
- {
- "uid": "chinqchint-23"
- },
- {
- "uid": "chinqchint-24"
- },
- {
- "uid": "chinqchint-25"
- },
- {
- "uid": "chinqchint-26"
- },
- {
- "uid": "chinqchint-27"
- },
- {
- "uid": "chinqchint-28"
- },
- {
- "uid": "chinqchint-29"
- },
- {
- "uid": "chinqchint-30"
- },
- {
- "uid": "chinqchint-31"
- },
- {
- "uid": "chinqchint-32"
- },
- {
- "uid": "chinqchint-33"
- },
- {
- "uid": "chinqchint-34"
- },
- {
- "uid": "chinqchint-35"
- },
- {
- "uid": "chinqchint-36"
- },
- {
- "uid": "chinqchint-37"
- },
- {
- "uid": "chinqchint-38"
- },
- {
- "uid": "chinqchint-39"
- },
- {
- "uid": "chinqchint-40"
- },
- {
- "uid": "chinqchint-5"
- },
- {
- "kind": "other",
- "port": "eth2",
- "uid": "chimint-srv"
- },
- {
- "kind": "other",
- "port": "eth0",
- "uid": "caulier"
- }
- ],
- "rate": 1000000000
- },
- {
- "kind": "node",
- "naming_pattern": "Gi%LINECARD%/%PORT%",
- "port": "eth1",
- "ports": [
- {
-
- },
- {
- "uid": "chinqchint-41"
- },
- {
-
- },
- {
- "uid": "chinqchint-43"
- },
- {
- "uid": "chinqchint-44"
- },
- {
- "uid": "chinqchint-45"
- },
- {
-
- },
- {
- "uid": "chimint-1"
- },
- {
- "uid": "chimint-19"
- },
- {
- "uid": "chimint-2"
- },
- {
- "uid": "chimint-5"
- },
- {
-
- },
- {
- "uid": "chimint-6"
- },
- {
- "uid": "chimint-8"
- },
- {
- "uid": "chimint-7"
- },
- {
- "uid": "chimint-9"
- },
- {
- "uid": "chimint-10"
- },
- {
- "uid": "chimint-11"
- },
- {
- "uid": "chimint-12"
- },
- {
- "uid": "chimint-13"
- },
- {
- "uid": "chimint-14"
- },
- {
- "uid": "chimint-17"
- },
- {
- "uid": "chimint-16"
- },
- {
- "uid": "chimint-15"
- },
- {
- "uid": "chimint-18"
- },
- {
- "uid": "chirloute-2"
- },
- {
- "uid": "chirloute-4"
- },
- {
- "uid": "chimint-20"
- },
- {
-
- },
- {
- "uid": "chirloute-1"
- },
- {
- "uid": "chirloute-3"
- },
- {
- "uid": "chirloute-6"
- },
- {
- "uid": "chirloute-8"
- },
- {
- "uid": "chirloute-5"
- },
- {
- "uid": "chicon-1"
- },
- {
- "uid": "chicon-2"
- },
- {
- "uid": "chicon-3"
- },
- {
- "uid": "chicon-4"
- },
- {
- "uid": "chicon-5"
- },
- {
-
- },
- {
-
- },
- {
- "uid": "chinqchint-46"
- },
- {
-
- },
- {
- "kind": "other",
- "port": "eth0",
- "uid": "fives"
- }
- ],
- "rate": 1000000000
- },
- {
- "kind": "switch",
- "naming_pattern": "Gi%LINECARD%/%PORT%",
- "ports": [
- {
-
- },
- {
- "kind": "node",
- "port": "eth1",
- "uid": "chicon-8"
- },
- {
- "kind": "node",
- "port": "eth1",
- "uid": "chicon-9"
- },
- {
- "kind": "node",
- "port": "eth1",
- "uid": "chicon-10"
- },
- {
- "kind": "node",
- "port": "eth1",
- "uid": "chicon-11"
- },
- {
-
- },
- {
- "kind": "node",
- "port": "eth1",
- "uid": "chicon-13"
- },
- {
- "kind": "node",
- "port": "eth1",
- "uid": "chicon-14"
- },
- {
- "kind": "node",
- "port": "eth1",
- "uid": "chicon-15"
- },
- {
- "kind": "node",
- "port": "eth1",
- "uid": "chicon-16"
- },
- {
- "kind": "node",
- "port": "eth1",
- "uid": "chicon-17"
- },
- {
- "kind": "node",
- "port": "eth1",
- "uid": "chicon-18"
- },
- {
- "kind": "node",
- "port": "eth1",
- "uid": "chicon-19"
- },
- {
- "kind": "node",
- "port": "eth1",
- "uid": "chicon-20"
- },
- {
- "kind": "node",
- "port": "eth1",
- "uid": "chicon-21"
- },
- {
- "kind": "node",
- "port": "eth1",
- "uid": "chicon-22"
- },
- {
- "kind": "node",
- "port": "eth1",
- "uid": "chicon-23"
- },
- {
- "kind": "node",
- "port": "eth1",
- "uid": "chicon-24"
- },
- {
- "kind": "node",
- "port": "eth1",
- "uid": "chicon-25"
- },
- {
- "kind": "node",
- "port": "eth1",
- "uid": "chicon-26"
- },
- {
-
- },
- {
-
- },
- {
-
- },
- {
- "port": "Gi0/47",
- "uid": "sw-admin1"
- },
- {
- "port": "Gi0/48",
- "uid": "sw-admin1"
- },
- {
- "port": "Gi0/47",
- "uid": "sw-admin2"
- },
- {
- "port": "Gi0/48",
- "uid": "sw-admin2"
- },
- {
- "port": "Gi0/47",
- "uid": "sw-admin3"
- },
- {
- "port": "Gi0/48",
- "uid": "sw-admin3"
- },
- {
- "port": "Gi0/47",
- "uid": "sw-admin4"
- },
- {
- "port": "Gi0/48",
- "uid": "sw-admin4"
- },
- {
- "kind": "other",
- "port": "eth0",
- "uid": "tilt"
- },
- {
- "kind": "other",
- "uid": "jiminy"
- },
- {
- "kind": "other",
- "port": "eth0",
- "uid": "zed"
- },
- {
-
- },
- {
-
- },
- {
-
- },
- {
-
- },
- {
- "kind": "other",
- "port": "eth0",
- "uid": "bourdon"
- },
- {
-
- },
- {
-
- },
- {
-
- },
- {
-
- },
- {
-
- },
- {
-
- },
- {
-
- },
- {
-
- },
- {
- "uid": "sw-admin5"
- },
- {
- "kind": "node",
- "port": "eth1",
- "uid": "chirloute-7"
- }
- ],
- "rate": 1000000000
- },
- {
-
- },
- {
- "kind": "router",
- "naming_pattern": "Gi%LINECARD%/%PORT%",
- "ports": [
- {
-
- },
- {
- "uid": "labo-inria"
- }
- ],
- "rate": 1000000000
- }
- ],
- "model": "cisco",
- "routes": {
-
- },
- "site": "lille",
- "snmp_community": "public",
- "type": "network_equipment",
- "uid": "gw-lille-6k",
- "vlans": {
- "100": {
- "addresses": [
- "192.168.159.254"
- ],
- "administrative": true
- },
- "naming_pattern": "Vlan%VLANID%"
- },
- "weathermap": {
-
- }
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/network_equipments/sw-admin1.json b/data/grid5000/sites/lille/network_equipments/sw-admin1.json
index 03828b1a503..b0ce0813340 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-admin1.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-admin1.json
@@ -152,12 +152,12 @@
{
"kind": "router",
"port": "Gi4/23",
- "uid": "gw-lille-6k"
+ "uid": "gw-lille"
},
{
"kind": "router",
"port": "Gi4/24",
- "uid": "gw-lille-6k"
+ "uid": "gw-lille"
}
],
"rate": 1000000000
diff --git a/data/grid5000/sites/lille/network_equipments/sw-admin2.json b/data/grid5000/sites/lille/network_equipments/sw-admin2.json
index ee456df67c8..6b51c641dc4 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-admin2.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-admin2.json
@@ -152,12 +152,12 @@
{
"kind": "router",
"port": "Gi4/25",
- "uid": "gw-lille-6k"
+ "uid": "gw-lille"
},
{
"kind": "router",
"port": "Gi4/26",
- "uid": "gw-lille-6k"
+ "uid": "gw-lille"
}
],
"rate": 1000000000
diff --git a/data/grid5000/sites/lille/network_equipments/sw-admin3.json b/data/grid5000/sites/lille/network_equipments/sw-admin3.json
index 722dd0a5f94..365746c6e02 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-admin3.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-admin3.json
@@ -152,12 +152,12 @@
{
"kind": "router",
"port": "Gi4/27",
- "uid": "gw-lille-6k"
+ "uid": "gw-lille"
},
{
"kind": "router",
"port": "Gi4/28",
- "uid": "gw-lille-6k"
+ "uid": "gw-lille"
}
],
"rate": 1000000000
diff --git a/data/grid5000/sites/lille/network_equipments/sw-admin4.json b/data/grid5000/sites/lille/network_equipments/sw-admin4.json
index 54c7300c36c..520be7f42df 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-admin4.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-admin4.json
@@ -152,12 +152,12 @@
{
"kind": "router",
"port": "Gi4/29",
- "uid": "gw-lille-6k"
+ "uid": "gw-lille"
},
{
"kind": "router",
"port": "Gi4/30",
- "uid": "gw-lille-6k"
+ "uid": "gw-lille"
}
],
"rate": 1000000000
diff --git a/data/grid5000/sites/lille/network_equipments/sw-admin5.json b/data/grid5000/sites/lille/network_equipments/sw-admin5.json
index 1959b9cec4a..c0949c154f0 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-admin5.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-admin5.json
@@ -155,7 +155,7 @@
},
{
"kind": "router",
- "uid": "gw-lille-6k"
+ "uid": "gw-lille"
}
],
"rate": 1000000000
diff --git a/generators/input/sites/lille/net-links/gw-lille.yaml b/generators/input/sites/lille/net-links/gw-lille.yaml
new file mode 100644
index 00000000000..7625e3d2d9a
--- /dev/null
+++ b/generators/input/sites/lille/net-links/gw-lille.yaml
@@ -0,0 +1,255 @@
+---
+gw-lille:
+ model: cisco
+ kind: router
+ site: lille
+ snmp_community: public
+ routes: {}
+
+ vlans:
+ naming_pattern: Vlan%VLANID%
+ "100":
+ administrative: yes
+ addresses:
+ - 192.168.159.254
+ linecards:
+ 6:
+ kind: router
+ naming_pattern: Gi%LINECARD%/%PORT%
+ rate: 1000000000
+ ports:
+ 1: labo-inria
+ 1:
+ kind: renater
+ naming_pattern: Te%LINECARD%/%PORT%
+ rate: 10000000000
+ ports:
+ 1: renater-lille
+ 2:
+ kind: node
+ naming_pattern: Gi%LINECARD%/%PORT%
+ rate: 1000000000
+ port: eth1
+ ports:
+ 27: chinqchint-27
+ 11: chinqchint-11
+ 33: chinqchint-33
+ 17: chinqchint-17
+ 6: chinqchint-6
+ 39: chinqchint-39
+ 34: chinqchint-34
+ 1: chinqchint-1
+ 12: chinqchint-12
+ 29: chinqchint-29
+ 18: chinqchint-18
+ 40: chinqchint-40
+ 24: chinqchint-24
+ 2: chinqchint-2
+ 13: chinqchint-13
+ 30: chinqchint-30
+ 8: chinqchint-8
+ 7: chinqchint-7
+ 19: chinqchint-19
+ 41: chinqchint-5
+ 25: chinqchint-25
+ 14: chinqchint-14
+ 3: chinqchint-3
+ 9: chinqchint-9
+ 31: chinqchint-31
+ 42:
+ kind: other
+ uid: chimint-srv
+ port: eth2
+ 43:
+ kind: other
+ uid: caulier
+ port: eth0
+ 20: chinqchint-20
+ 4: chinqchint-4
+ 15: chinqchint-15
+ 16: chinqchint-16
+ 26: chinqchint-26
+ 10: chinqchint-10
+ 21: chinqchint-21
+ 22: chinqchint-22
+ 23: chinqchint-23
+ 28: chinqchint-28
+ 35: chinqchint-35
+ 36: chinqchint-36
+ 37: chinqchint-37
+ 38: chinqchint-38
+ 32: chinqchint-32
+ 3:
+ kind: node
+ naming_pattern: Gi%LINECARD%/%PORT%
+ rate: 1000000000
+ port: eth1
+ ports:
+ 27: chimint-20
+ 16: chimint-10
+ 5: chinqchint-45
+ 33: chirloute-5
+ 17: chimint-11
+ 23: chimint-15
+ 12: chimint-6
+ 1: chinqchint-41
+ 18: chimint-12
+ 7: chimint-1
+ 13: chimint-8
+ 24: chimint-18
+ 8: chimint-3
+ 41: chinqchint-46
+ 30: chirloute-3
+ 19: chimint-13
+ 14: chimint-7
+ 38: chicon-5
+ 25: chirloute-2
+ 3: chinqchint-43
+ 9: chimint-2
+ 10: chimint-5
+ 22: chimint-16
+ 21: chimint-17
+ 8: chimint-19
+ 34: chicon-1
+ 35: chicon-2
+ 36: chicon-3
+ 37: chicon-4
+ 31: chirloute-6
+ 20: chimint-14
+ 15: chimint-9
+ 4: chinqchint-44
+ 26: chirloute-4
+ 29: chirloute-1
+ 32: chirloute-8
+ 43:
+ kind: other
+ uid: fives
+ port: eth0
+
+ 4:
+ kind: switch
+ naming_pattern: Gi%LINECARD%/%PORT%
+ rate: 1000000000
+ ports:
+ 27:
+ uid: sw-admin3
+ port: Gi0/47
+ 38:
+ kind: other
+ uid: bourdon
+ port: eth0
+ 33:
+ kind: other
+ uid: zed
+ port: eth0
+ 28:
+ uid: sw-admin3
+ port: Gi0/48
+ 23:
+ uid: sw-admin1
+ port: Gi0/47
+ 24:
+ uid: sw-admin1
+ port: Gi0/48
+ 29:
+ uid: sw-admin4
+ port: Gi0/47
+ 30:
+ uid: sw-admin4
+ port: Gi0/48
+ 25:
+ uid: sw-admin2
+ port: Gi0/47
+ 47: sw-admin5
+ 31:
+ kind: other
+ uid: tilt
+ port: eth0
+ 26:
+ uid: sw-admin2
+ port: Gi0/48
+ 48:
+ kind: node
+ uid: chirloute-7
+ port: eth1
+ 3:
+ kind: node
+ uid: chicon-10
+ port: eth1
+ 15:
+ kind: node
+ uid: chicon-12
+ port: eth1
+ 7:
+ kind: node
+ uid: chicon-14
+ port: eth1
+ 8:
+ kind: node
+ uid: chicon-15
+ port: eth1
+ 9:
+ kind: node
+ uid: chicon-16
+ port: eth1
+ 10:
+ kind: node
+ uid: chicon-17
+ port: eth1
+ 15:
+ kind: node
+ uid: chicon-22
+ port: eth1
+ 16:
+ kind: node
+ uid: chicon-23
+ port: eth1
+ 18:
+ kind: node
+ uid: chicon-25
+ port: eth1
+ 2:
+ kind: node
+ uid: chicon-9
+ port: eth1
+ 1:
+ kind: node
+ uid: chicon-8
+ port: eth1
+ 4:
+ kind: node
+ uid: chicon-11
+ port: eth1
+ 6:
+ kind: node
+ uid: chicon-13
+ port: eth1
+ 11:
+ kind: node
+ uid: chicon-18
+ port: eth1
+ 12:
+ kind: node
+ uid: chicon-19
+ port: eth1
+ 13:
+ kind: node
+ uid: chicon-20
+ port: eth1
+ 14:
+ kind: node
+ uid: chicon-21
+ port: eth1
+ 17:
+ kind: node
+ uid: chicon-24
+ port: eth1
+ 19:
+ kind: node
+ uid: chicon-26
+ port: eth1
+ 32:
+ kind: other
+ uid: jiminy
+ channels:
+ naming_pattern: Po%CHANNELID%
--
GitLab