diff --git a/buildroot b/buildroot index 92e25679..d57cc5ee 160000 --- a/buildroot +++ b/buildroot @@ -1 +1 @@ -Subproject commit 92e256798b78ce6909c227cda6fb588bb23d287d +Subproject commit d57cc5ee05c2e0924286c7ab2b1c2b81477402e8 diff --git a/patches/ethtool/6.11/fix-wrong-autoneg-state.patch b/patches/ethtool/6.11/fix-wrong-autoneg-state.patch new file mode 100644 index 00000000..c44176cc --- /dev/null +++ b/patches/ethtool/6.11/fix-wrong-autoneg-state.patch @@ -0,0 +1,29 @@ +From 9b2f6b94132d14b1d2d2a7d3b65bac4f3a056aac Mon Sep 17 00:00:00 2001 +From: Mohan Prasad J +Date: Mon, 4 Nov 2024 04:04:07 +0530 +Subject: netlink: settings: Fix for wrong auto-negotiation state + +Auto-negotiation state in json format showed the +opposite state due to wrong comparison. +Fix for returning the correct auto-neg state implemented. + +Signed-off-by: Mohan Prasad J +--- + netlink/settings.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/netlink/settings.c b/netlink/settings.c +index dbfb520..b9b3ba9 100644 +--- a/netlink/settings.c ++++ b/netlink/settings.c +@@ -546,7 +546,7 @@ int linkmodes_reply_cb(const struct nlmsghdr *nlhdr, void *data) + (autoneg == AUTONEG_DISABLE) ? "off" : "on"); + else + print_bool(PRINT_JSON, "auto-negotiation", NULL, +- autoneg == AUTONEG_DISABLE); ++ autoneg != AUTONEG_DISABLE); + } + if (tb[ETHTOOL_A_LINKMODES_MASTER_SLAVE_CFG]) { + uint8_t val; +-- +cgit 1.2.3-korg diff --git a/src/confd/bin/gen-interfaces b/src/confd/bin/gen-interfaces index a984d6be..497328eb 100755 --- a/src/confd/bin/gen-interfaces +++ b/src/confd/bin/gen-interfaces @@ -56,16 +56,6 @@ EOF exit 0 } -iftype() -{ - iftype=$(ip -d -j link show "$1" |jq -r .[].parentbus) - if [ "$iftype" = "virtio" ]; then - echo "infix-if-type:etherlike" - else - echo "infix-if-type:ethernet" - fi -} - # shellcheck disable=SC3043 gen_iface_json() { @@ -75,7 +65,7 @@ gen_iface_json() cat < ethernet +# + +file=$1 +temp=${file}.tmp + +jq '(.["ietf-interfaces:interfaces"].interface[] | select(.type == "infix-if-type:etherlike") .type) |= "infix-if-type:ethernet"' "$file" > "$temp" && + mv "$temp" "$file" diff --git a/src/confd/share/migrate/1.5/Makefile.am b/src/confd/share/migrate/1.5/Makefile.am index a9df1512..ee436791 100644 --- a/src/confd/share/migrate/1.5/Makefile.am +++ b/src/confd/share/migrate/1.5/Makefile.am @@ -1,2 +1,2 @@ migratedir = $(pkgdatadir)/migrate/1.5 -dist_migrate_DATA = 10-change-key-types.sh +dist_migrate_DATA = 10-change-key-types.sh 11-rename-etherlike.sh diff --git a/src/confd/src/ieee802-ethernet-interface.c b/src/confd/src/ieee802-ethernet-interface.c index 70285e91..4529c915 100644 --- a/src/confd/src/ieee802-ethernet-interface.c +++ b/src/confd/src/ieee802-ethernet-interface.c @@ -37,10 +37,10 @@ static int netdag_gen_ethtool_flow_control(struct dagger *net, struct lyd_node * const char *ifname = lydx_get_cattr(cif, "name"); FILE *fp; - fp = dagger_fopen_net_init(net, ifname, NETDAG_INIT_PHYS, "ethtool-aneg.sh"); + fp = dagger_fopen_net_init(net, ifname, NETDAG_INIT_PHYS, "ethtool-flow-control.sh"); if (!fp) return -EIO; - + fprintf(fp, "[[ -n $(ethtool --json %s | jq '.[] | select(.\"supported-pause-frame-use\" == \"No\")') ]] && exit 0\n", ifname); fprintf(fp, "ethtool --pause %s autoneg %s rx off tx off\n", ifname, iface_uses_autoneg(cif) ? "on" : "off"); fclose(fp); @@ -60,10 +60,10 @@ static int netdag_gen_ethtool_autoneg(struct dagger *net, struct lyd_node *cif) if (!fp) return -EIO; - fprintf(fp, "ethtool --change %s autoneg ", ifname); if (iface_uses_autoneg(cif)) { - fputs("on\n", fp); + fprintf(fp, "[[ -n $(ethtool --json %s | jq '.[] | select(.\"supports-auto-negotiation\" == false)') ]] && exit 0\n", ifname); + fprintf(fp, "ethtool --change %s autoneg on", ifname); } else { speed = lydx_get_cattr(eth, "speed"); if (!speed) { @@ -93,7 +93,7 @@ static int netdag_gen_ethtool_autoneg(struct dagger *net, struct lyd_node *cif) goto out; } - fprintf(fp,"off speed %d duplex %s\n", mbps, duplex); + fprintf(fp,"ethtool --change %s autoneg off speed %d duplex %s\n", ifname, mbps, duplex); } out: fclose(fp); diff --git a/src/confd/src/ietf-interfaces.c b/src/confd/src/ietf-interfaces.c index 6219e874..e874f5ec 100644 --- a/src/confd/src/ietf-interfaces.c +++ b/src/confd/src/ietf-interfaces.c @@ -370,7 +370,6 @@ static int netdag_gen_afspec_add(sr_session_ctx_t *session, struct dagger *net, return vxlan_gen(NULL, cif, ip); case IFT_ETH: - case IFT_ETHISH: case IFT_LO: case IFT_UNKNOWN: sr_session_set_error_message(net->session, "%s: unsupported interface type \"%s\"", @@ -402,7 +401,6 @@ static int netdag_gen_afspec_set(sr_session_ctx_t *session, struct dagger *net, return 0; case IFT_ETH: - case IFT_ETHISH: case IFT_LO: case IFT_UNKNOWN: return ERR_IFACE(cif, -ENOSYS, "unsupported interface type \"%s\"", @@ -421,7 +419,6 @@ static bool netdag_must_del(struct lyd_node *dif, struct lyd_node *cif) case IFT_LO: break; case IFT_ETH: - case IFT_ETHISH: /* case IFT_LAG: */ /* ... REMEMBER WHEN ADDING BOND SUPPORT ... */ return lydx_get_child(dif, "custom-phys-address"); @@ -441,6 +438,7 @@ static bool netdag_must_del(struct lyd_node *dif, struct lyd_node *cif) ERR_IFACE(cif, -EINVAL, "unsupported interface type \"%s\"", lydx_get_cattr(cif, "type")); return true; + } return false; @@ -505,7 +503,6 @@ static int netdag_gen_iface_del(struct dagger *net, struct lyd_node *dif, switch (type) { case IFT_ETH: - case IFT_ETHISH: case IFT_LO: eth_gen_del(dif, ip); break; @@ -665,7 +662,6 @@ static int netdag_init_iface(struct lyd_node *cif) case IFT_DUMMY: case IFT_ETH: - case IFT_ETHISH: case IFT_GRE: case IFT_GRETAP: case IFT_LO: diff --git a/src/confd/src/ietf-interfaces.h b/src/confd/src/ietf-interfaces.h index 22a0d86d..b6a900f3 100644 --- a/src/confd/src/ietf-interfaces.h +++ b/src/confd/src/ietf-interfaces.h @@ -25,7 +25,6 @@ _map(IFT_BRIDGE, "infix-if-type:bridge") \ _map(IFT_DUMMY, "infix-if-type:dummy") \ _map(IFT_ETH, "infix-if-type:ethernet") \ - _map(IFT_ETHISH, "infix-if-type:etherlike") \ _map(IFT_GRE, "infix-if-type:gre") \ _map(IFT_GRETAP, "infix-if-type:gretap") \ _map(IFT_LAG, "infix-if-type:lag") \ diff --git a/src/confd/yang/confd.inc b/src/confd/yang/confd.inc index e8f4b354..cb13d6c6 100644 --- a/src/confd/yang/confd.inc +++ b/src/confd/yang/confd.inc @@ -27,7 +27,7 @@ MODULES=( "infix-hardware@2024-04-25.yang" "ieee802-dot1q-types@2022-10-29.yang" "infix-ip@2024-09-16.yang" - "infix-if-type@2024-10-13.yang" + "infix-if-type@2025-02-12.yang" "infix-routing@2024-11-27.yang" "ieee802-dot1ab-lldp@2022-03-15.yang" "infix-lldp@2025-01-08.yang" diff --git a/src/confd/yang/infix-if-type.yang b/src/confd/yang/infix-if-type.yang index 8afce55c..6432d7c1 100644 --- a/src/confd/yang/infix-if-type.yang +++ b/src/confd/yang/infix-if-type.yang @@ -11,6 +11,11 @@ module infix-if-type { contact "kernelkit@googlegroups.com"; description "Infix extensions to IANA interfaces types"; + revision 2025-02-12 { + description "Remove interface type etherlike."; + reference "internal"; + } + revision 2024-10-13 { description "Add new interface type dummy."; reference "internal"; @@ -58,12 +63,7 @@ module infix-if-type { description "Any Ethernet interfaces, regardless of speed, RFC 3635."; reference "RFC 3635"; } - identity etherlike { - base infix-interface-type; - base ianaift:ilan; - description "Interface with properties resembling Ethernet"; - reference "RFC 3635"; - } + identity gre { base infix-interface-type; } diff --git a/src/confd/yang/infix-if-type@2024-10-13.yang b/src/confd/yang/infix-if-type@2025-02-12.yang similarity index 100% rename from src/confd/yang/infix-if-type@2024-10-13.yang rename to src/confd/yang/infix-if-type@2025-02-12.yang diff --git a/src/statd/python/yanger/ietf_interfaces/ethernet.py b/src/statd/python/yanger/ietf_interfaces/ethernet.py index ed1923b1..8e3c0404 100644 --- a/src/statd/python/yanger/ietf_interfaces/ethernet.py +++ b/src/statd/python/yanger/ietf_interfaces/ethernet.py @@ -68,41 +68,26 @@ def statistics(ifname): return statistics - -def link(ethtool): +def link(ifname): """Parse speed/duplex/autoneg from ethtool output""" + if data := HOST.run_json(["ethtool", "--json", ifname], {}): + data = data[0] + else: + return None + eth = {} + eth["auto-negotation"] = { "enable": data.get("auto-negotation", False) } - for line in ethtool: - kv = [s.strip() for s in line.split(":")] - if len(kv) != 2: - continue - - key, val = kv - match key: - case "Auto-negotiation": - eth["auto-negotiation"] = { "enable": val == "on" } - case "Duplex": - match val: - case "Half": - eth["duplex"] = "half" - case "Full": - eth["duplex"] = "full" - case _: - eth["duplex"] = "unknown" - case "Speed": - mbps = "".join(filter(str.isdigit, val)) - if mbps: - gbps = round((int(mbps) / 1000), 3) - eth["speed"] = str(gbps) - + if data.get("speed"): + gbps = round((int(data["speed"]) / 1000), 3) + eth["speed"] = str(gbps) + if data.get("duplex"): + eth["duplex"] = data["duplex"].lower() return eth def ethernet(iplink): - ethtool = HOST.run_multiline(["ethtool", iplink["ifname"]]) - - eth = link(ethtool) + eth = link(iplink["ifname"]) if stats := statistics(iplink["ifname"]): eth["statistics"] = stats diff --git a/src/statd/python/yanger/ietf_interfaces/link.py b/src/statd/python/yanger/ietf_interfaces/link.py index b53dd6a7..5fff2a6f 100644 --- a/src/statd/python/yanger/ietf_interfaces/link.py +++ b/src/statd/python/yanger/ietf_interfaces/link.py @@ -34,9 +34,6 @@ def iplink2yang_type(iplink): case _: return "infix-if-type:other" - if iplink.get("parentbus") == "virtio": - return "infix-if-type:etherlike" - match iplink.get("linkinfo", {}).get("info_kind"): case "bond": return "infix-if-type:lag" diff --git a/test/case/statd/bridge-mdb/ietf-interfaces.json b/test/case/statd/bridge-mdb/ietf-interfaces.json index ff41633c..3967bc8a 100644 --- a/test/case/statd/bridge-mdb/ietf-interfaces.json +++ b/test/case/statd/bridge-mdb/ietf-interfaces.json @@ -33,7 +33,7 @@ } }, { - "type": "infix-if-type:etherlike", + "type": "infix-if-type:ethernet", "name": "e1", "if-index": 2, "admin-status": "up", @@ -55,10 +55,15 @@ "origin": "link-layer" } ] + }, + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } } }, { - "type": "infix-if-type:etherlike", + "type": "infix-if-type:ethernet", "name": "e2", "if-index": 3, "admin-status": "up", @@ -74,6 +79,11 @@ "ietf-ip:ipv6": { "mtu": 1500 }, + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } + }, "infix-interfaces:bridge-port": { "bridge": "br0", "flood": { @@ -93,7 +103,7 @@ } }, { - "type": "infix-if-type:etherlike", + "type": "infix-if-type:ethernet", "name": "e3", "if-index": 4, "admin-status": "up", @@ -109,6 +119,11 @@ "ietf-ip:ipv6": { "mtu": 1500 }, + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } + }, "infix-interfaces:bridge-port": { "bridge": "br0", "flood": { @@ -128,7 +143,7 @@ } }, { - "type": "infix-if-type:etherlike", + "type": "infix-if-type:ethernet", "name": "e4", "if-index": 5, "admin-status": "up", @@ -144,6 +159,11 @@ "ietf-ip:ipv6": { "mtu": 1500 }, + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } + }, "infix-interfaces:bridge-port": { "bridge": "br0", "flood": { @@ -163,7 +183,7 @@ } }, { - "type": "infix-if-type:etherlike", + "type": "infix-if-type:ethernet", "name": "e5", "if-index": 6, "admin-status": "up", @@ -185,10 +205,15 @@ "origin": "link-layer" } ] + }, + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } } }, { - "type": "infix-if-type:etherlike", + "type": "infix-if-type:ethernet", "name": "e6", "if-index": 7, "admin-status": "up", @@ -210,10 +235,15 @@ "origin": "link-layer" } ] + }, + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } } }, { - "type": "infix-if-type:etherlike", + "type": "infix-if-type:ethernet", "name": "e7", "if-index": 8, "admin-status": "up", @@ -235,6 +265,11 @@ "origin": "link-layer" } ] + }, + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } } }, { diff --git a/test/case/statd/bridge-mdb/operational.json b/test/case/statd/bridge-mdb/operational.json index 6288caa5..ccb7b39d 100644 --- a/test/case/statd/bridge-mdb/operational.json +++ b/test/case/statd/bridge-mdb/operational.json @@ -34,6 +34,11 @@ }, { "admin-status": "up", + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } + }, "ietf-ip:ipv4": { "mtu": 1500 }, @@ -55,10 +60,15 @@ "in-octets": "143181", "out-octets": "1975737" }, - "type": "infix-if-type:etherlike" + "type": "infix-if-type:ethernet" }, { "admin-status": "up", + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } + }, "ietf-ip:ipv4": { "mtu": 1500 }, @@ -90,10 +100,15 @@ "in-octets": "1980", "out-octets": "46052" }, - "type": "infix-if-type:etherlike" + "type": "infix-if-type:ethernet" }, { "admin-status": "up", + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } + }, "ietf-ip:ipv4": { "mtu": 1500 }, @@ -125,10 +140,15 @@ "in-octets": "866", "out-octets": "47146" }, - "type": "infix-if-type:etherlike" + "type": "infix-if-type:ethernet" }, { "admin-status": "up", + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } + }, "ietf-ip:ipv4": { "mtu": 1500 }, @@ -160,10 +180,15 @@ "in-octets": "936", "out-octets": "46200" }, - "type": "infix-if-type:etherlike" + "type": "infix-if-type:ethernet" }, { "admin-status": "up", + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } + }, "ietf-ip:ipv4": { "mtu": 1500 }, @@ -185,10 +210,15 @@ "in-octets": "14460", "out-octets": "17169" }, - "type": "infix-if-type:etherlike" + "type": "infix-if-type:ethernet" }, { "admin-status": "up", + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } + }, "ietf-ip:ipv4": { "mtu": 1500 }, @@ -210,10 +240,15 @@ "in-octets": "15383", "out-octets": "17129" }, - "type": "infix-if-type:etherlike" + "type": "infix-if-type:ethernet" }, { "admin-status": "up", + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } + }, "ietf-ip:ipv4": { "mtu": 1500 }, @@ -235,7 +270,7 @@ "in-octets": "12245", "out-octets": "17169" }, - "type": "infix-if-type:etherlike" + "type": "infix-if-type:ethernet" }, { "admin-status": "up", diff --git a/test/case/statd/bridge-mdb/system/run/ethtool_--json_-S_e1_--all-groups b/test/case/statd/bridge-mdb/system/run/ethtool_--json_-S_e1_--all-groups new file mode 100644 index 00000000..164a71c5 --- /dev/null +++ b/test/case/statd/bridge-mdb/system/run/ethtool_--json_-S_e1_--all-groups @@ -0,0 +1,7 @@ +[ { + "ifname": "e1", + "eth-phy": {}, + "eth-mac": {}, + "eth-ctrl": {}, + "rmon": {} + } ] diff --git a/test/case/statd/bridge-mdb/system/run/ethtool_--json_-S_e2_--all-groups b/test/case/statd/bridge-mdb/system/run/ethtool_--json_-S_e2_--all-groups new file mode 100644 index 00000000..52a2c209 --- /dev/null +++ b/test/case/statd/bridge-mdb/system/run/ethtool_--json_-S_e2_--all-groups @@ -0,0 +1,7 @@ +[ { + "ifname": "e2", + "eth-phy": {}, + "eth-mac": {}, + "eth-ctrl": {}, + "rmon": {} + } ] diff --git a/test/case/statd/bridge-mdb/system/run/ethtool_--json_-S_e3_--all-groups b/test/case/statd/bridge-mdb/system/run/ethtool_--json_-S_e3_--all-groups new file mode 100644 index 00000000..be789238 --- /dev/null +++ b/test/case/statd/bridge-mdb/system/run/ethtool_--json_-S_e3_--all-groups @@ -0,0 +1,7 @@ +[ { + "ifname": "e3", + "eth-phy": {}, + "eth-mac": {}, + "eth-ctrl": {}, + "rmon": {} + } ] diff --git a/test/case/statd/bridge-mdb/system/run/ethtool_--json_-S_e4_--all-groups b/test/case/statd/bridge-mdb/system/run/ethtool_--json_-S_e4_--all-groups new file mode 100644 index 00000000..4caf7af3 --- /dev/null +++ b/test/case/statd/bridge-mdb/system/run/ethtool_--json_-S_e4_--all-groups @@ -0,0 +1,7 @@ +[ { + "ifname": "e4", + "eth-phy": {}, + "eth-mac": {}, + "eth-ctrl": {}, + "rmon": {} + } ] diff --git a/test/case/statd/bridge-mdb/system/run/ethtool_--json_-S_e5_--all-groups b/test/case/statd/bridge-mdb/system/run/ethtool_--json_-S_e5_--all-groups new file mode 100644 index 00000000..00406094 --- /dev/null +++ b/test/case/statd/bridge-mdb/system/run/ethtool_--json_-S_e5_--all-groups @@ -0,0 +1,7 @@ +[ { + "ifname": "e5", + "eth-phy": {}, + "eth-mac": {}, + "eth-ctrl": {}, + "rmon": {} + } ] diff --git a/test/case/statd/bridge-mdb/system/run/ethtool_--json_-S_e6_--all-groups b/test/case/statd/bridge-mdb/system/run/ethtool_--json_-S_e6_--all-groups new file mode 100644 index 00000000..c4289b02 --- /dev/null +++ b/test/case/statd/bridge-mdb/system/run/ethtool_--json_-S_e6_--all-groups @@ -0,0 +1,7 @@ +[ { + "ifname": "e6", + "eth-phy": {}, + "eth-mac": {}, + "eth-ctrl": {}, + "rmon": {} + } ] diff --git a/test/case/statd/bridge-mdb/system/run/ethtool_--json_-S_e7_--all-groups b/test/case/statd/bridge-mdb/system/run/ethtool_--json_-S_e7_--all-groups new file mode 100644 index 00000000..d662dbfb --- /dev/null +++ b/test/case/statd/bridge-mdb/system/run/ethtool_--json_-S_e7_--all-groups @@ -0,0 +1,7 @@ +[ { + "ifname": "e7", + "eth-phy": {}, + "eth-mac": {}, + "eth-ctrl": {}, + "rmon": {} + } ] diff --git a/test/case/statd/bridge-mdb/system/run/ethtool_--json_e1 b/test/case/statd/bridge-mdb/system/run/ethtool_--json_e1 new file mode 100644 index 00000000..a8904054 --- /dev/null +++ b/test/case/statd/bridge-mdb/system/run/ethtool_--json_e1 @@ -0,0 +1,17 @@ +[ { + "ifname": "e1", + "supported-ports": [ ], + "supported-link-modes": [ ], + "supported-pause-frame-use": "No", + "supports-auto-negotiation": false, + "supported-fec-modes": [ ], + "advertised-link-modes": [ ], + "advertised-pause-frame-use": "No", + "advertised-auto-negotiation": false, + "advertised-fec-modes": [ ], + "auto-negotiation": false, + "port": "Other", + "phyad": 0, + "transceiver": "internal", + "link-detected": true + } ] diff --git a/test/case/statd/bridge-mdb/system/run/ethtool_--json_e2 b/test/case/statd/bridge-mdb/system/run/ethtool_--json_e2 new file mode 100644 index 00000000..8e47e9ac --- /dev/null +++ b/test/case/statd/bridge-mdb/system/run/ethtool_--json_e2 @@ -0,0 +1,17 @@ +[ { + "ifname": "e2", + "supported-ports": [ ], + "supported-link-modes": [ ], + "supported-pause-frame-use": "No", + "supports-auto-negotiation": false, + "supported-fec-modes": [ ], + "advertised-link-modes": [ ], + "advertised-pause-frame-use": "No", + "advertised-auto-negotiation": false, + "advertised-fec-modes": [ ], + "auto-negotiation": false, + "port": "Other", + "phyad": 0, + "transceiver": "internal", + "link-detected": true + } ] diff --git a/test/case/statd/bridge-mdb/system/run/ethtool_--json_e3 b/test/case/statd/bridge-mdb/system/run/ethtool_--json_e3 new file mode 100644 index 00000000..f1b9e0b3 --- /dev/null +++ b/test/case/statd/bridge-mdb/system/run/ethtool_--json_e3 @@ -0,0 +1,17 @@ +[ { + "ifname": "e3", + "supported-ports": [ ], + "supported-link-modes": [ ], + "supported-pause-frame-use": "No", + "supports-auto-negotiation": false, + "supported-fec-modes": [ ], + "advertised-link-modes": [ ], + "advertised-pause-frame-use": "No", + "advertised-auto-negotiation": false, + "advertised-fec-modes": [ ], + "auto-negotiation": false, + "port": "Other", + "phyad": 0, + "transceiver": "internal", + "link-detected": true + } ] diff --git a/test/case/statd/bridge-mdb/system/run/ethtool_--json_e4 b/test/case/statd/bridge-mdb/system/run/ethtool_--json_e4 new file mode 100644 index 00000000..b07390d7 --- /dev/null +++ b/test/case/statd/bridge-mdb/system/run/ethtool_--json_e4 @@ -0,0 +1,17 @@ +[ { + "ifname": "e4", + "supported-ports": [ ], + "supported-link-modes": [ ], + "supported-pause-frame-use": "No", + "supports-auto-negotiation": false, + "supported-fec-modes": [ ], + "advertised-link-modes": [ ], + "advertised-pause-frame-use": "No", + "advertised-auto-negotiation": false, + "advertised-fec-modes": [ ], + "auto-negotiation": false, + "port": "Other", + "phyad": 0, + "transceiver": "internal", + "link-detected": true + } ] diff --git a/test/case/statd/bridge-mdb/system/run/ethtool_--json_e5 b/test/case/statd/bridge-mdb/system/run/ethtool_--json_e5 new file mode 100644 index 00000000..db29b794 --- /dev/null +++ b/test/case/statd/bridge-mdb/system/run/ethtool_--json_e5 @@ -0,0 +1,17 @@ +[ { + "ifname": "e5", + "supported-ports": [ ], + "supported-link-modes": [ ], + "supported-pause-frame-use": "No", + "supports-auto-negotiation": false, + "supported-fec-modes": [ ], + "advertised-link-modes": [ ], + "advertised-pause-frame-use": "No", + "advertised-auto-negotiation": false, + "advertised-fec-modes": [ ], + "auto-negotiation": false, + "port": "Other", + "phyad": 0, + "transceiver": "internal", + "link-detected": true + } ] diff --git a/test/case/statd/bridge-mdb/system/run/ethtool_--json_e6 b/test/case/statd/bridge-mdb/system/run/ethtool_--json_e6 new file mode 100644 index 00000000..0f43edd5 --- /dev/null +++ b/test/case/statd/bridge-mdb/system/run/ethtool_--json_e6 @@ -0,0 +1,17 @@ +[ { + "ifname": "e6", + "supported-ports": [ ], + "supported-link-modes": [ ], + "supported-pause-frame-use": "No", + "supports-auto-negotiation": false, + "supported-fec-modes": [ ], + "advertised-link-modes": [ ], + "advertised-pause-frame-use": "No", + "advertised-auto-negotiation": false, + "advertised-fec-modes": [ ], + "auto-negotiation": false, + "port": "Other", + "phyad": 0, + "transceiver": "internal", + "link-detected": true + } ] diff --git a/test/case/statd/bridge-mdb/system/run/ethtool_--json_e7 b/test/case/statd/bridge-mdb/system/run/ethtool_--json_e7 new file mode 100644 index 00000000..b2bfda2e --- /dev/null +++ b/test/case/statd/bridge-mdb/system/run/ethtool_--json_e7 @@ -0,0 +1,17 @@ +[ { + "ifname": "e7", + "supported-ports": [ ], + "supported-link-modes": [ ], + "supported-pause-frame-use": "No", + "supports-auto-negotiation": false, + "supported-fec-modes": [ ], + "advertised-link-modes": [ ], + "advertised-pause-frame-use": "No", + "advertised-auto-negotiation": false, + "advertised-fec-modes": [ ], + "auto-negotiation": false, + "port": "Other", + "phyad": 0, + "transceiver": "internal", + "link-detected": true + } ] diff --git a/test/case/statd/containers/cli/show-routing-table_--ip_ipv4 b/test/case/statd/containers/cli/show-routing-table_--ip_ipv4 index 92e46d24..3b392621 100644 --- a/test/case/statd/containers/cli/show-routing-table_--ip_ipv4 +++ b/test/case/statd/containers/cli/show-routing-table_--ip_ipv4 @@ -1,12 +1,12 @@  DESTINATION PREF NEXT-HOP PROTO UPTIME ->* 0.0.0.0/0 110/2 10.1.1.100 ospfv2 22:05:05 - 0.0.0.0/0 254/0 br0 static 22:05:45 - 10.1.1.0/24 110/1 e6 ospfv2 22:05:59 ->* 10.1.1.0/24 0/0 e6 direct 22:05:59 - * 10.1.1.1/32 0/0 e4.8 direct 22:06:00 ->* 10.1.1.1/32 0/0 e3.8 direct 22:06:00 ->* 10.1.2.0/24 110/2 10.1.1.100 ospfv2 22:05:05 +>* 0.0.0.0/0 110/2 10.1.1.100 ospfv2 16:03:51 + 0.0.0.0/0 254/0 br0 static 16:04:31 + 10.1.1.0/24 110/1 e6 ospfv2 16:04:45 +>* 10.1.1.0/24 0/0 e6 direct 16:04:45 + * 10.1.1.1/32 0/0 e4.8 direct 16:04:46 +>* 10.1.1.1/32 0/0 e3.8 direct 16:04:46 +>* 10.1.2.0/24 110/2 10.1.1.100 ospfv2 16:03:51 * 10.1.2.1 ->* 10.1.3.0/24 110/2 10.1.1.100 ospfv2 22:05:05 +>* 10.1.3.0/24 110/2 10.1.1.100 ospfv2 16:03:51 * 10.1.3.1 ->* 169.254.0.0/16 0/0 br0 direct 22:05:54 +>* 169.254.0.0/16 0/0 br0 direct 16:04:40 diff --git a/test/case/statd/containers/cli/show-routing-table_--ip_ipv6 b/test/case/statd/containers/cli/show-routing-table_--ip_ipv6 index 2732e15a..c4288d34 100644 --- a/test/case/statd/containers/cli/show-routing-table_--ip_ipv6 +++ b/test/case/statd/containers/cli/show-routing-table_--ip_ipv6 @@ -1,7 +1,7 @@  DESTINATION PREF NEXT-HOP PROTO UPTIME - * fe80::/64 0/0 e6 direct 22:05:58 - * fe80::/64 0/0 br0 direct 22:05:59 - * fe80::/64 0/0 e2 direct 22:06:01 - * fe80::/64 0/0 e7 direct 22:06:51 - * fe80::/64 0/0 e5 direct 22:06:51 ->* fe80::/64 0/0 e1 direct 22:06:51 + * fe80::/64 0/0 e6 direct 16:04:44 + * fe80::/64 0/0 br0 direct 16:04:45 + * fe80::/64 0/0 e2 direct 16:04:47 + * fe80::/64 0/0 e7 direct 16:05:37 + * fe80::/64 0/0 e5 direct 16:05:37 +>* fe80::/64 0/0 e1 direct 16:05:37 diff --git a/test/case/statd/containers/ietf-interfaces.json b/test/case/statd/containers/ietf-interfaces.json index e28be8c2..b60d8694 100644 --- a/test/case/statd/containers/ietf-interfaces.json +++ b/test/case/statd/containers/ietf-interfaces.json @@ -33,7 +33,7 @@ } }, { - "type": "infix-if-type:etherlike", + "type": "infix-if-type:ethernet", "name": "e1", "if-index": 2, "admin-status": "up", @@ -55,10 +55,15 @@ "origin": "link-layer" } ] + }, + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } } }, { - "type": "infix-if-type:etherlike", + "type": "infix-if-type:ethernet", "name": "e2", "if-index": 3, "admin-status": "up", @@ -80,10 +85,15 @@ "origin": "link-layer" } ] + }, + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } } }, { - "type": "infix-if-type:etherlike", + "type": "infix-if-type:ethernet", "name": "e3", "if-index": 4, "admin-status": "up", @@ -99,6 +109,11 @@ "ietf-ip:ipv6": { "mtu": 1500 }, + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } + }, "infix-interfaces:bridge-port": { "pvid": 1, "bridge": "br0", @@ -119,7 +134,7 @@ } }, { - "type": "infix-if-type:etherlike", + "type": "infix-if-type:ethernet", "name": "e4", "if-index": 5, "admin-status": "up", @@ -135,6 +150,11 @@ "ietf-ip:ipv6": { "mtu": 1500 }, + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } + }, "infix-interfaces:bridge-port": { "pvid": 1, "bridge": "br0", @@ -155,7 +175,7 @@ } }, { - "type": "infix-if-type:etherlike", + "type": "infix-if-type:ethernet", "name": "e5", "if-index": 6, "admin-status": "up", @@ -177,10 +197,15 @@ "origin": "link-layer" } ] + }, + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } } }, { - "type": "infix-if-type:etherlike", + "type": "infix-if-type:ethernet", "name": "e6", "if-index": 7, "admin-status": "up", @@ -209,10 +234,15 @@ "origin": "link-layer" } ] + }, + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } } }, { - "type": "infix-if-type:etherlike", + "type": "infix-if-type:ethernet", "name": "e7", "if-index": 8, "admin-status": "up", @@ -234,6 +264,11 @@ "origin": "link-layer" } ] + }, + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } } }, { @@ -250,9 +285,6 @@ "ietf-ip:ipv4": { "mtu": 1500 }, - "ietf-ip:ipv6": { - "mtu": 1500 - }, "infix-interfaces:bridge-port": { "pvid": 1, "bridge": "br0", @@ -286,9 +318,6 @@ "ietf-ip:ipv4": { "mtu": 1500 }, - "ietf-ip:ipv6": { - "mtu": 1500 - }, "infix-interfaces:bridge-port": { "pvid": 1, "bridge": "br0", @@ -330,7 +359,6 @@ ] }, "ietf-ip:ipv6": { - "mtu": 1500, "address": [ { "ip": "fe80::2a0:85ff:fe00:300", @@ -382,9 +410,6 @@ "ietf-ip:ipv4": { "mtu": 1500 }, - "ietf-ip:ipv6": { - "mtu": 1500 - }, "infix-interfaces:bridge-port": { "pvid": 6, "bridge": "br1", @@ -418,9 +443,6 @@ "ietf-ip:ipv4": { "mtu": 1500 }, - "ietf-ip:ipv6": { - "mtu": 1500 - }, "infix-interfaces:bridge-port": { "bridge": "br1", "flood": { @@ -452,9 +474,6 @@ "ietf-ip:ipv4": { "mtu": 1500 }, - "ietf-ip:ipv6": { - "mtu": 1500 - }, "infix-interfaces:bridge": { "vlans": { "proto": "ieee802-dot1q-types:c-vlan", @@ -498,9 +517,6 @@ } ] }, - "ietf-ip:ipv6": { - "mtu": 1500 - }, "infix-interfaces:vlan": { "tag-type": "ieee802-dot1q-types:c-vlan", "id": 8, @@ -528,9 +544,6 @@ } ] }, - "ietf-ip:ipv6": { - "mtu": 1500 - }, "infix-interfaces:vlan": { "tag-type": "ieee802-dot1q-types:c-vlan", "id": 8, @@ -620,7 +633,6 @@ ] }, "ietf-ip:ipv6": { - "mtu": 1500, "address": [ { "ip": "fe80::4a0:85ff:fe00:300", @@ -651,7 +663,6 @@ "mtu": 1500 }, "ietf-ip:ipv6": { - "mtu": 1500, "address": [ { "ip": "fe80::4a0:85ff:fe00:300", diff --git a/test/case/statd/containers/ietf-routing.json b/test/case/statd/containers/ietf-routing.json index 23a4c1ea..42960df6 100644 --- a/test/case/statd/containers/ietf-routing.json +++ b/test/case/statd/containers/ietf-routing.json @@ -15,7 +15,7 @@ "active": [ null ], - "last-updated": "2025-01-24T13:54:55+00:00", + "last-updated": "2025-02-11T19:56:09+00:00", "next-hop": { "next-hop-list": { "next-hop": [ @@ -33,7 +33,7 @@ "ietf-ipv4-unicast-routing:destination-prefix": "0.0.0.0/0", "source-protocol": "static", "route-preference": 254, - "last-updated": "2025-01-24T13:54:15+00:00", + "last-updated": "2025-02-11T19:55:29+00:00", "next-hop": { "next-hop-list": { "next-hop": [ @@ -49,7 +49,7 @@ "source-protocol": "ietf-ospf:ospfv2", "route-preference": 110, "ietf-ospf:metric": 1, - "last-updated": "2025-01-24T13:54:01+00:00", + "last-updated": "2025-02-11T19:55:15+00:00", "next-hop": { "next-hop-list": { "next-hop": [ @@ -67,7 +67,7 @@ "active": [ null ], - "last-updated": "2025-01-24T13:54:01+00:00", + "last-updated": "2025-02-11T19:55:15+00:00", "next-hop": { "next-hop-list": { "next-hop": [ @@ -85,7 +85,7 @@ "ietf-ipv4-unicast-routing:destination-prefix": "10.1.1.1/32", "source-protocol": "direct", "route-preference": 0, - "last-updated": "2025-01-24T13:54:00+00:00", + "last-updated": "2025-02-11T19:55:14+00:00", "next-hop": { "next-hop-list": { "next-hop": [ @@ -106,7 +106,7 @@ "active": [ null ], - "last-updated": "2025-01-24T13:54:00+00:00", + "last-updated": "2025-02-11T19:55:14+00:00", "next-hop": { "next-hop-list": { "next-hop": [ @@ -128,7 +128,7 @@ "active": [ null ], - "last-updated": "2025-01-24T13:54:55+00:00", + "last-updated": "2025-02-11T19:56:09+00:00", "next-hop": { "next-hop-list": { "next-hop": [ @@ -156,7 +156,7 @@ "active": [ null ], - "last-updated": "2025-01-24T13:54:55+00:00", + "last-updated": "2025-02-11T19:56:09+00:00", "next-hop": { "next-hop-list": { "next-hop": [ @@ -183,7 +183,7 @@ "active": [ null ], - "last-updated": "2025-01-24T13:54:06+00:00", + "last-updated": "2025-02-11T19:55:20+00:00", "next-hop": { "next-hop-list": { "next-hop": [ @@ -209,7 +209,7 @@ "ietf-ipv6-unicast-routing:destination-prefix": "fe80::/64", "source-protocol": "direct", "route-preference": 0, - "last-updated": "2025-01-24T13:54:02+00:00", + "last-updated": "2025-02-11T19:55:16+00:00", "next-hop": { "next-hop-list": { "next-hop": [ @@ -227,7 +227,7 @@ "ietf-ipv6-unicast-routing:destination-prefix": "fe80::/64", "source-protocol": "direct", "route-preference": 0, - "last-updated": "2025-01-24T13:54:01+00:00", + "last-updated": "2025-02-11T19:55:15+00:00", "next-hop": { "next-hop-list": { "next-hop": [ @@ -245,7 +245,7 @@ "ietf-ipv6-unicast-routing:destination-prefix": "fe80::/64", "source-protocol": "direct", "route-preference": 0, - "last-updated": "2025-01-24T13:53:59+00:00", + "last-updated": "2025-02-11T19:55:13+00:00", "next-hop": { "next-hop-list": { "next-hop": [ @@ -263,7 +263,7 @@ "ietf-ipv6-unicast-routing:destination-prefix": "fe80::/64", "source-protocol": "direct", "route-preference": 0, - "last-updated": "2025-01-24T13:53:09+00:00", + "last-updated": "2025-02-11T19:54:23+00:00", "next-hop": { "next-hop-list": { "next-hop": [ @@ -281,7 +281,7 @@ "ietf-ipv6-unicast-routing:destination-prefix": "fe80::/64", "source-protocol": "direct", "route-preference": 0, - "last-updated": "2025-01-24T13:53:09+00:00", + "last-updated": "2025-02-11T19:54:23+00:00", "next-hop": { "next-hop-list": { "next-hop": [ @@ -302,7 +302,7 @@ "active": [ null ], - "last-updated": "2025-01-24T13:53:09+00:00", + "last-updated": "2025-02-11T19:54:23+00:00", "next-hop": { "next-hop-list": { "next-hop": [ diff --git a/test/case/statd/containers/operational.json b/test/case/statd/containers/operational.json index d85bdacf..2489c43a 100644 --- a/test/case/statd/containers/operational.json +++ b/test/case/statd/containers/operational.json @@ -34,6 +34,11 @@ }, { "admin-status": "up", + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } + }, "ietf-ip:ipv4": { "mtu": 1500 }, @@ -55,10 +60,15 @@ "in-octets": "274021", "out-octets": "2236951" }, - "type": "infix-if-type:etherlike" + "type": "infix-if-type:ethernet" }, { "admin-status": "up", + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } + }, "ietf-ip:ipv4": { "mtu": 1500 }, @@ -80,10 +90,15 @@ "in-octets": "2050", "out-octets": "72419" }, - "type": "infix-if-type:etherlike" + "type": "infix-if-type:ethernet" }, { "admin-status": "up", + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } + }, "ietf-ip:ipv4": { "mtu": 1500 }, @@ -116,10 +131,15 @@ "in-octets": "13502", "out-octets": "117434" }, - "type": "infix-if-type:etherlike" + "type": "infix-if-type:ethernet" }, { "admin-status": "up", + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } + }, "ietf-ip:ipv4": { "mtu": 1500 }, @@ -152,10 +172,15 @@ "in-octets": "11449", "out-octets": "113004" }, - "type": "infix-if-type:etherlike" + "type": "infix-if-type:ethernet" }, { "admin-status": "up", + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } + }, "ietf-ip:ipv4": { "mtu": 1500 }, @@ -177,10 +202,15 @@ "in-octets": "31213", "out-octets": "34316" }, - "type": "infix-if-type:etherlike" + "type": "infix-if-type:ethernet" }, { "admin-status": "up", + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } + }, "ietf-ip:ipv4": { "address": [ { @@ -209,10 +239,15 @@ "in-octets": "48652", "out-octets": "60687" }, - "type": "infix-if-type:etherlike" + "type": "infix-if-type:ethernet" }, { "admin-status": "up", + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } + }, "ietf-ip:ipv4": { "mtu": 1500 }, @@ -234,16 +269,13 @@ "in-octets": "31741", "out-octets": "34279" }, - "type": "infix-if-type:etherlike" + "type": "infix-if-type:ethernet" }, { "admin-status": "up", "ietf-ip:ipv4": { "mtu": 1500 }, - "ietf-ip:ipv6": { - "mtu": 1500 - }, "if-index": 11, "infix-interfaces:bridge-port": { "bridge": "br0", @@ -277,9 +309,6 @@ "ietf-ip:ipv4": { "mtu": 1500 }, - "ietf-ip:ipv6": { - "mtu": 1500 - }, "if-index": 13, "infix-interfaces:bridge-port": { "bridge": "br0", @@ -327,8 +356,7 @@ "origin": "link-layer", "prefix-length": 64 } - ], - "mtu": 1500 + ] }, "if-index": 14, "infix-interfaces:bridge": { @@ -373,9 +401,6 @@ "ietf-ip:ipv4": { "mtu": 1500 }, - "ietf-ip:ipv6": { - "mtu": 1500 - }, "if-index": 16, "infix-interfaces:bridge-port": { "bridge": "br1", @@ -409,9 +434,6 @@ "ietf-ip:ipv4": { "mtu": 1500 }, - "ietf-ip:ipv6": { - "mtu": 1500 - }, "if-index": 18, "infix-interfaces:bridge-port": { "bridge": "br1", @@ -444,9 +466,6 @@ "ietf-ip:ipv4": { "mtu": 1500 }, - "ietf-ip:ipv6": { - "mtu": 1500 - }, "if-index": 19, "infix-interfaces:bridge": { "vlans": { @@ -489,9 +508,6 @@ ], "mtu": 1500 }, - "ietf-ip:ipv6": { - "mtu": 1500 - }, "if-index": 20, "infix-interfaces:vlan": { "id": 8, @@ -519,9 +535,6 @@ ], "mtu": 1500 }, - "ietf-ip:ipv6": { - "mtu": 1500 - }, "if-index": 21, "infix-interfaces:vlan": { "id": 8, @@ -617,8 +630,7 @@ "origin": "link-layer", "prefix-length": 64 } - ], - "mtu": 1500 + ] }, "if-index": 10, "infix-interfaces:container-network": { @@ -648,8 +660,7 @@ "origin": "link-layer", "prefix-length": 64 } - ], - "mtu": 1500 + ] }, "if-index": 15, "infix-interfaces:container-network": { @@ -817,7 +828,7 @@ ], "ietf-ipv4-unicast-routing:destination-prefix": "0.0.0.0/0", "ietf-ospf:metric": 2, - "last-updated": "2025-01-24T13:54:55+00:00", + "last-updated": "2025-02-11T19:56:09+00:00", "next-hop": { "next-hop-list": { "next-hop": [ @@ -835,7 +846,7 @@ }, { "ietf-ipv4-unicast-routing:destination-prefix": "0.0.0.0/0", - "last-updated": "2025-01-24T13:54:15+00:00", + "last-updated": "2025-02-11T19:55:29+00:00", "next-hop": { "next-hop-list": { "next-hop": [ @@ -851,7 +862,7 @@ { "ietf-ipv4-unicast-routing:destination-prefix": "10.1.1.0/24", "ietf-ospf:metric": 1, - "last-updated": "2025-01-24T13:54:01+00:00", + "last-updated": "2025-02-11T19:55:15+00:00", "next-hop": { "next-hop-list": { "next-hop": [ @@ -869,7 +880,7 @@ null ], "ietf-ipv4-unicast-routing:destination-prefix": "10.1.1.0/24", - "last-updated": "2025-01-24T13:54:01+00:00", + "last-updated": "2025-02-11T19:55:15+00:00", "next-hop": { "next-hop-list": { "next-hop": [ @@ -887,7 +898,7 @@ }, { "ietf-ipv4-unicast-routing:destination-prefix": "10.1.1.1/32", - "last-updated": "2025-01-24T13:54:00+00:00", + "last-updated": "2025-02-11T19:55:14+00:00", "next-hop": { "next-hop-list": { "next-hop": [ @@ -908,7 +919,7 @@ null ], "ietf-ipv4-unicast-routing:destination-prefix": "10.1.1.1/32", - "last-updated": "2025-01-24T13:54:00+00:00", + "last-updated": "2025-02-11T19:55:14+00:00", "next-hop": { "next-hop-list": { "next-hop": [ @@ -930,7 +941,7 @@ ], "ietf-ipv4-unicast-routing:destination-prefix": "10.1.2.0/24", "ietf-ospf:metric": 2, - "last-updated": "2025-01-24T13:54:55+00:00", + "last-updated": "2025-02-11T19:56:09+00:00", "next-hop": { "next-hop-list": { "next-hop": [ @@ -958,7 +969,7 @@ ], "ietf-ipv4-unicast-routing:destination-prefix": "10.1.3.0/24", "ietf-ospf:metric": 2, - "last-updated": "2025-01-24T13:54:55+00:00", + "last-updated": "2025-02-11T19:56:09+00:00", "next-hop": { "next-hop-list": { "next-hop": [ @@ -985,7 +996,7 @@ null ], "ietf-ipv4-unicast-routing:destination-prefix": "169.254.0.0/16", - "last-updated": "2025-01-24T13:54:06+00:00", + "last-updated": "2025-02-11T19:55:20+00:00", "next-hop": { "next-hop-list": { "next-hop": [ @@ -1011,7 +1022,7 @@ "route": [ { "ietf-ipv6-unicast-routing:destination-prefix": "fe80::/64", - "last-updated": "2025-01-24T13:54:02+00:00", + "last-updated": "2025-02-11T19:55:16+00:00", "next-hop": { "next-hop-list": { "next-hop": [ @@ -1029,7 +1040,7 @@ }, { "ietf-ipv6-unicast-routing:destination-prefix": "fe80::/64", - "last-updated": "2025-01-24T13:54:01+00:00", + "last-updated": "2025-02-11T19:55:15+00:00", "next-hop": { "next-hop-list": { "next-hop": [ @@ -1047,7 +1058,7 @@ }, { "ietf-ipv6-unicast-routing:destination-prefix": "fe80::/64", - "last-updated": "2025-01-24T13:53:59+00:00", + "last-updated": "2025-02-11T19:55:13+00:00", "next-hop": { "next-hop-list": { "next-hop": [ @@ -1065,7 +1076,7 @@ }, { "ietf-ipv6-unicast-routing:destination-prefix": "fe80::/64", - "last-updated": "2025-01-24T13:53:09+00:00", + "last-updated": "2025-02-11T19:54:23+00:00", "next-hop": { "next-hop-list": { "next-hop": [ @@ -1083,7 +1094,7 @@ }, { "ietf-ipv6-unicast-routing:destination-prefix": "fe80::/64", - "last-updated": "2025-01-24T13:53:09+00:00", + "last-updated": "2025-02-11T19:54:23+00:00", "next-hop": { "next-hop-list": { "next-hop": [ @@ -1104,7 +1115,7 @@ null ], "ietf-ipv6-unicast-routing:destination-prefix": "fe80::/64", - "last-updated": "2025-01-24T13:53:09+00:00", + "last-updated": "2025-02-11T19:54:23+00:00", "next-hop": { "next-hop-list": { "next-hop": [ diff --git a/test/case/statd/containers/system/rootfs/proc/sys/net/ipv6/conf/br0/mtu b/test/case/statd/containers/system/rootfs/proc/sys/net/ipv6/conf/br0/mtu index 3d86ec64..e69de29b 100644 --- a/test/case/statd/containers/system/rootfs/proc/sys/net/ipv6/conf/br0/mtu +++ b/test/case/statd/containers/system/rootfs/proc/sys/net/ipv6/conf/br0/mtu @@ -1 +0,0 @@ -1500 diff --git a/test/case/statd/containers/system/rootfs/proc/sys/net/ipv6/conf/br1/mtu b/test/case/statd/containers/system/rootfs/proc/sys/net/ipv6/conf/br1/mtu index 3d86ec64..e69de29b 100644 --- a/test/case/statd/containers/system/rootfs/proc/sys/net/ipv6/conf/br1/mtu +++ b/test/case/statd/containers/system/rootfs/proc/sys/net/ipv6/conf/br1/mtu @@ -1 +0,0 @@ -1500 diff --git a/test/case/statd/containers/system/rootfs/proc/sys/net/ipv6/conf/e3.8/mtu b/test/case/statd/containers/system/rootfs/proc/sys/net/ipv6/conf/e3.8/mtu index 3d86ec64..e69de29b 100644 --- a/test/case/statd/containers/system/rootfs/proc/sys/net/ipv6/conf/e3.8/mtu +++ b/test/case/statd/containers/system/rootfs/proc/sys/net/ipv6/conf/e3.8/mtu @@ -1 +0,0 @@ -1500 diff --git a/test/case/statd/containers/system/rootfs/proc/sys/net/ipv6/conf/e4.8/mtu b/test/case/statd/containers/system/rootfs/proc/sys/net/ipv6/conf/e4.8/mtu index 3d86ec64..e69de29b 100644 --- a/test/case/statd/containers/system/rootfs/proc/sys/net/ipv6/conf/e4.8/mtu +++ b/test/case/statd/containers/system/rootfs/proc/sys/net/ipv6/conf/e4.8/mtu @@ -1 +0,0 @@ -1500 diff --git a/test/case/statd/containers/system/rootfs/proc/sys/net/ipv6/conf/veth0b/mtu b/test/case/statd/containers/system/rootfs/proc/sys/net/ipv6/conf/veth0b/mtu index 3d86ec64..e69de29b 100644 --- a/test/case/statd/containers/system/rootfs/proc/sys/net/ipv6/conf/veth0b/mtu +++ b/test/case/statd/containers/system/rootfs/proc/sys/net/ipv6/conf/veth0b/mtu @@ -1 +0,0 @@ -1500 diff --git a/test/case/statd/containers/system/rootfs/proc/sys/net/ipv6/conf/veth1b/mtu b/test/case/statd/containers/system/rootfs/proc/sys/net/ipv6/conf/veth1b/mtu index 3d86ec64..e69de29b 100644 --- a/test/case/statd/containers/system/rootfs/proc/sys/net/ipv6/conf/veth1b/mtu +++ b/test/case/statd/containers/system/rootfs/proc/sys/net/ipv6/conf/veth1b/mtu @@ -1 +0,0 @@ -1500 diff --git a/test/case/statd/containers/system/rootfs/proc/sys/net/ipv6/conf/veth2b/mtu b/test/case/statd/containers/system/rootfs/proc/sys/net/ipv6/conf/veth2b/mtu index 3d86ec64..e69de29b 100644 --- a/test/case/statd/containers/system/rootfs/proc/sys/net/ipv6/conf/veth2b/mtu +++ b/test/case/statd/containers/system/rootfs/proc/sys/net/ipv6/conf/veth2b/mtu @@ -1 +0,0 @@ -1500 diff --git a/test/case/statd/containers/system/rootfs/proc/sys/net/ipv6/conf/veth3b/mtu b/test/case/statd/containers/system/rootfs/proc/sys/net/ipv6/conf/veth3b/mtu index 3d86ec64..e69de29b 100644 --- a/test/case/statd/containers/system/rootfs/proc/sys/net/ipv6/conf/veth3b/mtu +++ b/test/case/statd/containers/system/rootfs/proc/sys/net/ipv6/conf/veth3b/mtu @@ -1 +0,0 @@ -1500 diff --git a/test/case/statd/containers/system/run/ethtool_--json_-S_e1_--all-groups b/test/case/statd/containers/system/run/ethtool_--json_-S_e1_--all-groups new file mode 100644 index 00000000..164a71c5 --- /dev/null +++ b/test/case/statd/containers/system/run/ethtool_--json_-S_e1_--all-groups @@ -0,0 +1,7 @@ +[ { + "ifname": "e1", + "eth-phy": {}, + "eth-mac": {}, + "eth-ctrl": {}, + "rmon": {} + } ] diff --git a/test/case/statd/containers/system/run/ethtool_--json_-S_e2_--all-groups b/test/case/statd/containers/system/run/ethtool_--json_-S_e2_--all-groups new file mode 100644 index 00000000..52a2c209 --- /dev/null +++ b/test/case/statd/containers/system/run/ethtool_--json_-S_e2_--all-groups @@ -0,0 +1,7 @@ +[ { + "ifname": "e2", + "eth-phy": {}, + "eth-mac": {}, + "eth-ctrl": {}, + "rmon": {} + } ] diff --git a/test/case/statd/containers/system/run/ethtool_--json_-S_e3_--all-groups b/test/case/statd/containers/system/run/ethtool_--json_-S_e3_--all-groups new file mode 100644 index 00000000..be789238 --- /dev/null +++ b/test/case/statd/containers/system/run/ethtool_--json_-S_e3_--all-groups @@ -0,0 +1,7 @@ +[ { + "ifname": "e3", + "eth-phy": {}, + "eth-mac": {}, + "eth-ctrl": {}, + "rmon": {} + } ] diff --git a/test/case/statd/containers/system/run/ethtool_--json_-S_e4_--all-groups b/test/case/statd/containers/system/run/ethtool_--json_-S_e4_--all-groups new file mode 100644 index 00000000..4caf7af3 --- /dev/null +++ b/test/case/statd/containers/system/run/ethtool_--json_-S_e4_--all-groups @@ -0,0 +1,7 @@ +[ { + "ifname": "e4", + "eth-phy": {}, + "eth-mac": {}, + "eth-ctrl": {}, + "rmon": {} + } ] diff --git a/test/case/statd/containers/system/run/ethtool_--json_-S_e5_--all-groups b/test/case/statd/containers/system/run/ethtool_--json_-S_e5_--all-groups new file mode 100644 index 00000000..00406094 --- /dev/null +++ b/test/case/statd/containers/system/run/ethtool_--json_-S_e5_--all-groups @@ -0,0 +1,7 @@ +[ { + "ifname": "e5", + "eth-phy": {}, + "eth-mac": {}, + "eth-ctrl": {}, + "rmon": {} + } ] diff --git a/test/case/statd/containers/system/run/ethtool_--json_-S_e6_--all-groups b/test/case/statd/containers/system/run/ethtool_--json_-S_e6_--all-groups new file mode 100644 index 00000000..c4289b02 --- /dev/null +++ b/test/case/statd/containers/system/run/ethtool_--json_-S_e6_--all-groups @@ -0,0 +1,7 @@ +[ { + "ifname": "e6", + "eth-phy": {}, + "eth-mac": {}, + "eth-ctrl": {}, + "rmon": {} + } ] diff --git a/test/case/statd/containers/system/run/ethtool_--json_-S_e7_--all-groups b/test/case/statd/containers/system/run/ethtool_--json_-S_e7_--all-groups new file mode 100644 index 00000000..d662dbfb --- /dev/null +++ b/test/case/statd/containers/system/run/ethtool_--json_-S_e7_--all-groups @@ -0,0 +1,7 @@ +[ { + "ifname": "e7", + "eth-phy": {}, + "eth-mac": {}, + "eth-ctrl": {}, + "rmon": {} + } ] diff --git a/test/case/statd/containers/system/run/ethtool_--json_e1 b/test/case/statd/containers/system/run/ethtool_--json_e1 new file mode 100644 index 00000000..a8904054 --- /dev/null +++ b/test/case/statd/containers/system/run/ethtool_--json_e1 @@ -0,0 +1,17 @@ +[ { + "ifname": "e1", + "supported-ports": [ ], + "supported-link-modes": [ ], + "supported-pause-frame-use": "No", + "supports-auto-negotiation": false, + "supported-fec-modes": [ ], + "advertised-link-modes": [ ], + "advertised-pause-frame-use": "No", + "advertised-auto-negotiation": false, + "advertised-fec-modes": [ ], + "auto-negotiation": false, + "port": "Other", + "phyad": 0, + "transceiver": "internal", + "link-detected": true + } ] diff --git a/test/case/statd/containers/system/run/ethtool_--json_e2 b/test/case/statd/containers/system/run/ethtool_--json_e2 new file mode 100644 index 00000000..8e47e9ac --- /dev/null +++ b/test/case/statd/containers/system/run/ethtool_--json_e2 @@ -0,0 +1,17 @@ +[ { + "ifname": "e2", + "supported-ports": [ ], + "supported-link-modes": [ ], + "supported-pause-frame-use": "No", + "supports-auto-negotiation": false, + "supported-fec-modes": [ ], + "advertised-link-modes": [ ], + "advertised-pause-frame-use": "No", + "advertised-auto-negotiation": false, + "advertised-fec-modes": [ ], + "auto-negotiation": false, + "port": "Other", + "phyad": 0, + "transceiver": "internal", + "link-detected": true + } ] diff --git a/test/case/statd/containers/system/run/ethtool_--json_e3 b/test/case/statd/containers/system/run/ethtool_--json_e3 new file mode 100644 index 00000000..f1b9e0b3 --- /dev/null +++ b/test/case/statd/containers/system/run/ethtool_--json_e3 @@ -0,0 +1,17 @@ +[ { + "ifname": "e3", + "supported-ports": [ ], + "supported-link-modes": [ ], + "supported-pause-frame-use": "No", + "supports-auto-negotiation": false, + "supported-fec-modes": [ ], + "advertised-link-modes": [ ], + "advertised-pause-frame-use": "No", + "advertised-auto-negotiation": false, + "advertised-fec-modes": [ ], + "auto-negotiation": false, + "port": "Other", + "phyad": 0, + "transceiver": "internal", + "link-detected": true + } ] diff --git a/test/case/statd/containers/system/run/ethtool_--json_e4 b/test/case/statd/containers/system/run/ethtool_--json_e4 new file mode 100644 index 00000000..b07390d7 --- /dev/null +++ b/test/case/statd/containers/system/run/ethtool_--json_e4 @@ -0,0 +1,17 @@ +[ { + "ifname": "e4", + "supported-ports": [ ], + "supported-link-modes": [ ], + "supported-pause-frame-use": "No", + "supports-auto-negotiation": false, + "supported-fec-modes": [ ], + "advertised-link-modes": [ ], + "advertised-pause-frame-use": "No", + "advertised-auto-negotiation": false, + "advertised-fec-modes": [ ], + "auto-negotiation": false, + "port": "Other", + "phyad": 0, + "transceiver": "internal", + "link-detected": true + } ] diff --git a/test/case/statd/containers/system/run/ethtool_--json_e5 b/test/case/statd/containers/system/run/ethtool_--json_e5 new file mode 100644 index 00000000..db29b794 --- /dev/null +++ b/test/case/statd/containers/system/run/ethtool_--json_e5 @@ -0,0 +1,17 @@ +[ { + "ifname": "e5", + "supported-ports": [ ], + "supported-link-modes": [ ], + "supported-pause-frame-use": "No", + "supports-auto-negotiation": false, + "supported-fec-modes": [ ], + "advertised-link-modes": [ ], + "advertised-pause-frame-use": "No", + "advertised-auto-negotiation": false, + "advertised-fec-modes": [ ], + "auto-negotiation": false, + "port": "Other", + "phyad": 0, + "transceiver": "internal", + "link-detected": true + } ] diff --git a/test/case/statd/containers/system/run/ethtool_--json_e6 b/test/case/statd/containers/system/run/ethtool_--json_e6 new file mode 100644 index 00000000..0f43edd5 --- /dev/null +++ b/test/case/statd/containers/system/run/ethtool_--json_e6 @@ -0,0 +1,17 @@ +[ { + "ifname": "e6", + "supported-ports": [ ], + "supported-link-modes": [ ], + "supported-pause-frame-use": "No", + "supports-auto-negotiation": false, + "supported-fec-modes": [ ], + "advertised-link-modes": [ ], + "advertised-pause-frame-use": "No", + "advertised-auto-negotiation": false, + "advertised-fec-modes": [ ], + "auto-negotiation": false, + "port": "Other", + "phyad": 0, + "transceiver": "internal", + "link-detected": true + } ] diff --git a/test/case/statd/containers/system/run/ethtool_--json_e7 b/test/case/statd/containers/system/run/ethtool_--json_e7 new file mode 100644 index 00000000..b2bfda2e --- /dev/null +++ b/test/case/statd/containers/system/run/ethtool_--json_e7 @@ -0,0 +1,17 @@ +[ { + "ifname": "e7", + "supported-ports": [ ], + "supported-link-modes": [ ], + "supported-pause-frame-use": "No", + "supports-auto-negotiation": false, + "supported-fec-modes": [ ], + "advertised-link-modes": [ ], + "advertised-pause-frame-use": "No", + "advertised-auto-negotiation": false, + "advertised-fec-modes": [ ], + "auto-negotiation": false, + "port": "Other", + "phyad": 0, + "transceiver": "internal", + "link-detected": true + } ] diff --git a/test/case/statd/containers/system/timestamp b/test/case/statd/containers/system/timestamp index a62138a5..ac8ff0a0 100644 --- a/test/case/statd/containers/system/timestamp +++ b/test/case/statd/containers/system/timestamp @@ -1,2 +1,2 @@ -1737726908 +1739303782 diff --git a/test/case/statd/interfaces-all/ietf-interfaces.json b/test/case/statd/interfaces-all/ietf-interfaces.json index acd0ba16..bbd5cdb5 100644 --- a/test/case/statd/interfaces-all/ietf-interfaces.json +++ b/test/case/statd/interfaces-all/ietf-interfaces.json @@ -33,7 +33,7 @@ } }, { - "type": "infix-if-type:etherlike", + "type": "infix-if-type:ethernet", "name": "e1", "if-index": 2, "admin-status": "up", @@ -55,10 +55,15 @@ "origin": "link-layer" } ] + }, + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } } }, { - "type": "infix-if-type:etherlike", + "type": "infix-if-type:ethernet", "name": "e2", "if-index": 3, "admin-status": "up", @@ -80,10 +85,15 @@ "origin": "link-layer" } ] + }, + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } } }, { - "type": "infix-if-type:etherlike", + "type": "infix-if-type:ethernet", "name": "e3", "if-index": 4, "admin-status": "up", @@ -98,6 +108,11 @@ "ietf-ip:ipv6": { "mtu": 1500 }, + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } + }, "infix-interfaces:bridge-port": { "bridge": "br-Q", "flood": { @@ -117,7 +132,7 @@ } }, { - "type": "infix-if-type:etherlike", + "type": "infix-if-type:ethernet", "name": "e4", "if-index": 5, "admin-status": "up", @@ -139,10 +154,15 @@ "origin": "link-layer" } ] + }, + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } } }, { - "type": "infix-if-type:etherlike", + "type": "infix-if-type:ethernet", "name": "e5", "if-index": 6, "admin-status": "up", @@ -164,10 +184,15 @@ "origin": "link-layer" } ] + }, + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } } }, { - "type": "infix-if-type:etherlike", + "type": "infix-if-type:ethernet", "name": "e6", "if-index": 7, "admin-status": "up", @@ -189,10 +214,15 @@ "origin": "link-layer" } ] + }, + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } } }, { - "type": "infix-if-type:etherlike", + "type": "infix-if-type:ethernet", "name": "e7", "if-index": 8, "admin-status": "up", @@ -214,6 +244,11 @@ "origin": "link-layer" } ] + }, + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } } }, { diff --git a/test/case/statd/interfaces-all/operational.json b/test/case/statd/interfaces-all/operational.json index e3ca29f0..8a6725f9 100644 --- a/test/case/statd/interfaces-all/operational.json +++ b/test/case/statd/interfaces-all/operational.json @@ -34,6 +34,11 @@ }, { "admin-status": "up", + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } + }, "ietf-ip:ipv4": { "mtu": 1500 }, @@ -55,10 +60,15 @@ "in-octets": "320955", "out-octets": "1984258" }, - "type": "infix-if-type:etherlike" + "type": "infix-if-type:ethernet" }, { "admin-status": "up", + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } + }, "ietf-ip:ipv4": { "mtu": 1500 }, @@ -80,10 +90,15 @@ "in-octets": "70", "out-octets": "39889" }, - "type": "infix-if-type:etherlike" + "type": "infix-if-type:ethernet" }, { "admin-status": "up", + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } + }, "ietf-ip:ipv4": { "mtu": 1500 }, @@ -114,10 +129,15 @@ "statistics": { "out-octets": "45391" }, - "type": "infix-if-type:etherlike" + "type": "infix-if-type:ethernet" }, { "admin-status": "up", + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } + }, "ietf-ip:ipv4": { "mtu": 1500 }, @@ -139,10 +159,15 @@ "in-octets": "70", "out-octets": "39570" }, - "type": "infix-if-type:etherlike" + "type": "infix-if-type:ethernet" }, { "admin-status": "up", + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } + }, "ietf-ip:ipv4": { "mtu": 1500 }, @@ -164,10 +189,15 @@ "in-octets": "19910", "out-octets": "39388" }, - "type": "infix-if-type:etherlike" + "type": "infix-if-type:ethernet" }, { "admin-status": "up", + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } + }, "ietf-ip:ipv4": { "mtu": 1500 }, @@ -189,10 +219,15 @@ "in-octets": "26909", "out-octets": "41285" }, - "type": "infix-if-type:etherlike" + "type": "infix-if-type:ethernet" }, { "admin-status": "up", + "ieee802-ethernet-interface:ethernet": { + "auto-negotation": { + "enable": false + } + }, "ietf-ip:ipv4": { "mtu": 1500 }, @@ -214,7 +249,7 @@ "in-octets": "23322", "out-octets": "39536" }, - "type": "infix-if-type:etherlike" + "type": "infix-if-type:ethernet" }, { "admin-status": "up", diff --git a/test/case/statd/interfaces-all/system/run/ethtool_--json_-S_e1_--all-groups b/test/case/statd/interfaces-all/system/run/ethtool_--json_-S_e1_--all-groups new file mode 100644 index 00000000..164a71c5 --- /dev/null +++ b/test/case/statd/interfaces-all/system/run/ethtool_--json_-S_e1_--all-groups @@ -0,0 +1,7 @@ +[ { + "ifname": "e1", + "eth-phy": {}, + "eth-mac": {}, + "eth-ctrl": {}, + "rmon": {} + } ] diff --git a/test/case/statd/interfaces-all/system/run/ethtool_--json_-S_e2_--all-groups b/test/case/statd/interfaces-all/system/run/ethtool_--json_-S_e2_--all-groups new file mode 100644 index 00000000..52a2c209 --- /dev/null +++ b/test/case/statd/interfaces-all/system/run/ethtool_--json_-S_e2_--all-groups @@ -0,0 +1,7 @@ +[ { + "ifname": "e2", + "eth-phy": {}, + "eth-mac": {}, + "eth-ctrl": {}, + "rmon": {} + } ] diff --git a/test/case/statd/interfaces-all/system/run/ethtool_--json_-S_e3_--all-groups b/test/case/statd/interfaces-all/system/run/ethtool_--json_-S_e3_--all-groups new file mode 100644 index 00000000..be789238 --- /dev/null +++ b/test/case/statd/interfaces-all/system/run/ethtool_--json_-S_e3_--all-groups @@ -0,0 +1,7 @@ +[ { + "ifname": "e3", + "eth-phy": {}, + "eth-mac": {}, + "eth-ctrl": {}, + "rmon": {} + } ] diff --git a/test/case/statd/interfaces-all/system/run/ethtool_--json_-S_e4_--all-groups b/test/case/statd/interfaces-all/system/run/ethtool_--json_-S_e4_--all-groups new file mode 100644 index 00000000..4caf7af3 --- /dev/null +++ b/test/case/statd/interfaces-all/system/run/ethtool_--json_-S_e4_--all-groups @@ -0,0 +1,7 @@ +[ { + "ifname": "e4", + "eth-phy": {}, + "eth-mac": {}, + "eth-ctrl": {}, + "rmon": {} + } ] diff --git a/test/case/statd/interfaces-all/system/run/ethtool_--json_-S_e5_--all-groups b/test/case/statd/interfaces-all/system/run/ethtool_--json_-S_e5_--all-groups new file mode 100644 index 00000000..00406094 --- /dev/null +++ b/test/case/statd/interfaces-all/system/run/ethtool_--json_-S_e5_--all-groups @@ -0,0 +1,7 @@ +[ { + "ifname": "e5", + "eth-phy": {}, + "eth-mac": {}, + "eth-ctrl": {}, + "rmon": {} + } ] diff --git a/test/case/statd/interfaces-all/system/run/ethtool_--json_-S_e6_--all-groups b/test/case/statd/interfaces-all/system/run/ethtool_--json_-S_e6_--all-groups new file mode 100644 index 00000000..c4289b02 --- /dev/null +++ b/test/case/statd/interfaces-all/system/run/ethtool_--json_-S_e6_--all-groups @@ -0,0 +1,7 @@ +[ { + "ifname": "e6", + "eth-phy": {}, + "eth-mac": {}, + "eth-ctrl": {}, + "rmon": {} + } ] diff --git a/test/case/statd/interfaces-all/system/run/ethtool_--json_-S_e7_--all-groups b/test/case/statd/interfaces-all/system/run/ethtool_--json_-S_e7_--all-groups new file mode 100644 index 00000000..d662dbfb --- /dev/null +++ b/test/case/statd/interfaces-all/system/run/ethtool_--json_-S_e7_--all-groups @@ -0,0 +1,7 @@ +[ { + "ifname": "e7", + "eth-phy": {}, + "eth-mac": {}, + "eth-ctrl": {}, + "rmon": {} + } ] diff --git a/test/case/statd/interfaces-all/system/run/ethtool_--json_e1 b/test/case/statd/interfaces-all/system/run/ethtool_--json_e1 new file mode 100644 index 00000000..a8904054 --- /dev/null +++ b/test/case/statd/interfaces-all/system/run/ethtool_--json_e1 @@ -0,0 +1,17 @@ +[ { + "ifname": "e1", + "supported-ports": [ ], + "supported-link-modes": [ ], + "supported-pause-frame-use": "No", + "supports-auto-negotiation": false, + "supported-fec-modes": [ ], + "advertised-link-modes": [ ], + "advertised-pause-frame-use": "No", + "advertised-auto-negotiation": false, + "advertised-fec-modes": [ ], + "auto-negotiation": false, + "port": "Other", + "phyad": 0, + "transceiver": "internal", + "link-detected": true + } ] diff --git a/test/case/statd/interfaces-all/system/run/ethtool_--json_e2 b/test/case/statd/interfaces-all/system/run/ethtool_--json_e2 new file mode 100644 index 00000000..8e47e9ac --- /dev/null +++ b/test/case/statd/interfaces-all/system/run/ethtool_--json_e2 @@ -0,0 +1,17 @@ +[ { + "ifname": "e2", + "supported-ports": [ ], + "supported-link-modes": [ ], + "supported-pause-frame-use": "No", + "supports-auto-negotiation": false, + "supported-fec-modes": [ ], + "advertised-link-modes": [ ], + "advertised-pause-frame-use": "No", + "advertised-auto-negotiation": false, + "advertised-fec-modes": [ ], + "auto-negotiation": false, + "port": "Other", + "phyad": 0, + "transceiver": "internal", + "link-detected": true + } ] diff --git a/test/case/statd/interfaces-all/system/run/ethtool_--json_e3 b/test/case/statd/interfaces-all/system/run/ethtool_--json_e3 new file mode 100644 index 00000000..f1b9e0b3 --- /dev/null +++ b/test/case/statd/interfaces-all/system/run/ethtool_--json_e3 @@ -0,0 +1,17 @@ +[ { + "ifname": "e3", + "supported-ports": [ ], + "supported-link-modes": [ ], + "supported-pause-frame-use": "No", + "supports-auto-negotiation": false, + "supported-fec-modes": [ ], + "advertised-link-modes": [ ], + "advertised-pause-frame-use": "No", + "advertised-auto-negotiation": false, + "advertised-fec-modes": [ ], + "auto-negotiation": false, + "port": "Other", + "phyad": 0, + "transceiver": "internal", + "link-detected": true + } ] diff --git a/test/case/statd/interfaces-all/system/run/ethtool_--json_e4 b/test/case/statd/interfaces-all/system/run/ethtool_--json_e4 new file mode 100644 index 00000000..b07390d7 --- /dev/null +++ b/test/case/statd/interfaces-all/system/run/ethtool_--json_e4 @@ -0,0 +1,17 @@ +[ { + "ifname": "e4", + "supported-ports": [ ], + "supported-link-modes": [ ], + "supported-pause-frame-use": "No", + "supports-auto-negotiation": false, + "supported-fec-modes": [ ], + "advertised-link-modes": [ ], + "advertised-pause-frame-use": "No", + "advertised-auto-negotiation": false, + "advertised-fec-modes": [ ], + "auto-negotiation": false, + "port": "Other", + "phyad": 0, + "transceiver": "internal", + "link-detected": true + } ] diff --git a/test/case/statd/interfaces-all/system/run/ethtool_--json_e5 b/test/case/statd/interfaces-all/system/run/ethtool_--json_e5 new file mode 100644 index 00000000..db29b794 --- /dev/null +++ b/test/case/statd/interfaces-all/system/run/ethtool_--json_e5 @@ -0,0 +1,17 @@ +[ { + "ifname": "e5", + "supported-ports": [ ], + "supported-link-modes": [ ], + "supported-pause-frame-use": "No", + "supports-auto-negotiation": false, + "supported-fec-modes": [ ], + "advertised-link-modes": [ ], + "advertised-pause-frame-use": "No", + "advertised-auto-negotiation": false, + "advertised-fec-modes": [ ], + "auto-negotiation": false, + "port": "Other", + "phyad": 0, + "transceiver": "internal", + "link-detected": true + } ] diff --git a/test/case/statd/interfaces-all/system/run/ethtool_--json_e6 b/test/case/statd/interfaces-all/system/run/ethtool_--json_e6 new file mode 100644 index 00000000..0f43edd5 --- /dev/null +++ b/test/case/statd/interfaces-all/system/run/ethtool_--json_e6 @@ -0,0 +1,17 @@ +[ { + "ifname": "e6", + "supported-ports": [ ], + "supported-link-modes": [ ], + "supported-pause-frame-use": "No", + "supports-auto-negotiation": false, + "supported-fec-modes": [ ], + "advertised-link-modes": [ ], + "advertised-pause-frame-use": "No", + "advertised-auto-negotiation": false, + "advertised-fec-modes": [ ], + "auto-negotiation": false, + "port": "Other", + "phyad": 0, + "transceiver": "internal", + "link-detected": true + } ] diff --git a/test/case/statd/interfaces-all/system/run/ethtool_--json_e7 b/test/case/statd/interfaces-all/system/run/ethtool_--json_e7 new file mode 100644 index 00000000..b2bfda2e --- /dev/null +++ b/test/case/statd/interfaces-all/system/run/ethtool_--json_e7 @@ -0,0 +1,17 @@ +[ { + "ifname": "e7", + "supported-ports": [ ], + "supported-link-modes": [ ], + "supported-pause-frame-use": "No", + "supports-auto-negotiation": false, + "supported-fec-modes": [ ], + "advertised-link-modes": [ ], + "advertised-pause-frame-use": "No", + "advertised-auto-negotiation": false, + "advertised-fec-modes": [ ], + "auto-negotiation": false, + "port": "Other", + "phyad": 0, + "transceiver": "internal", + "link-detected": true + } ]