From 3fc3fb7156e2eebfa2dc6c8d52a0d6ab3871b0f6 Mon Sep 17 00:00:00 2001 From: Nicolas Perrin <nicolas.perrin@inria.fr> Date: Thu, 27 Jun 2024 16:23:50 +0200 Subject: [PATCH] [rennes] Fix sw-1-c003 interfaces name --- .../clusters/abacus12/nodes/abacus12-1.json | 2 +- .../clusters/abacus14/nodes/abacus14-1.json | 2 +- .../clusters/abacus16/nodes/abacus16-1.json | 2 +- .../clusters/abacus9/nodes/abacus9-1.json | 2 +- .../clusters/roazhon13/nodes/roazhon13-1.json | 2 +- .../clusters/roazhon13/nodes/roazhon13-2.json | 2 +- .../clusters/roazhon13/nodes/roazhon13-5.json | 2 +- .../clusters/roazhon13/nodes/roazhon13-6.json | 2 +- .../clusters/roazhon13/nodes/roazhon13-7.json | 2 +- .../clusters/roazhon13/nodes/roazhon13-8.json | 2 +- .../clusters/roazhon3/nodes/roazhon3-1.json | 2 +- .../clusters/roazhon7/nodes/roazhon7-1.json | 2 +- .../clusters/roazhon7/nodes/roazhon7-2.json | 2 +- .../clusters/roazhon7/nodes/roazhon7-3.json | 2 +- .../clusters/roazhon7/nodes/roazhon7-4.json | 2 +- .../clusters/roazhon8/nodes/roazhon8-1.json | 2 +- .../clusters/roazhon8/nodes/roazhon8-2.json | 2 +- .../clusters/roazhon8/nodes/roazhon8-3.json | 2 +- .../clusters/roazhon8/nodes/roazhon8-4.json | 2 +- .../clusters/roazhon9/nodes/roazhon9-1.json | 2 +- .../clusters/roazhon9/nodes/roazhon9-2.json | 2 +- .../clusters/roazhon9/nodes/roazhon9-3.json | 2 +- .../clusters/roazhon9/nodes/roazhon9-4.json | 2 +- .../rennes/network_equipments/sw-1-c003.json | 52 +++++++++---------- .../sites/rennes/networks/sw-1-c003.yaml | 4 +- 25 files changed, 51 insertions(+), 51 deletions(-) diff --git a/data/grid5000/sites/rennes/clusters/abacus12/nodes/abacus12-1.json b/data/grid5000/sites/rennes/clusters/abacus12/nodes/abacus12-1.json index 32924190ae9..4b5e1349826 100644 --- a/data/grid5000/sites/rennes/clusters/abacus12/nodes/abacus12-1.json +++ b/data/grid5000/sites/rennes/clusters/abacus12/nodes/abacus12-1.json @@ -165,7 +165,7 @@ "sriov": false, "sriov_totalvfs": 0, "switch": "sw-1-c003", - "switch_port": "Eth1/1/1", + "switch_port": "ethernet1/1/1", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/rennes/clusters/abacus14/nodes/abacus14-1.json b/data/grid5000/sites/rennes/clusters/abacus14/nodes/abacus14-1.json index 3e03022cbda..e9c63597a6a 100644 --- a/data/grid5000/sites/rennes/clusters/abacus14/nodes/abacus14-1.json +++ b/data/grid5000/sites/rennes/clusters/abacus14/nodes/abacus14-1.json @@ -184,7 +184,7 @@ "sriov": false, "sriov_totalvfs": 0, "switch": "sw-1-c003", - "switch_port": "Eth1/1/17", + "switch_port": "ethernet1/1/17", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/rennes/clusters/abacus16/nodes/abacus16-1.json b/data/grid5000/sites/rennes/clusters/abacus16/nodes/abacus16-1.json index e54e9090524..8ef01127bb3 100644 --- a/data/grid5000/sites/rennes/clusters/abacus16/nodes/abacus16-1.json +++ b/data/grid5000/sites/rennes/clusters/abacus16/nodes/abacus16-1.json @@ -184,7 +184,7 @@ "sriov": false, "sriov_totalvfs": 0, "switch": "sw-1-c003", - "switch_port": "Eth1/1/18", + "switch_port": "ethernet1/1/18", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/rennes/clusters/abacus9/nodes/abacus9-1.json b/data/grid5000/sites/rennes/clusters/abacus9/nodes/abacus9-1.json index 81e36418c2d..6441d7b235a 100644 --- a/data/grid5000/sites/rennes/clusters/abacus9/nodes/abacus9-1.json +++ b/data/grid5000/sites/rennes/clusters/abacus9/nodes/abacus9-1.json @@ -184,7 +184,7 @@ "sriov": false, "sriov_totalvfs": 0, "switch": "sw-1-c003", - "switch_port": "Eth1/1/16", + "switch_port": "ethernet1/1/16", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-1.json b/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-1.json index 2d53c4075cb..48e63b33788 100644 --- a/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-1.json +++ b/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-1.json @@ -112,7 +112,7 @@ "sriov": false, "sriov_totalvfs": 0, "switch": "sw-1-c003", - "switch_port": "Eth1/1/23", + "switch_port": "ethernet1/1/23", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-2.json b/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-2.json index cb620a705f0..97c97868f9a 100644 --- a/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-2.json +++ b/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-2.json @@ -112,7 +112,7 @@ "sriov": false, "sriov_totalvfs": 0, "switch": "sw-1-c003", - "switch_port": "Eth1/1/24", + "switch_port": "ethernet1/1/24", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-5.json b/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-5.json index 720d9cc555a..6753a63b32e 100644 --- a/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-5.json +++ b/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-5.json @@ -112,7 +112,7 @@ "sriov": false, "sriov_totalvfs": 0, "switch": "sw-1-c003", - "switch_port": "Eth1/1/21", + "switch_port": "ethernet1/1/21", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-6.json b/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-6.json index 31d3227ab25..9eb91487bbf 100644 --- a/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-6.json +++ b/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-6.json @@ -112,7 +112,7 @@ "sriov": false, "sriov_totalvfs": 0, "switch": "sw-1-c003", - "switch_port": "Eth1/1/19", + "switch_port": "ethernet1/1/19", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-7.json b/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-7.json index 782796addf3..0c95900ea33 100644 --- a/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-7.json +++ b/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-7.json @@ -112,7 +112,7 @@ "sriov": false, "sriov_totalvfs": 0, "switch": "sw-1-c003", - "switch_port": "Eth1/1/20", + "switch_port": "ethernet1/1/20", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-8.json b/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-8.json index 9e145bd1934..2935ad8a78c 100644 --- a/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-8.json +++ b/data/grid5000/sites/rennes/clusters/roazhon13/nodes/roazhon13-8.json @@ -112,7 +112,7 @@ "sriov": false, "sriov_totalvfs": 0, "switch": "sw-1-c003", - "switch_port": "Eth1/1/22", + "switch_port": "ethernet1/1/22", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/rennes/clusters/roazhon3/nodes/roazhon3-1.json b/data/grid5000/sites/rennes/clusters/roazhon3/nodes/roazhon3-1.json index c684544645d..2ba20a001e5 100644 --- a/data/grid5000/sites/rennes/clusters/roazhon3/nodes/roazhon3-1.json +++ b/data/grid5000/sites/rennes/clusters/roazhon3/nodes/roazhon3-1.json @@ -132,7 +132,7 @@ "sriov": false, "sriov_totalvfs": 0, "switch": "sw-1-c003", - "switch_port": "Eth1/1/2", + "switch_port": "ethernet1/1/2", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/rennes/clusters/roazhon7/nodes/roazhon7-1.json b/data/grid5000/sites/rennes/clusters/roazhon7/nodes/roazhon7-1.json index eb30449b7be..f6c77887fde 100644 --- a/data/grid5000/sites/rennes/clusters/roazhon7/nodes/roazhon7-1.json +++ b/data/grid5000/sites/rennes/clusters/roazhon7/nodes/roazhon7-1.json @@ -92,7 +92,7 @@ "sriov": true, "sriov_totalvfs": 63, "switch": "sw-1-c003", - "switch_port": "Eth1/1/8", + "switch_port": "ethernet1/1/8", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/rennes/clusters/roazhon7/nodes/roazhon7-2.json b/data/grid5000/sites/rennes/clusters/roazhon7/nodes/roazhon7-2.json index f16f52e6af7..72912106818 100644 --- a/data/grid5000/sites/rennes/clusters/roazhon7/nodes/roazhon7-2.json +++ b/data/grid5000/sites/rennes/clusters/roazhon7/nodes/roazhon7-2.json @@ -92,7 +92,7 @@ "sriov": true, "sriov_totalvfs": 63, "switch": "sw-1-c003", - "switch_port": "Eth1/1/11", + "switch_port": "ethernet1/1/11", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/rennes/clusters/roazhon7/nodes/roazhon7-3.json b/data/grid5000/sites/rennes/clusters/roazhon7/nodes/roazhon7-3.json index e11d8e56e9d..70f741e541f 100644 --- a/data/grid5000/sites/rennes/clusters/roazhon7/nodes/roazhon7-3.json +++ b/data/grid5000/sites/rennes/clusters/roazhon7/nodes/roazhon7-3.json @@ -92,7 +92,7 @@ "sriov": true, "sriov_totalvfs": 63, "switch": "sw-1-c003", - "switch_port": "Eth1/1/13", + "switch_port": "ethernet1/1/13", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/rennes/clusters/roazhon7/nodes/roazhon7-4.json b/data/grid5000/sites/rennes/clusters/roazhon7/nodes/roazhon7-4.json index 68edbc9487a..eff4c7c017f 100644 --- a/data/grid5000/sites/rennes/clusters/roazhon7/nodes/roazhon7-4.json +++ b/data/grid5000/sites/rennes/clusters/roazhon7/nodes/roazhon7-4.json @@ -92,7 +92,7 @@ "sriov": true, "sriov_totalvfs": 63, "switch": "sw-1-c003", - "switch_port": "Eth1/1/12", + "switch_port": "ethernet1/1/12", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/rennes/clusters/roazhon8/nodes/roazhon8-1.json b/data/grid5000/sites/rennes/clusters/roazhon8/nodes/roazhon8-1.json index ebf1df5ad87..63ae5382ee1 100644 --- a/data/grid5000/sites/rennes/clusters/roazhon8/nodes/roazhon8-1.json +++ b/data/grid5000/sites/rennes/clusters/roazhon8/nodes/roazhon8-1.json @@ -92,7 +92,7 @@ "sriov": true, "sriov_totalvfs": 63, "switch": "sw-1-c003", - "switch_port": "Eth1/1/7", + "switch_port": "ethernet1/1/7", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/rennes/clusters/roazhon8/nodes/roazhon8-2.json b/data/grid5000/sites/rennes/clusters/roazhon8/nodes/roazhon8-2.json index 9df01f502bb..1ce47667bfd 100644 --- a/data/grid5000/sites/rennes/clusters/roazhon8/nodes/roazhon8-2.json +++ b/data/grid5000/sites/rennes/clusters/roazhon8/nodes/roazhon8-2.json @@ -92,7 +92,7 @@ "sriov": true, "sriov_totalvfs": 63, "switch": "sw-1-c003", - "switch_port": "Eth1/1/10", + "switch_port": "ethernet1/1/10", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/rennes/clusters/roazhon8/nodes/roazhon8-3.json b/data/grid5000/sites/rennes/clusters/roazhon8/nodes/roazhon8-3.json index 601e9fcd8a8..19f7cc86ec9 100644 --- a/data/grid5000/sites/rennes/clusters/roazhon8/nodes/roazhon8-3.json +++ b/data/grid5000/sites/rennes/clusters/roazhon8/nodes/roazhon8-3.json @@ -92,7 +92,7 @@ "sriov": true, "sriov_totalvfs": 63, "switch": "sw-1-c003", - "switch_port": "Eth1/1/14", + "switch_port": "ethernet1/1/14", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/rennes/clusters/roazhon8/nodes/roazhon8-4.json b/data/grid5000/sites/rennes/clusters/roazhon8/nodes/roazhon8-4.json index 377b08491a2..d48edefab16 100644 --- a/data/grid5000/sites/rennes/clusters/roazhon8/nodes/roazhon8-4.json +++ b/data/grid5000/sites/rennes/clusters/roazhon8/nodes/roazhon8-4.json @@ -92,7 +92,7 @@ "sriov": true, "sriov_totalvfs": 63, "switch": "sw-1-c003", - "switch_port": "Eth1/1/9", + "switch_port": "ethernet1/1/9", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/rennes/clusters/roazhon9/nodes/roazhon9-1.json b/data/grid5000/sites/rennes/clusters/roazhon9/nodes/roazhon9-1.json index 7b0ca68f134..0be805487bb 100644 --- a/data/grid5000/sites/rennes/clusters/roazhon9/nodes/roazhon9-1.json +++ b/data/grid5000/sites/rennes/clusters/roazhon9/nodes/roazhon9-1.json @@ -132,7 +132,7 @@ "sriov": false, "sriov_totalvfs": 0, "switch": "sw-1-c003", - "switch_port": "Eth1/1/6", + "switch_port": "ethernet1/1/6", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/rennes/clusters/roazhon9/nodes/roazhon9-2.json b/data/grid5000/sites/rennes/clusters/roazhon9/nodes/roazhon9-2.json index bac57547a1e..bc363dd8d05 100644 --- a/data/grid5000/sites/rennes/clusters/roazhon9/nodes/roazhon9-2.json +++ b/data/grid5000/sites/rennes/clusters/roazhon9/nodes/roazhon9-2.json @@ -132,7 +132,7 @@ "sriov": false, "sriov_totalvfs": 0, "switch": "sw-1-c003", - "switch_port": "Eth1/1/5", + "switch_port": "ethernet1/1/5", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/rennes/clusters/roazhon9/nodes/roazhon9-3.json b/data/grid5000/sites/rennes/clusters/roazhon9/nodes/roazhon9-3.json index 3bfbffc282f..619eca89bc5 100644 --- a/data/grid5000/sites/rennes/clusters/roazhon9/nodes/roazhon9-3.json +++ b/data/grid5000/sites/rennes/clusters/roazhon9/nodes/roazhon9-3.json @@ -132,7 +132,7 @@ "sriov": false, "sriov_totalvfs": 0, "switch": "sw-1-c003", - "switch_port": "Eth1/1/3", + "switch_port": "ethernet1/1/3", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/rennes/clusters/roazhon9/nodes/roazhon9-4.json b/data/grid5000/sites/rennes/clusters/roazhon9/nodes/roazhon9-4.json index aeedfb1667f..87429679d99 100644 --- a/data/grid5000/sites/rennes/clusters/roazhon9/nodes/roazhon9-4.json +++ b/data/grid5000/sites/rennes/clusters/roazhon9/nodes/roazhon9-4.json @@ -132,7 +132,7 @@ "sriov": false, "sriov_totalvfs": 0, "switch": "sw-1-c003", - "switch_port": "Eth1/1/4", + "switch_port": "ethernet1/1/4", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/rennes/network_equipments/sw-1-c003.json b/data/grid5000/sites/rennes/network_equipments/sw-1-c003.json index f9a74f260e8..6721c131cd5 100644 --- a/data/grid5000/sites/rennes/network_equipments/sw-1-c003.json +++ b/data/grid5000/sites/rennes/network_equipments/sw-1-c003.json @@ -5,7 +5,7 @@ { }, { - "kavlan_pattern": "Eth%LINECARD%/1/%PORT%", + "kavlan_pattern": "ethernet%LINECARD%/1/%PORT%", "kind": "node", "ports": [ { @@ -13,85 +13,85 @@ { "kind": "node", "port": "eth0", - "snmp_name": "Eth1/1/1", + "snmp_name": "ethernet1/1/1", "uid": "abacus12-1" }, { "kind": "node", "port": "eth0", - "snmp_name": "Eth1/1/2", + "snmp_name": "ethernet1/1/2", "uid": "roazhon3-1" }, { "kind": "node", "port": "eth0", - "snmp_name": "Eth1/1/3", + "snmp_name": "ethernet1/1/3", "uid": "roazhon9-3" }, { "kind": "node", "port": "eth0", - "snmp_name": "Eth1/1/4", + "snmp_name": "ethernet1/1/4", "uid": "roazhon9-4" }, { "kind": "node", "port": "eth0", - "snmp_name": "Eth1/1/5", + "snmp_name": "ethernet1/1/5", "uid": "roazhon9-2" }, { "kind": "node", "port": "eth0", - "snmp_name": "Eth1/1/6", + "snmp_name": "ethernet1/1/6", "uid": "roazhon9-1" }, { "kind": "node", "port": "eth0", - "snmp_name": "Eth1/1/7", + "snmp_name": "ethernet1/1/7", "uid": "roazhon8-1" }, { "kind": "node", "port": "eth0", - "snmp_name": "Eth1/1/8", + "snmp_name": "ethernet1/1/8", "uid": "roazhon7-1" }, { "kind": "node", "port": "eth0", - "snmp_name": "Eth1/1/9", + "snmp_name": "ethernet1/1/9", "uid": "roazhon8-4" }, { "kind": "node", "port": "eth0", - "snmp_name": "Eth1/1/10", + "snmp_name": "ethernet1/1/10", "uid": "roazhon8-2" }, { "kind": "node", "port": "eth0", - "snmp_name": "Eth1/1/11", + "snmp_name": "ethernet1/1/11", "uid": "roazhon7-2" }, { "kind": "node", "port": "eth0", - "snmp_name": "Eth1/1/12", + "snmp_name": "ethernet1/1/12", "uid": "roazhon7-4" }, { "kind": "node", "port": "eth0", - "snmp_name": "Eth1/1/13", + "snmp_name": "ethernet1/1/13", "uid": "roazhon7-3" }, { "kind": "node", "port": "eth0", - "snmp_name": "Eth1/1/14", + "snmp_name": "ethernet1/1/14", "uid": "roazhon8-3" }, { @@ -99,55 +99,55 @@ { "kind": "node", "port": "eth0", - "snmp_name": "Eth1/1/16", + "snmp_name": "ethernet1/1/16", "uid": "abacus9-1" }, { "kind": "node", "port": "eth0", - "snmp_name": "Eth1/1/17", + "snmp_name": "ethernet1/1/17", "uid": "abacus14-1" }, { "kind": "node", "port": "eth0", - "snmp_name": "Eth1/1/18", + "snmp_name": "ethernet1/1/18", "uid": "abacus16-1" }, { "kind": "node", "port": "eth0", - "snmp_name": "Eth1/1/19", + "snmp_name": "ethernet1/1/19", "uid": "roazhon13-6" }, { "kind": "node", "port": "eth0", - "snmp_name": "Eth1/1/20", + "snmp_name": "ethernet1/1/20", "uid": "roazhon13-7" }, { "kind": "node", "port": "eth0", - "snmp_name": "Eth1/1/21", + "snmp_name": "ethernet1/1/21", "uid": "roazhon13-5" }, { "kind": "node", "port": "eth0", - "snmp_name": "Eth1/1/22", + "snmp_name": "ethernet1/1/22", "uid": "roazhon13-8" }, { "kind": "node", "port": "eth0", - "snmp_name": "Eth1/1/23", + "snmp_name": "ethernet1/1/23", "uid": "roazhon13-1" }, { "kind": "node", "port": "eth0", - "snmp_name": "Eth1/1/24", + "snmp_name": "ethernet1/1/24", "uid": "roazhon13-2" }, { @@ -157,12 +157,12 @@ { "kind": "router", "port": "1/1/43", - "snmp_name": "Eth1/1/27", + "snmp_name": "ethernet1/1/27", "uid": "gw" } ], "rate": 10000000000, - "snmp_pattern": "Eth%LINECARD%/1/%PORT%" + "snmp_pattern": "ethernet%LINECARD%/1/%PORT%" } ], "managed_by_us": true, diff --git a/input/grid5000/sites/rennes/networks/sw-1-c003.yaml b/input/grid5000/sites/rennes/networks/sw-1-c003.yaml index caa1ba11c7a..693902854ef 100644 --- a/input/grid5000/sites/rennes/networks/sw-1-c003.yaml +++ b/input/grid5000/sites/rennes/networks/sw-1-c003.yaml @@ -9,8 +9,8 @@ sw-1-c003: site: rennes linecards: 1: - snmp_pattern: "Eth%LINECARD%/1/%PORT%" - kavlan_pattern: "Eth%LINECARD%/1/%PORT%" + snmp_pattern: "ethernet%LINECARD%/1/%PORT%" + kavlan_pattern: "ethernet%LINECARD%/1/%PORT%" rate: 10000000000 kind: node ports: -- GitLab