X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fshared%2Fmemif.robot;h=0fda4547647be9b092abb7cab02067e76ed5f192;hp=71909af490c0eaa892fd8f1a2e9ddd01be6e5144;hb=533fcfe3d177447aee7a3dca5f0d7a5f06d70377;hpb=c9e827ea478fd713754103b03f144011b8543425

diff --git a/resources/libraries/robot/shared/memif.robot b/resources/libraries/robot/shared/memif.robot
index 71909af490..0fda454764 100644
--- a/resources/libraries/robot/shared/memif.robot
+++ b/resources/libraries/robot/shared/memif.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 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:
@@ -12,68 +12,87 @@
 # limitations under the License.
 
 *** Settings ***
-| Library | resources.libraries.python.Memif
 | Documentation | Memif interface keyword library.
+| ...
+| Library | resources.libraries.python.Memif
 
 *** Keywords ***
 | Set up memif interfaces on DUT node
 | | [Documentation] | Create two Memif interfaces on given VPP node.
 | | ...
 | | ... | *Arguments:*
-| | ... | - ${dut_node} - DUT node. Type: dictionary
-| | ... | - ${sock1} - Socket path for first Memif interface. Type: string
-| | ... | - ${sock2} - Socket path for second Memif interface. Type: string
-| | ... | - ${number} - Memif interface key. Type: integer
-| | ... | - ${memif_if1} - Name of the first Memif interface (Optional).
-| | ... | Type: string
-| | ... | - ${memif_if2} - Name of the second Memif interface (Optional).
-| | ... | Type: string
+| | ... | - dut_node - DUT node. Type: dictionary
+| | ... | - filename1 - Socket filename for 1st Memif interface. Type: string
+| | ... | - filename2 - Socket filename for 2nd Memif interface. Type: string
+| | ... | - mid - Memif interface ID. Type: integer, default value: ${1}
+| | ... | - memif_if1 - Name of the first Memif interface (Optional).
+| | ... | Type: string, default value: memif_if1
+| | ... | - memif_if2 - Name of the second Memif interface (Optional).
+| | ... | Type: string, default value: memif_if2
+| | ... | - rxq - RX queues; 0 means do not set (Optional). Type: integer,
+| | ... | default value: ${1}
+| | ... | - txq - TX queues; 0 means do not set (Optional). Type: integer,
+| | ... | default value: ${1}
+| | ... | - role - Memif role (Optional). Type: string, default value: SLAVE
 | | ...
 | | ... | _NOTE:_ This KW sets following test case variable:
-| | ... | - ${${memif_if1}} - First Memif interface.
-| | ... | - ${${memif_if2}} - Second Memif interface.
+| | ... | - ${${memif_if1}} - 1st Memif interface.
+| | ... | - ${${memif_if2}} - 2nd Memif interface.
 | | ...
 | | ... | *Example:*
 | | ...
 | | ... | \| Set up memif interfaces on DUT node \
-| | ... | \| ${nodes['DUT1']} \| /tmp/sock1 \| /tmp/sock2 \| 1 \|
+| | ... | \| ${nodes['DUT1']} \| sock1 \| sock2 \| 1 \|
 | | ... | \| Set up memif interfaces on DUT node \
-| | ... | \| ${nodes['DUT2']} \| /tmp/sock1 \| /tmp/sock2 \| 1 \
-| | ... | \| dut2_memif_if1 \| dut2_memif_if2 \|
+| | ... | \| ${nodes['DUT2']} \| sock1 \| sock2 \| 1 \
+| | ... | \| dut2_memif_if1 \| dut2_memif_if2 \| 1 \| 1 \| SLAVE \|
+| | ... | \| ${nodes['DUT2']} \| sock1 \| sock2 \| 1 \| rxq=0 \| txq=0 \
+| | ... | \| dcr_uuid=_a5730a0a-2ba1-4fe9-91bd-79b9828e968e \|
+| | ...
+| | [Arguments] | ${dut_node} | ${filename1} | ${filename2} | ${mid}=${1}
+| | ... | ${memif_if1}=memif_if1 | ${memif_if2}=memif_if2 | ${rxq}=${1}
+| | ... | ${txq}=${1} | ${role}=SLAVE
 | | ...
-| | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${number}=${1}
-| | ... | ${memif_if1}=memif_if1 | ${memif_if2}=memif_if2
-| | ${key_1}= | Evaluate | (${number}*2)-1
-| | ${key_2}= | Evaluate | (${number}*2)
-| | ${memif_1}= | Create memif interface | ${dut_node} | ${sock1} | ${key_1}
-| | ${memif_2}= | Create memif interface | ${dut_node} | ${sock2} | ${key_2}
+| | ${sid_1}= | Evaluate | (${mid}*2)-1
+| | ${sid_2}= | Evaluate | (${mid}*2)
+| | ${memif_1}= | Create memif interface | ${dut_node}
+| | ... | ${filename1}${mid}${dut1_uuid}-${sid_1} | ${mid} | ${sid_1}
+| | ... | rxq=${rxq} | txq=${txq} | role=${role}
+| | ${memif_2}= | Create memif interface | ${dut_node}
+| | ... | ${filename2}${mid}${dut1_uuid}-${sid_2} | ${mid} | ${sid_2}
+| | ... | rxq=${rxq} | txq=${txq} | role=${role}
 | | Set Interface State | ${dut_node} | ${memif_1} | up
 | | Set Interface State | ${dut_node} | ${memif_2} | up
 | | Set Test Variable | ${${memif_if1}} | ${memif_1}
 | | Set Test Variable | ${${memif_if2}} | ${memif_2}
 
-| Create memif VPP configuration on '${nr}' LXC containers on '${dut}' node
-| | [Documentation] | Create memif configuration of VPP on multiple LXC
-| | ... | container on DUT node.
-| | ...
-| | ... | *Example:*
+| Set up single memif interface on DUT node
+| | [Documentation] | Create single Memif interface on given VPP node.
 | | ...
-| | ... | \| Create memif VPP configuration on 1 LXC containers on DUT1 node \|
+| | ... | *Arguments:*
+| | ... | - dut_node - DUT node. Type: dictionary
+| | ... | - filename - Socket filename for Memif interface. Type: string
+| | ... | - mid - Memif interface ID (Optional). Type: integer
+| | ... | - sid - Memif socket ID (Optional). Type: integer
+| | ... | - memif_if - Name of the Memif interface (Optional).
+| | ... | Type: string
+| | ... | - rxq - RX queues (Optional). Type: integer
+| | ... | - txq - TX queues (Optional). Type: integer
+| | ... | - role - Memif role (Optional). Type: string
 | | ...
-| | :FOR | ${number} | IN RANGE | 1 | ${nr}+1
-| | | Run Keyword | ${dut}_${lxc_base_name}_${number}.Create VPP cfg in container
-| | | ... | memif_create_lxc.vat | socket1=memif-${dut}_VNF${number}-1
-| | | ... | socket2=memif-${dut}_VNF${number}-2
-
-| Create memif VPP configuration on '${nr}' LXC containers on all DUT nodes
-| | [Documentation] | Create memif configuration of VPP on multiple LXC
-| | ... | container on all DUT nodes.
+| | ... | _NOTE:_ This KW sets following test case variable:
+| | ... | - ${${memif_if}} - Memif interface.
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Create memif VPP configuration on 1 LXC containers on all \
-| | ... | DUT nodes \|
+| | ... | \| Set up single memif interface on DUT node \
+| | ... | \| ${nodes['DUT1']} \| sock1 \| 1 \| dut1_memif_if1 \| 1 \| 1 \
+| | ... | \| SLAVE \|
+| | ...
+| | [Arguments] | ${dut_node} | ${filename} | ${mid}=${1} | ${sid}=${1}
+| | ... | ${memif_if}=memif_if1 | ${rxq}=${1} | ${txq}=${1} | ${role}=SLAVE
 | | ...
-| | ${duts}= | Get Matches | ${nodes} | DUT*
-| | :FOR | ${dut} | IN | @{duts}
-| | | Create memif VPP configuration on '${nr}' LXC containers on '${dut}' node
+| | ${memif}= | Create memif interface | ${dut_node} | ${filename}${mid}-${sid}
+| | ... | ${mid} | ${sid} | rxq=${rxq} | txq=${txq} | role=${role}
+| | Set Interface State | ${dut_node} | ${memif} | up
+| | Set Test Variable | ${${memif_if}} | ${memif}