aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries/robot
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2019-07-25 11:09:23 +0000
committerVratko Polak <vrpolak@cisco.com>2019-08-06 11:02:02 +0000
commit7d7259ab1a065f0d1f849b29270514eacd3a1efe (patch)
tree872b5dd06071be44440bc0524b314cef4c3d3d82 /resources/libraries/robot
parentfb3aba8bd6418418d9b3741839c4b305d8c72a4e (diff)
VPPD: Dot1Q
Change-Id: I0d3c925ea4a6896a0df98db6ddaf4238e6291bf1 Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'resources/libraries/robot')
-rw-r--r--resources/libraries/robot/performance/performance_configuration.robot18
-rw-r--r--resources/libraries/robot/shared/interfaces.robot50
2 files changed, 47 insertions, 21 deletions
diff --git a/resources/libraries/robot/performance/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot
index 3f5538d3ad..6e65e26d8e 100644
--- a/resources/libraries/robot/performance/performance_configuration.robot
+++ b/resources/libraries/robot/performance/performance_configuration.robot
@@ -114,24 +114,6 @@
| | | ... | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if1_2}
| | All VPP Interfaces Ready Wait | ${nodes}
-| Initialize AVF interfaces
-| | [Documentation]
-| | ... | Initialize AVF interfaces on each DUT. Interfaces are brought up.
-| | ...
-| | ${duts}= | Get Matches | ${nodes} | DUT*
-| | :FOR | ${dut} | IN | @{duts}
-| | | ${if1_pci}= | Get Interface PCI Addr | ${nodes['${dut}']}
-| | | ... | ${${dut}_if1_vf0}
-| | | ${if2_pci}= | Get Interface PCI Addr | ${nodes['${dut}']}
-| | | ... | ${${dut}_if2_vf0}
-| | | ${dut_eth_vf_if1}= | VPP Create AVF Interface | ${nodes['${dut}']}
-| | | ... | ${if1_pci} | ${rxq_count_int}
-| | | ${dut_eth_vf_if2}= | VPP Create AVF Interface | ${nodes['${dut}']}
-| | | ... | ${if2_pci} | ${rxq_count_int}
-| | | Set Test Variable | ${${dut}_if1} | ${dut_eth_vf_if1}
-| | | Set Test Variable | ${${dut}_if2} | ${dut_eth_vf_if2}
-| | Set interfaces in path up
-
| Initialize IPSec in 3-node circular topology
| | [Documentation]
| | ... | Set UP state on VPP interfaces in path on nodes in 3-node circular
diff --git a/resources/libraries/robot/shared/interfaces.robot b/resources/libraries/robot/shared/interfaces.robot
index d24b2fba3c..50dec59442 100644
--- a/resources/libraries/robot/shared/interfaces.robot
+++ b/resources/libraries/robot/shared/interfaces.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
+# Copyright (c) 2019 Cisco 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:
@@ -82,6 +82,44 @@
| | Set Test Variable | ${prev_layer} | if
| | Set interfaces in path up
+| Initialize layer avf on node
+| | [Documentation]
+| | ... | Initialize AVF interfaces on DUT. Interfaces are brought up.
+| | ...
+| | ... | *Arguments:*
+| | ... | - dut - DUT node. Type: string
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Initialize layer avf on node \| DUT1 \|
+| | ...
+| | [Arguments] | ${dut}
+| | ...
+| | ${dut_str}= | Convert To Lowercase | ${dut}
+| | ${if1_vlan}= | Get Interface Vlan | ${nodes['${dut}']} | ${${dut}_if1}
+| | ${if2_vlan}= | Get Interface Vlan | ${nodes['${dut}']} | ${${dut}_if2}
+| | Set Test Variable | ${${dut_str}_vlan1} | ${if1_vlan}
+| | Set Test Variable | ${${dut_str}_vlan2} | ${if2_vlan}
+| | ${if1_pci}= | Get Interface PCI Addr | ${nodes['${dut}']}
+| | ... | ${${dut}_if1_vf0}
+| | ${if2_pci}= | Get Interface PCI Addr | ${nodes['${dut}']}
+| | ... | ${${dut}_if2_vf0}
+| | ${dut_eth_vf_if1}= | VPP Create AVF Interface | ${nodes['${dut}']}
+| | ... | ${if1_pci} | ${rxq_count_int}
+| | ${dut_eth_vf_if2}= | VPP Create AVF Interface | ${nodes['${dut}']}
+| | ... | ${if2_pci} | ${rxq_count_int}
+| | Set Test Variable | ${${dut_str}_if1} | ${dut_eth_vf_if1}
+| | Set Test Variable | ${${dut_str}_if2} | ${dut_eth_vf_if2}
+
+| Initialize AVF interfaces
+| | [Documentation]
+| | ... | Initialize AVF interfaces on each DUT. Interfaces are brought up.
+| | ...
+| | :FOR | ${dut} | IN | @{duts}
+| | | Initialize layer avf on node | ${dut}
+| | Set Test Variable | ${prev_layer} | vf
+| | Set interfaces in path up
+
| Initialize layer bonding on node
| | [Documentation]
| | ... | Bonded interface and variables to be created on across east and
@@ -152,8 +190,14 @@
| | ...
| | ${dut_str}= | Convert To Lowercase | ${dut}
| | :FOR | ${id} | IN RANGE | 1 | ${count} + 1
-| | | ${if1_vlan}= | Evaluate | ${100} + ${id} - ${1}
-| | | ${if2_vlan}= | Evaluate | ${200} + ${id} - ${1}
+| | | ${if1_vlan}= | Run Keyword If | ${${dut_str}_vlan1}
+| | | ... | Set Variable | ${${dut_str}_vlan1}
+| | | ... | ELSE
+| | | ... | Evaluate | ${100} + ${id} - ${1}
+| | | ${if2_vlan}= | Run Keyword If | ${${dut_str}_vlan2}
+| | | ... | Set Variable | ${${dut_str}_vlan2}
+| | | ... | ELSE
+| | | ... | Evaluate | ${200} + ${id} - ${1}
| | | ${if1_name} | ${if1_index}= | Run Keyword If
| | | ... | ${create} or ${id} == ${1}
| | | ... | Create Vlan Subinterface