From 83d5183aba7a35777ee4363b989bb22e22e8a2ef Mon Sep 17 00:00:00 2001 From: Miroslav Miklus Date: Tue, 28 Jun 2016 14:01:18 +0200 Subject: [PATCH] 2-node topology keywords JIRA: CSIT-182 Change-Id: I593c2d6b0e7a1ee344b879f7b54bb9443ab8c516 Signed-off-by: Miroslav Miklus --- resources/libraries/robot/performance.robot | 71 +++++++++++++++++++++- .../Long_Xconnect_Dot1q_Intel-X520-DA2.robot | 36 +++++------ .../Short_Xconnect_Dot1q_Intel-X520-DA2.robot | 18 +++--- 3 files changed, 97 insertions(+), 28 deletions(-) diff --git a/resources/libraries/robot/performance.robot b/resources/libraries/robot/performance.robot index efa4d27845..53fbf26488 100644 --- a/resources/libraries/robot/performance.robot +++ b/resources/libraries/robot/performance.robot @@ -73,6 +73,20 @@ | | Set Suite Variable | ${glob_loss_acceptance} | | Set Suite Variable | ${glob_loss_acceptance_type} +| 2-node circular Topology Variables Setup +| | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} +| | Compute Path +| | ${tg_if1} | ${tg}= | Next Interface +| | ${dut1_if1} | ${dut1}= | Next Interface +| | ${dut1_if2} | ${dut1}= | 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} + | 3-node circular Topology Variables Setup | | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | | ... | ${nodes['TG']} @@ -93,6 +107,27 @@ | | Set Suite Variable | ${dut2_if1} | | Set Suite Variable | ${dut2_if2} +| 2-node circular Topology Variables Setup with DUT interface model +| | [Documentation] | Find a path between TG-DUT1-TG based on interface +| | ... | model provided as an argument. Set suite variables +| | ... | tg, tg_if1, tg_if2, dut1, dut1_if1, dut1_if2, +| | [Arguments] | ${iface_model} +| | ${iface_model_list}= | Create list | ${iface_model} +| | Append Node | ${nodes['TG']} +| | Append Node | ${nodes['DUT1']} | filter_list=${iface_model_list} +| | Append Node | ${nodes['TG']} +| | Compute Path +| | ${tg_if1} | ${tg}= | Next Interface +| | ${dut1_if1} | ${dut1}= | Next Interface +| | ${dut1_if2} | ${dut1}= | 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} + | 3-node circular Topology Variables Setup with DUT interface model | | [Documentation] | Find a path between TG-DUT1-DUT2-TG based on interface | | ... | model provided as an argument. Set suite variables @@ -121,7 +156,14 @@ | | Set Suite Variable | ${dut2_if1} | | Set Suite Variable | ${dut2_if2} -| VPP interfaces in path are up +| VPP interfaces in path are up in a 2-node circular topology +| | [Documentation] | *Set UP state on VPP interfaces in path on nodes.* +| | ... +| | Set Interface State | ${dut1} | ${dut1_if1} | up +| | Set Interface State | ${dut1} | ${dut1_if2} | up +| | Vpp Node Interfaces Ready Wait | ${dut1} + +| VPP interfaces in path are up in a 3-node circular topology | | [Documentation] | *Set UP state on VPP interfaces in path on nodes.* | | ... | | Set Interface State | ${dut1} | ${dut1_if1} | up @@ -188,6 +230,19 @@ | | Vpp l2bd forwarding setup | ${dut2} | ${dut2_if1} | ${dut2_if2} | | All Vpp Interfaces Ready Wait | ${nodes} +| 2-node Performance Suite Setup +| | [Arguments] | ${topology_type} +| | Setup default startup configuration of VPP on all DUTs +| | Update All Interface Data On All Nodes | ${nodes} +| | Show vpp version on all DUTs +| | Setup performance rate Variables +| | Setup performance global Variables +| | 2-node circular Topology Variables Setup +| | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2} +| | ... | ${dut1} | ${dut1_if1} +| | ... | ${dut1} | ${dut1_if2} +| | ... | ${topology_type} + | 3-node Performance Suite Setup | | [Arguments] | ${topology_type} | | Setup default startup configuration of VPP on all DUTs @@ -201,6 +256,20 @@ | | ... | ${dut2} | ${dut2_if2} | | ... | ${topology_type} +2-node Performance Suite Setup with DUT's NIC model +| | [Arguments] | ${topology_type} | ${nic_model} +| | Setup default startup configuration of VPP on all DUTs +| | Update All Interface Data On All Nodes | ${nodes} +| | Show vpp version on all DUTs +| | Setup performance rate Variables +| | Setup performance global Variables +| | 2-node circular Topology Variables Setup with DUT interface model +| | ... | ${nic_model} +| | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2} +| | ... | ${dut1} | ${dut1_if1} +| | ... | ${dut1} | ${dut1_if2} +| | ... | ${topology_type} + 3-node Performance Suite Setup with DUT's NIC model | | [Arguments] | ${topology_type} | ${nic_model} | | Setup default startup configuration of VPP on all DUTs diff --git a/tests/suites/performance/Long_Xconnect_Dot1q_Intel-X520-DA2.robot b/tests/suites/performance/Long_Xconnect_Dot1q_Intel-X520-DA2.robot index 021e12695b..f94d11c8b8 100644 --- a/tests/suites/performance/Long_Xconnect_Dot1q_Intel-X520-DA2.robot +++ b/tests/suites/performance/Long_Xconnect_Dot1q_Intel-X520-DA2.robot @@ -64,7 +64,7 @@ | | And Add all PCI devices to all DUTs | | And Add No Multi Seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up +| | And VPP interfaces in path are up in a 3-node circular topology | | When VLAN dot1q subinterfaces initialized on 3-node topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | And L2 tag rewrite method setup on interfaces @@ -94,7 +94,7 @@ | | And Add all PCI devices to all DUTs | | And Add No Multi Seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up +| | And VPP interfaces in path are up in a 3-node circular topology | | When VLAN dot1q subinterfaces initialized on 3-node topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | And L2 tag rewrite method setup on interfaces @@ -126,7 +126,7 @@ | | And Add all PCI devices to all DUTs | | And Add No Multi Seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up +| | And VPP interfaces in path are up in a 3-node circular topology | | When VLAN dot1q subinterfaces initialized on 3-node topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | And L2 tag rewrite method setup on interfaces @@ -156,7 +156,7 @@ | | And Add all PCI devices to all DUTs | | And Add No Multi Seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up +| | And VPP interfaces in path are up in a 3-node circular topology | | When VLAN dot1q subinterfaces initialized on 3-node topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | And L2 tag rewrite method setup on interfaces @@ -187,7 +187,7 @@ | | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs | | And Add all PCI devices to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up +| | And VPP interfaces in path are up in a 3-node circular topology | | When VLAN dot1q subinterfaces initialized on 3-node topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | And L2 tag rewrite method setup on interfaces @@ -216,7 +216,7 @@ | | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs | | And Add all PCI devices to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up +| | And VPP interfaces in path are up in a 3-node circular topology | | When VLAN dot1q subinterfaces initialized on 3-node topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | And L2 tag rewrite method setup on interfaces @@ -248,7 +248,7 @@ | | And Add all PCI devices to all DUTs | | And Add No Multi Seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up +| | And VPP interfaces in path are up in a 3-node circular topology | | When VLAN dot1q subinterfaces initialized on 3-node topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | And L2 tag rewrite method setup on interfaces @@ -278,7 +278,7 @@ | | And Add all PCI devices to all DUTs | | And Add No Multi Seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up +| | And VPP interfaces in path are up in a 3-node circular topology | | When VLAN dot1q subinterfaces initialized on 3-node topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | And L2 tag rewrite method setup on interfaces @@ -310,7 +310,7 @@ | | And Add all PCI devices to all DUTs | | And Add No Multi Seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up +| | And VPP interfaces in path are up in a 3-node circular topology | | When VLAN dot1q subinterfaces initialized on 3-node topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | And L2 tag rewrite method setup on interfaces @@ -340,7 +340,7 @@ | | And Add all PCI devices to all DUTs | | And Add No Multi Seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up +| | And VPP interfaces in path are up in a 3-node circular topology | | When VLAN dot1q subinterfaces initialized on 3-node topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | And L2 tag rewrite method setup on interfaces @@ -371,7 +371,7 @@ | | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs | | And Add all PCI devices to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up +| | And VPP interfaces in path are up in a 3-node circular topology | | When VLAN dot1q subinterfaces initialized on 3-node topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | And L2 tag rewrite method setup on interfaces @@ -400,7 +400,7 @@ | | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs | | And Add all PCI devices to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up +| | And VPP interfaces in path are up in a 3-node circular topology | | When VLAN dot1q subinterfaces initialized on 3-node topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | And L2 tag rewrite method setup on interfaces @@ -432,7 +432,7 @@ | | And Add all PCI devices to all DUTs | | And Add No Multi Seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up +| | And VPP interfaces in path are up in a 3-node circular topology | | When VLAN dot1q subinterfaces initialized on 3-node topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | And L2 tag rewrite method setup on interfaces @@ -462,7 +462,7 @@ | | And Add all PCI devices to all DUTs | | And Add No Multi Seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up +| | And VPP interfaces in path are up in a 3-node circular topology | | When VLAN dot1q subinterfaces initialized on 3-node topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | And L2 tag rewrite method setup on interfaces @@ -494,7 +494,7 @@ | | And Add all PCI devices to all DUTs | | And Add No Multi Seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up +| | And VPP interfaces in path are up in a 3-node circular topology | | When VLAN dot1q subinterfaces initialized on 3-node topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | And L2 tag rewrite method setup on interfaces @@ -524,7 +524,7 @@ | | And Add all PCI devices to all DUTs | | And Add No Multi Seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up +| | And VPP interfaces in path are up in a 3-node circular topology | | When VLAN dot1q subinterfaces initialized on 3-node topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | And L2 tag rewrite method setup on interfaces @@ -555,7 +555,7 @@ | | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs | | And Add all PCI devices to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up +| | And VPP interfaces in path are up in a 3-node circular topology | | When VLAN dot1q subinterfaces initialized on 3-node topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | And L2 tag rewrite method setup on interfaces @@ -584,7 +584,7 @@ | | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs | | And Add all PCI devices to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up +| | And VPP interfaces in path are up in a 3-node circular topology | | When VLAN dot1q subinterfaces initialized on 3-node topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | And L2 tag rewrite method setup on interfaces diff --git a/tests/suites/performance/Short_Xconnect_Dot1q_Intel-X520-DA2.robot b/tests/suites/performance/Short_Xconnect_Dot1q_Intel-X520-DA2.robot index e5f7a60504..1057a7022b 100644 --- a/tests/suites/performance/Short_Xconnect_Dot1q_Intel-X520-DA2.robot +++ b/tests/suites/performance/Short_Xconnect_Dot1q_Intel-X520-DA2.robot @@ -59,7 +59,7 @@ | | And Add all PCI devices to all DUTs | | And Add No Multi Seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up +| | And VPP interfaces in path are up in a 3-node circular topology | | When VLAN dot1q subinterfaces initialized on 3-node topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | And L2 tag rewrite method setup on interfaces @@ -84,7 +84,7 @@ | | And Add all PCI devices to all DUTs | | And Add No Multi Seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up +| | And VPP interfaces in path are up in a 3-node circular topology | | When VLAN dot1q subinterfaces initialized on 3-node topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | And L2 tag rewrite method setup on interfaces @@ -108,7 +108,7 @@ | | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs | | And Add all PCI devices to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up +| | And VPP interfaces in path are up in a 3-node circular topology | | When VLAN dot1q subinterfaces initialized on 3-node topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | And L2 tag rewrite method setup on interfaces @@ -133,7 +133,7 @@ | | And Add all PCI devices to all DUTs | | And Add No Multi Seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up +| | And VPP interfaces in path are up in a 3-node circular topology | | When VLAN dot1q subinterfaces initialized on 3-node topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | And L2 tag rewrite method setup on interfaces @@ -158,7 +158,7 @@ | | And Add all PCI devices to all DUTs | | And Add No Multi Seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up +| | And VPP interfaces in path are up in a 3-node circular topology | | When VLAN dot1q subinterfaces initialized on 3-node topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | And L2 tag rewrite method setup on interfaces @@ -182,7 +182,7 @@ | | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs | | And Add all PCI devices to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up +| | And VPP interfaces in path are up in a 3-node circular topology | | When VLAN dot1q subinterfaces initialized on 3-node topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | And L2 tag rewrite method setup on interfaces @@ -207,7 +207,7 @@ | | And Add all PCI devices to all DUTs | | And Add No Multi Seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up +| | And VPP interfaces in path are up in a 3-node circular topology | | When VLAN dot1q subinterfaces initialized on 3-node topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | And L2 tag rewrite method setup on interfaces @@ -232,7 +232,7 @@ | | And Add all PCI devices to all DUTs | | And Add No Multi Seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up +| | And VPP interfaces in path are up in a 3-node circular topology | | When VLAN dot1q subinterfaces initialized on 3-node topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | And L2 tag rewrite method setup on interfaces @@ -256,7 +256,7 @@ | | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs | | And Add all PCI devices to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up +| | And VPP interfaces in path are up in a 3-node circular topology | | When VLAN dot1q subinterfaces initialized on 3-node topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | And L2 tag rewrite method setup on interfaces -- 2.16.6