From 9d510d595f73d26e3f7c6646fa6530e8f252f790 Mon Sep 17 00:00:00 2001 From: Juraj Linkeš Date: Thu, 7 Jan 2021 16:25:31 +0100 Subject: tests: add 2n1l l2 acl tests, update 2n-tx2 specs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Modify initialize L2BD ACL keywords to be usable for both 2-node and 3-node topologies and update testsuites accordingly. Add the missing macip T-rex profile. Add classifier tests to 2n-tx2 job specs. Change-Id: I17b84b8fc18ef9a6f275ae0238a0665ac2017f01 Signed-off-by: Juraj Linkeš --- resources/libraries/robot/l2/l2_bridge_domain.robot | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'resources/libraries/robot/l2/l2_bridge_domain.robot') diff --git a/resources/libraries/robot/l2/l2_bridge_domain.robot b/resources/libraries/robot/l2/l2_bridge_domain.robot index 812514bd98..f54d1685c4 100644 --- a/resources/libraries/robot/l2/l2_bridge_domain.robot +++ b/resources/libraries/robot/l2/l2_bridge_domain.robot @@ -1,4 +1,5 @@ -# Copyright (c) 2020 Cisco and/or its affiliates. +# Copyright (c) 2021 Cisco and/or its affiliates. +# Copyright (c) 2021 PANTHEON.tech 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: @@ -842,7 +843,7 @@ | | Set single interfaces in path up | | Show Memif on all DUTs | ${nodes} -| Initialize L2 bridge domain with MACIP ACLs on DUT1 in 3-node circular topology +| Initialize L2 bridge domain with MACIP ACLs in circular topology | | [Documentation] | | ... | Setup L2BD topology by adding two interfaces on DUT1 into bridge | | ... | domain that is created automatically with index 1. Learning is @@ -850,14 +851,16 @@ | | ... | DUT1 interfaces. | | | | Set interfaces in path up +| | | | VPP Add L2 Bridge Domain | | ... | ${dut1} | ${1} | ${DUT1_${int}1}[0] | ${DUT1_${int}2}[0] -| | Configure L2XC -| | ... | ${dut2} | ${DUT2_${int}1}[0] | ${DUT2_${int}2}[0] | | Configure MACIP ACLs | | ... | ${dut1} | ${DUT1_${int}1}[0] | ${DUT1_${int}2}[0] +| | +| | Run Keyword If | ${duts_count} == 2 +| | ... | Configure L2XC | ${dut2} | ${DUT2_${int}1}[0] | ${DUT2_${int}2}[0] -| Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology +| Initialize L2 bridge domain with IPv4 ACLs in circular topology | | [Documentation] | | ... | Setup L2BD topology by adding two interfaces on DUT1 into bridge | | ... | domain that is created automatically with index 1. Learning is @@ -865,9 +868,11 @@ | | ... | interfaces. | | | | Set interfaces in path up +| | | | VPP Add L2 Bridge Domain | | ... | ${dut1} | ${1} | ${DUT1_${int}1}[0] | ${DUT1_${int}2}[0] -| | Configure L2XC -| | ... | ${dut2} | ${DUT2_${int}1}[0] | ${DUT2_${int}2}[0] | | Configure IPv4 ACLs | | ... | ${dut1} | ${DUT1_${int}1}[0] | ${DUT1_${int}2}[0] +| | +| | Run Keyword If | ${duts_count} == 2 +| | ... | Configure L2XC | ${dut2} | ${DUT2_${int}1}[0] | ${DUT2_${int}2}[0] -- cgit 1.2.3-korg