Commit 8136dde9 authored by Simon Delamare's avatar Simon Delamare

[lyon] Change orion and hercule network topology

parent f796aa2f
......@@ -55,7 +55,7 @@
"network_address": "hercule-1.lyon.grid5000.fr",
"rate": 10000000000,
"switch": "force10",
"switch_port": "TenGigabitEthernet 0/24",
"switch_port": "TenGigabitEthernet 0/21",
"vendor": "Intel",
"version": "82599EB 10-Gigabit SFI/SFP+ Network Connection"
},
......
......@@ -55,7 +55,7 @@
"network_address": "hercule-2.lyon.grid5000.fr",
"rate": 10000000000,
"switch": "force10",
"switch_port": "TenGigabitEthernet 0/25",
"switch_port": "TenGigabitEthernet 0/22",
"vendor": "Intel",
"version": "82599EB 10-Gigabit SFI/SFP+ Network Connection"
},
......
......@@ -55,7 +55,7 @@
"network_address": "hercule-3.lyon.grid5000.fr",
"rate": 10000000000,
"switch": "force10",
"switch_port": "TenGigabitEthernet 0/26",
"switch_port": "TenGigabitEthernet 0/23",
"vendor": "Intel",
"version": "82599EB 10-Gigabit SFI/SFP+ Network Connection"
},
......
......@@ -55,7 +55,7 @@
"network_address": "hercule-4.lyon.grid5000.fr",
"rate": 10000000000,
"switch": "force10",
"switch_port": "TenGigabitEthernet 0/27",
"switch_port": "TenGigabitEthernet 0/24",
"vendor": "Intel",
"version": "82599EB 10-Gigabit SFI/SFP+ Network Connection"
},
......
......@@ -51,7 +51,7 @@
"network_address": "orion-1.lyon.grid5000.fr",
"rate": 10000000000,
"switch": "force10",
"switch_port": "TenGigabitEthernet 0/18",
"switch_port": "TenGigabitEthernet 0/17",
"vendor": "Intel"
},
{
......
......@@ -51,7 +51,7 @@
"network_address": "orion-2.lyon.grid5000.fr",
"rate": 10000000000,
"switch": "force10",
"switch_port": "TenGigabitEthernet 0/19",
"switch_port": "TenGigabitEthernet 0/18",
"vendor": "Intel"
},
{
......
......@@ -51,7 +51,7 @@
"network_address": "orion-3.lyon.grid5000.fr",
"rate": 10000000000,
"switch": "force10",
"switch_port": "TenGigabitEthernet 0/20",
"switch_port": "TenGigabitEthernet 0/19",
"vendor": "Intel"
},
{
......
......@@ -51,7 +51,7 @@
"network_address": "orion-4.lyon.grid5000.fr",
"rate": 10000000000,
"switch": "force10",
"switch_port": "TenGigabitEthernet 0/21",
"switch_port": "TenGigabitEthernet 0/20",
"vendor": "Intel"
},
{
......
......@@ -7,6 +7,9 @@
"port": "eth0",
"ports": [
{
"kind": "router",
"port": "9:2",
"uid": "gw-lyon"
},
{
"uid": "taurus-1"
......@@ -56,8 +59,6 @@
{
"uid": "taurus-16"
},
{
},
{
"uid": "orion-1"
},
......@@ -70,10 +71,6 @@
{
"uid": "orion-4"
},
{
},
{
},
{
"port": "eth1",
"uid": "hercule-1"
......@@ -106,27 +103,6 @@
},
{
},
{
"kind": "other",
"uid": "castor"
},
{
"kind": "other",
"uid": "pollux"
},
{
},
{
},
{
},
{
},
{
"kind": "router",
"port": "9:2",
"uid": "gw-lyon"
},
{
},
{
......@@ -134,11 +110,12 @@
{
},
{
"kind": "other",
"uid": "castor"
},
{
"kind": "switch",
"port": "1:25",
"uid": "pat"
"kind": "other",
"uid": "pollux"
}
],
"rate": 10000000000,
......
......@@ -22,6 +22,10 @@ force10:
rate: 10000000000
port: eth0
ports:
0:
uid: gw-lyon
kind: router
port: "9:2"
1: taurus-1
2: taurus-2
3: taurus-3
......@@ -38,20 +42,20 @@ force10:
14: taurus-14
15: taurus-15
16: taurus-16
18: orion-1
19: orion-2
20: orion-3
21: orion-4
24:
17: orion-1
18: orion-2
19: orion-3
20: orion-4
21:
uid: hercule-1
port: eth1
25:
22:
uid: hercule-2
port: eth1
26:
23:
uid: hercule-3
port: eth1
27:
24:
uid: hercule-4
port: eth1
36:
......@@ -60,11 +64,7 @@ force10:
37:
uid: pollux
kind: other
42:
uid: gw-lyon
kind: router
port: "9:2"
47:
uid: pat
port: "1:25"
kind: switch
#47:
# uid: pat
# port: "1:25"
# kind: switch
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