diff --git a/data/grid5000/sites/lyon/network_equipments/gw.json b/data/grid5000/sites/lyon/network_equipments/gw.json index 7bcdaf5bfb80bef1e6d4394b92bad7aa586a82f6..054a00e48928b034088b692f0ca60a4bdb99291f 100644 --- a/data/grid5000/sites/lyon/network_equipments/gw.json +++ b/data/grid5000/sites/lyon/network_equipments/gw.json @@ -55,6 +55,9 @@ { }, { + "kind": "switch", + "snmp_name": "ethernet1/1/8", + "uid": "sneowise" }, { }, diff --git a/data/grid5000/sites/lyon/network_equipments/sneowise.json b/data/grid5000/sites/lyon/network_equipments/sneowise.json index fbb33971d8c08274f63ba56c85ba2b17e6d32513..85c5feddc657f02e1b7873b8bfba352160f47098 100644 --- a/data/grid5000/sites/lyon/network_equipments/sneowise.json +++ b/data/grid5000/sites/lyon/network_equipments/sneowise.json @@ -70,6 +70,85 @@ "port": "eth1", "snmp_name": "1/10", "uid": "neowise-10" + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + "kind": "router", + "snmp_name": "1/48", + "uid": "gw" } ], "rate": 10000000000, diff --git a/input/grid5000/sites/lyon/networks/gw-lyon.yaml b/input/grid5000/sites/lyon/networks/gw-lyon.yaml index 95b51eb33568ff37dfd07639a253f2fdfa6a9960..49edf248418dc1a877f5c0716e961304af075d91 100644 --- a/input/grid5000/sites/lyon/networks/gw-lyon.yaml +++ b/input/grid5000/sites/lyon/networks/gw-lyon.yaml @@ -127,6 +127,9 @@ gw: 4: pyxis-2 5: pyxis-3 6: pyxis-4 + 8: + uid: sneowise + kind: switch 11: neowise-1 12: neowise-2 13: neowise-3 diff --git a/input/grid5000/sites/lyon/networks/sneowise.yaml b/input/grid5000/sites/lyon/networks/sneowise.yaml index c0f68cb3bf59e4052db85ab97e095849efd98bf3..4d5a46218bf940fc82d71c3557038e86fd565325 100644 --- a/input/grid5000/sites/lyon/networks/sneowise.yaml +++ b/input/grid5000/sites/lyon/networks/sneowise.yaml @@ -27,3 +27,6 @@ sneowise: 8: neowise-8-eth1 9: neowise-9-eth1 10: neowise-10-eth1 + 48: + uid: gw + kind: router diff --git a/lib/refrepo/valid/network.rb b/lib/refrepo/valid/network.rb index 3c5e1338e620cef1834310bd81a727af0cc9f829..cc05db9c748ef756b51d946863c746df66d18fd3 100644 --- a/lib/refrepo/valid/network.rb +++ b/lib/refrepo/valid/network.rb @@ -5,7 +5,7 @@ # in clustershell and graphviz debian packages # FIXME infiniband equipment is not completely described in the ref-api yet. See Bug 8586 -HPC_SWITCHES = ['ib-grenoble', 'voltaire-1', 'voltaire-2', 'voltaire-3', 'sgraoullyib', 'sw-myrinet', 'sgrele-opf', 'sneowiseib1', 'sneowiseib2', 'sneowise'] +HPC_SWITCHES = ['ib-grenoble', 'voltaire-1', 'voltaire-2', 'voltaire-3', 'sgraoullyib', 'sw-myrinet', 'sgrele-opf', 'sneowiseib1', 'sneowiseib2'] def check_network_description(options) ok = true