Commit 5770abc2 authored by Gaetan SIMO's avatar Gaetan SIMO
Browse files

[lille] network api restructured

parent 18186e35
......@@ -18,7 +18,7 @@
"uid": "UL_GRID5000_SW01.uni.lu"
}
],
"rate": 10000000
"rate": 10000000000
},
{
"kind": "node",
......@@ -151,11 +151,11 @@
"uid": "chinqchint-5"
},
{
"kind": "server",
"kind": "other",
"uid": "chimint-srv"
}
],
"rate": 1000000
"rate": 1000000000
},
{
"kind": "node",
......@@ -288,7 +288,7 @@
"uid": "chinqchint-46"
}
],
"rate": 1000000
"rate": 1000000000
},
{
"kind": "switch",
......@@ -364,39 +364,47 @@
},
{
"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": "server",
"kind": "other",
"uid": "syslog-dmz"
},
{
"kind": "server",
"kind": "other",
"uid": "jabber-global"
},
{
"kind": "server",
"kind": "other",
"uid": "conman"
},
{
......@@ -412,7 +420,7 @@
},
{
"kind": "server",
"kind": "other",
"uid": "groarr"
},
{
......@@ -447,7 +455,7 @@
"uid": "chirloute-7"
}
],
"rate": 1000000
"rate": 1000000000
},
{
......@@ -463,7 +471,7 @@
"uid": "sw1-core-lil.net-admin.lille.inria.fr"
}
],
"rate": 1000000
"rate": 1000000000
}
],
"model": "cisco",
......@@ -475,6 +483,15 @@
"type": "network_equipment",
"uid": "gw",
"vlans": {
"100": {
"addresses": [
"192.168.159.254"
],
"administrative": true
},
"naming_pattern": "Vlan%VLANID%"
},
"weathermap": {
}
}
\ No newline at end of file
......@@ -151,14 +151,16 @@
},
{
"kind": "router",
"uid": "gw-lille-6k.grid5000.fr"
"port": "Gi4/23",
"uid": "gw"
},
{
"kind": "router",
"uid": "gw-lille-6k.grid5000.fr"
"port": "Gi4/24",
"uid": "gw"
}
],
"rate": 1000000
"rate": 1000000000
}
],
"model": "cisco",
......@@ -170,6 +172,15 @@
"type": "network_equipment",
"uid": "sw-admin1",
"vlans": {
"100": {
"addresses": [
"192.168.163.1"
],
"administrative": true
},
"naming_pattern": "Vlan%VLANID%"
},
"weathermap": {
}
}
\ No newline at end of file
......@@ -151,14 +151,16 @@
},
{
"kind": "router",
"uid": "gw-lille-6k.grid5000.fr"
"port": "Gi4/25",
"uid": "gw"
},
{
"kind": "router",
"uid": "gw-lille-6k.grid5000.fr"
"port": "Gi4/26",
"uid": "gw"
}
],
"rate": 1000000
"rate": 1000000000
}
],
"model": "cisco",
......@@ -170,6 +172,15 @@
"type": "network_equipment",
"uid": "sw-admin2",
"vlans": {
"100": {
"addresses": [
"192.168.163.2"
],
"administrative": true
},
"naming_pattern": "Vlan%VLANID%"
},
"weathermap": {
}
}
\ No newline at end of file
......@@ -151,14 +151,16 @@
},
{
"kind": "router",
"uid": "gw-lille-6k.grid5000.fr"
"port": "Gi4/27",
"uid": "gw"
},
{
"kind": "router",
"uid": "gw-lille-6k.grid5000.fr"
"port": "Gi4/28",
"uid": "gw"
}
],
"rate": 1000000
"rate": 1000000000
}
],
"model": "cisco",
......@@ -170,6 +172,15 @@
"type": "network_equipment",
"uid": "sw-admin3",
"vlans": {
"100": {
"addresses": [
"192.168.163.3"
],
"administrative": true
},
"naming_pattern": "Vlan%VLANID%"
},
"weathermap": {
}
}
\ No newline at end of file
......@@ -151,14 +151,16 @@
},
{
"kind": "router",
"uid": "gw-lille-6k.grid5000.fr"
"port": "Gi4/29",
"uid": "gw"
},
{
"kind": "router",
"uid": "gw-lille-6k.grid5000.fr"
"port": "Gi4/30",
"uid": "gw"
}
],
"rate": 1000000
"rate": 1000000000
}
],
"model": "cisco",
......@@ -170,6 +172,15 @@
"type": "network_equipment",
"uid": "sw-admin4",
"vlans": {
"100": {
"addresses": [
"192.168.163.4"
],
"administrative": true
},
"naming_pattern": "Vlan%VLANID%"
},
"weathermap": {
}
}
\ No newline at end of file
......@@ -141,7 +141,7 @@
},
{
"kind": "server",
"kind": "other",
"uid": "tilt"
},
{
......@@ -155,10 +155,10 @@
},
{
"kind": "router",
"uid": "gw-lille-6k.grid5000.fr"
"uid": "gw"
}
],
"rate": 1000000
"rate": 1000000000
}
],
"model": "cisco",
......@@ -170,6 +170,15 @@
"type": "network_equipment",
"uid": "sw-admin5",
"vlans": {
"100": {
"addresses": [
"192.168.163.5"
],
"administrative": true
},
"naming_pattern": "Vlan%VLANID%"
},
"weathermap": {
}
}
\ No newline at end of file
---
sw-admin1:
model: cisco
kind: switch
site: lille
snmp_community: public
routes: {}
vlans:
naming_pattern: Vlan%VLANID%
linecards:
0:
kind: switch
naming_pattern: Gi%LINECARD%/%PORT%
rate: 1000000
ports:
44: sw-admin4
45: sw-admin3
46: sw-admin2
47:
kind: router
uid: gw-lille-6k.grid5000.fr
48:
kind: router
uid: gw-lille-6k.grid5000.fr
channels:
naming_pattern: Po%CHANNELID%
sw-admin2:
model: cisco
kind: switch
site: lille
snmp_community: public
routes: {}
vlans:
naming_pattern: Vlan%VLANID%
linecards:
0:
kind: switch
naming_pattern: Gi%LINECARD%/%PORT%
rate: 1000000
ports:
44: sw-admin4
45: sw-admin3
46: sw-admin1
47:
kind: router
uid: gw-lille-6k.grid5000.fr
48:
kind: router
uid: gw-lille-6k.grid5000.fr
channels:
naming_pattern: Po%CHANNELID%
sw-admin3:
model: cisco
kind: switch
site: lille
snmp_community: public
routes: {}
vlans:
naming_pattern: Vlan%VLANID%
linecards:
0:
kind: switch
naming_pattern: Gi%LINECARD%/%PORT%
rate: 1000000
ports:
44: sw-admin4
45: sw-admin2
46: sw-admin1
47:
kind: router
uid: gw-lille-6k.grid5000.fr
48:
kind: router
uid: gw-lille-6k.grid5000.fr
channels:
naming_pattern: Po%CHANNELID%
sw-admin4:
model: cisco
kind: switch
site: lille
snmp_community: public
routes: {}
vlans:
naming_pattern: Vlan%VLANID%
linecards:
0:
kind: switch
naming_pattern: Gi%LINECARD%/%PORT%
rate: 1000000
ports:
44: sw-admin3
45: sw-admin2
46: sw-admin1
47:
kind: router
uid: gw-lille-6k.grid5000.fr
48:
kind: router
uid: gw-lille-6k.grid5000.fr
channels:
naming_pattern: Po%CHANNELID%
sw-admin5:
model: cisco
kind: switch
site: lille
snmp_community: public
routes: {}
vlans:
naming_pattern: Vlan%VLANID%
linecards:
0:
kind: node
naming_pattern: Gi%LINECARD%/%PORT%
rate: 1000000
ports:
44:
kind: server
uid: tilt
48:
kind: router
uid: gw-lille-6k.grid5000.fr
channels:
naming_pattern: Po%CHANNELID%
gw:
model: cisco
kind: router
site: lille
snmp_community: public
routes: {}
vlans:
naming_pattern: Vlan%VLANID%
linecards:
6:
kind: router
naming_pattern: Gi%LINECARD%/%PORT%
rate: 1000000
ports:
1: sw1-core-lil.net-admin.lille.inria.fr
1:
kind: renater
naming_pattern: Te%LINECARD%/%PORT%
rate: 10000000
ports:
1: UL_GRID5000_SW01.uni.lu
2:
kind: node
naming_pattern: Gi%LINECARD%/%PORT%
rate: 1000000
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
19: chinqchint-19
41: chinqchint-5
25: chinqchint-25
14: chinqchint-14
3: chinqchint-3
9: chinqchint-9
31: chinqchint-31
42:
kind: server
uid: chimint-srv
20: chinqchint-20
4: chinqchint-4
15: chinqchint-15
26: chinqchint-26
10: chinqchint-10
21: chinqchint-21
32: chinqchint-32
3:
kind: node
naming_pattern: Gi%LINECARD%/%PORT%
rate: 1000000
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
25: chirloute-2
3: chinqchint-43
9: chimint-2
31: chirloute-6
20: chimint-14
15: chimint-9
4: chinqchint-44
26: chirloute-4
32: chirloute-8
4:
kind: switch
naming_pattern: Gi%LINECARD%/%PORT%
rate: 1000000
ports:
27: sw-admin3
38:
kind: server
uid: groarr
33:
kind: server
uid: conman
28: sw-admin3
23: sw-admin1
29: sw-admin4
24: sw-admin1
30: sw-admin4
25: sw-admin2
47: sw-admin5
31:
kind: server
uid: syslog-dmz
26: sw-admin2
48:
kind: node
uid: chirloute-7
32:
kind: server
uid: jabber-global
channels:
naming_pattern: Po%CHANNELID%
---
gw:
model: cisco
kind: router
snmp_community: public
vlans:
naming_pattern: "Vlan%VLANID%"
routes: {}
channels:
naming_pattern: "Po%CHANNELID%"
linecards:
naming_pattern: "Gi%LINECARD%/%PORT%"
1:
kind: virtual
rate: "10G"
naming_pattern: "Te%LINECARD%/%PORT%"
ports:
1: renater
2:
kind: node
rate: "1G"
ports:
0:
uid: node-1
2: node-2
3:
kind: server
rate: "1G"
naming_pattern: "Gi%LINECARD%/%PORT%"
uid: srv-stock
5: node-4
7: node-5
---
- :vlans:
- 600
:ifname: Po2
:mac: 00:16:3e:ff:ca:68
- :vlans:
- 600
:ifname: Po2
:mac: 00:30:48:7d:35:75
- :vlans:
- 600
:ifname: Po2
:mac: 84:2b:2b:70:4e:1f
- :ifname: Po2
:vlans: