From 5a53823d8a6e99072152654ac632bb06a6b467ac Mon Sep 17 00:00:00 2001
From: Jan Gelety <jgelety@cisco.com>
Date: Thu, 10 Jan 2019 11:53:58 +0100
Subject: VPP_Device - add baseline tests - part IIb)

CSIT-1372

Add following baseline tests to VPP_Device:
- ip4
  eth2p-ethip4-ip4base-eth-2memif-1dcr-dev

- ip6
  eth2p-ethip6-ip6base-eth-2memif-1dcr-dev

- l2bd
  eth2p-eth-l2bdbasemaclrn-eth-2memif-1dcr-dev

- l2xc
  eth2p-eth-l2xcbase-eth-2memif-1dcr-dev

Change-Id: Ic4a3a01b62d800c528a9c9371891dcc26b875220
Signed-off-by: Jan Gelety <jgelety@cisco.com>
---
 resources/templates/vat/memif_create.vat                  |  2 +-
 resources/templates/vat/memif_create_chain.vat            |  4 ++--
 resources/templates/vat/memif_create_chain_functional.vat | 12 ++++++++++++
 resources/templates/vat/memif_create_cross_horiz.vat      |  2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 resources/templates/vat/memif_create_chain_functional.vat

(limited to 'resources/templates')

diff --git a/resources/templates/vat/memif_create.vat b/resources/templates/vat/memif_create.vat
index b20b3d7c52..1e203690b9 100644
--- a/resources/templates/vat/memif_create.vat
+++ b/resources/templates/vat/memif_create.vat
@@ -1 +1 @@
-memif_create id {id} socket-id {socket} {role} rx-queues {rxq} tx-queues {txq}
+memif_create id {id} socket-id {socket} {role} {rx_q} {tx_q}
diff --git a/resources/templates/vat/memif_create_chain.vat b/resources/templates/vat/memif_create_chain.vat
index 306df83c57..5275f84a65 100644
--- a/resources/templates/vat/memif_create_chain.vat
+++ b/resources/templates/vat/memif_create_chain.vat
@@ -1,8 +1,8 @@
-create memif socket id {sid1} filename /mnt/host/{socket1}
+create memif socket id {sid1} filename {socket1}
 create interface memif id {mid1} socket-id {sid1} master
 set int state memif{sid1}/{mid1} up
 
-create memif socket id {sid2} filename /mnt/host/{socket2}
+create memif socket id {sid2} filename {socket2}
 create interface memif id {mid2} socket-id {sid2} master
 set int state memif{sid2}/{mid2} up
 
diff --git a/resources/templates/vat/memif_create_chain_functional.vat b/resources/templates/vat/memif_create_chain_functional.vat
new file mode 100644
index 0000000000..c5db09315c
--- /dev/null
+++ b/resources/templates/vat/memif_create_chain_functional.vat
@@ -0,0 +1,12 @@
+create memif socket id {sid1} filename {socket1}
+create interface memif id {mid1} socket-id {sid1} master
+set interface rx-mode memif{sid1}/{mid1} {rx_mode}
+set int state memif{sid1}/{mid1} up
+
+create memif socket id {sid2} filename {socket2}
+create interface memif id {mid2} socket-id {sid2} master
+set interface rx-mode memif{sid2}/{mid2} {rx_mode}
+set int state memif{sid2}/{mid2} up
+
+set interface l2 xconnect memif{sid2}/{mid2} memif{sid1}/{mid1}
+set interface l2 xconnect memif{sid1}/{mid1} memif{sid2}/{mid2}
diff --git a/resources/templates/vat/memif_create_cross_horiz.vat b/resources/templates/vat/memif_create_cross_horiz.vat
index 65db4e409c..40ff2c30fc 100644
--- a/resources/templates/vat/memif_create_cross_horiz.vat
+++ b/resources/templates/vat/memif_create_cross_horiz.vat
@@ -1,4 +1,4 @@
-create memif socket id {sid1} filename /mnt/host/{socket1}
+create memif socket id {sid1} filename {socket1}
 create interface memif id {mid1} socket-id {sid1} master
 
 set int state memif{sid1}/{mid1} up
-- 
cgit 1.2.3-korg