[spp] [PATCH 2/3] recipes: update SPP usecases

[ogawa.yasufumi at lab.ntt.co.jp]

From: Yasufumi Ogawa <ogawa.yasufumi at lab.ntt.co.jp>

Description of resource ID has changed from earlier version. However,
recipes for SPP usecases are still remained old.

This patch is to correct invalid command of old version. It also
updates to revise directory and name of the recipes. File extension is
changed from 'config' to 'rcps' for SPP recipe script.

Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi at lab.ntt.co.jp>
---
 recipes/spp/1nfv_1vm_bi.config             | 28 --------------------
 recipes/spp/1nfv_1vm_uni.config            | 21 ---------------
 recipes/spp/1nfv_bi.config                 | 10 --------
 recipes/spp/2nfv_1ring_uni.config          | 18 -------------
 recipes/spp/2nfv_1vm_bi.config             | 30 ----------------------
 recipes/spp/2nfv_bi.config                 | 12 ---------
 recipes/spp/usecases/dual_bidir.rcps       |  5 ++++
 recipes/spp/usecases/dual_loopback.rcps    |  4 +++
 recipes/spp/usecases/ring_dual_bidir.rcps  | 14 ++++++++++
 recipes/spp/usecases/ring_dual_unidir.rcps |  9 +++++++
 recipes/spp/usecases/single_bidir.rcps     |  4 +++
 recipes/spp/usecases/vhost_unidir.rcps     |  6 +++++
 12 files changed, 42 insertions(+), 119 deletions(-)
 delete mode 100644 recipes/spp/1nfv_1vm_bi.config
 delete mode 100644 recipes/spp/1nfv_1vm_uni.config
 delete mode 100644 recipes/spp/1nfv_bi.config
 delete mode 100644 recipes/spp/2nfv_1ring_uni.config
 delete mode 100644 recipes/spp/2nfv_1vm_bi.config
 delete mode 100644 recipes/spp/2nfv_bi.config
 create mode 100644 recipes/spp/usecases/dual_bidir.rcps
 create mode 100644 recipes/spp/usecases/dual_loopback.rcps
 create mode 100644 recipes/spp/usecases/ring_dual_bidir.rcps
 create mode 100644 recipes/spp/usecases/ring_dual_unidir.rcps
 create mode 100644 recipes/spp/usecases/single_bidir.rcps
 create mode 100644 recipes/spp/usecases/vhost_unidir.rcps

diff --git a/recipes/spp/1nfv_1vm_bi.config b/recipes/spp/1nfv_1vm_bi.config
deleted file mode 100644
index ae6104b..0000000
--- a/recipes/spp/1nfv_1vm_bi.config
+++ /dev/null
@@ -1,28 +0,0 @@
-# Show status
-status
-
-# Show status of secondaries
-sec 1;status
-sec 2;status
-
-# Add rings to secondaries
-sec 1;add ring 0
-sec 1;add ring 1
-sec 1;add ring 2
-sec 1;add ring 3
-sec 2;add ring 0
-sec 2;add ring 1
-sec 2;add ring 2
-sec 2;add ring 3
-
-# Patch all of ports as bi-directional
-sec 1;patch 0 2
-sec 1;patch 3 0
-sec 1;patch 1 4
-sec 1;patch 5 1
-sec 2;patch 0 3
-sec 2;patch 2 1
-
-# Start forwarding
-sec 1;forward
-sec 2;forward
diff --git a/recipes/spp/1nfv_1vm_uni.config b/recipes/spp/1nfv_1vm_uni.config
deleted file mode 100644
index 74aff3d..0000000
--- a/recipes/spp/1nfv_1vm_uni.config
+++ /dev/null
@@ -1,21 +0,0 @@
-# Show status
-status
-
-# Show status of secondaries
-sec 1;status
-sec 2;status
-
-# Add rings to secondaries
-sec 1;add ring 0
-sec 1;add ring 1
-sec 2;add ring 0
-sec 2;add ring 1
-
-# Patch all of ports as uni-directional
-sec 1;patch 0 2
-sec 1;patch 3 1
-sec 2;patch 0 1
-
-# Start forwarding
-sec 1;forward
-sec 2;forward
diff --git a/recipes/spp/1nfv_bi.config b/recipes/spp/1nfv_bi.config
deleted file mode 100644
index 0142988..0000000
--- a/recipes/spp/1nfv_bi.config
+++ /dev/null
@@ -1,10 +0,0 @@
-# Show status
-status
-sec 1;status
-
-# Patch ports as bi-directional
-sec 1;patch 0 1
-sec 1;patch 1 0
-
-# Start forwarding
-sec 1;forward
diff --git a/recipes/spp/2nfv_1ring_uni.config b/recipes/spp/2nfv_1ring_uni.config
deleted file mode 100644
index c3e391c..0000000
--- a/recipes/spp/2nfv_1ring_uni.config
+++ /dev/null
@@ -1,18 +0,0 @@
-# Show status
-status
-
-# Show status of secondaries
-sec 1;status
-sec 2;status
-
-# Add a ring to secondaries
-sec 1;add ring 0
-sec 2;add ring 0
-
-# Patch all of ports as uni-directional
-sec 1;patch 0 2
-sec 2;patch 2 1
-
-# Start forwarding
-sec 1;forward
-sec 2;forward
diff --git a/recipes/spp/2nfv_1vm_bi.config b/recipes/spp/2nfv_1vm_bi.config
deleted file mode 100644
index 3537c91..0000000
--- a/recipes/spp/2nfv_1vm_bi.config
+++ /dev/null
@@ -1,30 +0,0 @@
-# Show status
-status
-
-# Show status of secondaries
-sec 1;status
-sec 2;status
-sec 3;status
-
-# Add rings to secondaries
-sec 1;add ring 0
-sec 1;add ring 1
-sec 2;add ring 2
-sec 2;add ring 3
-sec 3;add ring 0
-sec 3;add ring 1
-sec 3;add ring 2
-sec 3;add ring 3
-
-# Patch all of ports as bi-directional
-sec 1;patch 0 2
-sec 1;patch 3 0
-sec 2;patch 3 1
-sec 2;patch 1 2
-sec 3;patch 0 3
-sec 3;patch 2 1
-
-# Start forwarding
-sec 2;forward
-sec 2;forward
-sec 3;forward
diff --git a/recipes/spp/2nfv_bi.config b/recipes/spp/2nfv_bi.config
deleted file mode 100644
index 4c4768c..0000000
--- a/recipes/spp/2nfv_bi.config
+++ /dev/null
@@ -1,12 +0,0 @@
-# Show status
-status
-
-# Patch port 0 and 1 as bi-directioonal
-sec 1;status
-sec 2;status
-sec 1;patch 0 1
-sec 2;patch 1 0
-
-# Start forwarding
-sec 1;forward
-sec 2;forward
diff --git a/recipes/spp/usecases/dual_bidir.rcps b/recipes/spp/usecases/dual_bidir.rcps
new file mode 100644
index 0000000..f3d186b
--- /dev/null
+++ b/recipes/spp/usecases/dual_bidir.rcps
@@ -0,0 +1,5 @@
+# Patch port 0 and 1 as bi-directioonal
+sec 1;patch phy:0 phy:1
+sec 2;patch phy:1 phy:0
+sec 1;forward
+sec 2;forward
diff --git a/recipes/spp/usecases/dual_loopback.rcps b/recipes/spp/usecases/dual_loopback.rcps
new file mode 100644
index 0000000..8d3350d
--- /dev/null
+++ b/recipes/spp/usecases/dual_loopback.rcps
@@ -0,0 +1,4 @@
+sec 1;patch phy:0 phy:0
+sec 2;patch phy:1 phy:1
+sec 1;forward
+sec 2;forward
diff --git a/recipes/spp/usecases/ring_dual_bidir.rcps b/recipes/spp/usecases/ring_dual_bidir.rcps
new file mode 100644
index 0000000..167c90f
--- /dev/null
+++ b/recipes/spp/usecases/ring_dual_bidir.rcps
@@ -0,0 +1,14 @@
+# Bi-directional with two rings
+
+sec 1;add ring 0
+sec 1;add ring 1
+sec 2;add ring 0
+sec 2;add ring 1
+
+sec 1;patch phy:0 ring:0
+sec 1;patch ring:1 phy:0
+sec 2;patch phy:1 ring:1
+sec 2;patch ring:0 phy:1
+
+sec 1;forward
+sec 2;forward
diff --git a/recipes/spp/usecases/ring_dual_unidir.rcps b/recipes/spp/usecases/ring_dual_unidir.rcps
new file mode 100644
index 0000000..eb6377e
--- /dev/null
+++ b/recipes/spp/usecases/ring_dual_unidir.rcps
@@ -0,0 +1,9 @@
+# Uni-directional with ring
+sec 1;add ring 0
+sec 2;add ring 0
+
+sec 1;patch phy:0 ring:0
+sec 2;patch ring:0 phy:1
+
+sec 1;forward
+sec 2;forward
diff --git a/recipes/spp/usecases/single_bidir.rcps b/recipes/spp/usecases/single_bidir.rcps
new file mode 100644
index 0000000..e56e29e
--- /dev/null
+++ b/recipes/spp/usecases/single_bidir.rcps
@@ -0,0 +1,4 @@
+# Patch ports as bi-directional
+sec 1;patch phy:0 phy:1
+sec 1;patch phy:1 phy:0
+sec 1;forward
diff --git a/recipes/spp/usecases/vhost_unidir.rcps b/recipes/spp/usecases/vhost_unidir.rcps
new file mode 100644
index 0000000..d835719
--- /dev/null
+++ b/recipes/spp/usecases/vhost_unidir.rcps
@@ -0,0 +1,6 @@
+# Uni-directional with vhost
+sec 1;patch phy:0 vhost:0
+sec 1;patch vhost:0 phy:1
+sec 2;patch phy:0 phy:0
+sec 1;forward
+sec 2;forward
-- 
2.17.1