From e6cb3709bd670738471fff40ce13dcb5aff8692f Mon Sep 17 00:00:00 2001 From: Stefan Kobza Date: Fri, 12 Feb 2016 15:28:57 +0100 Subject: Last bulk update of CSIT. Change-Id: I815e4d54e74a49fd19a9927554ce5c37a2719f7e Signed-off-by: Stefan Kobza --- tests/suites/ipv6/ipv6_untagged.robot | 7 +- .../suites/l2_xconnect/l2_xconnect_untagged.robot | 6 +- tests/suites/performance/short.robot | 84 ++++++++++++++++++---- 3 files changed, 78 insertions(+), 19 deletions(-) (limited to 'tests/suites') diff --git a/tests/suites/ipv6/ipv6_untagged.robot b/tests/suites/ipv6/ipv6_untagged.robot index e437ae618a..6f8b9c093e 100644 --- a/tests/suites/ipv6/ipv6_untagged.robot +++ b/tests/suites/ipv6/ipv6_untagged.robot @@ -34,11 +34,12 @@ | | Ipv6 icmp echo sweep | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes_ipv6_addr} | TG can route to first DUT egress interface -| | Ipv6 tg to dut1 egress | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes_ipv6_addr} +| | Ipv6 tg to dut1 egress | ${nodes['TG']} | ${nodes['DUT1']} | +| | ... | ${nodes['DUT2']} | ${nodes_ipv6_addr} | TG can route to second DUT through first DUT -| | Ipv6 tg to dut2 via dut1 | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} -| | ... | ${nodes_ipv6_addr} +| | Ipv6 tg to dut2 via dut1 | ${nodes['TG']} | ${nodes['DUT1']} +| | ... | ${nodes['DUT2']} | ${nodes_ipv6_addr} | TG can route to second DUT egress interface through first DUT | | Ipv6 tg to dut2 egress via dut1 | ${nodes['TG']} | ${nodes['DUT1']} diff --git a/tests/suites/l2_xconnect/l2_xconnect_untagged.robot b/tests/suites/l2_xconnect/l2_xconnect_untagged.robot index 4aaf15075f..36f49b30d8 100644 --- a/tests/suites/l2_xconnect/l2_xconnect_untagged.robot +++ b/tests/suites/l2_xconnect/l2_xconnect_untagged.robot @@ -16,9 +16,9 @@ | Resource | resources/libraries/robot/default.robot | Resource | resources/libraries/robot/l2_xconnect.robot | Force Tags | 3_NODE_SINGLE_LINK_TOPO -| Test Setup | Setup all DUTs before test -| Suite Setup | Setup all TGs before traffic script - +| Suite Setup | Run Keywords | Setup all DUTs before test +| ... | AND | Setup all TGs before traffic script +| ... | AND | Interfaces on all DUTs are in "up" state *** Test Cases *** diff --git a/tests/suites/performance/short.robot b/tests/suites/performance/short.robot index 5c04d5ec81..3d29485d7d 100644 --- a/tests/suites/performance/short.robot +++ b/tests/suites/performance/short.robot @@ -13,29 +13,87 @@ *** Settings *** | Resource | resources/libraries/robot/default.robot | Resource | resources/libraries/robot/interfaces.robot -| Library | resources/libraries/python/VatExecutor.py +| Resource | resources/libraries/robot/bridge_domain.robot +| Resource | resources/libraries/robot/ipv4.robot | Library | resources/libraries/python/TrafficGenerator.py +| Library | resources/libraries/python/CrossConnectSetup.py | Force Tags | topo-3node | Test Setup | Setup all DUTs before test +| Suite Setup | Initialize traffic generator | ${nodes['TG']} +| ... | ${nodes['TG']['interfaces']['port3']['pci_address']} +| ... | ${nodes['TG']['interfaces']['port5']['pci_address']} +| Suite Teardown | Teardown traffic generator | ${nodes['TG']} *** Test Cases *** -| VPP passes traffic through L2 cross connect -| | Given L2 xconnect initialized in topology -| | Then Traffic should pass with no loss | 10 | 10 | 512 +| VPP passes 64B frames through L2 cross connect at 30% of linerate in 3-node-topology +| | Given L2 xconnect initialized in a 3-node topology +| | Then Traffic should pass with no loss | 10 | 30 | 64 | 3-node-xconnect + +| VPP passes 1518B frames through L2 cross connect at 100% of linerate in 3-node-topology +| | Given L2 xconnect initialized in a 3-node topology +| | Then Traffic should pass with no loss | 10 | 100 | 1518 | 3-node-xconnect + +| VPP passes 9000B frames through L2 cross connect at 100% of linerate in 3-node-topology +| | Given L2 xconnect initialized in a 3-node topology +| | Then Traffic should pass with no loss | 10 | 100 | 9000 | 3-node-xconnect + +| VPP passes 64B frames through bridge domain at 30% in 3-node topology +| | Given L2 bridge domain initialized in a 3-node topology +| | Then Traffic should pass with no loss | 10 | 30 | 64 | 3-node-bridge + +| VPP passes 1518B frames through bridge domain at 100% in 3-node topology +| | Given L2 bridge domain initialized in a 3-node topology +| | Then Traffic should pass with no loss | 10 | 100 | 1518 | 3-node-bridge + +| VPP passes 9000B frames through bridge domain at 100% in 3-node topology +| | Given L2 bridge domain initialized in a 3-node topology +| | Then Traffic should pass with no loss | 10 | 100 | 9000 | 3-node-bridge + +#| VPP passes 64B frames through IPv4 forwarding at 30% in 3-node topology +#| | Given IPv4 forwarding initialized in a 3-node topology +#| | Then Traffic should pass with no loss | 10 | 30 | 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 *** -| L2 xconnect initialized in topology -| | Setup L2 xconnect | ${nodes['DUT1']} | port1 | port2 -| | Setup L2 xconnect | ${nodes['DUT2']} | port1 | port2 -| Setup L2 xconnect | [Arguments] | ${node} | ${src_port} | ${dst_port} -| | Execute script | l2xconnect.vat | ${node} -| | Script should have passed +| L2 xconnect initialized in a 3-node topology +| | Interfaces on DUT are in "up" state +| | L2 setup xconnect on DUTs + +| L2 setup xconnect on DUTs +| | Vpp Setup Bidirectional Cross Connect | ${nodes['DUT1']} +| | ... | ${nodes['DUT1']['interfaces']['port1']['name']} +| | ... | ${nodes['DUT1']['interfaces']['port3']['name']} +| | Vpp Setup Bidirectional Cross Connect | ${nodes['DUT2']} +| | ... | ${nodes['DUT2']['interfaces']['port1']['name']} +| | ... | ${nodes['DUT2']['interfaces']['port3']['name']} + +| L2 bridge domain initialized in a 3-node topology +| | ${tg}= | Set Variable | ${nodes['TG']} +| | ${dut1}= | Set Variable | ${nodes['DUT1']} +| | ${dut2}= | Set Variable | ${nodes['DUT2']} +| | ${tg_links}= | bridge_domain.Setup TG "${tg}" DUT1 "${dut1}" And DUT2 "${dut2}" For 3 Node L2 Bridge Domain Test + +| IPv4 forwarding initialized in a 3-node topology +| | Setup DUT nodes for IPv4 testing +| Interfaces on DUT are in "${state}" state +| | Node "${nodes['DUT1']}" interface "${nodes['DUT1']['interfaces']['port1']['name']}" is in "${state}" state +| | Node "${nodes['DUT1']}" interface "${nodes['DUT1']['interfaces']['port3']['name']}" is in "${state}" state +| | Node "${nodes['DUT2']}" interface "${nodes['DUT2']['interfaces']['port1']['name']}" is in "${state}" state +| | Node "${nodes['DUT2']}" interface "${nodes['DUT2']['interfaces']['port3']['name']}" is in "${state}" state | Traffic should pass with no loss -| | [Arguments] | ${duration} | ${rate} | ${framesize} -| | Send traffic on | ${nodes['TG']} | port1 | port2 | ${duration} -| | ... | ${rate} | ${framesize} +| | [Arguments] | ${duration} | ${rate} | ${framesize} | ${topology_type} +| | Send traffic on | ${nodes} | ${duration} +| | ... | ${rate} | ${framesize} | ${topology_type} | | No traffic loss occured -- cgit 1.2.3-korg