aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries/robot/shared
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2018-03-07 15:06:47 +0100
committerPeter Mikus <pmikus@cisco.com>2018-03-08 10:42:57 +0000
commitf65b8ddc723ed9fc444509525662eda6dbc74401 (patch)
tree8f38db7fae53819ee93820dc20b7a35665819223 /resources/libraries/robot/shared
parentd38fc2895fba1fe04d7f8c0d41373ffe42c14fab (diff)
CSIT-989 Fix: Reflect latest memif API changes
Change-Id: I0c9cb073a42a8b4b7e573023e784ab9e72d0ad55 Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'resources/libraries/robot/shared')
-rw-r--r--resources/libraries/robot/shared/container.robot2
-rw-r--r--resources/libraries/robot/shared/memif.robot26
2 files changed, 15 insertions, 13 deletions
diff --git a/resources/libraries/robot/shared/container.robot b/resources/libraries/robot/shared/container.robot
index c8c940ba45..4b23236a96 100644
--- a/resources/libraries/robot/shared/container.robot
+++ b/resources/libraries/robot/shared/container.robot
@@ -106,7 +106,7 @@
| | ... | group on all DUT nodes.
| | ...
| | Run Keyword | ${group}.Configure VPP In All Containers
-| | ... | memif_create_lxc.vat
+| | ... | memif_create_cnt.vat
| Stop all '${group}' containers
| | [Documentation] | Stop all container(s) in specific container group on all
diff --git a/resources/libraries/robot/shared/memif.robot b/resources/libraries/robot/shared/memif.robot
index a4857feccf..1739743498 100644
--- a/resources/libraries/robot/shared/memif.robot
+++ b/resources/libraries/robot/shared/memif.robot
@@ -21,32 +21,34 @@
| | ...
| | ... | *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
+| | ... | - ${filename1} - Socket filename for 1st Memif interface. Type: string
+| | ... | - ${filename2} - Socket filename for 2nd Memif interface. Type: string
+| | ... | - ${mid} - Memif interface ID. Type: integer
| | ... | - ${memif_if1} - Name of the first Memif interface (Optional).
| | ... | Type: string
| | ... | - ${memif_if2} - Name of the second Memif interface (Optional).
| | ... | Type: string
| | ...
| | ... | _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 \
+| | ... | \| ${nodes['DUT2']} \| sock1 \| sock2 \| 1 \
| | ... | \| dut2_memif_if1 \| dut2_memif_if2 \|
| | ...
-| | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${number}=${1}
+| | [Arguments] | ${dut_node} | ${filename1} | ${filename2} | ${mid}=${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}-${sid_1} | ${mid} | ${sid_1}
+| | ${memif_2}= | Create memif interface | ${dut_node}
+| | ... | ${filename2}${mid}-${sid_2} | ${mid} | ${sid_2}
| | Set Interface State | ${dut_node} | ${memif_1} | up
| | Set Interface State | ${dut_node} | ${memif_2} | up
| | Set Test Variable | ${${memif_if1}} | ${memif_1}