Extend host topology with NIC type filtering

JIRA: CSIT-1
Changes to allow filtering based on NIC model.
Switched xconnect perf test to use filtered topology.

Change-Id: Id526f47dc28f92bf26d070e54819ad29bccc0440
Signed-off-by: Miroslav Miklus <mmiklus@cisco.com>

2 files changed, 48 insertions, 0 deletions

diff --git a/resources/libraries/robot/bridge_domain.robot b/resources/libraries/robot/bridge_domain.robot
index cd3b626e1c..8879f6f643 100644
--- a/resources/libraries/robot/bridge_domain.robot
+++ b/resources/libraries/robot/bridge_domain.robot
@@ -56,6 +56,17 @@
 | | Set Test Variable | ${tg_node}
 | | Set Test Variable | ${dut_node}
 
+| Vpp l2bd forwarding setup
+| | [Documentation] | Setup BD between 2 interfaces on VPP node and if learning
+| | ...             | is off set static L2FIB entry on second interface
+| | [Arguments] | ${node} | ${if1} | ${if2} | ${learn}=${TRUE} | ${mac}=${EMPTY}
+| | Set Interface State | ${node} | ${if1} | up
+| | Set Interface State | ${node} | ${if2} | up
+| | Vpp Add L2 Bridge Domain | ${node} | ${1} | ${if1} | ${if2} | ${learn}
+| | Run Keyword If | ${learn} == ${FALSE}
+| | ... | Vpp Add L2fib Entry | ${node} | ${mac} | ${if2} | ${1}
+| | All Vpp Interfaces Ready Wait | ${nodes}
+
 | Path for 3-node BD testing is set
 | | [Documentation] | Compute path for bridge domain testing on three given
 | | ...             | nodes and set corresponding test case variables.
diff --git a/resources/libraries/robot/performance.robot b/resources/libraries/robot/performance.robot
index 804b6433d3..de5067b639 100644
--- a/resources/libraries/robot/performance.robot
+++ b/resources/libraries/robot/performance.robot
@@ -43,6 +43,34 @@
 | | Set Suite Variable | ${dut2_if1}
 | | Set Suite Variable | ${dut2_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
+| | ...             | tg, tg_if1, tg_if2, dut1, dut1_if1, dut1_if2,
+| | ...             | dut2, dut2_if1, dut2_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['DUT2']} | 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
+| | ${dut2_if1} | ${dut2}= | Next Interface
+| | ${dut2_if2} | ${dut2}= | 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}
+| | Set Suite Variable | ${dut2}
+| | Set Suite Variable | ${dut2_if1}
+| | Set Suite Variable | ${dut2_if2}
+
 | IPv4 forwarding initialized in a 3-node circular topology
 | | [Documentation] | Custom setup of IPv4 addresses on all DUT nodes and TG
 | | Set Interface State | ${dut1} | ${dut1_if1} | up
@@ -87,6 +115,15 @@
 | | ...                          | ${dut2} | ${dut2_if1} | ${dut2_if2}
 | | ...                          | ${topology_type}
 
+3-node Performance Suite Setup with DUT's NIC model
+| | [Arguments] | ${topology_type} | ${nic_model}
+| | 3-node circular Topology Variables Setup with DUT interface model
+| | ... | ${nic_model}
+| | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2}
+| | ...                          | ${dut1} | ${dut1_if1} | ${dut1_if2}
+| | ...                          | ${dut2} | ${dut2_if1} | ${dut2_if2}
+| | ...                          | ${topology_type}
+
 | 3-node Performance Suite Teardown
 | | Teardown traffic generator | ${tg}