CSIT-1539 Aligning FUNC/PERF keywords - Phase III

[csit.git] / resources / libraries / robot / shared / memif.robot

diff --git a/resources/libraries/robot/shared/memif.robot b/resources/libraries/robot/shared/memif.robot
index a433405..0fda454 100644 (file)
--- a/resources/libraries/robot/shared/memif.robot
+++ b/resources/libraries/robot/shared/memif.robot
@@ -33,11 +33,7 @@
 | | ... | 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
-| | ... | - dcr_uuid - UUID string (including prefix - underscore character) of
-| | ... | DUT1 /tmp volume created outside of the DUT1 docker in case of
-| | ... | vpp-device test. ${EMPTY} value means that /tmp directory is inside
-| | ... | the DUT1 docker. (Optional). Type: string, default value: ${EMPTY}
+| | ... | - role - Memif role (Optional). Type: string, default value: SLAVE
 | | ...
 | | ... | _NOTE:_ This KW sets following test case variable:
 | | ... | - ${${memif_if1}} - 1st Memif interface.
@@ -49,20 +45,21 @@
 | | ... | \| ${nodes['DUT1']} \| sock1 \| sock2 \| 1 \|
 | | ... | \| Set up memif interfaces on DUT node \
 | | ... | \| ${nodes['DUT2']} \| sock1 \| sock2 \| 1 \
-| | ... | \| dut2_memif_if1 \| dut2_memif_if2 \| 1 \| 1 \| slave \|
+| | ... | \| 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 | ${dcr_uuid}=${EMPTY}
+| | ... | ${txq}=${1} | ${role}=SLAVE
+| | ...
 | | ${sid_1}= | Evaluate | (${mid}*2)-1
 | | ${sid_2}= | Evaluate | (${mid}*2)
 | | ${memif_1}= | Create memif interface | ${dut_node}
-| | ... | ${filename1}${mid}${dcr_uuid}-${sid_1} | ${mid} | ${sid_1}
+| | ... | ${filename1}${mid}${dut1_uuid}-${sid_1} | ${mid} | ${sid_1}
 | | ... | rxq=${rxq} | txq=${txq} | role=${role}
 | | ${memif_2}= | Create memif interface | ${dut_node}
-| | ... | ${filename2}${mid}${dcr_uuid}-${sid_2} | ${mid} | ${sid_2}
+| | ... | ${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
@@ -75,12 +72,13 @@
 | | ... | *Arguments:*
 | | ... | - dut_node - DUT node. Type: dictionary
 | | ... | - filename - Socket filename for Memif interface. Type: string
-| | ... | - mid - Memif interface ID. Type: integer
+| | ... | - 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. Type: integer
-| | ... | - txq - TX queues. Type: integer
-| | ... | - role - Memif role. Type: string
+| | ... | - rxq - RX queues (Optional). Type: integer
+| | ... | - txq - TX queues (Optional). Type: integer
+| | ... | - role - Memif role (Optional). Type: string
 | | ...
 | | ... | _NOTE:_ This KW sets following test case variable:
 | | ... | - ${${memif_if}} - Memif interface.
@@ -89,11 +87,11 @@
 | | ...
 | | ... | \| Set up single memif interface on DUT node \
 | | ... | \| ${nodes['DUT1']} \| sock1 \| 1 \| dut1_memif_if1 \| 1 \| 1 \
-| | ... | \| slave \|
+| | ... | \| SLAVE \|
+| | ...
+| | [Arguments] | ${dut_node} | ${filename} | ${mid}=${1} | ${sid}=${1}
+| | ... | ${memif_if}=memif_if1 | ${rxq}=${1} | ${txq}=${1} | ${role}=SLAVE
 | | ...
-| | [Arguments] | ${dut_node} | ${filename} | ${mid}=${1}
-| | ... | ${memif_if}=memif_if1 | ${rxq}=${1} | ${txq}=${1} | ${role}=slave
-| | ${sid}= | Evaluate | (${mid}*2)-1
 | | ${memif}= | Create memif interface | ${dut_node} | ${filename}${mid}-${sid}
 | | ... | ${mid} | ${sid} | rxq=${rxq} | txq=${txq} | role=${role}
 | | Set Interface State | ${dut_node} | ${memif} | up