From 430afafb4cadf503ccee99c09f6de7402f5404c7 Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Thu, 1 Jun 2017 07:00:50 +0200 Subject: CSIT-662: KWI - KW renaming - plus: CSIT-656: Script to rename robot keywords. Change-Id: Ia69917e406a1b346b80e5ea742f6200c1c9e9d21 Signed-off-by: Tibor Frank --- tests/func/tap/api-crud-tap-func.robot | 8 ++--- .../eth2p-eth-l2bdbasemaclrn-eth-2tap-func.robot | 22 ++++++------- ...2p-eth-l2bdbasemaclrn-l2shg-eth-2tap-func.robot | 36 +++++++++++----------- .../tap/eth2p-ethip4-ip4base-eth-1tap-func.robot | 16 +++++----- 4 files changed, 41 insertions(+), 41 deletions(-) (limited to 'tests/func/tap') diff --git a/tests/func/tap/api-crud-tap-func.robot b/tests/func/tap/api-crud-tap-func.robot index 762c4e3df2..99014a9583 100644 --- a/tests/func/tap/api-crud-tap-func.robot +++ b/tests/func/tap/api-crud-tap-func.robot @@ -24,9 +24,9 @@ | Library | resources.libraries.python.Namespaces | Library | resources.libraries.python.IPUtil | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO -| Test Setup | Run Keywords | Func Test Setup +| Test Setup | Run Keywords | Set up functional test | ... | AND | Clean Up Namespaces | ${nodes['DUT1']} -| Test Teardown | Run Keywords | Func Test Teardown +| Test Teardown | Run Keywords | Tear down functional test | ... | AND | Clean Up Namespaces | ${nodes['DUT1']} | Documentation | *Tap Interface CRUD Tests* | ... | *[Top] Network Topologies:* TG=DUT1 2-node topology with two links @@ -49,9 +49,9 @@ | | ... | [Cfg] Set two TAP interfaces. | | ... | [Ver] Verify that TAP interface can be modified, deleted, and no other | | ... | TAP interface is affected. -| | Given Path for 2-node testing is set | ${nodes['TG']} | ${nodes['DUT1']} +| | Given Configure path in 2-node circular topology | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['TG']} -| | And Interfaces in 2-node path are up +| | And Set interfaces in 2-node circular topology up | | ${int1}= | And Add Tap Interface | ${dut_node} | ${tap_int1} | | ${int2}= | And Add Tap Interface | ${dut_node} | ${tap_int2} | | And Set Interface State | ${dut_node} | ${int1} | up diff --git a/tests/func/tap/eth2p-eth-l2bdbasemaclrn-eth-2tap-func.robot b/tests/func/tap/eth2p-eth-l2bdbasemaclrn-eth-2tap-func.robot index 64284e5faf..f7d267f272 100644 --- a/tests/func/tap/eth2p-eth-l2bdbasemaclrn-eth-2tap-func.robot +++ b/tests/func/tap/eth2p-eth-l2bdbasemaclrn-eth-2tap-func.robot @@ -24,9 +24,9 @@ | Library | resources.libraries.python.Namespaces | Library | resources.libraries.python.IPUtil | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO -| Test Setup | Run Keywords | Func Test Setup +| Test Setup | Run Keywords | Set up functional test | ... | AND | Clean Up Namespaces | ${nodes['DUT1']} -| Test Teardown | Run Keywords | Func Test Teardown +| Test Teardown | Run Keywords | Tear down functional test | ... | AND | Linux Del Bridge | ${nodes['DUT1']} | ${bid_TAP} | ... | AND | Clean Up Namespaces | ${nodes['DUT1']} | Documentation | *Tap Interface Traffic Tests* @@ -62,26 +62,26 @@ | | ... | [Ver] Packet sent from TG is passed through all L2BD and received | | ... | back on TG. Then src_ip, dst_ip and MAC are checked. | | ... -| | Given Path for 2-node testing is set | ${nodes['TG']} | ${nodes['DUT1']} +| | Given Configure path in 2-node circular topology | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['TG']} -| | And Interfaces in 2-node path are up +| | And Set interfaces in 2-node circular topology up | | ${int1}= | And Add Tap Interface | ${dut_node} | ${tap_int1} | | ${int2}= | And Add Tap Interface | ${dut_node} | ${tap_int2} | | And Set Interface State | ${dut_node} | ${int1} | up | | And Set Interface State | ${dut_node} | ${int2} | up -| | And Bridge domain on DUT node is created | ${dut_node} +| | And Create bridge domain | ${dut_node} | | ... | ${bid_from_TG} | learn=${TRUE} -| | And Bridge domain on DUT node is created | ${dut_node} +| | And Create bridge domain | ${dut_node} | | ... | ${bid_to_TG} | learn=${TRUE} | | And Linux Add Bridge | ${dut_node} | | ... | ${bid_TAP} | ${tap_int1} | ${tap_int2} -| | And Interface is added to bridge domain | ${dut_node} +| | And Add interface to bridge domain | ${dut_node} | | ... | ${int1} | ${bid_to_TG} | 0 -| | And Interface is added to bridge domain | ${dut_node} +| | And Add interface to bridge domain | ${dut_node} | | ... | ${dut_to_tg_if1} | ${bid_to_TG} | 0 -| | And Interface is added to bridge domain | ${dut_node} +| | And Add interface to bridge domain | ${dut_node} | | ... | ${int2} | ${bid_from_TG} | 0 -| | And Interface is added to bridge domain | ${dut_node} +| | And Add interface to bridge domain | ${dut_node} | | ... | ${dut_to_tg_if2} | ${bid_from_TG} | 0 -| | Then Send and receive ICMP Packet | ${tg_node} +| | Then Send ICMP packet and verify received packet | ${tg_node} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if2} diff --git a/tests/func/tap/eth2p-eth-l2bdbasemaclrn-l2shg-eth-2tap-func.robot b/tests/func/tap/eth2p-eth-l2bdbasemaclrn-l2shg-eth-2tap-func.robot index 8620dd05fd..8b3d25d051 100644 --- a/tests/func/tap/eth2p-eth-l2bdbasemaclrn-l2shg-eth-2tap-func.robot +++ b/tests/func/tap/eth2p-eth-l2bdbasemaclrn-l2shg-eth-2tap-func.robot @@ -24,9 +24,9 @@ | Library | resources.libraries.python.Namespaces | Library | resources.libraries.python.IPUtil | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO -| Test Setup | Run Keywords | Func Test Setup +| Test Setup | Run Keywords | Set up functional test | ... | AND | Clean Up Namespaces | ${nodes['DUT1']} -| Test Teardown | Run Keywords | Func Test Teardown +| Test Teardown | Run Keywords | Tear down functional test | ... | AND | Clean Up Namespaces | ${nodes['DUT1']} | Documentation | *Tap Interface Traffic Tests* | ... | *[Top] Network Topologies:* TG=DUT1 2-node topology with two links @@ -73,9 +73,9 @@ | | ... | and assign two linux-TAP interfaces to it respectively. | | ... | [Ver] Packet is sent from TG to both linux-TAP interfaces and reply | | ... | is checked. Ping from First linux-TAP to another should pass. -| | Given Path for 2-node testing is set | ${nodes['TG']} | ${nodes['DUT1']} +| | Given Configure path in 2-node circular topology | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['TG']} -| | And Interfaces in 2-node path are up +| | And Set interfaces in 2-node circular topology up | | ${int1}= | And Add Tap Interface | ${dut_node} | ${tap_int1} | | ${int2}= | And Add Tap Interface | ${dut_node} | ${tap_int2} | | And Set Interface State | ${dut_node} | ${int1} | up @@ -98,18 +98,18 @@ | | ... | ${tg_ip_address_SHG} | ${tg_to_dut_if1_mac} | ${namespace1} | | And Set Linux Interface ARP | ${dut_node} | ${tap_int2} | | ... | ${tg_ip_address_SHG} | ${tg_to_dut_if1_mac} | ${namespace2} -| | And Bridge domain on DUT node is created | ${dut_node} +| | And Create bridge domain | ${dut_node} | | ... | ${bd_id1} | learn=${TRUE} -| | And Interface is added to bridge domain | ${dut_node} | ${dut_to_tg_if1} +| | And Add interface to bridge domain | ${dut_node} | ${dut_to_tg_if1} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut_node} | ${int1} +| | And Add interface to bridge domain | ${dut_node} | ${int1} | | ... | ${bd_id1} | ${shg1} -| | And Interface is added to bridge domain | ${dut_node} | ${int2} +| | And Add interface to bridge domain | ${dut_node} | ${int2} | | ... | ${bd_id1} | ${shg2} -| | Then Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut_if1} +| | Then Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tap1_NM_mac} | ${tg_to_dut_if1_mac} | | ... | ${tap1_NM_ip} | ${tg_ip_address_SHG} -| | And Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut_if1} +| | And Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tap2_NM_mac} | ${tg_to_dut_if1_mac} | | ... | ${tap2_NM_SHG} | ${tg_ip_address_SHG} | | And Send Ping From Node To Dst | ${dut_node} | ${tap1_NM_ip} | namespace=${namespace2} @@ -125,9 +125,9 @@ | | ... | and assign two linux-TAP interfaces to it respectively. | | ... | [Ver] Packet is sent from TG to both linux-TAP interfaces and reply | | ... | is checked. Ping from First linux-TAP to another should fail. -| | Given Path for 2-node testing is set | ${nodes['TG']} | ${nodes['DUT1']} +| | Given Configure path in 2-node circular topology | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['TG']} -| | And Interfaces in 2-node path are up +| | And Set interfaces in 2-node circular topology up | | ${int1}= | And Add Tap Interface | ${dut_node} | ${tap_int1} | | ${int2}= | And Add Tap Interface | ${dut_node} | ${tap_int2} | | And Set Interface State | ${dut_node} | ${int1} | up @@ -150,18 +150,18 @@ | | ... | ${tg_ip_address_SHG} | ${tg_to_dut_if1_mac} | ${namespace1} | | And Set Linux Interface ARP | ${dut_node} | ${tap_int2} | | ... | ${tg_ip_address_SHG} | ${tg_to_dut_if1_mac} | ${namespace2} -| | And Bridge domain on DUT node is created | ${dut_node} +| | And Create bridge domain | ${dut_node} | | ... | ${bd_id1} | learn=${TRUE} -| | And Interface is added to bridge domain | ${dut_node} | ${dut_to_tg_if1} +| | And Add interface to bridge domain | ${dut_node} | ${dut_to_tg_if1} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut_node} | ${int1} +| | And Add interface to bridge domain | ${dut_node} | ${int1} | | ... | ${bd_id1} | ${shg1} -| | And Interface is added to bridge domain | ${dut_node} | ${int2} +| | And Add interface to bridge domain | ${dut_node} | ${int2} | | ... | ${bd_id1} | ${shg1} -| | Then Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut_if1} +| | Then Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tap1_NM_mac} | ${tg_to_dut_if1_mac} | | ... | ${tap1_NM_ip} | ${tg_ip_address_SHG} -| | And Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut_if1} +| | And Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tap2_NM_mac} | ${tg_to_dut_if1_mac} | | ... | ${tap2_NM_SHG} | ${tg_ip_address_SHG} | | And Run Keyword And Expect Error | Ping Not Successful | Send Ping From Node To Dst diff --git a/tests/func/tap/eth2p-ethip4-ip4base-eth-1tap-func.robot b/tests/func/tap/eth2p-ethip4-ip4base-eth-1tap-func.robot index bd767e704c..7b84a00028 100644 --- a/tests/func/tap/eth2p-ethip4-ip4base-eth-1tap-func.robot +++ b/tests/func/tap/eth2p-ethip4-ip4base-eth-1tap-func.robot @@ -24,9 +24,9 @@ | Library | resources.libraries.python.Namespaces | Library | resources.libraries.python.IPUtil | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO -| Test Setup | Run Keywords | Func Test Setup +| Test Setup | Run Keywords | Set up functional test | ... | AND | Clean Up Namespaces | ${nodes['DUT1']} -| Test Teardown | Run Keywords | Func Test Teardown +| Test Teardown | Run Keywords | Tear down functional test | ... | AND | Clean Up Namespaces | ${nodes['DUT1']} | Documentation | *Tap Interface Traffic Tests* | ... | *[Top] Network Topologies:* TG=DUT1 2-node topology with two links @@ -65,9 +65,9 @@ | | ... | and one is linux-TAP. | | ... | [Ver] Packet sent from TG gets to the destination and ICMP-reply is | | ... | received on TG. -| | Given Path for 2-node testing is set | ${nodes['TG']} | ${nodes['DUT1']} +| | Given Configure path in 2-node circular topology | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['TG']} -| | And Interfaces in 2-node path are up +| | And Set interfaces in 2-node circular topology up | | ${int1}= | And Add Tap Interface | ${dut_node} | ${tap_int1} | | | And Set Interface Address | | ... | ${dut_node} | ${int1} | ${tap1_VPP_ip} | ${prefix} @@ -83,7 +83,7 @@ | | ... | ${tg_ip_address} | ${tg_to_dut_if1_mac} | | And Add Arp On Dut | ${dut_node} | ${int1} | | ... | ${tap1_NM_ip} | ${tap1_NM_mac} -| | Then Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut_if1} +| | Then Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut_if1} | | ... | ${dut_to_tg_if1_mac} | ${tg_to_dut_if1_mac} | | ... | ${tap1_NM_ip} | ${tg_ip_address} @@ -96,9 +96,9 @@ | | ... | and one is linux-TAP in namespace. | | ... | [Ver] Packet sent from TG gets to the destination and ICMP-reply is | | ... | received on TG. -| | Given Path for 2-node testing is set | ${nodes['TG']} | ${nodes['DUT1']} +| | Given Configure path in 2-node circular topology | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['TG']} -| | And Interfaces in 2-node path are up +| | And Set interfaces in 2-node circular topology up | | ${int1}= | And Add Tap Interface | ${dut_node} | ${tap_int1} | | | And Set Interface Address | | ... | ${dut_node} | ${int1} | ${tap1_VPP_ip} | ${prefix} @@ -118,6 +118,6 @@ | | ... | ${tap1_NM_ip} | ${tap1_NM_mac} | | And Add Route | ${dut_node} | | ... | ${tg_ip_address_GW} | ${prefix} | ${tap1_VPP_ip} | ${namespace1} -| | Then Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut_if1} +| | Then Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut_if1} | | ... | ${dut_to_tg_if1_mac} | ${tg_to_dut_if1_mac} | | ... | ${tap1_NM_ip} | ${tg_ip_address} -- cgit 1.2.3-korg