X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fshared%2Fdefault.robot;h=6c80f9827d54d05fd44a1027aef34fc8974ba8ec;hp=3d1ce25732ea396feea32a59fb8913168eb861a5;hb=60b38270a79c8f789a6201c52c2eb2fd8420fba4;hpb=036e5a85bab081bfa94b8c025c06aee0addb94cb

diff --git a/resources/libraries/robot/shared/default.robot b/resources/libraries/robot/shared/default.robot
index 3d1ce25732..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
@@ -23,8 +24,10 @@
 | Library | resources.libraries.python.TGSetup
 | Library | resources.libraries.python.L2Util
 | Library | resources.libraries.python.Tap
-| Library | resources/libraries/python/VppConfigGenerator.py
-| Library | resources/libraries/python/VppCounters.py
+| Library | resources.libraries.python.VppConfigGenerator
+| Library | resources.libraries.python.VppCounters
+| Library | resources.libraries.python.VPPUtil
+| Library | resources.libraries.python.Trace
 | Library | Collections
 
 *** Keywords ***
@@ -38,13 +41,6 @@
 | | ...
 | | All TGs Set Interface Default Driver | ${nodes}
 
-| Show VPP version on all DUTs
-| | [Documentation] | Show VPP version verbose on all DUTs.
-| | ...
-| | ${duts}= | Get Matches | ${nodes} | DUT*
-| | :FOR | ${dut} | IN | @{duts}
-| | | Vpp show version verbose | ${nodes['${dut}']}
-
 | Show Vpp Errors On All DUTs
 | | [Documentation] | Show VPP errors verbose on all DUTs.
 | | ...
@@ -60,13 +56,6 @@
 | | | Vpp api trace save | ${nodes['${dut}']}
 | | | Vpp api trace dump | ${nodes['${dut}']}
 
-| Show VPP vhost on all DUTs
-| | [Documentation] | Show Vhost User on all DUTs.
-| | ...
-| | ${duts}= | Get Matches | ${nodes} | DUT*
-| | :FOR | ${dut} | IN | @{duts}
-| | | Vpp Show Vhost | ${nodes['${dut}']}
-
 | Show Bridge Domain Data On All DUTs
 | | [Documentation] | Show Bridge Domain data on all DUTs.
 | | ...
@@ -254,12 +243,12 @@
 | | :FOR | ${dut} | IN | @{duts}
 | | | Run keyword | ${dut}.Add DPDK Dev Default TXD | ${txd}
 
-| Add SNAT to all DUTs
-| | [Documentation] | Add SNAT configuration to all DUTs.
+| Add NAT to all DUTs
+| | [Documentation] | Add NAT configuration to all DUTs.
 | | ...
 | | ${duts}= | Get Matches | ${nodes} | DUT*
 | | :FOR | ${dut} | IN | @{duts}
-| | | Run keyword | ${dut}.Add SNAT
+| | | Run keyword | ${dut}.Add NAT
 
 | Add cryptodev to all DUTs
 | | [Documentation] | Add Cryptodev to VPP startup configuration to all DUTs.
@@ -325,6 +314,7 @@
 | Tear down functional test
 | | [Documentation] | Common test teardown for functional tests.
 | | ...
+| | Remove All Added Ports On All DUTs From Topology | ${nodes}
 | | Show Packet Trace on All DUTs | ${nodes}
 | | Show VAT History On All DUTs | ${nodes}
 | | Vpp Show Errors On All DUTs | ${nodes}
@@ -333,6 +323,7 @@
 | Tear down LISP functional test
 | | [Documentation] | Common test teardown for functional tests with LISP.
 | | ...
+| | Remove All Added Ports On All DUTs From Topology | ${nodes}
 | | Show Packet Trace on All DUTs | ${nodes}
 | | Show VAT History On All DUTs | ${nodes}
 | | Show Vpp Settings | ${nodes['DUT1']}
@@ -353,6 +344,7 @@
 | | ...
 | | [Arguments] | ${vm_node}
 | | ...
+| | Remove All Added Ports On All DUTs From Topology | ${nodes}
 | | Show Packet Trace on All DUTs | ${nodes}
 | | Show VAT History On All DUTs | ${nodes}
 | | Show Vpp Settings | ${nodes['DUT1']}
@@ -389,3 +381,50 @@
 | | Tear down functional test
 | | 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.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - information about a DUT node. Type: dictionary
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Stop VPP Service on DUT \| ${nodes['DUT1']} \|
+| | ...
+| | [Arguments] | ${node}
+| | Stop VPP Service | ${node}
+
+| Start VPP Service on DUT
+| | [Documentation] | Start the VPP service on the specified node.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - information about a DUT node. Type: dictionary
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Start VPP Service on DUT \| ${nodes['DUT1']} \|
+| | ...
+| | [Arguments] | ${node}
+| | Start VPP Service | ${node}