Commit d14f3f77 authored by Gaetan SIMO's avatar Gaetan SIMO
Browse files

[network_equipments] adding sophia's network equipments + adding parameter :site on each equipment

parent 5a010169
......@@ -248,8 +248,14 @@ namespace :netlinks do
File.read(config_file).lines.each do |line|
if ((scan = line.strip.scan(/^([^.]+)\.([^.]+)\.grid5000\.fr\s+(\S+)\s+(\S+)$/)).size > 0)
uid,site,ifname,router = scan.flatten
router = router.downcase
config[router] = [] unless config.has_key? router
config[router].push({:uid=>uid,:ifname=>ifname})
# if ((scan = uid.scan(/^(\S+-\d+)-(\S+)$/)).size > 0)
# uid,port = scan.flatten
# config[router].push({:uid=>uid,:ifname=>ifname,:port=>port})
# else
config[router].push({:uid=>uid,:ifname=>ifname})
# end
end
end
......
......@@ -1435,6 +1435,7 @@
"routes": {
},
"site": "lille",
"snmp_community": "public",
"type": "network_equipment",
"uid": "gw",
......
......@@ -598,6 +598,7 @@
"routes": {
},
"site": "lille",
"snmp_community": "public",
"type": "network_equipment",
"uid": "sw-admin1",
......
......@@ -598,6 +598,7 @@
"routes": {
},
"site": "lille",
"snmp_community": "public",
"type": "network_equipment",
"uid": "sw-admin2",
......
......@@ -328,6 +328,7 @@
"routes": {
},
"site": "lille",
"snmp_community": "public",
"type": "network_equipment",
"uid": "sw-admin3",
......
......@@ -185,6 +185,7 @@
"routes": {
},
"site": "lille",
"snmp_community": "public",
"type": "network_equipment",
"uid": "sw-admin4",
......
......@@ -174,6 +174,7 @@
"routes": {
},
"site": "lille",
"snmp_community": "public",
"type": "network_equipment",
"uid": "sw-admin5",
......
......@@ -78,7 +78,7 @@
"routes": {
},
"site_uid": "nancy",
"site": "nancy",
"snmp_community": "public",
"type": "network_equipment",
"uid": "gw",
......
......@@ -155,7 +155,7 @@
"routes": {
},
"site_uid": "nancy",
"site": "nancy",
"snmp_community": "public",
"type": "network_equipment",
"uid": "sgraphene1",
......
......@@ -140,7 +140,7 @@
"routes": {
},
"site_uid": "nancy",
"site": "nancy",
"snmp_community": "public",
"type": "network_equipment",
"uid": "sgraphene2",
......
......@@ -125,7 +125,7 @@
"routes": {
},
"site_uid": "nancy",
"site": "nancy",
"snmp_community": "public",
"type": "network_equipment",
"uid": "sgraphene3",
......
......@@ -152,7 +152,7 @@
"routes": {
},
"site_uid": "nancy",
"site": "nancy",
"snmp_community": "public",
"type": "network_equipment",
"uid": "sgraphene4",
......
......@@ -164,7 +164,7 @@
"routes": {
},
"site_uid": "nancy",
"site": "nancy",
"snmp_community": "public",
"type": "network_equipment",
"uid": "sgriffon1",
......
......@@ -161,7 +161,7 @@
"routes": {
},
"site_uid": "nancy",
"site": "nancy",
"snmp_community": "public",
"type": "network_equipment",
"uid": "sgriffon2",
......
......@@ -164,7 +164,7 @@
"routes": {
},
"site_uid": "nancy",
"site": "nancy",
"snmp_community": "public",
"type": "network_equipment",
"uid": "sgriffon3",
......
......@@ -148,7 +148,7 @@
"routes": {
},
"site_uid": "nancy",
"site": "nancy",
"snmp_community": "public",
"type": "network_equipment",
"uid": "stalc1",
......
......@@ -145,7 +145,7 @@
"routes": {
},
"site_uid": "nancy",
"site": "nancy",
"snmp_community": "public",
"type": "network_equipment",
"uid": "stalc2",
......
......@@ -145,7 +145,7 @@
"routes": {
},
"site_uid": "nancy",
"site": "nancy",
"snmp_community": "public",
"type": "network_equipment",
"uid": "stalc3",
......
{
"channels": {
"naming_pattern": "Po%CHANNELID%"
},
"kind": "switch",
"linecards": [
{
"kind": "switch",
"naming_pattern": "Gi%LINECARD%/%PORT%",
"ports": [
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
"uid": "sw-admin4"
},
{
"uid": "sw-admin3"
},
{
"uid": "sw-admin2"
},
{
"kind": "router",
"uid": "gw-lille-6k.grid5000.fr"
},
{
"kind": "router",
"uid": "gw-lille-6k.grid5000.fr"
}
],
"rate": 1000000
}
],
"model": "cisco",
"routes": {
},
"site": "reims",
"snmp_community": "public",
"type": "network_equipment",
"uid": "gw",
"vlans": {
"naming_pattern": "Vlan%VLANID%"
}
}
\ No newline at end of file
{
"compilation_server": false,
"description": "Grid5000 Reims site",
<<<<<<< HEAD
"description": "",
"email_contact": "reims-staff@lists.grid5000.fr",
"latitude": 49.244508,
"location": "Reims, France",
......@@ -11,5 +11,9 @@
"type": "site",
"uid": "reims",
"user_support_contact": "reims-staff@lists.grid5000.fr",
"web": "http://www.grid5000.fr/mediawiki/index.php/Reims:Home"
"web": ""
=======
"type": "site",
"uid": "reims"
>>>>>>> [network_equipments] adding sophia's network equipments + adding parameter :site on each equipment
}
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment