223 lines
6.8 KiB
Diff
223 lines
6.8 KiB
Diff
|
From 9d5786383a148be6731257f5c518a3438025a505 Mon Sep 17 00:00:00 2001
|
||
|
|
From: renmingshuai <renmingshuai@huawei.com>
|
||
|
|
Date: Mon, 28 Nov 2022 19:21:32 +0800
|
||
|
|
Subject: [PATCH] bugfix iproute2 cancel some test cases
|
||
|
|
|
||
|
|
---
|
||
|
|
testsuite/tests/ip/link/add_type_bareudp.t | 86 ----------------------
|
||
|
|
testsuite/tests/ip/link/add_type_xfrm.t | 32 --------
|
||
|
|
testsuite/tests/tc/mpls.t | 69 -----------------
|
||
|
|
3 files changed, 187 deletions(-)
|
||
|
|
delete mode 100755 testsuite/tests/ip/link/add_type_bareudp.t
|
||
|
|
delete mode 100755 testsuite/tests/ip/link/add_type_xfrm.t
|
||
|
|
delete mode 100755 testsuite/tests/tc/mpls.t
|
||
|
|
|
||
|
|
diff --git a/testsuite/tests/ip/link/add_type_bareudp.t b/testsuite/tests/ip/link/add_type_bareudp.t
|
||
|
|
deleted file mode 100755
|
||
|
|
index 8a2a1ed..0000000
|
||
|
|
--- a/testsuite/tests/ip/link/add_type_bareudp.t
|
||
|
|
+++ /dev/null
|
||
|
|
@@ -1,86 +0,0 @@
|
||
|
|
-#!/bin/sh
|
||
|
|
-
|
||
|
|
-. lib/generic.sh
|
||
|
|
-
|
||
|
|
-ts_log "[Testing Add BareUDP interface (unicast MPLS)]"
|
||
|
|
-NEW_DEV="$(rand_dev)"
|
||
|
|
-
|
||
|
|
-ts_ip "$0" "Add $NEW_DEV BareUDP interface (unicast MPLS)" link add dev $NEW_DEV type bareudp dstport 6635 ethertype mpls_uc
|
||
|
|
-
|
||
|
|
-ts_ip "$0" "Show $NEW_DEV BareUDP interface (unicast MPLS)" -d link show dev $NEW_DEV
|
||
|
|
-test_on "$NEW_DEV"
|
||
|
|
-test_on "dstport 6635"
|
||
|
|
-test_on "ethertype mpls_uc"
|
||
|
|
-test_on "nomultiproto"
|
||
|
|
-
|
||
|
|
-ts_ip "$0" "Del $NEW_DEV BareUDP interface (unicast MPLS)" link del dev $NEW_DEV
|
||
|
|
-
|
||
|
|
-
|
||
|
|
-ts_log "[Testing Add BareUDP interface (multicast MPLS)]"
|
||
|
|
-NEW_DEV="$(rand_dev)"
|
||
|
|
-
|
||
|
|
-ts_ip "$0" "Add $NEW_DEV BareUDP interface (multicast MPLS)" link add dev $NEW_DEV type bareudp dstport 6635 ethertype mpls_mc
|
||
|
|
-
|
||
|
|
-ts_ip "$0" "Show $NEW_DEV BareUDP interface (multicast MPLS)" -d link show dev $NEW_DEV
|
||
|
|
-test_on "$NEW_DEV"
|
||
|
|
-test_on "dstport 6635"
|
||
|
|
-test_on "ethertype mpls_mc"
|
||
|
|
-test_on "nomultiproto"
|
||
|
|
-
|
||
|
|
-ts_ip "$0" "Del $NEW_DEV BareUDP interface (multicast MPLS)" link del dev $NEW_DEV
|
||
|
|
-
|
||
|
|
-
|
||
|
|
-ts_log "[Testing Add BareUDP interface (unicast and multicast MPLS)]"
|
||
|
|
-NEW_DEV="$(rand_dev)"
|
||
|
|
-
|
||
|
|
-ts_ip "$0" "Add $NEW_DEV BareUDP interface (unicast and multicast MPLS)" link add dev $NEW_DEV type bareudp dstport 6635 ethertype mpls_uc multiproto
|
||
|
|
-
|
||
|
|
-ts_ip "$0" "Show $NEW_DEV BareUDP interface (unicast and multicast MPLS)" -d link show dev $NEW_DEV
|
||
|
|
-test_on "$NEW_DEV"
|
||
|
|
-test_on "dstport 6635"
|
||
|
|
-test_on "ethertype mpls_uc"
|
||
|
|
-test_on "multiproto"
|
||
|
|
-
|
||
|
|
-ts_ip "$0" "Del $NEW_DEV BareUDP interface (unicast and multicast MPLS)" link del dev $NEW_DEV
|
||
|
|
-
|
||
|
|
-
|
||
|
|
-ts_log "[Testing Add BareUDP interface (IPv4)]"
|
||
|
|
-NEW_DEV="$(rand_dev)"
|
||
|
|
-
|
||
|
|
-ts_ip "$0" "Add $NEW_DEV BareUDP interface (IPv4)" link add dev $NEW_DEV type bareudp dstport 6635 ethertype ipv4
|
||
|
|
-
|
||
|
|
-ts_ip "$0" "Show $NEW_DEV BareUDP interface (IPv4)" -d link show dev $NEW_DEV
|
||
|
|
-test_on "$NEW_DEV"
|
||
|
|
-test_on "dstport 6635"
|
||
|
|
-test_on "ethertype ip"
|
||
|
|
-test_on "nomultiproto"
|
||
|
|
-
|
||
|
|
-ts_ip "$0" "Del $NEW_DEV BareUDP interface (IPv4)" link del dev $NEW_DEV
|
||
|
|
-
|
||
|
|
-
|
||
|
|
-ts_log "[Testing Add BareUDP interface (IPv6)]"
|
||
|
|
-NEW_DEV="$(rand_dev)"
|
||
|
|
-
|
||
|
|
-ts_ip "$0" "Add $NEW_DEV BareUDP interface (IPv6)" link add dev $NEW_DEV type bareudp dstport 6635 ethertype ipv6
|
||
|
|
-
|
||
|
|
-ts_ip "$0" "Show $NEW_DEV BareUDP interface (IPv6)" -d link show dev $NEW_DEV
|
||
|
|
-test_on "$NEW_DEV"
|
||
|
|
-test_on "dstport 6635"
|
||
|
|
-test_on "ethertype ipv6"
|
||
|
|
-test_on "nomultiproto"
|
||
|
|
-
|
||
|
|
-ts_ip "$0" "Del $NEW_DEV BareUDP interface (IPv6)" link del dev $NEW_DEV
|
||
|
|
-
|
||
|
|
-
|
||
|
|
-ts_log "[Testing Add BareUDP interface (IPv4 and IPv6)]"
|
||
|
|
-NEW_DEV="$(rand_dev)"
|
||
|
|
-
|
||
|
|
-ts_ip "$0" "Add $NEW_DEV BareUDP interface (IPv4 and IPv6)" link add dev $NEW_DEV type bareudp dstport 6635 ethertype ipv4 multiproto
|
||
|
|
-
|
||
|
|
-ts_ip "$0" "Show $NEW_DEV BareUDP interface (IPv4 and IPv6)" -d link show dev $NEW_DEV
|
||
|
|
-test_on "$NEW_DEV"
|
||
|
|
-test_on "dstport 6635"
|
||
|
|
-test_on "ethertype ip"
|
||
|
|
-test_on "multiproto"
|
||
|
|
-
|
||
|
|
-ts_ip "$0" "Del $NEW_DEV BareUDP interface (IPv4 and IPv6)" link del dev $NEW_DEV
|
||
|
|
diff --git a/testsuite/tests/ip/link/add_type_xfrm.t b/testsuite/tests/ip/link/add_type_xfrm.t
|
||
|
|
deleted file mode 100755
|
||
|
|
index 78ce28e..0000000
|
||
|
|
--- a/testsuite/tests/ip/link/add_type_xfrm.t
|
||
|
|
+++ /dev/null
|
||
|
|
@@ -1,32 +0,0 @@
|
||
|
|
-#!/bin/sh
|
||
|
|
-
|
||
|
|
-. lib/generic.sh
|
||
|
|
-
|
||
|
|
-ts_log "[Testing Add XFRM Interface, With IF-ID]"
|
||
|
|
-
|
||
|
|
-PHYS_DEV="lo"
|
||
|
|
-NEW_DEV="$(rand_dev)"
|
||
|
|
-IF_ID="0xf"
|
||
|
|
-
|
||
|
|
-ts_ip "$0" "Add $NEW_DEV xfrm interface" link add dev $NEW_DEV type xfrm dev $PHYS_DEV if_id $IF_ID
|
||
|
|
-
|
||
|
|
-ts_ip "$0" "Show $NEW_DEV xfrm interface" -d link show dev $NEW_DEV
|
||
|
|
-test_on "$NEW_DEV"
|
||
|
|
-test_on "if_id $IF_ID"
|
||
|
|
-
|
||
|
|
-ts_ip "$0" "Del $NEW_DEV xfrm interface" link del dev $NEW_DEV
|
||
|
|
-
|
||
|
|
-
|
||
|
|
-ts_log "[Testing Add XFRM Interface, No IF-ID]"
|
||
|
|
-
|
||
|
|
-PHYS_DEV="lo"
|
||
|
|
-NEW_DEV="$(rand_dev)"
|
||
|
|
-IF_ID="0xf"
|
||
|
|
-
|
||
|
|
-ts_ip "$0" "Add $NEW_DEV xfrm interface" link add dev $NEW_DEV type xfrm dev $PHYS_DEV
|
||
|
|
-
|
||
|
|
-ts_ip "$0" "Show $NEW_DEV xfrm interface" -d link show dev $NEW_DEV
|
||
|
|
-test_on "$NEW_DEV"
|
||
|
|
-test_on_not "if_id $IF_ID"
|
||
|
|
-
|
||
|
|
-ts_ip "$0" "Del $NEW_DEV xfrm interface" link del dev $NEW_DEV
|
||
|
|
diff --git a/testsuite/tests/tc/mpls.t b/testsuite/tests/tc/mpls.t
|
||
|
|
deleted file mode 100755
|
||
|
|
index cb25f36..0000000
|
||
|
|
--- a/testsuite/tests/tc/mpls.t
|
||
|
|
+++ /dev/null
|
||
|
|
@@ -1,69 +0,0 @@
|
||
|
|
-#!/bin/sh
|
||
|
|
-
|
||
|
|
-. lib/generic.sh
|
||
|
|
-
|
||
|
|
-DEV="$(rand_dev)"
|
||
|
|
-ts_ip "$0" "Add $DEV dummy interface" link add dev $DEV up type dummy
|
||
|
|
-ts_tc "$0" "Add ingress qdisc" qdisc add dev $DEV ingress
|
||
|
|
-
|
||
|
|
-reset_qdisc()
|
||
|
|
-{
|
||
|
|
- ts_tc "$0" "Remove ingress qdisc" qdisc del dev $DEV ingress
|
||
|
|
- ts_tc "$0" "Add ingress qdisc" qdisc add dev $DEV ingress
|
||
|
|
-}
|
||
|
|
-
|
||
|
|
-ts_tc "$0" "Add mpls action pop" \
|
||
|
|
- filter add dev $DEV ingress protocol mpls_uc matchall \
|
||
|
|
- action mpls pop protocol ip
|
||
|
|
-ts_tc "$0" "Show ingress filters" filter show dev $DEV ingress
|
||
|
|
-test_on "mpls"
|
||
|
|
-test_on "pop protocol ip pipe"
|
||
|
|
-
|
||
|
|
-reset_qdisc
|
||
|
|
-ts_tc "$0" "Add mpls action push" \
|
||
|
|
- filter add dev $DEV ingress protocol ip matchall \
|
||
|
|
- action mpls push protocol mpls_uc label 20 tc 3 bos 1 ttl 64
|
||
|
|
-ts_tc "$0" "Show ingress filters" filter show dev $DEV ingress
|
||
|
|
-test_on "mpls"
|
||
|
|
-test_on "push"
|
||
|
|
-test_on "protocol mpls_uc"
|
||
|
|
-test_on "label 20"
|
||
|
|
-test_on "tc 3"
|
||
|
|
-test_on "bos 1"
|
||
|
|
-test_on "ttl 64"
|
||
|
|
-test_on "pipe"
|
||
|
|
-
|
||
|
|
-reset_qdisc
|
||
|
|
-ts_tc "$0" "Add mpls action mac_push" \
|
||
|
|
- filter add dev $DEV ingress matchall \
|
||
|
|
- action mpls mac_push protocol mpls_uc label 20 tc 3 bos 1 ttl 64
|
||
|
|
-ts_tc "$0" "Show ingress filters" filter show dev $DEV ingress
|
||
|
|
-test_on "mpls"
|
||
|
|
-test_on "mac_push"
|
||
|
|
-test_on "protocol mpls_uc"
|
||
|
|
-test_on "label 20"
|
||
|
|
-test_on "tc 3"
|
||
|
|
-test_on "bos 1"
|
||
|
|
-test_on "ttl 64"
|
||
|
|
-test_on "pipe"
|
||
|
|
-
|
||
|
|
-reset_qdisc
|
||
|
|
-ts_tc "$0" "Add mpls action modify" \
|
||
|
|
- filter add dev $DEV ingress protocol mpls_uc matchall \
|
||
|
|
- action mpls modify label 20 tc 3 ttl 64
|
||
|
|
-ts_tc "$0" "Show ingress filters" filter show dev $DEV ingress
|
||
|
|
-test_on "mpls"
|
||
|
|
-test_on "modify"
|
||
|
|
-test_on "label 20"
|
||
|
|
-test_on "tc 3"
|
||
|
|
-test_on "ttl 64"
|
||
|
|
-test_on "pipe"
|
||
|
|
-
|
||
|
|
-reset_qdisc
|
||
|
|
-ts_tc "$0" "Add mpls action dec_ttl" \
|
||
|
|
- filter add dev $DEV ingress protocol mpls_uc matchall \
|
||
|
|
- action mpls dec_ttl
|
||
|
|
-ts_tc "$0" "Show ingress filters" filter show dev $DEV ingress
|
||
|
|
-test_on "mpls"
|
||
|
|
-test_on "dec_ttl"
|
||
|
|
-test_on "pipe"
|
||
|
|
--
|
||
|
|
2.23.0
|
||
|
|
|