[spp] [PATCH 3/3] recipes: update SPP_VF usecases

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

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

In spp_vf documentation, some of commands was invalid and fix in commit
260c390. So, recipes should also be corrected.

This update is for correcting invalid commands. It also include revising
directory and file names to be more understandable. File extension is
changed from 'config' to 'rcps' for SPP recipe script.

Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi at lab.ntt.co.jp>
---
 .../spp_vf/usecase1/2-add_ports_path1.config  | 25 -------------------
 .../spp_vf/usecase1/5-add_ports_path2.config  | 25 -------------------
 .../1-start_components.rcps}                  |  0
 .../usecase1/setup/2-add_ports_path1.rcps     | 20 +++++++++++++++
 .../3-reg_mac_path1.rcps}                     |  0
 .../4-start_components.rcps}                  |  0
 .../usecase1/setup/5-add_ports_path2.rcps     | 20 +++++++++++++++
 .../6-reg_mac_path2.rcps}                     |  0
 recipes/spp_vf/usecase1/setup/7-flush.rcps    |  1 +
 .../usecase1/shutdown/1-del_mac_path1.rcps    |  3 +++
 .../usecase1/shutdown/2-del_ports_path1.rcps  | 20 +++++++++++++++
 .../usecase1/shutdown/3-stop_components.rcps  |  7 ++++++
 .../usecase1/shutdown/4-del_mac_path2.rcps    |  3 +++
 .../usecase1/shutdown/5-del_ports_path2.rcps  | 20 +++++++++++++++
 .../usecase1/shutdown/6-stop_components.rcps  |  7 ++++++
 recipes/spp_vf/usecase1/shutdown/7-flush.rcps |  1 +
 .../sppc/{l2fwd.config => samples/l2fwd.rcps} |  0
 .../load_balancer.rcps}                       |  0
 18 files changed, 102 insertions(+), 50 deletions(-)
 delete mode 100644 recipes/spp_vf/usecase1/2-add_ports_path1.config
 delete mode 100644 recipes/spp_vf/usecase1/5-add_ports_path2.config
 rename recipes/spp_vf/usecase1/{1-start_components_path1.config => setup/1-start_components.rcps} (100%)
 create mode 100644 recipes/spp_vf/usecase1/setup/2-add_ports_path1.rcps
 rename recipes/spp_vf/usecase1/{3-reg_mac_path1.config => setup/3-reg_mac_path1.rcps} (100%)
 rename recipes/spp_vf/usecase1/{4-start_components_path2.config => setup/4-start_components.rcps} (100%)
 create mode 100644 recipes/spp_vf/usecase1/setup/5-add_ports_path2.rcps
 rename recipes/spp_vf/usecase1/{6-reg_mac_path2.config => setup/6-reg_mac_path2.rcps} (100%)
 create mode 100644 recipes/spp_vf/usecase1/setup/7-flush.rcps
 create mode 100644 recipes/spp_vf/usecase1/shutdown/1-del_mac_path1.rcps
 create mode 100644 recipes/spp_vf/usecase1/shutdown/2-del_ports_path1.rcps
 create mode 100644 recipes/spp_vf/usecase1/shutdown/3-stop_components.rcps
 create mode 100644 recipes/spp_vf/usecase1/shutdown/4-del_mac_path2.rcps
 create mode 100644 recipes/spp_vf/usecase1/shutdown/5-del_ports_path2.rcps
 create mode 100644 recipes/spp_vf/usecase1/shutdown/6-stop_components.rcps
 create mode 100644 recipes/spp_vf/usecase1/shutdown/7-flush.rcps
 rename recipes/sppc/{l2fwd.config => samples/l2fwd.rcps} (100%)
 rename recipes/sppc/{load_balancer.config => samples/load_balancer.rcps} (100%)

diff --git a/recipes/spp_vf/usecase1/2-add_ports_path1.config b/recipes/spp_vf/usecase1/2-add_ports_path1.config
deleted file mode 100644
index e7c1924..0000000
--- a/recipes/spp_vf/usecase1/2-add_ports_path1.config
+++ /dev/null
@@ -1,25 +0,0 @@
-# Add ports to classifier1
-sec 1;port add phy:0 rx classifier1
-sec 1;port add ring:0 tx classifier1
-sec 1;port add ring:1 tx classifier1
-
-# Add ports to forwarder1
-sec 1;port add ring:0 rx forwarder1
-sec 1;port add vhost:0 tx forwarder1
-
-# Add ports to forwarder2
-sec 1;port add vhost:0 rx forwarder2
-sec 1;port add ring:2 tx forwarder2
-
-# Add ports to forwarder3
-sec 1;port add ring:1 rx forwarder3
-sec 1;port add vhost:2 rx forwarder3
-
-# Add ports to forwarder4
-sec 1;port add vhost:2 tx forwarder4
-sec 1;port add ring:3 rx forwarder4
-
-# Add ports to merger1
-sec 1;port add ring:2 rx merger1
-sec 1;port add ring:3 rx merger1
-sec 1;port add phy:0 tx merger1
diff --git a/recipes/spp_vf/usecase1/5-add_ports_path2.config b/recipes/spp_vf/usecase1/5-add_ports_path2.config
deleted file mode 100644
index 6e7bec2..0000000
--- a/recipes/spp_vf/usecase1/5-add_ports_path2.config
+++ /dev/null
@@ -1,25 +0,0 @@
-# Add ports to classifier2
-sec 1;port add phy:1 rx classifier2
-sec 1;port add ring:4 tx classifier2
-sec 1;port add ring:5 tx classifier2
-
-# Add ports to forwarder5
-sec 1;port add ring:4 rx forwarder5
-sec 1;port add vhost:1 tx forwarder5
-
-# Add ports to forwarder6
-sec 1;port add vhost:1 rx forwarder6
-sec 1;port add ring:6 tx forwarder6
-
-# Add ports to forwarder7
-sec 1;port add ring:5 rx forwarder7
-sec 1;port add vhost:3 rx forwarder7
-
-# Add ports to forwarder8
-sec 1;port add vhost:3 tx forwarder8
-sec 1;port add ring:7 rx forwarder8
-
-# Add ports to merger2
-sec 1;port add ring:6 rx merger2
-sec 1;port add ring:7 rx merger2
-sec 1;port add phy:1 tx merger2
diff --git a/recipes/spp_vf/usecase1/1-start_components_path1.config b/recipes/spp_vf/usecase1/setup/1-start_components.rcps
similarity index 100%
rename from recipes/spp_vf/usecase1/1-start_components_path1.config
rename to recipes/spp_vf/usecase1/setup/1-start_components.rcps
diff --git a/recipes/spp_vf/usecase1/setup/2-add_ports_path1.rcps b/recipes/spp_vf/usecase1/setup/2-add_ports_path1.rcps
new file mode 100644
index 0000000..bfb59ba
--- /dev/null
+++ b/recipes/spp_vf/usecase1/setup/2-add_ports_path1.rcps
@@ -0,0 +1,20 @@
+# classifier1
+sec 1;port add phy:0 rx classifier1
+sec 1;port add ring:0 tx classifier1
+sec 1;port add ring:1 tx classifier1
+# forwarder1
+sec 1;port add ring:0 rx forwarder1
+sec 1;port add vhost:0 tx forwarder1
+# forwarder2
+sec 1;port add ring:1 rx forwarder2
+sec 1;port add vhost:2 tx forwarder2
+# forwarder3
+sec 1;port add vhost:0 rx forwarder3
+sec 1;port add ring:2 tx forwarder3
+# forwarder4
+sec 1;port add vhost:2 rx forwarder4
+sec 1;port add ring:3 tx forwarder4
+# merger1
+sec 1;port add ring:2 rx merger1
+sec 1;port add ring:3 rx merger1
+sec 1;port add phy:0 tx merger1
diff --git a/recipes/spp_vf/usecase1/3-reg_mac_path1.config b/recipes/spp_vf/usecase1/setup/3-reg_mac_path1.rcps
similarity index 100%
rename from recipes/spp_vf/usecase1/3-reg_mac_path1.config
rename to recipes/spp_vf/usecase1/setup/3-reg_mac_path1.rcps
diff --git a/recipes/spp_vf/usecase1/4-start_components_path2.config b/recipes/spp_vf/usecase1/setup/4-start_components.rcps
similarity index 100%
rename from recipes/spp_vf/usecase1/4-start_components_path2.config
rename to recipes/spp_vf/usecase1/setup/4-start_components.rcps
diff --git a/recipes/spp_vf/usecase1/setup/5-add_ports_path2.rcps b/recipes/spp_vf/usecase1/setup/5-add_ports_path2.rcps
new file mode 100644
index 0000000..d5334a5
--- /dev/null
+++ b/recipes/spp_vf/usecase1/setup/5-add_ports_path2.rcps
@@ -0,0 +1,20 @@
+# classifier2
+sec 1;port add phy:1 rx classifier2
+sec 1;port add ring:4 tx classifier2
+sec 1;port add ring:5 tx classifier2
+# forwarder5
+sec 1;port add ring:4 rx forwarder5
+sec 1;port add vhost:1 tx forwarder5
+# forwarder6
+sec 1;port add ring:5 rx forwarder6
+sec 1;port add vhost:3 tx forwarder6
+# forwarder7
+sec 1;port add vhost:1 rx forwarder7
+sec 1;port add ring:6 tx forwarder7
+# forwarder8
+sec 1;port add vhost:3 rx forwarder8
+sec 1;port add ring:7 tx forwarder8
+# merger2
+sec 1;port add ring:6 rx merger2
+sec 1;port add ring:7 rx merger2
+sec 1;port add phy:1 tx merger2
diff --git a/recipes/spp_vf/usecase1/6-reg_mac_path2.config b/recipes/spp_vf/usecase1/setup/6-reg_mac_path2.rcps
similarity index 100%
rename from recipes/spp_vf/usecase1/6-reg_mac_path2.config
rename to recipes/spp_vf/usecase1/setup/6-reg_mac_path2.rcps
diff --git a/recipes/spp_vf/usecase1/setup/7-flush.rcps b/recipes/spp_vf/usecase1/setup/7-flush.rcps
new file mode 100644
index 0000000..9ea2237
--- /dev/null
+++ b/recipes/spp_vf/usecase1/setup/7-flush.rcps
@@ -0,0 +1 @@
+sec 1;flush
diff --git a/recipes/spp_vf/usecase1/shutdown/1-del_mac_path1.rcps b/recipes/spp_vf/usecase1/shutdown/1-del_mac_path1.rcps
new file mode 100644
index 0000000..e642ada
--- /dev/null
+++ b/recipes/spp_vf/usecase1/shutdown/1-del_mac_path1.rcps
@@ -0,0 +1,3 @@
+# Delete MAC address for path1
+sec 1;classifier_table del mac 51:54:00:12:34:56 ring:0
+sec 1;classifier_table del mac 51:54:00:12:34:58 ring:1
diff --git a/recipes/spp_vf/usecase1/shutdown/2-del_ports_path1.rcps b/recipes/spp_vf/usecase1/shutdown/2-del_ports_path1.rcps
new file mode 100644
index 0000000..eea5b9e
--- /dev/null
+++ b/recipes/spp_vf/usecase1/shutdown/2-del_ports_path1.rcps
@@ -0,0 +1,20 @@
+# classifier1
+sec 1;port del phy:0 rx classifier1
+sec 1;port del ring:0 tx classifier1
+sec 1;port del ring:1 tx classifier1
+# forwarder1
+sec 1;port del ring:0 rx forwarder1
+sec 1;port del vhost:0 tx forwarder1
+# forwarder2
+sec 1;port del ring:1 rx forwarder2
+sec 1;port del vhost:2 tx forwarder2
+# forwarder3
+sec 1;port del vhost:0 rx forwarder3
+sec 1;port del ring:2 tx forwarder3
+# forwarder4
+sec 1;port del vhost:2 rx forwarder4
+sec 1;port del ring:3 tx forwarder4
+# merger1
+sec 1;port del ring:2 rx merger1
+sec 1;port del ring:3 rx merger1
+sec 1;port del phy:0 tx merger1
diff --git a/recipes/spp_vf/usecase1/shutdown/3-stop_components.rcps b/recipes/spp_vf/usecase1/shutdown/3-stop_components.rcps
new file mode 100644
index 0000000..c29c740
--- /dev/null
+++ b/recipes/spp_vf/usecase1/shutdown/3-stop_components.rcps
@@ -0,0 +1,7 @@
+# Stop component for path1
+sec 1;component stop classifier1
+sec 1;component stop forwarder1
+sec 1;component stop forwarder2
+sec 1;component stop forwarder3
+sec 1;component stop forwarder4
+sec 1;component stop merger1
diff --git a/recipes/spp_vf/usecase1/shutdown/4-del_mac_path2.rcps b/recipes/spp_vf/usecase1/shutdown/4-del_mac_path2.rcps
new file mode 100644
index 0000000..030a9c7
--- /dev/null
+++ b/recipes/spp_vf/usecase1/shutdown/4-del_mac_path2.rcps
@@ -0,0 +1,3 @@
+# Delete MAC address for path2
+sec 1;classifier_table del mac 51:54:00:12:34:57 ring:4
+sec 1;classifier_table del mac 51:54:00:12:34:59 ring:5
diff --git a/recipes/spp_vf/usecase1/shutdown/5-del_ports_path2.rcps b/recipes/spp_vf/usecase1/shutdown/5-del_ports_path2.rcps
new file mode 100644
index 0000000..0d0a235
--- /dev/null
+++ b/recipes/spp_vf/usecase1/shutdown/5-del_ports_path2.rcps
@@ -0,0 +1,20 @@
+# classifier2
+sec 1;port del phy:1 rx classifier2
+sec 1;port del ring:4 tx classifier2
+sec 1;port del ring:5 tx classifier2
+# forwarder5
+sec 1;port del ring:4 rx forwarder5
+sec 1;port del vhost:1 tx forwarder5
+# forwarder6
+sec 1;port del ring:5 rx forwarder6
+sec 1;port del vhost:3 tx forwarder6
+# forwarder7
+sec 1;port del vhost:1 rx forwarder7
+sec 1;port del ring:6 tx forwarder7
+# forwarder8
+sec 1;port del vhost:3 tx forwarder8
+sec 1;port del ring:7 rx forwarder8
+# merger2
+sec 1;port del ring:6 rx merger2
+sec 1;port del ring:7 rx merger2
+sec 1;port del phy:1 tx merger2
diff --git a/recipes/spp_vf/usecase1/shutdown/6-stop_components.rcps b/recipes/spp_vf/usecase1/shutdown/6-stop_components.rcps
new file mode 100644
index 0000000..535f02b
--- /dev/null
+++ b/recipes/spp_vf/usecase1/shutdown/6-stop_components.rcps
@@ -0,0 +1,7 @@
+# Stop component to spp_vf
+sec 1;component stop classifier2
+sec 1;component stop forwarder5
+sec 1;component stop forwarder6
+sec 1;component stop forwarder7
+sec 1;component stop forwarder8
+sec 1;component stop merger2
diff --git a/recipes/spp_vf/usecase1/shutdown/7-flush.rcps b/recipes/spp_vf/usecase1/shutdown/7-flush.rcps
new file mode 100644
index 0000000..9ea2237
--- /dev/null
+++ b/recipes/spp_vf/usecase1/shutdown/7-flush.rcps
@@ -0,0 +1 @@
+sec 1;flush
diff --git a/recipes/sppc/l2fwd.config b/recipes/sppc/samples/l2fwd.rcps
similarity index 100%
rename from recipes/sppc/l2fwd.config
rename to recipes/sppc/samples/l2fwd.rcps
diff --git a/recipes/sppc/load_balancer.config b/recipes/sppc/samples/load_balancer.rcps
similarity index 100%
rename from recipes/sppc/load_balancer.config
rename to recipes/sppc/samples/load_balancer.rcps
-- 
2.17.1