X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fshared%2Finterfaces.robot;h=2ec44cca733eb0a60bc3d3f148b98860c5e85b3a;hp=a3b4223c4898d3c32ff66489b2920d2217e8e33c;hb=67d683ebfc222d63d79b883fe7cf94027dbde00c;hpb=c58cba70baa74588619018a2e8b461592bff1bf4

diff --git a/resources/libraries/robot/shared/interfaces.robot b/resources/libraries/robot/shared/interfaces.robot
index a3b4223c48..2ec44cca73 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:
@@ -13,25 +13,81 @@
 *** Settings ***
 | Library | resources.libraries.python.InterfaceUtil
 | Library | resources.libraries.python.NodePath
-| Library | resources.libraries.python.VatExecutor
 
 *** Keywords ***
-| VPP reports interfaces through VAT on '${node}'
-| | Execute Script | dump_interfaces.vat | ${node}
-| | Script Should Have Passed
+| Set interfaces in path up
+| | [Documentation]
+| | ... | *Set UP state on VPP interfaces in path on all DUT nodes and set
+| | ... | maximal MTU.*
+| | ...
+# TODO: Rework KW to set all interfaces in path UP and set MTU (including
+# software interfaces. Run KW at the start phase of VPP setup to split
+# from other "functional" configuration. This will allow modularity of this
+# library
+| | :FOR | ${dut} | IN | @{duts}
+| | | ${if1_status} | ${value}= | Run Keyword And Ignore Error
+| | | ... | Variable Should Exist | ${${dut}_if1}
+| | | Run Keyword If | '${if1_status}' == 'PASS'
+| | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if1} | up
+| | | ... | ELSE
+| | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if1_1} | up
+| | | Run Keyword Unless | '${if1_status}' == 'PASS'
+| | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if1_2} | up
+| | | ${if2_status} | ${value}= | Run Keyword And Ignore Error
+| | | ... | Variable Should Exist | ${${dut}_if2}
+| | | Run Keyword If | '${if2_status}' == 'PASS'
+| | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if2} | up
+| | | ... | ELSE
+| | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if2_1} | up
+| | | Run Keyword Unless | '${if2_status}' == 'PASS'
+| | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if2_2} | up
+| | :FOR | ${dut} | IN | @{duts}
+| | | ${if1_status} | ${value}= | Run Keyword And Ignore Error
+| | | ... | Variable Should Exist | ${${dut}_if1}
+| | | Run Keyword If | '${if1_status}' == 'PASS'
+| | | ... | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if1}
+| | | ... | ELSE
+| | | ... | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if1_1}
+| | | Run Keyword Unless | '${if1_status}' == 'PASS'
+| | | ... | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if1_2}
+| | | ${if2_status} | ${value}= | Run Keyword And Ignore Error
+| | | ... | Variable Should Exist | ${${dut}_if2}
+| | | Run Keyword If | '${if2_status}' == 'PASS'
+| | | ... | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if2}
+| | | ... | ELSE
+| | | ... | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if2_1}
+| | | Run Keyword Unless | '${if2_status}' == 'PASS'
+| | | ... | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if2_2}
+| | All VPP Interfaces Ready Wait | ${nodes} | retries=${300}
 
-| Configure MTU on TG based on MTU on DUT
-| | [Documentation] | Type of the tg_node must be TG and dut_node must be DUT
-| | [Arguments] | ${tg_node} | ${dut_node}
-| | Append Nodes | ${tg_node} | ${dut_node}
-| | Compute Path
-| | ${tg_port} | ${tg_node}= | First Interface
-| | ${dut_port} | ${dut_node}= | Last Interface
-| | # get physical layer MTU (max. size of Ethernet frame)
-| | ${mtu}= | Get Interface MTU | ${dut_node} | ${dut_port}
-| | # Ethernet MTU is physical layer MTU minus size of Ethernet header and FCS
-| | ${eth_mtu}= | Evaluate | ${mtu} - 14 - 4
-| | Set Interface Ethernet MTU | ${tg_node} | ${tg_port} | ${eth_mtu}
+| Set single interfaces in path up
+| | [Documentation]
+| | ... | *Set UP state on single VPP interfaces in path on all DUT nodes and set
+| | ... | maximal MTU.*
+| | ...
+# TODO: Rework KW to set all interfaces in path UP and set MTU (including
+# software interfaces. Run KW at the start phase of VPP setup to split
+# from other "functional" configuration. This will allow modularity of this
+# library
+| | :FOR | ${dut} | IN | @{duts}
+| | | ${if1_status} | ${value}= | Run Keyword And Ignore Error
+| | | ... | Variable Should Exist | ${${dut}_if1}
+| | | Run Keyword If | '${if1_status}' == 'PASS'
+| | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if1} | up
+| | | ... | ELSE
+| | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if1_1} | up
+| | | Run Keyword Unless | '${if1_status}' == 'PASS'
+| | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if1_2} | up
+| | :FOR | ${dut} | IN | @{duts}
+| | | ${if1_status} | ${value}= | Run Keyword And Ignore Error
+| | | ... | Variable Should Exist | ${${dut}_if1}
+| | | Run Keyword If | '${if1_status}' == 'PASS'
+| | | ... | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if1}
+| | | ... | ELSE
+| | | ... | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if1_1}
+| | | Run Keyword Unless | '${if1_status}' == 'PASS'
+| | | ... | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if1_2}
+| | All VPP Interfaces Ready Wait | ${nodes}
 
 | Get Vhost dump
 | | [Documentation] | Get vhost-user dump.
@@ -82,6 +138,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,22 +246,38 @@
 | | ...
 | | ${dut_str}= | Convert To Lowercase | ${dut}
 | | :FOR | ${id} | IN RANGE | 1 | ${count} + 1
-| | | ${vlan_west}= | Evaluate | 100 + ${id} - 1
-| | | ${vlan_east}= | Evaluate | 200 + ${id} - 1
-| | | ${if1_name} | ${if1_index}= | Run Keyword Unless
-| | | ... | ${create} and ${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
 | | | ... | ${nodes['${dut}']} | ${${dut_str}_${prev_layer}_${id}_1}
-| | | ... | ${vlan_west}
-| | | ${if2_name} | ${if2_index}= | Run Keyword Unless
-| | | ... | ${create} and ${id} > ${1}
+| | | ... | ${if1_vlan}
+| | | ${if2_name} | ${if2_index}= | Run Keyword If
+| | | ... | ${create} or ${id} == ${1}
 | | | ... | Create Vlan Subinterface
 | | | ... | ${nodes['${dut}']} | ${${dut_str}_${prev_layer}_${id}_2}
-| | | ... | ${vlan_east}
-| | | Run Keyword Unless | ${create} and ${id} > ${1}
+| | | ... | ${if2_vlan}
+| | | Run Keyword If | ${create} or ${id} == ${1}
 | | | ... | Set Interface State | ${nodes['${dut}']} | ${if1_index} | up
-| | | Run Keyword Unless | ${create} and ${id} > ${1}
+| | | Run Keyword If | ${create} or ${id} == ${1}
 | | | ... | Set Interface State | ${nodes['${dut}']} | ${if2_index} | up
+| | | Run Keyword If | ${create} or ${id} == ${1}
+| | | ... | Configure L2 tag rewrite method on interfaces
+| | | ... | ${nodes['${dut}']} | ${if1_index} | TAG_REWRITE_METHOD=pop-1
+| | | Run Keyword If | ${create} or ${id} == ${1}
+| | | ... | Configure L2 tag rewrite method on interfaces
+| | | ... | ${nodes['${dut}']} | ${if2_index} | TAG_REWRITE_METHOD=pop-1
+| | | ${if1_index}= | Set Variable If | '${if1_index}' == '${NONE}'
+| | | ... | ${${dut_str}_dot1q_1_1} | ${if1_index}
+| | | ${if2_index}= | Set Variable If | '${if2_index}' == '${NONE}'
+| | | ... | ${${dut_str}_dot1q_1_2} | ${if2_index}
 | | | Set Test Variable | ${${dut_str}_dot1q_${id}_1} | ${if1_index}
 | | | Set Test Variable | ${${dut_str}_dot1q_${id}_2} | ${if2_index}
 
@@ -206,10 +316,10 @@
 | | [Arguments] | ${dut} | ${count}=${1}
 | | ...
 | | ${dut_str}= | Convert To Lowercase | ${dut}
-| | Configure IP addresses on interfaces
+| | VPP Interface Set IP Address
 | | ... | ${nodes['${dut}']} | ${${dut_str}_${prev_layer}_1_1}
 | | ... | 172.16.0.1 | 24
-| | Configure IP addresses on interfaces
+| | VPP Interface Set IP Address
 | | ... | ${nodes['${dut}']} | ${${dut_str}_${prev_layer}_1_2}
 | | ... | 172.26.0.1 | 24
 | | :FOR | ${id} | IN RANGE | 1 | ${count} + 1
@@ -260,3 +370,38 @@
 | | :FOR | ${dut} | IN | @{duts}
 | | | Initialize layer ip4vxlan on node | ${dut} | count=${count}
 | | Set Test Variable | ${prev_layer} | ip4vxlan
+
+| Configure vhost interfaces
+| | [Documentation]
+| | ... | Create two Vhost-User interfaces on defined VPP node.
+| | ...
+| | ... | *Arguments:*
+| | ... | - ${dut_node} - DUT node. Type: dictionary
+| | ... | - ${sock1} - Socket path for first Vhost-User interface. Type: string
+| | ... | - ${sock2} - Socket path for second Vhost-User interface. Type: string
+| | ... | - ${vhost_if1} - Name of the first Vhost-User interface (Optional).
+| | ... | Type: string
+| | ... | - ${vhost_if2} - Name of the second Vhost-User interface (Optional).
+| | ... | Type: string
+| | ...
+| | ... | _NOTE:_ This KW sets following test case variable:
+| | ... | - ${${vhost_if1}} - First Vhost-User interface.
+| | ... | - ${${vhost_if2}} - Second Vhost-User interface.
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Configure vhost interfaces \
+| | ... | \| ${nodes['DUT1']} \| /tmp/sock1 \| /tmp/sock2 \|
+| | ... | \| Configure vhost interfaces \
+| | ... | \| ${nodes['DUT2']} \| /tmp/sock1 \| /tmp/sock2 \| dut2_vhost_if1 \
+| | ... | \| dut2_vhost_if2 \|
+| | ...
+| | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${vhost_if1}=vhost_if1
+| | ... | ${vhost_if2}=vhost_if2
+| | ...
+| | ${vhost_1}= | Vpp Create Vhost User Interface | ${dut_node} | ${sock1}
+| | ${vhost_2}= | Vpp Create Vhost User Interface | ${dut_node} | ${sock2}
+| | Set Interface State | ${dut_node} | ${vhost_1} | up
+| | Set Interface State | ${dut_node} | ${vhost_2} | up
+| | Set Test Variable | ${${vhost_if1}} | ${vhost_1}
+| | Set Test Variable | ${${vhost_if2}} | ${vhost_2}