Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
grid5000
reference-repository
Commits
2223838c
Commit
2223838c
authored
Jul 05, 2012
by
Elodie Bertoncello
Browse files
[Grenoble] fix conflict in network api
parents
23023186
6ab3171d
Changes
85
Hide whitespace changes
Inline
Side-by-side
data/grid5000/sites/bordeaux/network_equipments/gw.json
→
data/grid5000/sites/bordeaux/network_equipments/gw
-bdx
.json
View file @
2223838c
...
...
@@ -16,8 +16,7 @@
"uid"
:
"storage"
},
{
"kind"
:
"other"
,
"uid"
:
"mx"
"uid"
:
"mx-bdx"
},
{
"uid"
:
"sborderline"
...
...
@@ -30,8 +29,7 @@
"uid"
:
"labri"
},
{
"kind"
:
"other"
,
"uid"
:
"ib"
"uid"
:
"ib-bdx"
},
{
"uid"
:
"st-bordemer"
...
...
@@ -370,7 +368,7 @@
"site"
:
"bordeaux"
,
"snmp_community"
:
"public"
,
"type"
:
"network_equipment"
,
"uid"
:
"gw"
,
"uid"
:
"gw
-bdx
"
,
"vlans"
:
{
"1"
:
{
"addresses"
:
[
...
...
@@ -379,5 +377,8 @@
"administrative"
:
true
},
"naming_pattern"
:
"Vlan%VLANID%"
},
"weathermap"
:
{
}
}
\ No newline at end of file
data/grid5000/sites/bordeaux/network_equipments/ib.json
→
data/grid5000/sites/bordeaux/network_equipments/ib
-bdx
.json
View file @
2223838c
...
...
@@ -5,14 +5,14 @@
"kind"
:
"switch"
,
"linecards"
:
[
{
"kind"
:
"
node
"
,
"kind"
:
"
router
"
,
"naming_pattern"
:
"%LINECARD%/%PORT%"
,
"ports"
:
[
{
"uid"
:
"gw"
"uid"
:
"gw
-bdx
"
}
],
"rate"
:
100000000
"rate"
:
100000000
00
}
],
"model"
:
"Infiniband"
,
...
...
@@ -22,8 +22,11 @@
"site"
:
"bordeaux"
,
"snmp_community"
:
"public"
,
"type"
:
"network_equipment"
,
"uid"
:
"ib"
,
"uid"
:
"ib
-bdx
"
,
"vlans"
:
{
"naming_pattern"
:
"Vlan%VLANID%"
},
"weathermap"
:
{
"use_cacti"
:
"no"
}
}
\ No newline at end of file
data/grid5000/sites/bordeaux/network_equipments/mx.json
→
data/grid5000/sites/bordeaux/network_equipments/mx
-bdx
.json
View file @
2223838c
...
...
@@ -5,25 +5,28 @@
"kind"
:
"switch"
,
"linecards"
:
[
{
"kind"
:
"
node
"
,
"kind"
:
"
router
"
,
"naming_pattern"
:
"%LINECARD%/%PORT%"
,
"ports"
:
[
{
"uid"
:
"gw"
"uid"
:
"gw
-bdx
"
}
],
"rate"
:
100000000
"rate"
:
100000000
00
}
],
"model"
:
"
Infiniband
"
,
"model"
:
"
Myrinet
"
,
"routes"
:
{
},
"site"
:
"bordeaux"
,
"snmp_community"
:
"public"
,
"type"
:
"network_equipment"
,
"uid"
:
"mx"
,
"uid"
:
"mx
-bdx
"
,
"vlans"
:
{
"naming_pattern"
:
"Vlan%VLANID%"
},
"weathermap"
:
{
"use_cacti"
:
"no"
}
}
\ No newline at end of file
data/grid5000/sites/bordeaux/network_equipments/sbordeplage-1.json
View file @
2223838c
...
...
@@ -68,5 +68,8 @@
"uid"
:
"sbordeplage-1"
,
"vlans"
:
{
"naming_pattern"
:
"Vlan%VLANID%"
},
"weathermap"
:
{
}
}
\ No newline at end of file
data/grid5000/sites/bordeaux/network_equipments/sbordeplage-2.json
View file @
2223838c
...
...
@@ -158,5 +158,8 @@
"uid"
:
"sbordeplage-2"
,
"vlans"
:
{
"naming_pattern"
:
"Vlan%VLANID%"
},
"weathermap"
:
{
}
}
\ No newline at end of file
data/grid5000/sites/bordeaux/network_equipments/sborderline.json
View file @
2223838c
...
...
@@ -9,7 +9,7 @@
"naming_pattern"
:
"%LINECARD%/%PORT%"
,
"ports"
:
[
{
"uid"
:
"gw"
"uid"
:
"gw
-bdx
"
}
],
"rate"
:
10000000000
...
...
@@ -65,5 +65,8 @@
"uid"
:
"sborderline"
,
"vlans"
:
{
"naming_pattern"
:
"Vlan%VLANID%"
},
"weathermap"
:
{
}
}
\ No newline at end of file
data/grid5000/sites/bordeaux/network_equipments/st-bordemer.json
View file @
2223838c
...
...
@@ -9,7 +9,7 @@
"naming_pattern"
:
"%LINECARD%/%PORT%"
,
"ports"
:
[
{
"uid"
:
"gw"
"uid"
:
"gw
-bdx
"
}
],
"rate"
:
10000000000
...
...
@@ -41,5 +41,8 @@
"uid"
:
"st-bordemer"
,
"vlans"
:
{
"naming_pattern"
:
"Vlan%VLANID%"
},
"weathermap"
:
{
}
}
\ No newline at end of file
data/grid5000/sites/grenoble/network_equipments/
gw
.json
→
data/grid5000/sites/grenoble/network_equipments/
aspen
.json
View file @
2223838c
...
...
@@ -263,7 +263,8 @@
"uid"
:
"alpes"
},
{
"uid"
:
"ib"
"kind"
:
"switch"
,
"uid"
:
"ib-grenoble"
}
],
"rate"
:
1000000000
...
...
@@ -276,7 +277,7 @@
"site"
:
"grenoble"
,
"snmp_community"
:
"public"
,
"type"
:
"network_equipment"
,
"uid"
:
"
gw
"
,
"uid"
:
"
aspen
"
,
"vlans"
:
{
"1"
:
{
"addresses"
:
[
...
...
@@ -286,5 +287,7 @@
},
"naming_pattern"
:
"Vlan%VLANID%"
},
"weathermap"
:
null
"weathermap"
:
{
}
}
\ No newline at end of file
data/grid5000/sites/grenoble/network_equipments/blade-1.json
View file @
2223838c
...
...
@@ -13,15 +13,15 @@
},
{
"port"
:
"2:1"
,
"uid"
:
"
gw
"
"uid"
:
"
aspen
"
},
{
"port"
:
"2:2"
,
"uid"
:
"
gw
"
"uid"
:
"
aspen
"
},
{
"port"
:
"2:3"
,
"uid"
:
"
gw
"
"uid"
:
"
aspen
"
}
],
"rate"
:
1000000000
...
...
data/grid5000/sites/grenoble/network_equipments/blade-2.json
View file @
2223838c
...
...
@@ -13,15 +13,15 @@
},
{
"port"
:
"2:4"
,
"uid"
:
"
gw
"
"uid"
:
"
aspen
"
},
{
"port"
:
"2:5"
,
"uid"
:
"
gw
"
"uid"
:
"
aspen
"
},
{
"port"
:
"2:6"
,
"uid"
:
"
gw
"
"uid"
:
"
aspen
"
}
],
"rate"
:
1000000000
...
...
data/grid5000/sites/grenoble/network_equipments/blade-3.json
View file @
2223838c
...
...
@@ -13,15 +13,15 @@
},
{
"port"
:
"2:7"
,
"uid"
:
"
gw
"
"uid"
:
"
aspen
"
},
{
"port"
:
"2:8"
,
"uid"
:
"
gw
"
"uid"
:
"
aspen
"
},
{
"port"
:
"2:9"
,
"uid"
:
"
gw
"
"uid"
:
"
aspen
"
}
],
"rate"
:
1000000000
...
...
data/grid5000/sites/grenoble/network_equipments/blade-4.json
View file @
2223838c
...
...
@@ -13,15 +13,15 @@
},
{
"port"
:
"2:10"
,
"uid"
:
"
gw
"
"uid"
:
"
aspen
"
},
{
"port"
:
"2:11"
,
"uid"
:
"
gw
"
"uid"
:
"
aspen
"
},
{
"port"
:
"2:12"
,
"uid"
:
"
gw
"
"uid"
:
"
aspen
"
}
],
"rate"
:
1000000000
...
...
data/grid5000/sites/grenoble/network_equipments/ib-grenoble.json
0 → 100644
View file @
2223838c
{
"channels"
:
{
"naming_pattern"
:
"Po%CHANNELID%"
},
"kind"
:
"switch"
,
"linecards"
:
[
{
"kind"
:
"router"
,
"naming_pattern"
:
"%LINECARD%/%PORT%"
,
"ports"
:
[
{
"uid"
:
"aspen"
}
],
"rate"
:
10000000000
}
],
"model"
:
"Infiniband"
,
"routes"
:
{
},
"site"
:
"grenoble"
,
"snmp_community"
:
"public"
,
"type"
:
"network_equipment"
,
"uid"
:
"ib-grenoble"
,
"vlans"
:
{
"naming_pattern"
:
"Vlan%VLANID%"
},
"weathermap"
:
{
"use_cacti"
:
"no"
}
}
\ No newline at end of file
data/grid5000/sites/lille/network_equipments/gw.json
→
data/grid5000/sites/lille/network_equipments/gw
-lille-6k
.json
View file @
2223838c
...
...
@@ -18,7 +18,7 @@
"uid"
:
"UL_GRID5000_SW01.uni.lu"
}
],
"rate"
:
10000000
"rate"
:
10000000
000
},
{
"kind"
:
"node"
,
...
...
@@ -151,11 +151,11 @@
"uid"
:
"chinqchint-5"
},
{
"kind"
:
"
serv
er"
,
"kind"
:
"
oth
er"
,
"uid"
:
"chimint-srv"
}
],
"rate"
:
1000000
"rate"
:
1000000
000
},
{
"kind"
:
"node"
,
...
...
@@ -288,7 +288,7 @@
"uid"
:
"chinqchint-46"
}
],
"rate"
:
1000000
"rate"
:
1000000
000
},
{
"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"
:
"
serv
er"
,
"kind"
:
"
oth
er"
,
"uid"
:
"syslog-dmz"
},
{
"kind"
:
"
serv
er"
,
"kind"
:
"
oth
er"
,
"uid"
:
"jabber-global"
},
{
"kind"
:
"
serv
er"
,
"kind"
:
"
oth
er"
,
"uid"
:
"conman"
},
{
...
...
@@ -412,7 +420,7 @@
},
{
"kind"
:
"
serv
er"
,
"kind"
:
"
oth
er"
,
"uid"
:
"groarr"
},
{
...
...
@@ -447,7 +455,7 @@
"uid"
:
"chirloute-7"
}
],
"rate"
:
1000000
"rate"
:
1000000
000
},
{
...
...
@@ -463,7 +471,7 @@
"uid"
:
"sw1-core-lil.net-admin.lille.inria.fr"
}
],
"rate"
:
1000000
"rate"
:
1000000
000
}
],
"model"
:
"cisco"
,
...
...
@@ -473,8 +481,17 @@
"site"
:
"lille"
,
"snmp_community"
:
"public"
,
"type"
:
"network_equipment"
,
"uid"
:
"gw"
,
"uid"
:
"gw
-lille-6k
"
,
"vlans"
:
{
"100"
:
{
"addresses"
:
[
"192.168.159.254"
],
"administrative"
:
true
},
"naming_pattern"
:
"Vlan%VLANID%"
},
"weathermap"
:
{
}
}
\ No newline at end of file
data/grid5000/sites/lille/network_equipments/sw-admin1.json
View file @
2223838c
...
...
@@ -151,14 +151,16 @@
},
{
"kind"
:
"router"
,
"uid"
:
"gw-lille-6k.grid5000.fr"
"port"
:
"Gi4/23"
,
"uid"
:
"gw-lille-6k"
},
{
"kind"
:
"router"
,
"uid"
:
"gw-lille-6k.grid5000.fr"
"port"
:
"Gi4/24"
,
"uid"
:
"gw-lille-6k"
}
],
"rate"
:
1000000
"rate"
:
1000000
000
}
],
"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
data/grid5000/sites/lille/network_equipments/sw-admin2.json
View file @
2223838c
...
...
@@ -151,14 +151,16 @@
},
{
"kind"
:
"router"
,
"uid"
:
"gw-lille-6k.grid5000.fr"
"port"
:
"Gi4/25"
,
"uid"
:
"gw-lille-6k"
},
{
"kind"
:
"router"
,
"uid"
:
"gw-lille-6k.grid5000.fr"
"port"
:
"Gi4/26"
,
"uid"
:
"gw-lille-6k"
}
],
"rate"
:
1000000
"rate"
:
1000000
000
}
],
"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
data/grid5000/sites/lille/network_equipments/sw-admin3.json
View file @
2223838c
...
...
@@ -151,14 +151,16 @@
},
{
"kind"
:
"router"
,
"uid"
:
"gw-lille-6k.grid5000.fr"
"port"
:
"Gi4/27"
,
"uid"
:
"gw-lille-6k"
},
{
"kind"
:
"router"
,
"uid"
:
"gw-lille-6k.grid5000.fr"
"port"
:
"Gi4/28"
,
"uid"
:
"gw-lille-6k"
}
],
"rate"
:
1000000
"rate"
:
1000000
000
}
],
"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
data/grid5000/sites/lille/network_equipments/sw-admin4.json
View file @
2223838c
...
...
@@ -151,14 +151,16 @@
},
{
"kind"
:
"router"
,
"uid"
:
"gw-lille-6k.grid5000.fr"
"port"
:
"Gi4/29"
,
"uid"
:
"gw-lille-6k"
},
{
"kind"
:
"router"
,
"uid"
:
"gw-lille-6k.grid5000.fr"
"port"
:
"Gi4/30"
,
"uid"
:
"gw-lille-6k"
}
],
"rate"
:
1000000
"rate"
:
1000000
000
}
],
"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
data/grid5000/sites/lille/network_equipments/sw-admin5.json
View file @
2223838c
...
...
@@ -141,7 +141,7 @@
},
{
"kind"
:
"
serv
er"
,
"kind"
:
"
oth
er"
,
"uid"
:
"tilt"
},
{
...
...
@@ -155,10 +155,10 @@
},
{
"kind"
:
"router"
,
"uid"
:
"gw-lille-6k
.grid5000.fr
"
"uid"
:
"gw-lille-6k"
}
],
"rate"
:
1000000
"rate"
:
1000000
000
}
],
"model"
:
"cisco"
,
...
...
@@ -170,6 +170,15 @@
"type"
:
"network_equipment"
,
"uid"
:
"sw-admin5"
,
"vlans"
:
{