diff --git a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-1.json b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-1.json index e819ddd474c98f5b3bafc43594eea27e25cd79d0..2a22997c743f2e33680cdb0fc78bfb47f81f6a21 100644 --- a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-1.json +++ b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-1.json @@ -182,7 +182,7 @@ "sriov": false, "sriov_totalvfs": 0, "switch": "sw-7", - "switch_port": "Te1/0/2", + "switch_port": "Unit: 1 Slot: 0 Port: 2 10G - Level", "vendor": "Broadcom Inc. and subsidiaries" }, { diff --git a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-2.json b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-2.json index 3e26191323d05ca9c17f2d72dd8c5aea70f4a41e..cd9710d3fdbcfbd20a85535b836c6e36997102e7 100644 --- a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-2.json +++ b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-2.json @@ -182,7 +182,7 @@ "sriov": false, "sriov_totalvfs": 0, "switch": "sw-7", - "switch_port": "Te1/0/3", + "switch_port": "Unit: 1 Slot: 0 Port: 3 10G - Level", "vendor": "Broadcom Inc. and subsidiaries" }, { diff --git a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-3.json b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-3.json index 676978075c7e7b1259a96f0289de0ad02551fd75..3094f64fbf3c8467e31161e6a24565eda12b8f75 100644 --- a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-3.json +++ b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-3.json @@ -182,7 +182,7 @@ "sriov": false, "sriov_totalvfs": 0, "switch": "sw-7", - "switch_port": "Te1/0/5", + "switch_port": "Unit: 1 Slot: 0 Port: 5 10G - Level", "vendor": "Broadcom Inc. and subsidiaries" }, { diff --git a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-4.json b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-4.json index acca10cb9d9a39958d855d4578f5be325d19eecb..0140d35c73079b142c76be73d0e7089cfb4a0b86 100644 --- a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-4.json +++ b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-4.json @@ -182,7 +182,7 @@ "sriov": false, "sriov_totalvfs": 0, "switch": "sw-7", - "switch_port": "Te1/0/6", + "switch_port": "Unit: 1 Slot: 0 Port: 6 10G - Level", "vendor": "Broadcom Inc. and subsidiaries" }, { diff --git a/data/grid5000/sites/sophia/network_equipments/sw-7.json b/data/grid5000/sites/sophia/network_equipments/sw-7.json index 7e14920c2746f9635d3e89e0dda0d4a060d2e0e6..f96d4f6a1ddf2638664718ddebf039cd78e37bbc 100644 --- a/data/grid5000/sites/sophia/network_equipments/sw-7.json +++ b/data/grid5000/sites/sophia/network_equipments/sw-7.json @@ -14,13 +14,13 @@ { "kind": "node", "port": "eth0", - "snmp_name": "Te1/0/2", + "snmp_name": "Unit: 1 Slot: 0 Port: 2 10G - Level", "uid": "esterel31-1" }, { "kind": "node", "port": "eth0", - "snmp_name": "Te1/0/3", + "snmp_name": "Unit: 1 Slot: 0 Port: 3 10G - Level", "uid": "esterel31-2" }, { @@ -28,13 +28,13 @@ { "kind": "node", "port": "eth0", - "snmp_name": "Te1/0/5", + "snmp_name": "Unit: 1 Slot: 0 Port: 5 10G - Level", "uid": "esterel31-3" }, { "kind": "node", "port": "eth0", - "snmp_name": "Te1/0/6", + "snmp_name": "Unit: 1 Slot: 0 Port: 6 10G - Level", "uid": "esterel31-4" }, { @@ -72,18 +72,18 @@ { "kind": "router", "rate": 1000000000, - "snmp_name": "Te1/0/23", + "snmp_name": "Unit: 1 Slot: 0 Port: 23 10G - Level", "uid": "gw" }, { "kind": "switch", "rate": 1000000000, - "snmp_name": "Te1/0/24", + "snmp_name": "Unit: 1 Slot: 0 Port: 24 10G - Level", "uid": "swadmin-7" } ], "rate": 10000000000, - "snmp_pattern": "Te1/%LINECARD%/%PORT%" + "snmp_pattern": "Unit: 1 Slot: %LINECARD% Port: %PORT% 10G - Level" } ], "managed_by_us": true, diff --git a/input/grid5000/sites/sophia/networks/sw-7.yaml b/input/grid5000/sites/sophia/networks/sw-7.yaml index 4522f5d4617b4a1b5b546fc70e249fb27ae244ba..ee805ad5b253b237a290d336808aff981f9e4bb1 100644 --- a/input/grid5000/sites/sophia/networks/sw-7.yaml +++ b/input/grid5000/sites/sophia/networks/sw-7.yaml @@ -60,7 +60,7 @@ sw-7: backplane_bps: 1280000000000 linecards: 0: - snmp_pattern: "Te1/%LINECARD%/%PORT%" + snmp_pattern: "Unit: 1 Slot: %LINECARD% Port: %PORT% 10G - Level" kavlan_pattern: "Te1/%LINECARD%/%PORT%" rate: 10000000000 kind: node