Code Review / csit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 35ac362)
Report: Fix greps 85/12485/1
authorTibor Frank <tifrank@cisco.com>
Wed, 9 May 2018 07:53:58 +0000 (09:53 +0200)
committerTibor Frank <tifrank@cisco.com>
Wed, 9 May 2018 07:53:58 +0000 (09:53 +0200)
Change-Id: I450d5e9fa1cbd4a40caec68f3fc4674f744f1168
Signed-off-by: Tibor Frank <tifrank@cisco.com>
docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec.rst patch | blob | history
docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost.rst patch | blob | history
tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdrdisc.robot patch | blob | history
tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdrdisc.robot patch | blob | history
tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdrdisc.robot patch | blob | history
tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdrdisc.robot patch | blob | history
tests/vpp/perf/l2/40ge2p1vic1385-eth-l2bdbasemaclrn-ndrpdrdisc.robot patch | blob | history

diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec.rst
index 3d8d175..b0fd17d 100644 (file)
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec.rst
@@ -36,7 +36,7 @@ git repository:
 
 .. only:: html
 
 
 .. only:: html
 
-   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/crypto && grep -E "64B-1t1c-.*ipsec.*-ndrdisc" *
+   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/crypto && grep -E "64B-1t1c-(ethip4ipsecbasetnl|ethip4ipsecscale1000tnl|ethip4ipsectptlispgpe)-.*-ndrdisc" *
       :shell:
 
 .. only:: latex
       :shell:
 
 .. only:: latex
@@ -44,7 +44,7 @@ git repository:
    .. code-block:: bash
 
       $ cd tests/vpp/perf/crypto
    .. code-block:: bash
 
       $ cd tests/vpp/perf/crypto
-      $ grep -E "64B-1t1c-.*ipsec.*-ndrdisc" *
+      $ grep -E "64B-1t1c-(ethip4ipsecbasetnl|ethip4ipsecscale1000tnl|ethip4ipsectptlispgpe)-.*-ndrdisc" *
 
 VPP NDR 64B packet throughput in 2t2c setup (2thread, 2core) is presented
 in the graph below.
 
 VPP NDR 64B packet throughput in 2t2c setup (2thread, 2core) is presented
 in the graph below.
@@ -69,7 +69,7 @@ git repository:
 
 .. only:: html
 
 
 .. only:: html
 
-   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/crypto && grep -E "64B-2t2c-.*ipsec.*-ndrdisc" *
+   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/crypto && grep -E "64B-2t2c-(ethip4ipsecbasetnl|ethip4ipsecscale1000tnl|ethip4ipsectptlispgpe)-.*-ndrdisc" *
       :shell:
 
 .. only:: latex
       :shell:
 
 .. only:: latex
@@ -77,7 +77,7 @@ git repository:
    .. code-block:: bash
 
       $ cd tests/vpp/perf/crypto
    .. code-block:: bash
 
       $ cd tests/vpp/perf/crypto
-      $ grep -E "64B-2t2c-.*ipsec.*-ndrdisc" *
+      $ grep -E "64B-2t2c-(ethip4ipsecbasetnl|ethip4ipsecscale1000tnl|ethip4ipsectptlispgpe)-.*-ndrdisc" *
 
 PDR Throughput
 ~~~~~~~~~~~~~~
 
 PDR Throughput
 ~~~~~~~~~~~~~~
@@ -105,7 +105,7 @@ git repository:
 
 .. only:: html
 
 
 .. only:: html
 
-   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/crypto && grep -E "64B-1t1c-.*ipsec.*-pdrdisc" *
+   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/crypto && grep -E "64B-1t1c-(ethip4ipsecbasetnl|ethip4ipsecscale1000tnl|ethip4ipsectptlispgpe)-.*-pdrdisc" *
       :shell:
 
 .. only:: latex
       :shell:
 
 .. only:: latex
@@ -113,7 +113,7 @@ git repository:
    .. code-block:: bash
 
       $ cd tests/vpp/perf/crypto
    .. code-block:: bash
 
       $ cd tests/vpp/perf/crypto
-      $ grep -E "64B-1t1c-.*ipsec.*-pdrdisc" *
+      $ grep -E "64B-1t1c-(ethip4ipsecbasetnl|ethip4ipsecscale1000tnl|ethip4ipsectptlispgpe)-.*-pdrdisc" *
 
 VPP PDR 64B packet throughput in 2t2c setup (2thread, 2core) is presented
 in the graph below. PDR measured for 0.5% packet loss ratio.
 
 VPP PDR 64B packet throughput in 2t2c setup (2thread, 2core) is presented
 in the graph below. PDR measured for 0.5% packet loss ratio.
@@ -138,7 +138,7 @@ git repository:
 
 .. only:: html
 
 
 .. only:: html
 
-   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/crypto && grep -E "64B-2t2c-.*ipsec.*-pdrdisc" *
+   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/crypto && grep -E "64B-2t2c-(ethip4ipsecbasetnl|ethip4ipsecscale1000tnl|ethip4ipsectptlispgpe)-.*-pdrdisc" *
       :shell:
 
 .. only:: latex
       :shell:
 
 .. only:: latex
@@ -146,4 +146,4 @@ git repository:
    .. code-block:: bash
 
       $ cd tests/vpp/perf/crypto
    .. code-block:: bash
 
       $ cd tests/vpp/perf/crypto
-      $ grep -E "64B-2t2c-.*ipsec.*-pdrdisc" *
+      $ grep -E "64B-2t2c-(ethip4ipsecbasetnl|ethip4ipsecscale1000tnl|ethip4ipsectptlispgpe)-.*-pdrdisc" *
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost.rst
index bcfc2d0..938e06f 100644 (file)
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost.rst
@@ -51,7 +51,7 @@ git repository:
 
 .. only:: html
 
 
 .. only:: html
 
-   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/vm_vhost && grep -E "64B-1t1c-.*vhost.*-ndrdisc" *
+   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/vm_vhost && grep -E "64B-1t1c-(eth|ethip4)-.*vhost.*-ndrdisc" *0-eth*-*-ndrpdrdisc.robot
       :shell:
 
 .. only:: latex
       :shell:
 
 .. only:: latex
@@ -59,7 +59,7 @@ git repository:
    .. code-block:: bash
 
       $ cd tests/vpp/perf/vm_vhost
    .. code-block:: bash
 
       $ cd tests/vpp/perf/vm_vhost
-      $ grep -E "64B-1t1c-.*vhost.*-ndrdisc" *
+      $ grep -E "64B-1t1c-(eth|ethip4)-.*vhost.*-pdrdisc" *0-eth*-*-ndrpdrdisc.robot
 
 VPP NDR 64B packet throughput in 2t2c setup (2thread, 2core) is presented
 in the graph below.
 
 VPP NDR 64B packet throughput in 2t2c setup (2thread, 2core) is presented
 in the graph below.
@@ -101,7 +101,7 @@ git repository:
 
 .. only:: html
 
 
 .. only:: html
 
-   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/vm_vhost && grep -E "64B-2t2c-.*vhost.*-ndrdisc" *
+   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/vm_vhost && grep -E "64B-2t2c-(eth|ethip4)-.*vhost.*-ndrdisc" *0-eth*-*-ndrpdrdisc.robot
       :shell:
 
 .. only:: latex
       :shell:
 
 .. only:: latex
@@ -109,7 +109,7 @@ git repository:
    .. code-block:: bash
 
       $ cd tests/vpp/perf/vm_vhost
    .. code-block:: bash
 
       $ cd tests/vpp/perf/vm_vhost
-      $ grep -E "64B-2t2c-.*vhost.*-ndrdisc" *
+      $ grep -E "64B-2t2c-(eth|ethip4)-.*vhost.*-pdrdisc" *0-eth*-*-ndrpdrdisc.robot
 
 PDR Throughput
 ~~~~~~~~~~~~~~
 
 PDR Throughput
 ~~~~~~~~~~~~~~
@@ -154,7 +154,7 @@ git repository:
 
 .. only:: html
 
 
 .. only:: html
 
-   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/vm_vhost && grep -E "64B-1t1c-.*vhost.*-pdrdisc" *
+   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/vm_vhost && grep -E "64B-1t1c-(eth|ethip4)-.*vhost.*-pdrdisc" *0-eth*-*-ndrpdrdisc.robot
       :shell:
 
 .. only:: latex
       :shell:
 
 .. only:: latex
@@ -162,7 +162,7 @@ git repository:
    .. code-block:: bash
 
       $ cd tests/vpp/perf/vm_vhost
    .. code-block:: bash
 
       $ cd tests/vpp/perf/vm_vhost
-      $ grep -E "64B-1t1c-.*vhost.*-pdrdisc" *
+      $ grep -E "64B-1t1c-(eth|ethip4)-.*vhost.*-pdrdisc" *0-eth*-*-ndrpdrdisc.robot
 
 VPP PDR 64B packet throughput in 2t2c setup (2thread, 2core) is presented
 in the graph below. PDR measured for 0.5% packet loss ratio.
 
 VPP PDR 64B packet throughput in 2t2c setup (2thread, 2core) is presented
 in the graph below. PDR measured for 0.5% packet loss ratio.
@@ -204,7 +204,7 @@ git repository:
 
 .. only:: html
 
 
 .. only:: html
 
-   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/vm_vhost && grep -E "64B-2t2c-.*vhost.*-pdrdisc" *
+   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/vm_vhost && grep -E "64B-2t2c-(eth|ethip4)-.*vhost.*-pdrdisc" *0-eth*-*-ndrpdrdisc.robot
       :shell:
 
 .. only:: latex
       :shell:
 
 .. only:: latex
@@ -212,4 +212,4 @@ git repository:
    .. code-block:: bash
 
       $ cd tests/vpp/perf/vm_vhost
    .. code-block:: bash
 
       $ cd tests/vpp/perf/vm_vhost
-      $ grep -E "64B-2t2c-.*vhost.*-pdrdisc" *
+      $ grep -E "64B-2t2c-(eth|ethip4)-.*vhost.*-pdrdisc" *0-eth*-*-ndrpdrdisc.robot
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdrdisc.robot
index c1654cb..6b42cae 100644 (file)
--- a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdrdisc.robot
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdrdisc.robot
@@ -175,7 +175,7 @@
 | | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 *** Test Cases ***
 | | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 *** Test Cases ***
-| tc01-64B-1t1ceth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrdisc
+| tc01-64B-1t1c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
 | | ... | 1 receive queue per NIC port.
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdrdisc.robot
index 98baa5e..d976d8a 100644 (file)
--- a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdrdisc.robot
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdrdisc.robot
@@ -176,7 +176,7 @@
 | | [Template] | L2 Cross Connect Binary Search
 | | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
 
 | | [Template] | L2 Cross Connect Binary Search
 | | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
 
-| tc02-64B-1t1-ceth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-pdrdisc
+| tc02-64B-1t1c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
 | | ... | 1 receive queue per NIC port.
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdrdisc.robot
index fcac481..8dd07cf 100644 (file)
--- a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdrdisc.robot
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdrdisc.robot
@@ -176,7 +176,7 @@
 | | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 *** Test Cases ***
 | | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 *** Test Cases ***
-| tc01-64B-1t1ceth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrdisc
+| tc01-64B-1t1c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
 | | ... | 1 receive queue per NIC port.
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdrdisc.robot
index 2282a10..4cc366a 100644 (file)
--- a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdrdisc.robot
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdrdisc.robot
@@ -177,7 +177,7 @@
 | | [Template] | L2 Cross Connect Binary Search
 | | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
 
 | | [Template] | L2 Cross Connect Binary Search
 | | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
 
-| tc02-64B-1t1-ceth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-pdrdisc
+| tc02-64B-1t1c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
 | | ... | 1 receive queue per NIC port.
diff --git a/tests/vpp/perf/l2/40ge2p1vic1385-eth-l2bdbasemaclrn-ndrpdrdisc.robot b/tests/vpp/perf/l2/40ge2p1vic1385-eth-l2bdbasemaclrn-ndrpdrdisc.robot
index 19c505b..f903a1c 100644 (file)
--- a/tests/vpp/perf/l2/40ge2p1vic1385-eth-l2bdbasemaclrn-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/40ge2p1vic1385-eth-l2bdbasemaclrn-ndrpdrdisc.robot
@@ -186,7 +186,7 @@
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at\
 | | ... | 18.75Mpps rate, step 50kpps.
 | | ...
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at\
 | | ... | 18.75Mpps rate, step 50kpps.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | PDR | SKIP_PATCH
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${50000}
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${50000}
Integration tests