Remove THIS tag and use unix endlines

The THIS tag has sneaked in 10Ge2P1X520-Eth-L2Xcbase-Eth-1Memif-1Dcr-Mrr
but usually it is only to be used in draft testing.

Not sure about the way non-unix endlines crept in.
Is not git supposed to perform endline conversions on text files?
Or are .robot, .rst, .yaml and .vat not recognized as text?

Change-Id: Ia78cf942c05c3029c340a8639782786f37e57469
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

1 files changed, 220 insertions, 220 deletions

diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-1memif-1dcr-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-1memif-1dcr-mrr.robot
index d0c70f0c6d..d9dcce584e 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-1memif-1dcr-mrr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-1memif-1dcr-mrr.robot
@@ -1,220 +1,220 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.

-# Licensed under the Apache License, Version 2.0 (the "License");

-# you may not use this file except in compliance with the License.

-# You may obtain a copy of the License at:

-#

-#     http://www.apache.org/licenses/LICENSE-2.0

-#

-# Unless required by applicable law or agreed to in writing, software

-# distributed under the License is distributed on an "AS IS" BASIS,

-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-# See the License for the specific language governing permissions and

-# limitations under the License.

-

-*** Settings ***

-| Resource | resources/libraries/robot/performance/performance_setup.robot

-| ...

-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR

-| ... | NIC_Intel-X520-DA2 | ETH | L2XCFWD | BASE | MEMIF | SINGLE_MEMIF

-| ... | DOCKER

-| ...

-| Suite Setup | Run Keywords

-| ... | Set up 3-node performance topology with DUT's NIC model | L2

-| ... | Intel-X520-DA2

-| ... | AND | Set up performance test suite with MEMIF

-| ... | AND | Set up performance topology with containers

-| ...

-| Suite Teardown | Tear down 3-node performance topology with container

-| ...

-| Test Setup | Run Keywords

-| ... | Set up performance test

-| ... | AND | Restart VPP in all 'VNF' containers

-| ...

-| Test Teardown | Tear down performance mrr test

-| ...

-| Test Template | Check RR for l2xcbase-eth-1memif-1dcr

-| ...

-| Documentation |  *Raw results L2XC test cases*

-| ...

-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology

-| ... | with single links between nodes.

-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross connect.

-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 configured with L2 cross-

-| ... | connect. DUT1 and DUT2 tested with 2p10GE NIC X520 Niantic by Intel.

-| ... | Container is connected to VPP via Memif interface running same VPP

-| ... | version as running on DUT. Resources are limited via cgroup to use 5

-| ... | cores allocated from pool of isolated CPUs. There are no memory

-| ... | contraints. Cross Horizontal topology with packets flowing via DUT (VPP)

-| ... | to Container, then via horizontal memif to the next Container, and so on

-| ... | until the last Container then to NIC (in last Container). Single

-| ... | Container is supported as of now.

-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic

-| ... | at line rate and reports total received/sent packets over trial period.

-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile

-| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per

-| ... | flow-group) with all packets containing Ethernet header, IPv4 header

-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC

-| ... | addresses of the TG node interfaces.

-

-*** Variables ***

-# X520-DA2 bandwidth limit

-| ${s_limit} | ${10000000000}

-# Traffic profile

-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254

-# Container settings

-| ${container_count}= | ${1}

-| ${container_engine}= | Docker

-| ${container_image}= | ubuntu:xenial-20180412

-| ${container_install_dkms}= | ${TRUE}

-| ${container_chain_topology}= | cross_horiz

-# CPU settings

-| ${system_cpus}= | ${1}

-| ${vpp_cpus}= | ${5}

-| ${container_cpus}= | ${5}

-

-*** Keywords ***

-| Check RR for l2xcbase-eth-1memif-1dcr

-| | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with ${wt} thread(s), ${wt}\

-| | ... | phy core(s), ${rxq} receive queue(s) per NIC port.

-| | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\

-| | ... | trial throughput test.

-| | ...

-| | [Arguments] | ${framesize} | ${wt} | ${rxq}

-| | ...

-| | Set Test Variable | ${framesize}

-| | ${get_framesize}= | Get Frame Size | ${framesize}

-| | ${max_rate}= | Calculate pps | ${s_limit} | ${get_framesize}

-| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology

-| | And Add single PCI device to all DUTs

-| | And Run Keyword If | ${get_framesize} < ${1522}

-| | ... | Add no multi seg to all DUTs

-| | And Apply startup configuration on all VPP DUTs

-| | And Initialize L2 xconnect for single memif in 3-node circular topology

-| | ... | ${rxq}

-| | Then Traffic should pass with maximum rate | ${perf_trial_duration}

-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}

-

-*** Test Cases ***

-| tc01-64B-1t1c-eth-l2xcbase-eth-1memif-1dcr-mrr

-| | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\

-| | ... | 1 receive queue per NIC port.

-| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\

-| | ... | throughput test.

-| | ...

-| | [Tags] | 64B | 1C | THIS

-| | framesize=${64} | wt=1 | rxq=1

-

-| tc02-1518B-1t1c-eth-l2xcbase-eth-1memif-1dcr-mrr

-| | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\

-| | ... | 1 receive queue per NIC port.

-| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single trial\

-| | ... | throughput test.

-| | ...

-| | [Tags] | 1518B | 1C

-| | framesize=${1518} | wt=1 | rxq=1

-

-| tc03-9000B-1t1c-eth-l2xcbase-eth-1memif-1dcr-mrr

-| | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\

-| | ... | 1 receive queue per NIC port.

-| | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\

-| | ... | throughput test.

-| | ...

-| | [Tags] | 9000B | 1C

-| | framesize=${9000} | wt=1 | rxq=1

-

-| tc04-IMIX-1t1c-eth-l2xcbase-eth-1memif-1dcr-mrr

-| | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\

-| | ... | 1 receive queue per NIC port.

-| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single trial\

-| | ... | throughput test.

-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)

-| | ...

-| | [Tags] | IMIX | 1C

-| | framesize=IMIX_v4_1 | wt=1 | rxq=1

-

-| tc05-64B-2t2c-eth-l2xcbase-eth-1memif-1dcr-mrr

-| | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 2 phy cores,\

-| | ... | 1 receive queue per NIC port.

-| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\

-| | ... | throughput test.

-| | ...

-| | [Tags] | 64B | 2C

-| | framesize=${64} | wt=2 | rxq=1

-

-| tc06-1518B-2t2c-eth-l2xcbase-eth-1memif-1dcr-mrr

-| | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy cores,\

-| | ... | 1 receive queue per NIC port.

-| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single trial\

-| | ... | throughput test.

-| | ...

-| | [Tags] | 1518B | 2C

-| | framesize=${1518} | wt=2 | rxq=1

-

-| tc07-9000B-2t2c-eth-l2xcbase-eth-1memif-1dcr-mrr

-| | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy cores,\

-| | ... | 1 receive queue per NIC port.

-| | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\

-| | ... | throughput test.

-| | ...

-| | [Tags] | 9000B | 2C

-| | framesize=${9000} | wt=2 | rxq=1

-

-| tc08-IMIX-2t2c-eth-l2xcbase-eth-1memif-1dcr-mrr

-| | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 2 phy cores,\

-| | ... | 1 receive queue per NIC port.

-| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single trial\

-| | ... | throughput test.

-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)

-| | ...

-| | [Tags] | IMIX | 2C

-| | framesize=IMIX_v4_1 | wt=2 | rxq=1

-

-| tc09-64B-4t4c-eth-l2xcbase-eth-1memif-1dcr-mrr

-| | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 4 phy cores,\

-| | ... | 2 receive queues per NIC port.

-| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\

-| | ... | throughput test.

-| | ...

-| | [Tags] | 64B | 4C

-| | framesize=${64} | wt=4 | rxq=2

-

-| tc10-1518B-4t4c-eth-l2xcbase-eth-1memif-1dcr-mrr

-| | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 4 phy cores,\

-| | ... | 2 receive queues per NIC port.

-| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single trial\

-| | ... | throughput test.

-| | ...

-| | [Tags] | 1518B | 4C

-| | framesize=${1518} | wt=4 | rxq=2

-

-| tc11-9000B-4t4c-eth-l2xcbase-eth-1memif-1dcr-mrr

-| | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 4 phy cores,\

-| | ... | 2 receive queues per NIC port.

-| | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\

-| | ... | throughput test.

-| | ...

-| | [Tags] | 9000B | 4C

-| | framesize=${9000} | wt=4 | rxq=2

-

-| tc12-IMIX-4t4c-eth-l2xcbase-eth-1memif-1dcr-mrr

-| | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 4 phy cores,\

-| | ... | 2 receive queues per NIC port.

-| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single trial\

-| | ... | throughput test.

-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)

-| | ...

-| | [Tags] | IMIX | 4C

-| | framesize=IMIX_v4_1 | wt=4 | rxq=2

+# Copyright (c) 2018 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*** Settings ***
+| Resource | resources/libraries/robot/performance/performance_setup.robot
+| ...
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
+| ... | NIC_Intel-X520-DA2 | ETH | L2XCFWD | BASE | MEMIF | SINGLE_MEMIF
+| ... | DOCKER
+| ...
+| Suite Setup | Run Keywords
+| ... | Set up 3-node performance topology with DUT's NIC model | L2
+| ... | Intel-X520-DA2
+| ... | AND | Set up performance test suite with MEMIF
+| ... | AND | Set up performance topology with containers
+| ...
+| Suite Teardown | Tear down 3-node performance topology with container
+| ...
+| Test Setup | Run Keywords
+| ... | Set up performance test
+| ... | AND | Restart VPP in all 'VNF' containers
+| ...
+| Test Teardown | Tear down performance mrr test
+| ...
+| Test Template | Check RR for l2xcbase-eth-1memif-1dcr
+| ...
+| Documentation |  *Raw results L2XC test cases*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross connect.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 configured with L2 cross-
+| ... | connect. DUT1 and DUT2 tested with 2p10GE NIC X520 Niantic by Intel.
+| ... | Container is connected to VPP via Memif interface running same VPP
+| ... | version as running on DUT. Resources are limited via cgroup to use 5
+| ... | cores allocated from pool of isolated CPUs. There are no memory
+| ... | contraints. Cross Horizontal topology with packets flowing via DUT (VPP)
+| ... | to Container, then via horizontal memif to the next Container, and so on
+| ... | until the last Container then to NIC (in last Container). Single
+| ... | Container is supported as of now.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
+| ... | at line rate and reports total received/sent packets over trial period.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
+| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
+| ... | flow-group) with all packets containing Ethernet header, IPv4 header
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
+| ... | addresses of the TG node interfaces.
+
+*** Variables ***
+# X520-DA2 bandwidth limit
+| ${s_limit} | ${10000000000}
+# Traffic profile
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
+# Container settings
+| ${container_count}= | ${1}
+| ${container_engine}= | Docker
+| ${container_image}= | ubuntu:xenial-20180412
+| ${container_install_dkms}= | ${TRUE}
+| ${container_chain_topology}= | cross_horiz
+# CPU settings
+| ${system_cpus}= | ${1}
+| ${vpp_cpus}= | ${5}
+| ${container_cpus}= | ${5}
+
+*** Keywords ***
+| Check RR for l2xcbase-eth-1memif-1dcr
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with ${wt} thread(s), ${wt}\
+| | ... | phy core(s), ${rxq} receive queue(s) per NIC port.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\
+| | ... | trial throughput test.
+| | ...
+| | [Arguments] | ${framesize} | ${wt} | ${rxq}
+| | ...
+| | Set Test Variable | ${framesize}
+| | ${get_framesize}= | Get Frame Size | ${framesize}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${get_framesize}
+| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology
+| | And Add single PCI device to all DUTs
+| | And Run Keyword If | ${get_framesize} < ${1522}
+| | ... | Add no multi seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Initialize L2 xconnect for single memif in 3-node circular topology
+| | ... | ${rxq}
+| | Then Traffic should pass with maximum rate | ${perf_trial_duration}
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1t1c-eth-l2xcbase-eth-1memif-1dcr-mrr
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\
+| | ... | throughput test.
+| | ...
+| | [Tags] | 64B | 1C
+| | framesize=${64} | wt=1 | rxq=1
+
+| tc02-1518B-1t1c-eth-l2xcbase-eth-1memif-1dcr-mrr
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single trial\
+| | ... | throughput test.
+| | ...
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | wt=1 | rxq=1
+
+| tc03-9000B-1t1c-eth-l2xcbase-eth-1memif-1dcr-mrr
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
+| | ... | throughput test.
+| | ...
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | wt=1 | rxq=1
+
+| tc04-IMIX-1t1c-eth-l2xcbase-eth-1memif-1dcr-mrr
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single trial\
+| | ... | throughput test.
+| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
+| | ...
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | wt=1 | rxq=1
+
+| tc05-64B-2t2c-eth-l2xcbase-eth-1memif-1dcr-mrr
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy cores,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\
+| | ... | throughput test.
+| | ...
+| | [Tags] | 64B | 2C
+| | framesize=${64} | wt=2 | rxq=1
+
+| tc06-1518B-2t2c-eth-l2xcbase-eth-1memif-1dcr-mrr
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy cores,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single trial\
+| | ... | throughput test.
+| | ...
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | wt=2 | rxq=1
+
+| tc07-9000B-2t2c-eth-l2xcbase-eth-1memif-1dcr-mrr
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy cores,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
+| | ... | throughput test.
+| | ...
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | wt=2 | rxq=1
+
+| tc08-IMIX-2t2c-eth-l2xcbase-eth-1memif-1dcr-mrr
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy cores,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single trial\
+| | ... | throughput test.
+| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
+| | ...
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | wt=2 | rxq=1
+
+| tc09-64B-4t4c-eth-l2xcbase-eth-1memif-1dcr-mrr
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 4 phy cores,\
+| | ... | 2 receive queues per NIC port.
+| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\
+| | ... | throughput test.
+| | ...
+| | [Tags] | 64B | 4C
+| | framesize=${64} | wt=4 | rxq=2
+
+| tc10-1518B-4t4c-eth-l2xcbase-eth-1memif-1dcr-mrr
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 4 phy cores,\
+| | ... | 2 receive queues per NIC port.
+| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single trial\
+| | ... | throughput test.
+| | ...
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | wt=4 | rxq=2
+
+| tc11-9000B-4t4c-eth-l2xcbase-eth-1memif-1dcr-mrr
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 4 phy cores,\
+| | ... | 2 receive queues per NIC port.
+| | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
+| | ... | throughput test.
+| | ...
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | wt=4 | rxq=2
+
+| tc12-IMIX-4t4c-eth-l2xcbase-eth-1memif-1dcr-mrr
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 4 phy cores,\
+| | ... | 2 receive queues per NIC port.
+| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single trial\
+| | ... | throughput test.
+| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
+| | ...
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | wt=4 | rxq=2