4 files changed, 221 insertions, 117 deletions
diff --git a/tests/suites/performance/short.robot b/tests/suites/performance/short.robot
deleted file mode 100644
index 4273b9b527..0000000000
--- a/tests/suites/performance/short.robot
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright (c) 2016 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/default.robot
-| Resource | resources/libraries/robot/interfaces.robot
-| Resource | resources/libraries/robot/bridge_domain.robot
-| Resource | resources/libraries/robot/ipv4.robot
-| Resource | resources/libraries/robot/l2_xconnect.robot
-| Resource | resources/libraries/robot/counters.robot
-| Library | resources.libraries.python.TrafficGenerator
-| Library | resources.libraries.python.NodePath
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV
-| Suite Setup | 3-node Performance Suite Setup
-| Suite Teardown | 3-node Performance Suite Teardown
-| Test Setup | Setup all DUTs before test
-| Test Teardown  | Run Keyword If Test Failed | Show statistics on all DUTs
-
-*** Test Cases ***
-| 2core VPP passes 64B frames through L2 cross connect at 3.5mpps in 3-node topology
-| | Given L2 xconnect initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | 10 | 3.5mpps | 64 | 3-node-xconnect
-
-| 2core VPP passes 1518B frames through L2 cross connect at 10gbps in 3-node topology
-| | Given L2 xconnect initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | 10 | 10gbps | 1518 | 3-node-xconnect
-
-| 2core VPP passes 9000B frames through L2 cross connect at 10gbps in 3-node topology
-| | Given L2 xconnect initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | 10 | 10gbps | 9000 | 3-node-xconnect
-
-| 2core VPP passes 64B frames through bridge domain at 3.5mpps in 3-node topology
-| | Given L2 bridge domain initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | 10 | 3.5mpps | 64 | 3-node-bridge
-
-| 2core VPP passes 1518B frames through bridge domain at 10gbps in 3-node topology
-| | Given L2 bridge domain initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | 10 | 10gbps | 1518 | 3-node-bridge
-
-| 2core VPP passes 9000B frames through bridge domain at 10gbps in 3-node topology
-| | Given L2 bridge domain initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | 10 | 10gbps | 9000 | 3-node-bridge
-
-#| VPP passes 64B frames through IPv4 forwarding at 3.5mpps in 3-node topology
-#| | Given IPv4 forwarding initialized in a 3-node topology
-#| | Then Traffic should pass with no loss | 10 | 3.5mpps | 64 | 3-node-IPv4
-
-#| VPP passes 1518B frames through IPv4 forwarding at 100% in 3-node topology
-#| | Given IPv4 forwarding initialized in a 3-node topology
-#| | Then Traffic should pass with no loss | 10 | 100 | 1518 | 3-node-IPv4
-
-#| VPP passes 9000B frames through IPv4 forwarding at 100% in 3-node topology
-#| | Given IPv4 forwarding initialized in a 3-node topology
-#| | Then Traffic should pass with no loss | 10 | 100 | 9000 | 3-node-IPv4
-
-
-*** Keywords ***
-
-| 3-node Topology Variables Setup
-| | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']}
-| | ...          | ${nodes['TG']}
-| | Compute Path
-| | ${tg_if1} | ${tg}= | Next Interface
-| | ${dut1_if1} | ${dut1}= | Next Interface
-| | ${dut1_if2} | ${dut1}= | Next Interface
-| | ${dut2_if1} | ${dut2}= | Next Interface
-| | ${dut2_if2} | ${dut2}= | Next Interface
-| | ${tg_if2} | ${tg}= | Next Interface
-| | Set Suite Variable | ${tg}
-| | Set Suite Variable | ${tg_if1}
-| | Set Suite Variable | ${tg_if2}
-| | Set Suite Variable | ${dut1}
-| | Set Suite Variable | ${dut1_if1}
-| | Set Suite Variable | ${dut1_if2}
-| | Set Suite Variable | ${dut2}
-| | Set Suite Variable | ${dut2_if1}
-| | Set Suite Variable | ${dut2_if2}
-
-| 3-node Performance Suite Setup
-| | 3-node Topology Variables Setup
-| | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2} | L2
-
-| 3-node Performance Suite Teardown
-| | Teardown traffic generator | ${tg}
-
-| IPv4 forwarding initialized in a 3-node topology
-| | Setup nodes for IPv4 testing
-
-| L2 bridge domain initialized in a 3-node circular topology
-| | Vpp l2bd forwarding setup | ${dut1} | ${dut1_if1} | ${dut1_if2}
-| | Vpp l2bd forwarding setup | ${dut2} | ${dut2_if1} | ${dut2_if2}
-| | Sleep | 10 | Wait for interfaces initialization
-
-| L2 xconnect initialized in a 3-node circular topology
-| | L2 setup xconnect on DUT | ${dut1} | ${dut1_if1} | ${dut1_if2}
-| | L2 setup xconnect on DUT | ${dut2} | ${dut2_if1} | ${dut2_if2}
-| | Sleep | 10 | Wait for interfaces initialization
-
-| Traffic should pass with no loss
-| | [Arguments] | ${duration} | ${rate} | ${framesize} | ${topology_type}
-| | Send traffic on | ${nodes} | ${duration}
-| | ...             | ${rate} | ${framesize} | ${topology_type}
-| | No traffic loss occured
-
-| Show statistics on all DUTs
-| | Sleep | 10 | Waiting for statistics to be collected
-| | Vpp show stats | ${dut1}
-| | Vpp show stats | ${dut2}
diff --git a/tests/suites/performance/short_bridge_domain.robot b/tests/suites/performance/short_bridge_domain.robot
new file mode 100644
index 0000000000..669450307b
--- /dev/null
+++ b/tests/suites/performance/short_bridge_domain.robot
@@ -0,0 +1,66 @@
+# Copyright (c) 2016 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/default.robot
+| Resource | resources/libraries/robot/interfaces.robot
+| Resource | resources/libraries/robot/bridge_domain.robot
+| Resource | resources/libraries/robot/performance.robot
+| Resource | resources/libraries/robot/counters.robot
+| Library | resources.libraries.python.TrafficGenerator
+| Library | resources.libraries.python.NodePath
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV
+| Suite Setup | 3-node Performance Suite Setup
+| Suite Teardown | 3-node Performance Suite Teardown
+| Test Setup | Setup all DUTs before test
+| Test Teardown  | Run Keyword If Test Failed | Show statistics on all DUTs
+
+*** Test Cases ***
+| 1core VPP passes 64B frames through bridge domain at 3.5mpps in 3-node topology
+| | Given L2 bridge domain initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | 10 | 3.5mpps | 64 | 3-node-bridge
+
+| 1core VPP passes 1518B frames through bridge domain at 10gbps in 3-node topology
+| | Given L2 bridge domain initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | 10 | 10gbps | 1518 | 3-node-bridge
+
+| 1core VPP passes 9000B frames through bridge domain at 10gbps in 3-node topology
+| | Given L2 bridge domain initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | 10 | 10gbps | 9000 | 3-node-bridge
+
+*** Keywords ***
+
+| 3-node Performance Suite Setup
+| | 3-node circular Topology Variables Setup
+| | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2}
+| | ...                          | ${dut1} | ${dut1_if1} | ${dut1_if2}
+| | ...                          | ${dut2} | ${dut2_if1} | ${dut2_if2}
+| | ...                          | L2
+
+| 3-node Performance Suite Teardown
+| | Teardown traffic generator | ${tg}
+
+| L2 bridge domain initialized in a 3-node circular topology
+| | Vpp l2bd forwarding setup | ${dut1} | ${dut1_if1} | ${dut1_if2}
+| | Vpp l2bd forwarding setup | ${dut2} | ${dut2_if1} | ${dut2_if2}
+| | All Vpp Interfaces Ready Wait | ${nodes}
+
+| Traffic should pass with no loss
+| | [Arguments] | ${duration} | ${rate} | ${framesize} | ${topology_type}
+| | Send traffic on | ${nodes} | ${duration}
+| | ...             | ${rate} | ${framesize} | ${topology_type}
+| | No traffic loss occured
+
+| Show statistics on all DUTs
+| | Sleep | 10 | Waiting for statistics to be collected
+| | Vpp show stats | ${dut1}
+| | Vpp show stats | ${dut2}
diff --git a/tests/suites/performance/short_ipv4.robot b/tests/suites/performance/short_ipv4.robot
new file mode 100644
index 0000000000..d89039e849
--- /dev/null
+++ b/tests/suites/performance/short_ipv4.robot
@@ -0,0 +1,88 @@
+# Copyright (c) 2016 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/default.robot
+| Resource | resources/libraries/robot/interfaces.robot
+| Resource | resources/libraries/robot/ipv4.robot
+| Resource | resources/libraries/robot/performance.robot
+| Resource | resources/libraries/robot/counters.robot
+| Library | resources.libraries.python.topology.Topology
+| Library | resources.libraries.python.TrafficGenerator
+| Library | resources.libraries.python.NodePath
+| Library | resources.libraries.python.InterfaceUtil
+| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT1']} | WITH NAME | dut1_v4
+| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT2']} | WITH NAME | dut2_v4
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV
+| Suite Setup | 3-node Performance Suite Setup
+| Suite Teardown | 3-node Performance Suite Teardown
+| Test Setup | Setup all DUTs before test
+| Test Teardown  | Run Keyword If Test Failed | Show statistics on all DUTs
+
+*** Test Cases ***
+| 1core VPP passes 64B frames through IPv4 forwarding at 3.5mpps in 3-node topology
+| | Given IPv4 forwarding initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | 10 | 3.5mpps | 64 | 3-node-IPv4
+
+| 1core VPP passes 1518B frames through IPv4 forwarding at 10gbps in 3-node topology
+| | Given IPv4 forwarding initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | 10 | 10gbps | 1518 | 3-node-IPv4
+
+| 1core VPP passes 9000B frames through IPv4 forwarding at 10gbps in 3-node topology
+| | Given IPv4 forwarding initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | 10 | 10gbps | 9000 | 3-node-IPv4
+
+*** Keywords ***
+
+| 3-node Performance Suite Setup
+| | 3-node circular Topology Variables Setup
+| | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2}
+| | ...                          | ${dut1} | ${dut1_if1} | ${dut1_if2}
+| | ...                          | ${dut2} | ${dut2_if1} | ${dut2_if2}
+| | ...                          | L3
+
+| 3-node Performance Suite Teardown
+| | Teardown traffic generator | ${tg}
+
+| IPv4 forwarding initialized in a 3-node circular topology
+| | Set Interface State | ${dut1} | ${dut1_if1} | up
+| | Set Interface State | ${dut1} | ${dut1_if2} | up
+| | Set Interface State | ${dut2} | ${dut2_if1} | up
+| | Set Interface State | ${dut2} | ${dut2_if2} | up
+| | ${tg1_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
+| | ${tg1_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
+| | ${dut1_if1_mac}= | Get Interface MAC | ${dut1} | ${dut1_if1}
+| | ${dut1_if2_mac}= | Get Interface MAC | ${dut1} | ${dut1_if2}
+| | ${dut2_if1_mac}= | Get Interface MAC | ${dut2} | ${dut1_if1}
+| | ${dut2_if2_mac}= | Get Interface MAC | ${dut2} | ${dut1_if2}
+| | dut1_v4.set_arp | ${dut1_if1} | 10.10.10.2 | ${tg1_if1_mac}
+| | dut1_v4.set_arp | ${dut1_if2} | 1.1.1.2 | ${dut2_if1_mac}
+| | dut2_v4.set_arp | ${dut2_if1} | 1.1.1.1 | ${dut1_if2_mac}
+| | dut2_v4.set_arp | ${dut2_if2} | 20.20.20.2 | ${tg1_if2_mac}
+| | dut1_v4.set_ip | ${dut1_if1} | 10.10.10.1 | 24
+| | dut1_v4.set_ip | ${dut1_if2} | 1.1.1.1 | 30
+| | dut2_v4.set_ip | ${dut2_if1} | 1.1.1.2 | 30
+| | dut2_v4.set_ip | ${dut2_if2} | 20.20.20.1 | 24
+| | dut1_v4.set_route | 20.20.20.0 | 24 | 1.1.1.2 | ${dut1_if2}
+| | dut2_v4.set_route | 10.10.10.0 | 24 | 1.1.1.1 | ${dut2_if1}
+| | All Vpp Interfaces Ready Wait | ${nodes}
+
+| Traffic should pass with no loss
+| | [Arguments] | ${duration} | ${rate} | ${framesize} | ${topology_type}
+| | Send traffic on | ${nodes} | ${duration}
+| | ...             | ${rate} | ${framesize} | ${topology_type}
+| | No traffic loss occured
+
+| Show statistics on all DUTs
+| | Sleep | 10 | Waiting for statistics to be collected
+| | Vpp show stats | ${dut1}
+| | Vpp show stats | ${dut2}
diff --git a/tests/suites/performance/short_xconnect.robot b/tests/suites/performance/short_xconnect.robot
new file mode 100644
index 0000000000..7c33d4f545
--- /dev/null
+++ b/tests/suites/performance/short_xconnect.robot
@@ -0,0 +1,67 @@
+# Copyright (c) 2016 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/default.robot
+| Resource | resources/libraries/robot/interfaces.robot
+| Resource | resources/libraries/robot/l2_xconnect.robot
+| Resource | resources/libraries/robot/performance.robot
+| Resource | resources/libraries/robot/counters.robot
+| Library | resources.libraries.python.TrafficGenerator
+| Library | resources.libraries.python.InterfaceUtil
+| Library | resources.libraries.python.NodePath
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV
+| Suite Setup | 3-node Performance Suite Setup
+| Suite Teardown | 3-node Performance Suite Teardown
+| Test Setup | Setup all DUTs before test
+| Test Teardown  | Run Keyword If Test Failed | Show statistics on all DUTs
+
+*** Test Cases ***
+| 1core VPP passes 64B frames through L2 cross connect at 3.5mpps in 3-node topology
+| | Given L2 xconnect initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | 10 | 3.5mpps | 64 | 3-node-xconnect
+
+| 1core VPP passes 1518B frames through L2 cross connect at 10gbps in 3-node topology
+| | Given L2 xconnect initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | 10 | 10gbps | 1518 | 3-node-xconnect
+
+| 1core VPP passes 9000B frames through L2 cross connect at 10gbps in 3-node topology
+| | Given L2 xconnect initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | 10 | 10gbps | 9000 | 3-node-xconnect
+
+*** Keywords ***
+
+| 3-node Performance Suite Setup
+| | 3-node circular Topology Variables Setup
+| | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2}
+| | ...                          | ${dut1} | ${dut1_if1} | ${dut1_if2}
+| | ...                          | ${dut2} | ${dut2_if1} | ${dut2_if2}
+| | ...                          | L2
+
+| 3-node Performance Suite Teardown
+| | Teardown traffic generator | ${tg}
+
+| L2 xconnect initialized in a 3-node circular topology
+| | L2 setup xconnect on DUT | ${dut1} | ${dut1_if1} | ${dut1_if2}
+| | L2 setup xconnect on DUT | ${dut2} | ${dut2_if1} | ${dut2_if2}
+| | All Vpp Interfaces Ready Wait | ${nodes}
+
+| Traffic should pass with no loss
+| | [Arguments] | ${duration} | ${rate} | ${framesize} | ${topology_type}
+| | Send traffic on | ${nodes} | ${duration}
+| | ...             | ${rate} | ${framesize} | ${topology_type}
+| | No traffic loss occured
+
+| Show statistics on all DUTs
+| | Sleep | 10 | Waiting for statistics to be collected
+| | Vpp show stats | ${dut1}
+| | Vpp show stats | ${dut2}