aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries
diff options
context:
space:
mode:
authorMiroslav Miklus <mmiklus@cisco.com>2016-07-15 15:16:34 +0200
committerDave Wallace <dwallacelf@gmail.com>2016-07-26 15:12:34 +0000
commitf45cd0ceb17f33376a04edf9b4fb5a37d9ebfb89 (patch)
treecf66653b729e3490da769f0844300e2ae6e9de47 /resources/libraries
parent721f39743c31003ccbdad3c27ffcc3145bfccf90 (diff)
CSIT-106 Vpp config - use only test-related interfaces
Current behaviour is to add all interfaces from topology, we only want to add interfaces from computed path. Change-Id: I9c5d4e765dbe399ee06dd13f0d25c48d3d8e5127 Signed-off-by: Miroslav Miklus <mmiklus@cisco.com>
Diffstat (limited to 'resources/libraries')
-rw-r--r--resources/libraries/python/InterfaceUtil.py6
-rw-r--r--resources/libraries/robot/default.robot1
-rw-r--r--resources/libraries/robot/performance.robot12
3 files changed, 13 insertions, 6 deletions
diff --git a/resources/libraries/python/InterfaceUtil.py b/resources/libraries/python/InterfaceUtil.py
index 2b985bf434..9537b2ba1d 100644
--- a/resources/libraries/python/InterfaceUtil.py
+++ b/resources/libraries/python/InterfaceUtil.py
@@ -427,19 +427,21 @@ class InterfaceUtil(object):
InterfaceUtil.tg_set_interfaces_udev_rules(node)
@staticmethod
- def update_all_interface_data_on_all_nodes(nodes):
+ def update_all_interface_data_on_all_nodes(nodes, skip_tg=False):
"""Update interface names on all nodes in DICT__nodes.
This method updates the topology dictionary by querying interface lists
of all nodes mentioned in the topology dictionary.
:param nodes: Nodes in the topology.
+ :param skip_tg: Skip TG node
:type nodes: dict
+ :type skip_tg: bool
"""
for node_data in nodes.values():
if node_data['type'] == NodeType.DUT:
InterfaceUtil.update_vpp_interface_data_on_node(node_data)
- elif node_data['type'] == NodeType.TG:
+ elif node_data['type'] == NodeType.TG and not skip_tg:
InterfaceUtil.update_tg_interface_data_on_node(node_data)
@staticmethod
diff --git a/resources/libraries/robot/default.robot b/resources/libraries/robot/default.robot
index ad5d69dfed..3135ef0041 100644
--- a/resources/libraries/robot/default.robot
+++ b/resources/libraries/robot/default.robot
@@ -146,3 +146,4 @@
| | ${duts}= | Get Matches | ${nodes} | DUT*
| | :FOR | ${dut} | IN | @{duts}
| | | Apply Config | ${nodes['${dut}']}
+| | Update All Interface Data On All Nodes | ${nodes} | skip_tg=${TRUE}
diff --git a/resources/libraries/robot/performance.robot b/resources/libraries/robot/performance.robot
index 8bc0dbec24..2099deef77 100644
--- a/resources/libraries/robot/performance.robot
+++ b/resources/libraries/robot/performance.robot
@@ -357,7 +357,6 @@
| | ... | \| 2-node Performance Suite Setup \| L2 \|
| | [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
@@ -381,7 +380,6 @@
| | ... | \| 3-node Performance Suite Setup \| L2 \|
| | [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
@@ -407,7 +405,6 @@
| | ... | \| 2-node Performance Suite Setup \| L2 \| Intel-X520-DA2 \|
| | [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
@@ -434,7 +431,6 @@
| | ... | \| 3-node Performance Suite Setup \| L2 \| Intel-X520-DA2 \|
| | [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
@@ -831,3 +827,11 @@
| | Sleep | ${duration}
| | Show runtime counters on all DUTs
| | Stop traffic on tg
+
+| Add PCI devices to DUTs from 3-node single link topology
+| | ${dut1_if1_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if1}
+| | ${dut1_if2_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if2}
+| | ${dut2_if1_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if1}
+| | ${dut2_if2_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if2}
+| | Add PCI device | ${dut1} | ${dut1_if1_pci} | ${dut1_if2_pci}
+| | Add PCI device | ${dut2} | ${dut2_if1_pci} | ${dut2_if2_pci}