[dts] [PATCH v5] test_plans: add large packet payload check in vm2vm virtio_pmd test

[Tu, Lijuan]

Applied error, could you please fix it.

Applying: test_plans: add large packet payload check in vm2vm virtio_pmd test
error: patch failed: test_plans/vm2vm_virtio_pmd_test_plan.rst:34
error: test_plans/vm2vm_virtio_pmd_test_plan.rst: patch does not apply
Patch failed at 0001 test_plans: add large packet payload check in vm2vm virtio_pmd test

> -----Original Message-----
> From: dts [mailto:dts-bounces at dpdk.org] On Behalf Of Yinan
> Sent: Tuesday, July 9, 2019 7:26 AM
> To: dts at dpdk.org
> Cc: Wang, Yinan <yinan.wang at intel.com>
> Subject: [dts] [PATCH v5] test_plans: add large packet payload check in
> vm2vm virtio_pmd test
> 
> From: Wang Yinan <yinan.wang at intel.com>
> 
> Signed-off-by: Wang Yinan <yinan.wang at intel.com>
> ---
>  test_plans/vm2vm_virtio_pmd_test_plan.rst | 33 ++++++++++++++---------
>  1 file changed, 21 insertions(+), 12 deletions(-)
> 
> diff --git a/test_plans/vm2vm_virtio_pmd_test_plan.rst
> b/test_plans/vm2vm_virtio_pmd_test_plan.rst
> index 5de1196..202f391 100644
> --- a/test_plans/vm2vm_virtio_pmd_test_plan.rst
> +++ b/test_plans/vm2vm_virtio_pmd_test_plan.rst
> @@ -34,10 +34,22 @@
>  vm2vm vhost-user/virtio-pmd test plan
>  =====================================
> 
> -Description
> -===========
> +This test plan includes vm2vm vhost-user/virtio-pmd(0.95) mergeable
> +,normal and vector_rx path test, and vm2vm vhost/virtio-pmd(1.0)
> mergeable, normal and vector_rx path test. Specially, two mergeable path
> test check the payload of each packets are valid by using pdump.
> 
> -This test plan includes vm2vm vhost-user/virtio-pmd(0.95)
> mergeable ,normal and vector_rx path test, and vm2vm vhost/virtio-pmd(1.0)
> mergeable ,normal and vector_rx path test. Specially, two mergeable path
> test check the payload of each packets are valid by using pdump.
> +Prerequisites
> +=============
> +
> +Enable pcap lib in dpdk code and recompile::
> +
> +    --- a/config/common_base
> +    +++ b/config/common_base
> +    @@ -492,7 +492,7 @@ CONFIG_RTE_LIBRTE_PMD_NULL=y
> +     #
> +     # Compile software PMD backed by PCAP files
> +     #
> +    -CONFIG_RTE_LIBRTE_PMD_PCAP=n
> +    +CONFIG_RTE_LIBRTE_PMD_PCAP=y
> 
>  Test flow
>  =========
> @@ -413,8 +425,9 @@ Test Case 7: vm2vm virtio1.1 mergeable path test
> with payload check
>      --vdev 'eth_vhost0,iface=vhost-net,queues=1' --vdev
> 'eth_vhost1,iface=vhost-net1,queues=1' -- \
>      -i --nb-cores=2 --txd=1024 --rxd=1024
>      testpmd>set fwd mac
> +    testpmd>start
> 
> -2. Launch virtio-user by below command::
> +2. Launch virtio-user1 by below command::
> 
>      ./testpmd -n 4 -l 7-8 --socket-mem 1024,1024 \
>      --no-pci --file-prefix=virtio1 \
> @@ -425,20 +438,16 @@ Test Case 7: vm2vm virtio1.1 mergeable path test
> with payload check
> 
>  3. Attach pdump secondary process to primary process by same file-prefix::
> 
> -    ./dpdk-pdump -v --file-prefix=virtio1 -- --pdump
> 'device_id=net_virtio_user1,queue=*,rx-dev=/root/pdump-rx.pcap,mbuf-
> size=8000'
> +    ./x86_64-native-linuxapp-gcc/app/dpdk-pdump -v --file-prefix=virtio1 -- --
> pdump 'device_id=net_virtio_user1,queue=*,rx-dev=/root/pdump-
> rx.pcap,mbuf-size=8000'
> 
> -4. Launch virtio-user by below command::
> +4. Launch virtio-user0 and send 8k length packets::
> 
> -    ./x86_64-native-linuxapp-gcc/app/testpmd -n 4 -l 5-6 --socket-mem
> 1024,1024 \
> +    ./testpmd -n 4 -l 5-6 --socket-mem 1024,1024 \
>      --no-pci --file-prefix=virtio \
>      --vdev=net_virtio_user0,mac=00:01:02:03:04:05,path=./vhost-
> net,queues=1,packed_vq=1,mrg_rxbuf=1,in_order=0 \
>      -- -i --nb-cores=1 --txd=1024 --rxd=1024 --max-pkt-len=9600
> -    testpmd>set fwd txonly
> -
> -5. Send large packets from net_virtio_user0::
> -
>      testpmd>set txpkts 2000,2000,2000,2000
>      testpmd>set burst 1
>      testpmd>start tx_first 10
> 
> -6. Check payload is correct in each dumped packets.
> \ No newline at end of file
> +5. Check payload is correct in each dumped packets.
> \ No newline at end of file
> --
> 2.17.1