From e10d9e58e0ca17f294db622e90910595ef36b095 Mon Sep 17 00:00:00 2001 From: Simon Delamare <simon.delamare@ens-lyon.fr> Date: Fri, 27 Jun 2014 17:35:10 +0200 Subject: [PATCH] [all] network - forgot to 'rake netlink:generate'... --- .../lille/network_equipments/gw-lille.json | 20 ++++++++++++++++ .../lyon/network_equipments/force10.json | 4 ++++ .../sites/lyon/network_equipments/pat.json | 24 ++++++++++++------- .../nantes/network_equipments/gw-nantes.json | 3 ++- .../sophia/network_equipments/edgeiron.json | 10 +++++--- 5 files changed, 49 insertions(+), 12 deletions(-) diff --git a/data/grid5000/sites/lille/network_equipments/gw-lille.json b/data/grid5000/sites/lille/network_equipments/gw-lille.json index 6469dd5e400..9e208410c96 100644 --- a/data/grid5000/sites/lille/network_equipments/gw-lille.json +++ b/data/grid5000/sites/lille/network_equipments/gw-lille.json @@ -207,57 +207,75 @@ }, { + "port": "eth0", "uid": "chimint-1" }, { + "port": "eth0", "uid": "chimint-3" }, { + "port": "eth0", "uid": "chimint-2" }, { + "port": "eth0", "uid": "chimint-5" }, { + "port": "eth0", "uid": "chimint-4" }, { + "port": "eth0", "uid": "chimint-6" }, { + "port": "eth0", "uid": "chimint-8" }, { + "port": "eth0", "uid": "chimint-7" }, { + "port": "eth0", "uid": "chimint-9" }, { + "port": "eth0", "uid": "chimint-10" }, { + "port": "eth0", "uid": "chimint-11" }, { + "port": "eth0", "uid": "chimint-12" }, { + "port": "eth0", "uid": "chimint-13" }, { + "port": "eth0", "uid": "chimint-14" }, { + "port": "eth0", "uid": "chimint-17" }, { + "port": "eth0", "uid": "chimint-16" }, { + "port": "eth0", "uid": "chimint-15" }, { + "port": "eth0", "uid": "chimint-18" }, { @@ -267,9 +285,11 @@ "uid": "chirloute-4" }, { + "port": "eth0", "uid": "chimint-20" }, { + "port": "eth0", "uid": "chimint-19" }, { diff --git a/data/grid5000/sites/lyon/network_equipments/force10.json b/data/grid5000/sites/lyon/network_equipments/force10.json index 0458605b5fa..db7dc23f3ee 100644 --- a/data/grid5000/sites/lyon/network_equipments/force10.json +++ b/data/grid5000/sites/lyon/network_equipments/force10.json @@ -83,15 +83,19 @@ }, { + "port": "eth1", "uid": "hercule-1" }, { + "port": "eth1", "uid": "hercule-2" }, { + "port": "eth1", "uid": "hercule-3" }, { + "port": "eth1", "uid": "hercule-4" }, { diff --git a/data/grid5000/sites/lyon/network_equipments/pat.json b/data/grid5000/sites/lyon/network_equipments/pat.json index 34fad5f4c3b..a22afa84380 100644 --- a/data/grid5000/sites/lyon/network_equipments/pat.json +++ b/data/grid5000/sites/lyon/network_equipments/pat.json @@ -16,16 +16,20 @@ }, { - "uid": "hercule-1-eth2" + "port": "eth2", + "uid": "hercule-1" }, { - "uid": "hercule-2-eth2" + "port": "eth2", + "uid": "hercule-2" }, { - "uid": "hercule-3-eth2" + "port": "eth2", + "uid": "hercule-3" }, { - "uid": "hercule-4-eth2" + "port": "eth2", + "uid": "hercule-4" }, { @@ -76,16 +80,20 @@ }, { - "uid": "hercule-1-eth3" + "port": "eth3", + "uid": "hercule-1" }, { - "uid": "hercule-2-eth3" + "port": "eth3", + "uid": "hercule-2" }, { - "uid": "hercule-3-eth3" + "port": "eth3", + "uid": "hercule-3" }, { - "uid": "hercule-4-eth3" + "port": "eth3", + "uid": "hercule-4" }, { "kind": "switch", diff --git a/data/grid5000/sites/nantes/network_equipments/gw-nantes.json b/data/grid5000/sites/nantes/network_equipments/gw-nantes.json index 9ecc3495f1f..8f46419d684 100644 --- a/data/grid5000/sites/nantes/network_equipments/gw-nantes.json +++ b/data/grid5000/sites/nantes/network_equipments/gw-nantes.json @@ -151,7 +151,8 @@ "uid": "econome-1" } ], - "rate": 10000000000 + "rate": 10000000000, + "snmp_pattern": "TenGigabitEthernet %LINECARD%/%PORT%" } ], "model": "Force10 S4810", diff --git a/data/grid5000/sites/sophia/network_equipments/edgeiron.json b/data/grid5000/sites/sophia/network_equipments/edgeiron.json index 7cf61df8eed..9bc3b3b0eb3 100644 --- a/data/grid5000/sites/sophia/network_equipments/edgeiron.json +++ b/data/grid5000/sites/sophia/network_equipments/edgeiron.json @@ -21,7 +21,8 @@ "uid": "gw-sophia" } ], - "rate": 1000000000 + "rate": 1000000000, + "snmp_pattern": "GigabitEthernet%LINECARD%/%PORT%" }, { "kind": "node", @@ -175,7 +176,8 @@ "uid": "helios-1" } ], - "rate": 1000000000 + "rate": 1000000000, + "snmp_pattern": "GigabitEthernet%LINECARD%/%PORT%" }, { @@ -275,7 +277,8 @@ "uid": "helios-20" } ], - "rate": 1000000000 + "rate": 1000000000, + "snmp_pattern": "GigabitEthernet%LINECARD%/%PORT%" } ], "model": "Foundry", @@ -289,6 +292,7 @@ "uid": "edgeiron", "vlans": { "naming_pattern": "Vlan%VLANID%", + "snmp_pattern": "v%VLANID%", "vlan100": { "addresses": [ "172.16.143.250" -- GitLab