aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries/robot
diff options
context:
space:
mode:
authorJan Gelety <jgelety@cisco.com>2017-11-13 12:14:24 +0100
committerJan Gelety <jgelety@cisco.com>2017-11-14 08:49:29 +0000
commit60b38270a79c8f789a6201c52c2eb2fd8420fba4 (patch)
tree56c69d78771acd4dd523441b0b956095ab1082a1 /resources/libraries/robot
parent175f19c60425ca5fd22519354f4419b430cbdb79 (diff)
FIX: Tear down FDS functional test
- use standard Tear down functional test as part of tear down for FDS tests Change-Id: I8540683cd9c817445461cc596821fe797c1636c5 Signed-off-by: Jan Gelety <jgelety@cisco.com>
Diffstat (limited to 'resources/libraries/robot')
-rw-r--r--resources/libraries/robot/fds/default.robot64
-rw-r--r--resources/libraries/robot/shared/default.robot23
2 files changed, 23 insertions, 64 deletions
diff --git a/resources/libraries/robot/fds/default.robot b/resources/libraries/robot/fds/default.robot
deleted file mode 100644
index 2808ec08db..0000000000
--- a/resources/libraries/robot/fds/default.robot
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright (c) 2017 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/shared/default.robot
-| Resource | resources/libraries/robot/vm/double_qemu_setup.robot
-| Library | resources.libraries.python.VatHistory
-| Library | resources.libraries.python.Trace
-| ...
-| Documentation | Test setup and test teardown of FDS functional tests.
-
-*** Keywords ***
-| Set up FDS functional test
-| | [Documentation]
-| | ... |
-| | ...
-| | ... | *Arguments:*
-| | ... | - nodes - Nodes to reset VAT command history for. Type: dictionary
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Set up FDS functional test \| ${nodes} \|
-| | ...
-| | [Arguments] | ${nodes}
-| | ...
-| | Configure all DUTs before test
-| | Save VPP PIDs
-| | Configure all TGs for traffic script
-| | Reset VAT History On All DUTs | ${nodes}
-
-| Tear down FDS functional test
-| | [Documentation]
-| | ... |
-| | ...
-| | ... | *Arguments:*
-| | ... | - nodes - Nodes to reset VAT command history for. Type: dictionary
-| | ... | - dut1_node - Node nr 1 where to clean qemu. Type: dictionary
-| | ... | - qemu_node1 - VM nr 1 node info dictionary. Type: string
-| | ... | - dut2_node - Node nr 2 where to clean qemu. Type: dictionary
-| | ... | - qemu_node2 - VM nr 2 node info dictionary. Type: string
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Tear down FDS functional test \| ${nodes}\
-| | ... | \| ${dut1_node} \| ${qemu_node1} \| ${dut2_node} \| ${qemu_node2} \|
-| | ...
-| | [Arguments] | ${nodes} | ${dut1_node} | ${qemu_node1} | ${dut2_node}
-| | ... | ${qemu_node2}
-| | ...
-| | Show Packet Trace on All DUTs | ${nodes}
-| | Show VAT History On All DUTs | ${nodes}
-| | Tear down QEMU | ${dut1_node} | ${qemu_node1} | qemu_node1
-| | Tear down QEMU | ${dut2_node} | ${qemu_node2} | qemu_node2
-| | Verify VPP PID in Teardown
diff --git a/resources/libraries/robot/shared/default.robot b/resources/libraries/robot/shared/default.robot
index 555919f9c8..6c80f9827d 100644
--- a/resources/libraries/robot/shared/default.robot
+++ b/resources/libraries/robot/shared/default.robot
@@ -13,6 +13,7 @@
*** Settings ***
| Resource | resources/libraries/robot/vm/qemu.robot
+| Resource | resources/libraries/robot/vm/double_qemu_setup.robot
| Variables | resources/libraries/python/topology.py
| Variables | resources/libraries/python/VatHistory.py
| Library | resources.libraries.python.topology.Topology
@@ -26,6 +27,7 @@
| Library | resources.libraries.python.VppConfigGenerator
| Library | resources.libraries.python.VppCounters
| Library | resources.libraries.python.VPPUtil
+| Library | resources.libraries.python.Trace
| Library | Collections
*** Keywords ***
@@ -380,6 +382,27 @@
| | Linux Del Bridge | ${nodes['DUT1']} | ${bid_TAP}
| | Clean Up Namespaces | ${nodes['DUT1']}
+| Tear down FDS functional test
+| | [Documentation] | Common test teardown for FDS functional tests.
+| | ...
+| | ... | *Arguments:*
+| | ... | - dut1_node - Node Nr.1 where to clean qemu. Type: dictionary
+| | ... | - qemu_node1 - VM Nr.1 node info dictionary. Type: string
+| | ... | - dut2_node - Node Nr.2 where to clean qemu. Type: dictionary
+| | ... | - qemu_node2 - VM Nr.2 node info dictionary. Type: string
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Tear down FDS functional test \| ${dut1_node} \| ${qemu_node1}\
+| | ... | \| ${dut2_node} \| ${qemu_node2} \|
+| | ...
+| | [Arguments] | ${dut1_node} | ${qemu_node1} | ${dut2_node}
+| | ... | ${qemu_node2}
+| | ...
+| | Tear down functional test
+| | Tear down QEMU | ${dut1_node} | ${qemu_node1} | qemu_node1
+| | Tear down QEMU | ${dut2_node} | ${qemu_node2} | qemu_node2
+
| Stop VPP Service on DUT
| | [Documentation] | Stop the VPP service on the specified node.
| | ...