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 32924190ae9fb5f7ef085702c6cc910b5a9259b3..4b5e1349826f1efa5e070efcfe226c5caf4ace17 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 3e03022cbda11d09deffd9b3dbfd07a6c2197cd6..e9c63597a6a566d2832fe03220d6dc44ad9df80f 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 e54e90905248a7b5415968f1a43bb2c812975c30..8ef01127bb331272b92e541597c4b988c440540d 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 81e36418c2d80b386ec7fb5e29d5147db6b8f2db..6441d7b235ac60cb1c8889c90a1f4355abe33e3f 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 2d53c4075cb96f378f862291647e604c3ad12859..48e63b33788e29baf5261e0f7a1cd47162ca9e5f 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 cb620a705f06653ed19cad7ed024a64b5d4f9946..97c97868f9a7c12cdba5f26f9c7f325455505941 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 720d9cc555a7051cdbbd6a89d3f533dd4b1ed0c0..6753a63b32edac4b70a8abdab99ccf46e066928e 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 31d3227ab25e7a20f3020b18de70f2e3985a171a..9eb91487bbfe2bca33533be5ae3f733e452740dd 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 782796addf3ec21da023b545185b443f5815e9da..0c95900ea33c774814c095d2a277c274e850d773 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 9e145bd19349dbc81d43abf4df4dde380175f7e5..2935ad8a78ce08af62f75784d7cde9e2748a3027 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 c684544645dc3bb38a91b06184aee3d44f655e79..2ba20a001e559d06b1b5fad63a6389ef52d55bb3 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 eb30449b7bed64fa9c21bf502cec239bffff6535..f6c77887fdea00d1490a4ada5f872a28d9cffdde 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 f16f52e6af728a551f395b4d2c992f4d743fee52..72912106818eb2c2e6d854869c8ba41ffb368833 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 e11d8e56e9d21e4d3f2141313252c0c6641e3961..70f741e541f296c6bfb542061be57c2493172cc5 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 68edbc9487aa3bf9da82e8fe6d07a29fa1190c03..eff4c7c017f8d10f1c4d5929ab42195dc2c438cf 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 ebf1df5ad87b430dd56ca86fcfd44604f98699e0..63ae5382ee19e91a8b68407c3a382480c6839d77 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 9df01f502bbb385ce983d102d70614ebf9345708..1ce47667bfdeb976f2e1eecc02ce09446e39bb92 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 601e9fcd8a8e3ca8a0661e65b6185d0385098f0b..19f7cc86ec9387bb9ade5570aeec8c26d9288b63 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 377b08491a203b825c2be04dc5990b9d182ff7be..d48edefab1683edb7731ea02915f6c87fc9edb8e 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 7b0ca68f1344eb6c2a37731e185a522ec6af6854..0be805487bb0944f4a538f6939aad081cdddaa78 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 bac57547a1eeea789b79ce3eaa7c30faa037e08b..bc363dd8d05681a53e872b8294eb54ed63b0b299 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 3bfbffc282f0f2665b0d40bea8f0d9f2ba3e0764..619eca89bc5effe855a905da5622b87b330d717a 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 aeedfb1667f42a2496bf16418e4dbb3427ca0ecd..87429679d997a0dfd619eaa78a464c798fed664a 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 f9a74f260e8307a55d2dbfc842328393fe934c5b..6721c131cd531484289d1ce358217e7057771c2a 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 caa1ba11c7a1b348b9209298225c5c5181baee92..693902854ef72b255916ee84effc72545b8ec4a3 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: