From 795f2615cb2da21fbd50708e0ca2534d97f29ff1 Mon Sep 17 00:00:00 2001 From: Richard Alpe Date: Tue, 30 Jan 2024 16:05:40 +0100 Subject: [PATCH] test: update cli output test to reflect etherlike changes * Remove bogus ethernet statistics for br0 * Change parentbus for e0 and e1 to make them ethernet devices (not virtio -> etherlike). Signed-off-by: Richard Alpe --- .../cli/cli-output/show-interface-br0.txt | 13 ----- .../case/cli/cli-output/show-interface-e2.txt | 13 ----- .../case/cli/cli-output/show-interface-e3.txt | 13 ----- .../case/cli/cli-output/show-interface-e4.txt | 13 ----- test/case/cli/system-output/ethtool-br0.txt | 56 ++++++------------- .../system-output/ip-link-show-dev-e0.json | 4 +- .../system-output/ip-link-show-dev-e1.json | 4 +- 7 files changed, 21 insertions(+), 95 deletions(-) diff --git a/test/case/cli/cli-output/show-interface-br0.txt b/test/case/cli/cli-output/show-interface-br0.txt index 7948a491..3109ac53 100644 --- a/test/case/cli/cli-output/show-interface-br0.txt +++ b/test/case/cli/cli-output/show-interface-br0.txt @@ -2,21 +2,8 @@ name : br0 index : 7 mtu : 1500 operational status : up -auto-negotiation : on -duplex : full -speed : 10000 physical address : 02:00:00:00:00:00 ipv4 addresses : ipv6 addresses : in-octets : 0 out-octets : 3158 - -eth-out-frames : 713 -eth-out-multicast-frames : 605 -eth-out-broadcast-frames : 69 -eth-in-frames : 418 -eth-in-multicast-frames : 336 -eth-in-broadcast-frames : 46 -eth-in-error-fcs-frames : 0 -eth-in-total-frames : 418 -eth-in-error-oversize-frames : 0 diff --git a/test/case/cli/cli-output/show-interface-e2.txt b/test/case/cli/cli-output/show-interface-e2.txt index a60f466a..13714ecf 100644 --- a/test/case/cli/cli-output/show-interface-e2.txt +++ b/test/case/cli/cli-output/show-interface-e2.txt @@ -2,21 +2,8 @@ name : e2 index : 4 mtu : 1500 operational status : up -auto-negotiation : on -duplex : full -speed : 10000 physical address : 02:00:00:00:00:02 ipv4 addresses : ipv6 addresses : in-octets : 17582 out-octets : 1327 - -eth-out-frames : 713 -eth-out-multicast-frames : 605 -eth-out-broadcast-frames : 69 -eth-in-frames : 418 -eth-in-multicast-frames : 336 -eth-in-broadcast-frames : 46 -eth-in-error-fcs-frames : 0 -eth-in-total-frames : 418 -eth-in-error-oversize-frames : 0 diff --git a/test/case/cli/cli-output/show-interface-e3.txt b/test/case/cli/cli-output/show-interface-e3.txt index b2bc5e24..9c8851d4 100644 --- a/test/case/cli/cli-output/show-interface-e3.txt +++ b/test/case/cli/cli-output/show-interface-e3.txt @@ -2,21 +2,8 @@ name : e3 index : 5 mtu : 1500 operational status : up -auto-negotiation : on -duplex : full -speed : 10000 physical address : 02:00:00:00:00:03 ipv4 addresses : ipv6 addresses : in-octets : 15057 out-octets : 1327 - -eth-out-frames : 713 -eth-out-multicast-frames : 605 -eth-out-broadcast-frames : 69 -eth-in-frames : 418 -eth-in-multicast-frames : 336 -eth-in-broadcast-frames : 46 -eth-in-error-fcs-frames : 0 -eth-in-total-frames : 418 -eth-in-error-oversize-frames : 0 diff --git a/test/case/cli/cli-output/show-interface-e4.txt b/test/case/cli/cli-output/show-interface-e4.txt index 116d59c2..75251e92 100644 --- a/test/case/cli/cli-output/show-interface-e4.txt +++ b/test/case/cli/cli-output/show-interface-e4.txt @@ -2,21 +2,8 @@ name : e4 index : 6 mtu : 1500 operational status : down -auto-negotiation : on -duplex : full -speed : 10000 physical address : 02:00:00:00:00:04 ipv4 addresses : ipv6 addresses : in-octets : 19022 out-octets : 1327 - -eth-out-frames : 713 -eth-out-multicast-frames : 605 -eth-out-broadcast-frames : 69 -eth-in-frames : 418 -eth-in-multicast-frames : 336 -eth-in-broadcast-frames : 46 -eth-in-error-fcs-frames : 0 -eth-in-total-frames : 418 -eth-in-error-oversize-frames : 0 diff --git a/test/case/cli/system-output/ethtool-br0.txt b/test/case/cli/system-output/ethtool-br0.txt index de4a03d7..e2c00a7f 100644 --- a/test/case/cli/system-output/ethtool-br0.txt +++ b/test/case/cli/system-output/ethtool-br0.txt @@ -1,39 +1,17 @@ -Settings for e0: - Supported ports: [ ] - Supported link modes: 10baseT/Half 10baseT/Full - 100baseT/Half 100baseT/Full - 1000baseT/Full - 10000baseT/Full - 2500baseT/Full - 5000baseT/Full - Supported pause frame use: Symmetric - Supports auto-negotiation: Yes - Supported FEC modes: Not reported - Advertised link modes: 10baseT/Half 10baseT/Full - 100baseT/Half 100baseT/Full - 1000baseT/Full - 10000baseT/Full - 2500baseT/Full - 5000baseT/Full - Advertised pause frame use: Symmetric - Advertised auto-negotiation: Yes - Advertised FEC modes: Not reported - Link partner advertised link modes: 10baseT/Half 10baseT/Full - 100baseT/Half 100baseT/Full - 1000baseT/Full - 10000baseT/Full - 2500baseT/Full - 5000baseT/Full - Link partner advertised pause frame use: Symmetric - Link partner advertised auto-negotiation: Yes - Link partner advertised FEC modes: Not reported - Speed: 10000Mb/s - Duplex: Full - Auto-negotiation: on - Port: Twisted Pair - PHYAD: 4 - Transceiver: external - MDI-X: on (auto) - Supports Wake-on: g - Wake-on: d - Link detected: yes +Settings for br0: + Supported ports: [ ] + Supported link modes: Not reported + Supported pause frame use: No + Supports auto-negotiation: No + Supported FEC modes: Not reported + Advertised link modes: Not reported + Advertised pause frame use: No + Advertised auto-negotiation: No + Advertised FEC modes: Not reported + Speed: Unknown! + Duplex: Unknown! (255) + Auto-negotiation: off + Port: Other + PHYAD: 0 + Transceiver: internal + Link detected: yes diff --git a/test/case/cli/system-output/ip-link-show-dev-e0.json b/test/case/cli/system-output/ip-link-show-dev-e0.json index 860ee90c..49b39b6f 100644 --- a/test/case/cli/system-output/ip-link-show-dev-e0.json +++ b/test/case/cli/system-output/ip-link-show-dev-e0.json @@ -67,8 +67,8 @@ "tso_max_size": 65536, "tso_max_segs": 65535, "gro_max_size": 65536, - "parentbus": "virtio", - "parentdev": "virtio2", + "parentbus": "e1000", + "parentdev": "e1000-foobar", "stats64": { "rx": { "bytes": 6537, diff --git a/test/case/cli/system-output/ip-link-show-dev-e1.json b/test/case/cli/system-output/ip-link-show-dev-e1.json index 25f5884f..55930658 100644 --- a/test/case/cli/system-output/ip-link-show-dev-e1.json +++ b/test/case/cli/system-output/ip-link-show-dev-e1.json @@ -67,8 +67,8 @@ "tso_max_size": 65536, "tso_max_segs": 65535, "gro_max_size": 65536, - "parentbus": "virtio", - "parentdev": "virtio3", + "parentbus": "e1000", + "parentdev": "e1000-foobar", "stats64": { "rx": { "bytes": 1397,