Commit 2223838c authored by Elodie Bertoncello's avatar Elodie Bertoncello
Browse files

[Grenoble] fix conflict in network api

parents 23023186 6ab3171d
......@@ -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
......@@ -5,14 +5,14 @@
"kind": "switch",
"linecards": [
{
"kind": "node",
"kind": "router",
"naming_pattern": "%LINECARD%/%PORT%",
"ports": [
{
"uid": "gw"
"uid": "gw-bdx"
}
],
"rate": 100000000
"rate": 10000000000
}
],
"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
......@@ -5,25 +5,28 @@
"kind": "switch",
"linecards": [
{
"kind": "node",
"kind": "router",
"naming_pattern": "%LINECARD%/%PORT%",
"ports": [
{
"uid": "gw"
"uid": "gw-bdx"
}
],
"rate": 100000000
"rate": 10000000000
}
],
"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
......@@ -68,5 +68,8 @@
"uid": "sbordeplage-1",
"vlans": {
"naming_pattern": "Vlan%VLANID%"
},
"weathermap": {
}
}
\ No newline at end of file
......@@ -158,5 +158,8 @@
"uid": "sbordeplage-2",
"vlans": {
"naming_pattern": "Vlan%VLANID%"
},
"weathermap": {
}
}
\ No newline at end of file
......@@ -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
......@@ -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
......@@ -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
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
{
"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
......@@ -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",
......@@ -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
......@@ -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": 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-lille-6k"
},
{
"kind": "router",
"uid": "gw-lille-6k.grid5000.fr"
"port": "Gi4/26",
"uid": "gw-lille-6k"
}
],
"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-lille-6k"
},
{
"kind": "router",
"uid": "gw-lille-6k.grid5000.fr"
"port": "Gi4/28",
"uid": "gw-lille-6k"
}
],
"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-lille-6k"
},
{
"kind": "router",
"uid": "gw-lille-6k.grid5000.fr"
"port": "Gi4/30",
"uid": "gw-lille-6k"
}
],
"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-lille-6k"
}