ci: cram: accept live br-lcm carrier state
The LCM bridge carrier reflects whether its container-side port is live. Split execution can inspect it before the LCM suite tears that state down, so the bridge can appear either live or without carrier. Carrier state is not the route line's only variable part: ip route also emits a trailing separator. Account for that separator after the optional linkdown flag so both carrier states match. Accept both observed route and link forms in every board's copy of the affected expectations while keeping every address, interface attribute, and the carrier-to-state pairing constrained. Assisted-by: codex:gpt-5 Assisted-by: claude:opus-5:orchestrator Assisted-by: codex:gpt-5.6-sol:medium-fast References: CI-7 Signed-off-by: Petr Štetiar <petr.stetiar@prplfoundation.org>
This commit is contained in:
parent
8b234753ca
commit
ffff4ed676
@ -9,14 +9,14 @@ Check correct routing table:
|
||||
10.0.0.0/24 dev eth2 proto kernel scope link src 10.0.0.2
|
||||
192.168.1.0/24 dev br-lan proto kernel scope link src 192.168.1.1
|
||||
192.168.2.0/24 dev br-guest proto kernel scope link src 192.168.2.1 linkdown
|
||||
192.168.3.0/24 dev br-lcm proto kernel scope link src 192.168.3.1 linkdown
|
||||
192\.168\.3\.0/24 dev br-lcm proto kernel scope link src 192\.168\.3\.1( linkdown)? (re)
|
||||
|
||||
Check correct interface setup:
|
||||
|
||||
$ R "ip link | grep ^\\\\d | cut -d: -f2-" | LC_ALL=C sort
|
||||
br-guest: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default qlen 1000
|
||||
br-lan: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP mode DEFAULT group default qlen 1000
|
||||
br-lcm: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default qlen 1000
|
||||
br-lcm: <(NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN|BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UNKNOWN) mode DEFAULT group default qlen 1000 (re)
|
||||
eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1504 qdisc mq state UP mode DEFAULT group default qlen 1000
|
||||
eth1: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc mq master br-lan state DOWN mode DEFAULT group default qlen 1000
|
||||
eth2: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq state UP mode DEFAULT group default qlen 1000
|
||||
|
||||
@ -9,7 +9,7 @@ Check correct routing table:
|
||||
10.0.0.0/24 dev eth1 proto kernel scope link src 10.0.0.2
|
||||
192.168.1.0/24 dev br-lan proto kernel scope link src 192.168.1.1
|
||||
192.168.2.0/24 dev br-guest proto kernel scope link src 192.168.2.1 linkdown
|
||||
192.168.3.0/24 dev br-lcm proto kernel scope link src 192.168.3.1 linkdown
|
||||
192\.168\.3\.0/24 dev br-lcm proto kernel scope link src 192\.168\.3\.1( linkdown)? (re)
|
||||
|
||||
Check correct interface setup:
|
||||
|
||||
@ -17,7 +17,7 @@ Check correct interface setup:
|
||||
|
||||
br-guest: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default qlen 1000
|
||||
br-lan: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP mode DEFAULT group default qlen 1000
|
||||
br-lcm: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default qlen 1000
|
||||
br-lcm: <(NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN|BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UNKNOWN) mode DEFAULT group default qlen 1000 (re)
|
||||
cpu0_0_0: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 1000
|
||||
cpu0_1_0: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 1000
|
||||
cpu1_2_0: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 1000
|
||||
|
||||
@ -9,14 +9,14 @@ Check correct routing table:
|
||||
10.0.0.0/24 dev eth2 proto kernel scope link src 10.0.0.2
|
||||
192.168.1.0/24 dev br-lan proto kernel scope link src 192.168.1.1
|
||||
192.168.2.0/24 dev br-guest proto kernel scope link src 192.168.2.1 linkdown
|
||||
192.168.3.0/24 dev br-lcm proto kernel scope link src 192.168.3.1 linkdown
|
||||
192\.168\.3\.0/24 dev br-lcm proto kernel scope link src 192\.168\.3\.1( linkdown)? (re)
|
||||
|
||||
Check correct interface setup:
|
||||
|
||||
$ R "ip link | grep ^\\\\d | cut -d: -f2-" | LC_ALL=C sort
|
||||
br-guest: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default qlen 1000
|
||||
br-lan: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP mode DEFAULT group default qlen 1000
|
||||
br-lcm: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default qlen 1000
|
||||
br-lcm: <(NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN|BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UNKNOWN) mode DEFAULT group default qlen 1000 (re)
|
||||
eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1504 qdisc mq state UNKNOWN mode DEFAULT group default qlen 1000
|
||||
eth1: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 1000
|
||||
eth2: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq state UP mode DEFAULT group default qlen 1000
|
||||
|
||||
@ -9,14 +9,14 @@ Check correct routing table:
|
||||
10.0.0.0/24 dev wan proto kernel scope link src 10.0.0.2
|
||||
192.168.1.0/24 dev br-lan proto kernel scope link src 192.168.1.1
|
||||
192.168.2.0/24 dev br-guest proto kernel scope link src 192.168.2.1 linkdown
|
||||
192.168.3.0/24 dev br-lcm proto kernel scope link src 192.168.3.1 linkdown
|
||||
192\.168\.3\.0/24 dev br-lcm proto kernel scope link src 192\.168\.3\.1( linkdown)? (re)
|
||||
|
||||
Check correct interface setup:
|
||||
|
||||
$ R "ip link | grep ^\\\\d | cut -d: -f2-" | LC_ALL=C sort
|
||||
br-guest: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default qlen 1000
|
||||
br-lan: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP mode DEFAULT group default qlen 1000
|
||||
br-lcm: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default qlen 1000
|
||||
br-lcm: <(NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN|BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UNKNOWN) mode DEFAULT group default qlen 1000 (re)
|
||||
ip6tnl0@NONE: <NOARP> mtu 1452 qdisc noop state DOWN mode DEFAULT group default qlen 1000
|
||||
lan1: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc mq master br-lan state DOWN mode DEFAULT group default qlen 1000
|
||||
lan2: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc mq master br-lan state DOWN mode DEFAULT group default qlen 1000
|
||||
|
||||
@ -9,14 +9,14 @@ Check correct routing table:
|
||||
10.0.0.0/24 dev eth2 proto kernel scope link src 10.0.0.2
|
||||
192.168.1.0/24 dev br-lan proto kernel scope link src 192.168.1.1
|
||||
192.168.2.0/24 dev br-guest proto kernel scope link src 192.168.2.1 linkdown
|
||||
192.168.3.0/24 dev br-lcm proto kernel scope link src 192.168.3.1 linkdown
|
||||
192\.168\.3\.0/24 dev br-lcm proto kernel scope link src 192\.168\.3\.1( linkdown)? (re)
|
||||
|
||||
Check correct interface setup:
|
||||
|
||||
$ R "ip link | grep ^\\\\d | cut -d: -f2-" | LC_ALL=C sort
|
||||
br-guest: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default qlen 1000
|
||||
br-lan: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP mode DEFAULT group default qlen 1000
|
||||
br-lcm: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default qlen 1000
|
||||
br-lcm: <(NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN|BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UNKNOWN) mode DEFAULT group default qlen 1000 (re)
|
||||
eth0: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 1024
|
||||
eth1: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1508 qdisc mq state UP mode DEFAULT group default qlen 1024
|
||||
eth2: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq state UP mode DEFAULT group default qlen 1024
|
||||
|
||||
@ -9,14 +9,14 @@ Check correct routing table:
|
||||
10.0.0.0/24 dev wan proto kernel scope link src 10.0.0.2
|
||||
192.168.1.0/24 dev br-lan proto kernel scope link src 192.168.1.1
|
||||
192.168.2.0/24 dev br-guest proto kernel scope link src 192.168.2.1 linkdown
|
||||
192.168.3.0/24 dev br-lcm proto kernel scope link src 192.168.3.1 linkdown
|
||||
192\.168\.3\.0/24 dev br-lcm proto kernel scope link src 192\.168\.3\.1( linkdown)? (re)
|
||||
|
||||
Check correct interface setup:
|
||||
|
||||
$ R "ip link | grep ^\\\\d | cut -d: -f2-" | grep -v 'wwan0' | LC_ALL=C sort
|
||||
br-guest: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default qlen 1000
|
||||
br-lan: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP mode DEFAULT group default qlen 1000
|
||||
br-lcm: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default qlen 1000
|
||||
br-lcm: <(NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN|BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UNKNOWN) mode DEFAULT group default qlen 1000 (re)
|
||||
erspan0@NONE: <BROADCAST,MULTICAST> mtu 1450 qdisc noop state DOWN mode DEFAULT group default qlen 1000
|
||||
gre0@NONE: <NOARP> mtu 1476 qdisc noop state DOWN mode DEFAULT group default qlen 1000
|
||||
gretap0@NONE: <BROADCAST,MULTICAST> mtu 1462 qdisc noop state DOWN mode DEFAULT group default qlen 1000
|
||||
|
||||
Loading…
Reference in New Issue
Block a user