Commit 5010879f authored by Gaetan SIMO's avatar Gaetan SIMO
Browse files

[sophia] Update network api with routers and they links to nodes and physical servers

parent ac79659d
......@@ -5,7 +5,18 @@
"kind": "router",
"linecards": [
{
"kind": "router",
"naming_pattern": "%LINECARD%/0/%PORT%",
"ports": [
{
},
{
"port": "9/5",
"uid": "fastiron"
}
],
"rate": 1000
},
{
......@@ -18,76 +29,98 @@
},
{
"uid": "sol-7-eth1"
"port": "eth1",
"uid": "sol-7"
},
{
"uid": "sol-6-eth1"
"port": "eth1",
"uid": "sol-6"
},
{
"uid": "sol-3-eth1"
"port": "eth1",
"uid": "sol-3"
},
{
"uid": "sol-12-eth1"
"port": "eth1",
"uid": "sol-12"
},
{
"uid": "sol-5-eth1"
"port": "eth1",
"uid": "sol-5"
},
{
"uid": "sol-8-eth1"
"port": "eth1",
"uid": "sol-8"
},
{
"uid": "sol-14-eth1"
"port": "eth1",
"uid": "sol-14"
},
{
"uid": "sol-13-eth1"
"port": "eth1",
"uid": "sol-13"
},
{
"uid": "sol-10-eth1"
"port": "eth1",
"uid": "sol-10"
},
{
"uid": "sol-11-eth1"
"port": "eth1",
"uid": "sol-11"
},
{
"uid": "sol-9-eth1"
"port": "eth1",
"uid": "sol-9"
},
{
"uid": "sol-4-eth1"
"port": "eth1",
"uid": "sol-4"
},
{
},
{
"uid": "sol-44-eth1"
"port": "eth1",
"uid": "sol-44"
},
{
"uid": "sol-45-eth1"
"port": "eth1",
"uid": "sol-45"
},
{
"uid": "sol-46-eth1"
"port": "eth1",
"uid": "sol-46"
},
{
"uid": "sol-41-eth1"
"port": "eth1",
"uid": "sol-41"
},
{
"uid": "sol-1-eth1"
"port": "eth1",
"uid": "sol-1"
},
{
"uid": "sol-33-eth1"
"port": "eth1",
"uid": "sol-33"
},
{
"uid": "sol-43-eth1"
"port": "eth1",
"uid": "sol-43"
},
{
"uid": "sol-32-eth1"
"port": "eth1",
"uid": "sol-32"
},
{
"uid": "sol-2-eth1"
"port": "eth1",
"uid": "sol-2"
},
{
},
{
"uid": "sol-42-eth1"
"port": "eth1",
"uid": "sol-42"
}
],
"rate": 1000
......@@ -112,76 +145,100 @@
},
{
"uid": "sol-18-eth1"
"port": "eth1",
"uid": "sol-18"
},
{
"uid": "sol-16-eth1"
"port": "eth1",
"uid": "sol-16"
},
{
"uid": "sol-19-eth1"
"port": "eth1",
"uid": "sol-19"
},
{
"uid": "sol-17-eth1"
"port": "eth1",
"uid": "sol-17"
},
{
"uid": "sol-20-eth1"
"port": "eth1",
"uid": "sol-20"
},
{
"uid": "sol-28-eth1"
"port": "eth1",
"uid": "sol-28"
},
{
"uid": "sol-15-eth1"
"port": "eth1",
"uid": "sol-15"
},
{
"uid": "sol-25-eth1"
"port": "eth1",
"uid": "sol-25"
},
{
"uid": "sol-27-eth1"
"port": "eth1",
"uid": "sol-27"
},
{
"uid": "sol-30-eth1"
"port": "eth1",
"uid": "sol-30"
},
{
"uid": "sol-26-eth1"
"port": "eth1",
"uid": "sol-26"
},
{
"uid": "sol-29-eth1"
"port": "eth1",
"uid": "sol-29"
},
{
"uid": "sol-34-eth1"
"port": "eth1",
"uid": "sol-34"
},
{
"uid": "sol-21-eth1"
"port": "eth1",
"uid": "sol-21"
},
{
"uid": "sol-22-eth1"
"port": "eth1",
"uid": "sol-22"
},
{
"uid": "sol-40-eth1"
"port": "eth1",
"uid": "sol-40"
},
{
"uid": "sol-39-eth1"
"port": "eth1",
"uid": "sol-39"
},
{
"uid": "sol-35-eth1"
"port": "eth1",
"uid": "sol-35"
},
{
"uid": "sol-38-eth1"
"port": "eth1",
"uid": "sol-38"
},
{
"uid": "sol-37-eth1"
"port": "eth1",
"uid": "sol-37"
},
{
"uid": "sol-36-eth1"
"port": "eth1",
"uid": "sol-36"
},
{
"uid": "sol-31-eth1"
"port": "eth1",
"uid": "sol-31"
},
{
"uid": "sol-24-eth1"
"port": "eth1",
"uid": "sol-24"
},
{
"uid": "sol-23-eth1"
"port": "eth1",
"uid": "sol-23"
}
],
"rate": 1000
......
......@@ -5,7 +5,22 @@
"kind": "router",
"linecards": [
{
"kind": "router",
"naming_pattern": "%LINECARD%/%PORT%",
"ports": [
{
},
{
"port": "2/1",
"uid": "fastiron"
},
{
"port": "2/2",
"uid": "fastiron"
}
],
"rate": 1000
},
{
"kind": "node",
......
......@@ -11,14 +11,26 @@
},
{
"kind": "node",
"kind": "router",
"naming_pattern": "%LINECARD%/%PORT%",
"ports": [
{
},
{
"port": "0/1",
"uid": "edgeiron"
},
{
"port": "0/2",
"uid": "edgeiron"
}
],
"rate": 1000
"rate": 10000
},
{
"kind": "node",
"naming_pattern": "%LINECARD%/%PORT%",
"ports": [
{
......@@ -95,9 +107,12 @@
{
"uid": "sol-36"
}
]
],
"rate": 1000
},
{
"kind": "node",
"naming_pattern": "%LINECARD%/%PORT%",
"ports": [
{
......@@ -174,9 +189,12 @@
{
"uid": "sol-48"
}
]
],
"rate": 1000
},
{
"kind": "node",
"naming_pattern": "%LINECARD%/%PORT%",
"ports": [
{
......@@ -244,9 +262,12 @@
{
"uid": "suno-16"
}
]
],
"rate": 1000
},
{
"kind": "node",
"naming_pattern": "%LINECARD%/%PORT%",
"ports": [
{
......@@ -304,8 +325,39 @@
},
{
"uid": "suno-35"
},
{
"kind": "other",
"port": "eth2",
"uid": "srv-stock"
},
{
"kind": "other",
"port": "eth1",
"uid": "srv"
},
{
"kind": "other",
"port": "eth3",
"uid": "srv"
},
{
"kind": "other",
"port": "eth2",
"uid": "srv"
},
{
"kind": "other",
"port": "eth3",
"uid": "srv-stock"
},
{
"kind": "other",
"port": "eth1",
"uid": "srv-stock"
}
]
],
"rate": 1000
},
{
"kind": "node",
......@@ -343,6 +395,52 @@
},
{
"uid": "suno-45"
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
"kind": "other",
"port": "eth0",
"uid": "srv"
},
{
"kind": "other",
"port": "eth0",
"uid": "srv-stock"
}
],
"rate": 1000
......@@ -351,20 +449,57 @@
},
{
"kind": "other",
"naming_pattern": "%LINECARD%/%PORT%",
"ports": [
{
},
{
"kind": "node",
"uid": "sol-49"
},
{
"uid": "newservices"
},
{
"kind": "node",
"uid": "sol-50"
},
{
"uid": "services2"
},
{
"kind": "switch",
"port": "1/0/1",
"uid": "ciscosol"
},
{
"uid": "sw-myrinet"
},
{
"port": "eth1",
"uid": "services2"
},
{
"uid": "front-sop"
},
{
"uid": "renater-1g"
},
{
"port": "eth0",
"uid": "stock"
},
{
"uid": "services"
},
{
"port": "eth1",
"uid": "stock"
}
]
],
"rate": 1000
}
],
"model": "Foundry",
......
{
<<<<<<< HEAD
"compilation_server": false,
"description": "Grid'5000 Sophia-Antipolis site",
"email_contact": "sophia-staff@lists.grid5000.fr",
"latitude": 43.6161,
"location": "Sophia-Antipolis, France",
"longitude": 7.0678,
"name": "Sophia-Antipolis",
"security_contact": "sophia-staff@lists.grid5000.fr",
"sys_admin_contact": "sophia-staff@lists.grid5000.fr",
"type": "site",
"uid": "sophia",
"user_support_contact": "sophia-staff@lists.grid5000.fr",
"web": "http://www.grid5000.fr/mediawiki/index.php/Sophia:Home"
=======
"type": "site",
"uid": "sophia"
>>>>>>> [network_equipments] adding sophia's network equipments + adding parameter :site on each equipment
}
\ No newline at end of file
......@@ -9,62 +9,162 @@ ciscosol:
routes: {}
linecards:
0:
naming_pattern: "%LINECARD%/0/%PORT%"
kind: router
rate: 1000
ports:
1:
uid: fastiron
port: 9/5
2:
naming_pattern: "%LINECARD%/0/%PORT%"
kind: node
rate: 1000
ports:
18: sol-1-eth1
22: sol-2-eth1
3: sol-3-eth1
12: sol-4-eth1
5: sol-5-eth1
2: sol-6-eth1
1: sol-7-eth1
6: sol-8-eth1
11: sol-9-eth1
9: sol-10-eth1
10: sol-11-eth1
4: sol-12-eth1
8: sol-13-eth1
7: sol-14-eth1
21: sol-32-eth1
19: sol-33-eth1
17: sol-41-eth1
24: sol-42-eth1
20: sol-43-eth1
14: sol-44-eth1
15: sol-45-eth1
16: sol-46-eth1
18:
uid: sol-1
port: eth1
22:
uid: sol-2
port: eth1
3:
uid: sol-3
port: eth1
12:
uid: sol-4
port: eth1
5:
uid: sol-5
port: eth1
2:
uid: sol-6
port: eth1
1:
uid: sol-7
port: eth1
6:
uid: sol-8
port: eth1
11:
uid: sol-9
port: eth1
9:
uid: sol-10
port: eth1
10:
uid: sol-11
port: eth1
4:
uid: sol-12
port: eth1