On Tue, Jul 5, 2022 at 7:11 AM Dumitru Ceara <[email protected]> wrote:
>
> Signed-off-by: Dumitru Ceara <[email protected]>
Thanks for this patch.
The below test cases is failing with this patch
347. ovn.at:14447: 347. localnet connectivity with multiple
requested-chassis -- ovn-northd -- parallelization=yes --
ovn_monitor_all=yes (ovn.at:14447): FAILED (--)
348. ovn.at:14447: 348. localnet connectivity with multiple
requested-chassis -- ovn-northd -- parallelization=yes --
ovn_monitor_all=no (ovn.at:14447): FAILED (--)
349. ovn.at:14447: 349. localnet connectivity with multiple
requested-chassis -- ovn-northd -- parallelization=no --
ovn_monitor_all=yes (ovn.at:14447): FAILED (--)
+ovs-vsctl: no row "hv1" in table Interface
../../tests/ovn-macros.at:384: exit code was 1, expected 0
350. ovn.at:14447: 350. localnet connectivity with multiple
requested-chassis -- ovn-northd -- parallelization=no --
ovn_monitor_all=no (ovn.at:14447): FAILED (--)
Can you please take a look.
Numan
> ---
> tests/ovn-macros.at | 20 +++
> tests/ovn.at | 358
> +++------------------------------------------------
> 2 files changed, 43 insertions(+), 335 deletions(-)
>
> diff --git a/tests/ovn-macros.at b/tests/ovn-macros.at
> index 335f9158c..77e89f6b4 100644
> --- a/tests/ovn-macros.at
> +++ b/tests/ovn-macros.at
> @@ -508,9 +508,13 @@ wait_for_ports_up() {
> fi
> }
>
> -# reset_pcap_file iface pcap_file
> +# reset_iface_pcap_file iface pcap_file
> # Resets the pcap file associates with OVS interface. should be used
> # with dummy datapath.
> +#
> +# XXX: This should actually replace reset_pcap_file() as they do almost
> +# exactly the same thing but the "wait while the pcap file has the size
> +# of the PCAP header" check causes tests to fail.
> reset_iface_pcap_file() {
> local iface=$1
> local pcap_file=$2
> @@ -525,6 +529,20 @@ options:rxq_pcap=${pcap_file}-rx.pcap
> OVS_WAIT_WHILE([test 24 = $(wc -c ${pcap_file}-tx.pcap | cut -d " "
> -f1)])
> }
>
> +# reset_pcap_file iface pcap_file
> +# Resets the pcap file associates with OVS interface. should be used
> +# with dummy datapath.
> +reset_pcap_file() {
> + local iface=$1
> + local pcap_file=$2
> + check rm -f dummy-*.pcap
> + check ovs-vsctl -- set Interface $iface options:tx_pcap=dummy-tx.pcap \
> +options:rxq_pcap=dummy-rx.pcap
> + check rm -f ${pcap_file}*.pcap
> + check ovs-vsctl -- set Interface $iface
> options:tx_pcap=${pcap_file}-tx.pcap \
> +options:rxq_pcap=${pcap_file}-rx.pcap
> +}
> +
> # Receive a packet on a dummy netdev interface. If we expect packets to be
> # recorded, then wait until the pcap file reflects the change.
> netdev_dummy_receive() {
> diff --git a/tests/ovn.at b/tests/ovn.at
> index 0e868ae66..9512fd033 100644
> --- a/tests/ovn.at
> +++ b/tests/ovn.at
> @@ -6479,16 +6479,6 @@ compare_dhcp_packets() {
> fi
> }
>
> -reset_pcap_file() {
> - local iface=$1
> - local pcap_file=$2
> - check ovs-vsctl -- set Interface $iface options:tx_pcap=dummy-tx.pcap \
> -options:rxq_pcap=dummy-rx.pcap
> - rm -f ${pcap_file}*.pcap
> - check ovs-vsctl -- set Interface $iface
> options:tx_pcap=${pcap_file}-tx.pcap \
> -options:rxq_pcap=${pcap_file}-rx.pcap
> -}
> -
> AT_CAPTURE_FILE([sbflows])
> ovn-sbctl dump-flows > sbflows
>
> @@ -7074,16 +7064,6 @@ test_dhcpv6() {
> as hv1 ovs-appctl netdev-dummy/receive hv1-vif$inport $request
> }
>
> -reset_pcap_file() {
> - local iface=$1
> - local pcap_file=$2
> - ovs-vsctl -- set Interface $iface options:tx_pcap=dummy-tx.pcap \
> -options:rxq_pcap=dummy-rx.pcap
> - rm -f ${pcap_file}*.pcap
> - ovs-vsctl -- set Interface $iface options:tx_pcap=${pcap_file}-tx.pcap \
> -options:rxq_pcap=${pcap_file}-rx.pcap
> -}
> -
> AT_CAPTURE_FILE([ofctl_monitor0.log])
> as hv1 ovs-ofctl monitor br-int resume --detach --no-chdir \
> --pidfile=ovs-ofctl0.pid 2> ofctl_monitor0.log
> @@ -8781,16 +8761,6 @@ OVS_WAIT_UNTIL([
> ])
> ovn-nbctl lsp-set-options lrp0-rp router-port=lrp0
> nat-addresses="f0:00:00:00:00:03 192.168.0.3"
>
> -reset_pcap_file() {
> - local iface=$1
> - local pcap_file=$2
> - ovs-vsctl -- set Interface $iface options:tx_pcap=dummy-tx.pcap \
> -options:rxq_pcap=dummy-rx.pcap
> - rm -f ${pcap_file}*.pcap
> - ovs-vsctl -- set Interface $iface options:tx_pcap=${pcap_file}-tx.pcap \
> -options:rxq_pcap=${pcap_file}-rx.pcap
> -}
> -
> reset_pcap_file snoopvif hv1/snoopvif
> OVS_WAIT_UNTIL([test `wc -c < "hv1/snoopvif-tx.pcap"` -ge 140])
>
> @@ -8865,20 +8835,8 @@ grep "Port patch-br-int-to-ln_port" | wc -l`])
> # Temporarily remove lr0 chassis
> AT_CHECK([ovn-nbctl remove logical_router lr0 options chassis])
>
> -reset_pcap_file() {
> - local hv=$1
> - local iface=$2
> - local pcap_file=$3
> - as $hv
> - ovs-vsctl -- set Interface $iface options:tx_pcap=dummy-tx.pcap \
> -options:rxq_pcap=dummy-rx.pcap
> - rm -f ${pcap_file}*.pcap
> - ovs-vsctl -- set Interface $iface options:tx_pcap=${pcap_file}-tx.pcap \
> -options:rxq_pcap=${pcap_file}-rx.pcap
> -}
> -
> -reset_pcap_file hv1 snoopvif hv1/snoopvif
> -reset_pcap_file hv2 snoopvif hv2/snoopvif
> +as hv1 reset_pcap_file snoopvif hv1/snoopvif
> +as hv2 reset_pcap_file snoopvif hv2/snoopvif
>
> hv1_uuid=$(ovn-sbctl --bare --columns _uuid list chassis hv1)
> AT_CHECK([ovn-nbctl set logical_router lr0 options:chassis=hv1])
> @@ -8894,8 +8852,8 @@ OVN_CHECK_PACKETS([hv2/snoopvif-tx.pcap],
> [empty_expected])
> # Temporarily remove lr0 chassis
> AT_CHECK([ovn-nbctl remove logical_router lr0 options chassis])
>
> -reset_pcap_file hv1 snoopvif hv1/snoopvif
> -reset_pcap_file hv2 snoopvif hv2/snoopvif
> +as hv1 reset_pcap_file snoopvif hv1/snoopvif
> +as hv2 reset_pcap_file snoopvif hv2/snoopvif
>
> hv2_uuid=$(ovn-sbctl --bare --columns _uuid list chassis hv2)
> AT_CHECK([ovn-nbctl set logical_router lr0 options:chassis=hv2])
> @@ -8980,16 +8938,6 @@ AT_CHECK([sort packets], [0], [expout])
> # due to GARP backoff
> ovn-nbctl lsp-set-options lrp0-rp router-port=lrp0 nat-addresses=""
>
> -reset_pcap_file() {
> - local iface=$1
> - local pcap_file=$2
> - ovs-vsctl -- set Interface $iface options:tx_pcap=dummy-tx.pcap \
> -options:rxq_pcap=dummy-rx.pcap
> - rm -f ${pcap_file}*.pcap
> - ovs-vsctl -- set Interface $iface options:tx_pcap=${pcap_file}-tx.pcap \
> -options:rxq_pcap=${pcap_file}-rx.pcap
> -}
> -
> as hv1 reset_pcap_file snoopvif hv1/snoopvif
>
> # Re-add nat-addresses option
> @@ -10467,16 +10415,6 @@ AT_CAPTURE_FILE([dns])
> ovn-sbctl dump-flows > sbflows
> AT_CAPTURE_FILE([sbflows])
>
> -reset_pcap_file() {
> - local iface=$1
> - local pcap_file=$2
> - ovs-vsctl -- set Interface $iface options:tx_pcap=dummy-tx.pcap \
> -options:rxq_pcap=dummy-rx.pcap
> - rm -f ${pcap_file}*.pcap
> - ovs-vsctl -- set Interface $iface options:tx_pcap=${pcap_file}-tx.pcap \
> -options:rxq_pcap=${pcap_file}-rx.pcap
> -}
> -
> # set_dns_params host_name
> # Sets the dns_req_data and dns_resp_data
> set_dns_params() {
> @@ -11851,16 +11789,6 @@ sort packets | cat
> # due to GARP backoff
> ovn-nbctl lsp-set-options lrp0-rp router-port=lrp0 nat-addresses=""
>
> -reset_pcap_file() {
> - local iface=$1
> - local pcap_file=$2
> - ovs-vsctl -- set Interface $iface options:tx_pcap=dummy-tx.pcap \
> -options:rxq_pcap=dummy-rx.pcap
> - rm -f ${pcap_file}*.pcap
> - ovs-vsctl -- set Interface $iface options:tx_pcap=${pcap_file}-tx.pcap \
> -options:rxq_pcap=${pcap_file}-rx.pcap
> -}
> -
> as hv1 reset_pcap_file snoopvif hv1/snoopvif
>
> # Add OVS ports for foo1 and foo2 on hv3
> @@ -12126,15 +12054,6 @@ AS_BOX([Verify packet at outside1 i.e
> nexthop(172.16.1.1) port])
>
> expected=${nexthop_mac}${gw_mac}08004500001c000000003f110100${foo1_ip}${dst_ip}0035111100080000
> echo $expected > hv3-vif1.expected
>
> -reset_pcap_file() {
> - local iface=$1
> - local pcap_file=$2
> - ovs-vsctl -- set Interface $iface options:tx_pcap=dummy-tx.pcap \
> -options:rxq_pcap=dummy-rx.pcap
> - rm -f ${pcap_file}*.pcap
> - ovs-vsctl -- set Interface $iface options:tx_pcap=${pcap_file}-tx.pcap \
> -options:rxq_pcap=${pcap_file}-rx.pcap
> -}
> check as hv1 ovs-appctl dpctl/del-flows
>
> as hv1 reset_pcap_file br-ex_n2 hv1/br-ex_n2
> @@ -12295,16 +12214,6 @@ ovs-vsctl -- add-port br-int hv1-vif3 -- \
> wait_for_ports_up
> check ovn-nbctl --wait=hv sync
>
> -reset_pcap_file() {
> - local iface=$1
> - local pcap_file=$2
> - ovs-vsctl -- set Interface $iface options:tx_pcap=dummy-tx.pcap \
> -options:rxq_pcap=dummy-rx.pcap
> - rm -f ${pcap_file}*.pcap
> - ovs-vsctl -- set Interface $iface options:tx_pcap=${pcap_file}-tx.pcap \
> -options:rxq_pcap=${pcap_file}-rx.pcap
> -}
> -
> # Make sure that ovn-controller has installed the corresponding OF Flow.
> OVS_WAIT_UNTIL([test 1 = `as hv1 ovs-ofctl dump-flows br-int | grep -c
> "ipv6_dst=ff02::2,nw_ttl=255,icmp_type=133,icmp_code=0"`])
>
> @@ -13551,16 +13460,6 @@ AT_CHECK([ovn-nbctl lsp-set-options ln_port
> network_name=physnet1])
> wait_for_ports_up
> check ovn-nbctl --wait=hv sync
>
> -reset_pcap_file() {
> - local iface=$1
> - local pcap_file=$2
> - ovs-vsctl -- set Interface $iface options:tx_pcap=dummy-tx.pcap \
> -options:rxq_pcap=dummy-rx.pcap
> - rm -f ${pcap_file}*.pcap
> - ovs-vsctl -- set Interface $iface options:tx_pcap=${pcap_file}-tx.pcap \
> -options:rxq_pcap=${pcap_file}-rx.pcap
> -}
> -
> as hv1 reset_pcap_file snoopvif hv1/snoopvif
> as hv2 reset_pcap_file br-phys_n1 hv2/br-phys_n1
> as hv3 reset_pcap_file br-phys_n1 hv3/br-phys_n1
> @@ -13897,16 +13796,6 @@ trim_zeros() {
> sed 's/\(00\)\{1,\}$//'
> }
>
> -reset_pcap_file() {
> - local iface=$1
> - local pcap_file=$2
> - ovs-vsctl -- set Interface $iface options:tx_pcap=dummy-tx.pcap \
> -options:rxq_pcap=dummy-rx.pcap
> - rm -f ${pcap_file}*.pcap
> - ovs-vsctl -- set Interface $iface options:tx_pcap=${pcap_file}-tx.pcap \
> -options:rxq_pcap=${pcap_file}-rx.pcap
> -}
> -
> # Test the IPv6 Neighbor Solicitation (NS) - nd_ns action for unknown MAC
> # addresses. ovn-controller should generate an IPv6 NS request for IPv6
> # packets whose MAC is unknown (in the ARP_REQUEST router pipeline stage.
> @@ -14293,23 +14182,12 @@ send_arp() {
> echo "${request}"
> }
>
> -reset_pcap_file() {
> - local hv=$1
> - local iface=$2
> - local pcap_file=$3
> - as $hv check ovs-vsctl -- set Interface $iface
> options:tx_pcap=dummy-tx.pcap \
> -
> options:rxq_pcap=dummy-rx.pcap
> - check rm -f ${pcap_file}*.pcap
> - as $hv check ovs-vsctl -- set Interface $iface
> options:tx_pcap=${pcap_file}-tx.pcap \
> -
> options:rxq_pcap=${pcap_file}-rx.pcap
> -}
> -
> reset_env() {
> - reset_pcap_file hv1 first hv1/first
> - reset_pcap_file hv2 second hv2/second
> - reset_pcap_file hv3 third hv3/third
> - reset_pcap_file hv1 migrator hv1/migrator
> - reset_pcap_file hv2 migrator hv2/migrator
> + as hv1 reset_pcap_file first hv1/first
> + as hv2 reset_pcap_file second hv2/second
> + as hv3 reset_pcap_file third hv3/third
> + as hv1 reset_pcap_file migrator hv1/migrator
> + as hv2 reset_pcap_file migrator hv2/migrator
>
> for port in hv1/migrator hv2/migrator hv1/first hv2/second hv3/third; do
> : > $port.expected
> @@ -14641,23 +14519,12 @@ send_garp() {
> echo "${request}"
> }
>
> -reset_pcap_file() {
> - local hv=$1
> - local iface=$2
> - local pcap_file=$3
> - as $hv check ovs-vsctl -- set Interface $iface
> options:tx_pcap=dummy-tx.pcap \
> -
> options:rxq_pcap=dummy-rx.pcap
> - check rm -f ${pcap_file}*.pcap
> - as $hv check ovs-vsctl -- set Interface $iface
> options:tx_pcap=${pcap_file}-tx.pcap \
> -
> options:rxq_pcap=${pcap_file}-rx.pcap
> -}
> -
> reset_env() {
> - reset_pcap_file hv1 first hv1/first
> - reset_pcap_file hv2 second hv2/second
> - reset_pcap_file hv3 third hv3/third
> - reset_pcap_file hv1 migrator hv1/migrator
> - reset_pcap_file hv2 migrator hv2/migrator
> + as hv1 reset_pcap_file first hv1/first
> + as hv2 reset_pcap_file second hv2/second
> + as hv3 reset_pcap_file third hv3/third
> + as hv1 reset_pcap_file migrator hv1/migrator
> + as hv2 reset_pcap_file migrator hv2/migrator
>
> for port in hv1/migrator hv2/migrator hv1/first hv2/second hv3/third; do
> : > $port.expected
> @@ -15013,23 +14880,12 @@ send_rarp() {
> echo "${request}"
> }
>
> -reset_pcap_file() {
> - local hv=$1
> - local iface=$2
> - local pcap_file=$3
> - as $hv check ovs-vsctl -- set Interface $iface
> options:tx_pcap=dummy-tx.pcap \
> -
> options:rxq_pcap=dummy-rx.pcap
> - check rm -f ${pcap_file}*.pcap
> - as $hv check ovs-vsctl -- set Interface $iface
> options:tx_pcap=${pcap_file}-tx.pcap \
> -
> options:rxq_pcap=${pcap_file}-rx.pcap
> -}
> -
> reset_env() {
> - reset_pcap_file hv1 migrator hv1/migrator
> - reset_pcap_file hv2 migrator hv2/migrator
> - reset_pcap_file hv1 first hv1/first
> - reset_pcap_file hv2 second hv2/second
> - reset_pcap_file hv3 outside hv3/outside
> + as hv1 reset_pcap_file migrator hv1/migrator
> + as hv2 reset_pcap_file migrator hv2/migrator
> + as hv1 reset_pcap_file first hv1/first
> + as hv2 reset_pcap_file second hv2/second
> + as hv3 reset_pcap_file outside hv3/outside
>
> for port in hv1/migrator hv2/migrator hv1/first hv2/second hv3/outside;
> do
> : > $port.expected
> @@ -15209,21 +15065,10 @@ send_rarp() {
> echo "${request}"
> }
>
> -reset_pcap_file() {
> - local hv=$1
> - local iface=$2
> - local pcap_file=$3
> - as $hv check ovs-vsctl -- set Interface $iface
> options:tx_pcap=dummy-tx.pcap \
> -
> options:rxq_pcap=dummy-rx.pcap
> - check rm -f ${pcap_file}*.pcap
> - as $hv check ovs-vsctl -- set Interface $iface
> options:tx_pcap=${pcap_file}-tx.pcap \
> -
> options:rxq_pcap=${pcap_file}-rx.pcap
> -}
> -
> reset_env() {
> - reset_pcap_file hv1 migrator hv1/migrator
> - reset_pcap_file hv2 migrator hv2/migrator
> - reset_pcap_file hv1 first hv1/first
> + as hv1 reset_pcap_file migrator hv1/migrator
> + as hv2 reset_pcap_file migrator hv2/migrator
> + as hv1 reset_pcap_file first hv1/first
>
> for port in hv1/migrator hv2/migrator hv1/first; do
> : > $port.expected
> @@ -15493,17 +15338,6 @@ done
> OVS_WAIT_UNTIL([test x`ovn-nbctl lsp-get-up sw-p1` = xup])
> OVS_WAIT_UNTIL([test x`ovn-nbctl lsp-get-up sw-p2` = xup])
>
> -reset_pcap_file() {
> - local iface=$1
> - local pcap_file=$2
> - ovs-vsctl -- set Interface $iface options:tx_pcap=dummy-tx.pcap \
> -options:rxq_pcap=dummy-rx.pcap
> - rm -f ${pcap_file}*.pcap
> - ovs-vsctl -- set Interface $iface options:tx_pcap=${pcap_file}-tx.pcap \
> -options:rxq_pcap=${pcap_file}-rx.pcap
> -
> -}
> -
> construct_expected_ra() {
> local src_mac=000000000001
> local dst_mac=333300000001
> @@ -15653,20 +15487,9 @@ for hv in hv1 hv2; do
> options:rxq_pcap=$hv/port-rx.pcap
> done
>
> -reset_pcap_file() {
> - local hv=$1
> - local iface=$2
> - local pcap_file=$3
> - as $hv check ovs-vsctl -- set Interface $iface
> options:tx_pcap=dummy-tx.pcap \
> -
> options:rxq_pcap=dummy-rx.pcap
> - check rm -f ${pcap_file}*.pcap
> - as $hv check ovs-vsctl -- set Interface $iface
> options:tx_pcap=${pcap_file}-tx.pcap \
> -
> options:rxq_pcap=${pcap_file}-rx.pcap
> -}
> -
> reset_env() {
> - reset_pcap_file hv1 br-phys_n1 hv1/br-phys_n1
> - reset_pcap_file hv2 br-phys_n1 hv2/br-phys_n1
> + as hv1 reset_pcap_file br-phys_n1 hv1/br-phys_n1
> + as hv2 reset_pcap_file br-phys_n1 hv2/br-phys_n1
>
> for port in hv1/n1 hv2/n1; do
> : > $port.expected
> @@ -15767,17 +15590,6 @@ done
>
> wait_for_ports_up
>
> -reset_pcap_file() {
> - local iface=$1
> - local pcap_file=$2
> - ovs-vsctl -- set Interface $iface options:tx_pcap=dummy-tx.pcap \
> -options:rxq_pcap=dummy-rx.pcap
> - rm -f ${pcap_file}*.pcap
> - ovs-vsctl -- set Interface $iface options:tx_pcap=${pcap_file}-tx.pcap \
> -options:rxq_pcap=${pcap_file}-rx.pcap
> -
> -}
> -
> construct_expected_ra() {
> local src_mac=000000000001
> local dst_mac=333300000001
> @@ -16809,17 +16621,6 @@ ${dst_ip}0035111100080000
> done
> }
>
> -reset_pcap_file() {
> - local iface=$1
> - local pcap_file=$2
> - ovs-vsctl -- set Interface $iface options:tx_pcap=dummy-tx.pcap \
> -options:rxq_pcap=dummy-rx.pcap
> - rm -f ${pcap_file}*.pcap
> - ovs-vsctl -- set Interface $iface options:tx_pcap=${pcap_file}-tx.pcap \
> -options:rxq_pcap=${pcap_file}-rx.pcap
> -}
> -
> -
> sip=`ip_to_hex 10 0 0 4`
> dip=`ip_to_hex 10 0 0 6`
>
> @@ -17112,16 +16913,6 @@ ${dst_ip}0035111100080000
> done
> }
>
> -reset_pcap_file() {
> - local iface=$1
> - local pcap_file=$2
> - check ovs-vsctl -- set Interface $iface options:tx_pcap=dummy-tx.pcap \
> -options:rxq_pcap=dummy-rx.pcap
> - rm -f ${pcap_file}*.pcap
> - check ovs-vsctl -- set Interface $iface
> options:tx_pcap=${pcap_file}-tx.pcap \
> -options:rxq_pcap=${pcap_file}-rx.pcap
> -}
> -
> # Add a default deny ACL and an allow ACL for specific IP traffic.
> check ovn-nbctl acl-add ls1 to-lport 2 'arp' allow
> check ovn-nbctl acl-add ls1 to-lport 1 'ip4' drop
> @@ -18355,16 +18146,6 @@ test_dhcpv6() {
> as hv1 ovs-appctl netdev-dummy/receive hv${inport}-ext${inport} $request
> }
>
> -reset_pcap_file() {
> - local iface=$1
> - local pcap_file=$2
> - ovs-vsctl -- set Interface $iface options:tx_pcap=dummy-tx.pcap \
> -options:rxq_pcap=dummy-rx.pcap
> - rm -f ${pcap_file}*.pcap
> - ovs-vsctl -- set Interface $iface options:tx_pcap=${pcap_file}-tx.pcap \
> -options:rxq_pcap=${pcap_file}-rx.pcap
> -}
> -
> AT_CAPTURE_FILE([ofctl_monitor0_hv1.log])
> as hv1 ovs-ofctl monitor br-int resume --detach --no-chdir \
> --pidfile=ovs-ofctl0.pid 2> ofctl_monitor0_hv1.log
> @@ -19038,16 +18819,6 @@ ovs-vsctl -- add-port br-int hv1-vif2 -- \
> options:rxq_pcap=hv1/vif2-rx.pcap \
> ofport-request=1
>
> -reset_pcap_file() {
> - local iface=$1
> - local pcap_file=$2
> - ovs-vsctl -- set Interface $iface options:tx_pcap=dummy-tx.pcap \
> - options:rxq_pcap=dummy-rx.pcap
> - rm -f ${pcap_file}*.pcap
> - ovs-vsctl -- set Interface $iface options:tx_pcap=${pcap_file}-tx.pcap \
> - options:rxq_pcap=${pcap_file}-rx.pcap
> -}
> -
> # IPv4 outgoing traffic generated inside the cluster
> test_ip_packet_larger() {
> local mtu=$1
> @@ -20952,16 +20723,6 @@ ovn_start
> # - 1 port bound on hv2 (sw3-p2)
> # - 1 localnet port (sw3-ln)
>
> -reset_pcap_file() {
> - local iface=$1
> - local pcap_file=$2
> - check ovs-vsctl -- set Interface $iface options:tx_pcap=dummy-tx.pcap \
> -options:rxq_pcap=dummy-rx.pcap
> - rm -f ${pcap_file}*.pcap
> - check ovs-vsctl -- set Interface $iface
> options:tx_pcap=${pcap_file}-tx.pcap \
> -options:rxq_pcap=${pcap_file}-rx.pcap
> -}
> -
> ovn-nbctl ls-add sw1
> ovn-nbctl ls-add sw2
> ovn-nbctl ls-add sw3
> @@ -21538,16 +21299,6 @@ ovn_start
> # - 1 port bound on hv2 (sw2-p2)
> # - IGMP Querier from 20.0.0.254
>
> -reset_pcap_file() {
> - local iface=$1
> - local pcap_file=$2
> - check ovs-vsctl -- set Interface $iface options:tx_pcap=dummy-tx.pcap \
> -options:rxq_pcap=dummy-rx.pcap
> - rm -f ${pcap_file}*.pcap
> - check ovs-vsctl -- set Interface $iface
> options:tx_pcap=${pcap_file}-tx.pcap \
> -options:rxq_pcap=${pcap_file}-rx.pcap
> -}
> -
> check ovn-nbctl ls-add sw1 \
> -- lsp-add sw1 sw1-p1
>
> @@ -21694,16 +21445,6 @@ ovn_start
> # - 1 port bound on hv2 (sw3-p2)
> # - 1 localnet port (sw3-ln)
>
> -reset_pcap_file() {
> - local iface=$1
> - local pcap_file=$2
> - check ovs-vsctl -- set Interface $iface options:tx_pcap=dummy-tx.pcap \
> -options:rxq_pcap=dummy-rx.pcap
> - rm -f ${pcap_file}*.pcap
> - check ovs-vsctl -- set Interface $iface
> options:tx_pcap=${pcap_file}-tx.pcap \
> -options:rxq_pcap=${pcap_file}-rx.pcap
> -}
> -
> check ovn-nbctl ls-add sw1
> check ovn-nbctl ls-add sw2
> check ovn-nbctl ls-add sw3
> @@ -25653,16 +25394,6 @@ OVN_FOR_EACH_NORTHD([
> AT_SETUP([Load Balancer LS hairpin])
> ovn_start
>
> -reset_pcap_file() {
> - local iface=$1
> - local pcap_file=$2
> - ovs-vsctl -- set Interface $iface options:tx_pcap=dummy-tx.pcap \
> -options:rxq_pcap=dummy-rx.pcap
> - rm -f ${pcap_file}*.pcap
> - ovs-vsctl -- set Interface $iface options:tx_pcap=${pcap_file}-tx.pcap \
> -options:rxq_pcap=${pcap_file}-rx.pcap
> -}
> -
> build_udp() {
> local sport=$1 dport=$2 chksum=$3
> local len=000a
> @@ -27959,16 +27690,6 @@ ovs-vsctl -- add-port br-phys hv2-phys1 -- \
> options:rxq_pcap=hv2/phys1-rx.pcap \
> ofport-request=1
>
> -reset_pcap_file() {
> - local iface=$1
> - local pcap_file=$2
> - ovs-vsctl -- set Interface $iface options:tx_pcap=dummy-tx.pcap \
> -options:rxq_pcap=dummy-rx.pcap
> - rm -f ${pcap_file}*.pcap
> - ovs-vsctl -- set Interface $iface options:tx_pcap=${pcap_file}-tx.pcap \
> -options:rxq_pcap=${pcap_file}-rx.pcap
> -}
> -
> send_arp_request() {
> local eth_src=$1 spa=$2 tpa=$3
> local eth_dst=ffffffffffff
> @@ -28128,17 +27849,6 @@ ${dst_ip}0035111100080000
> done
> }
>
> -reset_pcap_file() {
> - local iface=$1
> - local pcap_file=$2
> - ovs-vsctl -- set Interface $iface options:tx_pcap=dummy-tx.pcap \
> -options:rxq_pcap=dummy-rx.pcap
> - rm -f ${pcap_file}*.pcap
> - ovs-vsctl -- set Interface $iface options:tx_pcap=${pcap_file}-tx.pcap \
> -options:rxq_pcap=${pcap_file}-rx.pcap
> -}
> -
> -
> # Create overlapping ACLs resulting in duplicated desired OVS flows
> check ovn-nbctl acl-add ls1 to-lport 1001 \
> 'outport == "lsp1" && ip4 && ip4.src == 10.0.0.2' allow
> @@ -28246,16 +27956,6 @@ ${dst_ip}0035111100080000
> done
> }
>
> -reset_pcap_file() {
> - local iface=$1
> - local pcap_file=$2
> - ovs-vsctl -- set Interface $iface options:tx_pcap=dummy-tx.pcap \
> -options:rxq_pcap=dummy-rx.pcap
> - rm -f ${pcap_file}*.pcap
> - ovs-vsctl -- set Interface $iface options:tx_pcap=${pcap_file}-tx.pcap \
> -options:rxq_pcap=${pcap_file}-rx.pcap
> -}
> -
> # Create an address set
> ovn-nbctl create Address_Set name=as1 \
> addresses=\"10.0.0.2\",\"10.0.0.3\"
> @@ -29446,16 +29146,6 @@ send_icmp_packet() {
> as hv$hv ovs-appctl netdev-dummy/receive hv$hv-vif$inport $packet
> }
>
> -reset_pcap_file() {
> - local iface=$1
> - local pcap_file=$2
> - ovs-vsctl -- set Interface $iface options:tx_pcap=dummy-tx.pcap \
> -options:rxq_pcap=dummy-rx.pcap
> - rm -f ${pcap_file}*.pcap
> - ovs-vsctl -- set Interface $iface options:tx_pcap=${pcap_file}-tx.pcap \
> -options:rxq_pcap=${pcap_file}-rx.pcap
> -}
> -
> trim_zeros() {
> sed 's/\(00\)\{1,\}$//'
> }
>
> _______________________________________________
> dev mailing list
> [email protected]
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
