[spp] [PATCH 4/7] rcps: fix rcps for shutting down spp_vf

[x-fn-spp at sl.ntt-tx.co.jp]

From: Hideyuki Yamashita <yamashita.hideyuki at po.ntt-tx.co.jp>

This patch set fixes shutting down configuration of spp_vf.

Signed-off-by: Hideyuki Yamashita <yamashita.hideyuki at po.ntt-tx.co.jp>
Signed-off-by: Yasufumi Ogawa <yasufum.o at gmail.com>
---
 .../ssh_login/shutdown/1-del_mac_path1.rcps   |  3 ---
 .../ssh_login/shutdown/1_del_mac_path1.rcps   |  3 +++
 .../ssh_login/shutdown/2-del_ports_path1.rcps | 20 -------------------
 .../ssh_login/shutdown/2_del_ports_path1.rcps | 17 ++++++++++++++++
 .../ssh_login/shutdown/3-stop_components.rcps |  7 -------
 .../ssh_login/shutdown/3_stop_components.rcps |  7 +++++++
 .../ssh_login/shutdown/4-del_mac_path2.rcps   |  3 ---
 .../ssh_login/shutdown/4_del_mac_path2.rcps   |  3 +++
 .../ssh_login/shutdown/5-del_ports_path2.rcps | 20 -------------------
 .../ssh_login/shutdown/5_del_ports_path2.rcps | 17 ++++++++++++++++
 .../ssh_login/shutdown/6-stop_components.rcps |  7 -------
 .../ssh_login/shutdown/6_stop_components.rcps |  7 +++++++
 .../spp_vf/ssh_login/shutdown/7-flush.rcps    |  1 -
 .../spp_vf/ssh_login/shutdown/7_exit.rcps     |  1 +
 14 files changed, 55 insertions(+), 61 deletions(-)
 delete mode 100644 recipes/usecases/spp_vf/ssh_login/shutdown/1-del_mac_path1.rcps
 create mode 100644 recipes/usecases/spp_vf/ssh_login/shutdown/1_del_mac_path1.rcps
 delete mode 100644 recipes/usecases/spp_vf/ssh_login/shutdown/2-del_ports_path1.rcps
 create mode 100644 recipes/usecases/spp_vf/ssh_login/shutdown/2_del_ports_path1.rcps
 delete mode 100644 recipes/usecases/spp_vf/ssh_login/shutdown/3-stop_components.rcps
 create mode 100644 recipes/usecases/spp_vf/ssh_login/shutdown/3_stop_components.rcps
 delete mode 100644 recipes/usecases/spp_vf/ssh_login/shutdown/4-del_mac_path2.rcps
 create mode 100644 recipes/usecases/spp_vf/ssh_login/shutdown/4_del_mac_path2.rcps
 delete mode 100644 recipes/usecases/spp_vf/ssh_login/shutdown/5-del_ports_path2.rcps
 create mode 100644 recipes/usecases/spp_vf/ssh_login/shutdown/5_del_ports_path2.rcps
 delete mode 100644 recipes/usecases/spp_vf/ssh_login/shutdown/6-stop_components.rcps
 create mode 100644 recipes/usecases/spp_vf/ssh_login/shutdown/6_stop_components.rcps
 delete mode 100644 recipes/usecases/spp_vf/ssh_login/shutdown/7-flush.rcps
 create mode 100644 recipes/usecases/spp_vf/ssh_login/shutdown/7_exit.rcps

diff --git a/recipes/usecases/spp_vf/ssh_login/shutdown/1-del_mac_path1.rcps b/recipes/usecases/spp_vf/ssh_login/shutdown/1-del_mac_path1.rcps
deleted file mode 100644
index e642ada..0000000
--- a/recipes/usecases/spp_vf/ssh_login/shutdown/1-del_mac_path1.rcps
+++ /dev/null
@@ -1,3 +0,0 @@
-# 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/usecases/spp_vf/ssh_login/shutdown/1_del_mac_path1.rcps b/recipes/usecases/spp_vf/ssh_login/shutdown/1_del_mac_path1.rcps
new file mode 100644
index 0000000..6833798
--- /dev/null
+++ b/recipes/usecases/spp_vf/ssh_login/shutdown/1_del_mac_path1.rcps
@@ -0,0 +1,3 @@
+# Delete MAC address for path1
+vf 1; classifier_table del mac 52:54:00:12:34:56 ring:0
+vf 1; classifier_table del mac 52:54:00:12:34:58 ring:1
diff --git a/recipes/usecases/spp_vf/ssh_login/shutdown/2-del_ports_path1.rcps b/recipes/usecases/spp_vf/ssh_login/shutdown/2-del_ports_path1.rcps
deleted file mode 100644
index eea5b9e..0000000
--- a/recipes/usecases/spp_vf/ssh_login/shutdown/2-del_ports_path1.rcps
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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/usecases/spp_vf/ssh_login/shutdown/2_del_ports_path1.rcps b/recipes/usecases/spp_vf/ssh_login/shutdown/2_del_ports_path1.rcps
new file mode 100644
index 0000000..4112350
--- /dev/null
+++ b/recipes/usecases/spp_vf/ssh_login/shutdown/2_del_ports_path1.rcps
@@ -0,0 +1,17 @@
+# classifier
+vf 1; port del phy:0 rx cls1
+vf 1; port del ring:0 tx cls1
+vf 1; port del ring:1 tx cls1
+# forwarders
+vf 1; port del ring:0 rx fwd1
+vf 1; port del vhost:0 tx fwd1
+vf 1; port del ring:1 rx fwd2
+vf 1; port del vhost:2 tx fwd2
+vf 1; port del vhost:0 rx fwd3
+vf 1; port del ring:2 tx fwd3
+vf 1; port del vhost:2 rx fwd4
+vf 1; port del ring:3 tx fwd4
+# merger
+vf 1; port del ring:2 rx mgr1
+vf 1; port del ring:3 rx mgr1
+vf 1; port del phy:0 tx mgr1
diff --git a/recipes/usecases/spp_vf/ssh_login/shutdown/3-stop_components.rcps b/recipes/usecases/spp_vf/ssh_login/shutdown/3-stop_components.rcps
deleted file mode 100644
index c29c740..0000000
--- a/recipes/usecases/spp_vf/ssh_login/shutdown/3-stop_components.rcps
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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/usecases/spp_vf/ssh_login/shutdown/3_stop_components.rcps b/recipes/usecases/spp_vf/ssh_login/shutdown/3_stop_components.rcps
new file mode 100644
index 0000000..a599eb8
--- /dev/null
+++ b/recipes/usecases/spp_vf/ssh_login/shutdown/3_stop_components.rcps
@@ -0,0 +1,7 @@
+# Stop component for spp_vf
+vf 1; component stop cls1
+vf 1; component stop fwd1
+vf 1; component stop fwd2
+vf 1; component stop fwd3
+vf 1; component stop fwd4
+vf 1; component stop mgr1
diff --git a/recipes/usecases/spp_vf/ssh_login/shutdown/4-del_mac_path2.rcps b/recipes/usecases/spp_vf/ssh_login/shutdown/4-del_mac_path2.rcps
deleted file mode 100644
index 030a9c7..0000000
--- a/recipes/usecases/spp_vf/ssh_login/shutdown/4-del_mac_path2.rcps
+++ /dev/null
@@ -1,3 +0,0 @@
-# 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/usecases/spp_vf/ssh_login/shutdown/4_del_mac_path2.rcps b/recipes/usecases/spp_vf/ssh_login/shutdown/4_del_mac_path2.rcps
new file mode 100644
index 0000000..55ffca3
--- /dev/null
+++ b/recipes/usecases/spp_vf/ssh_login/shutdown/4_del_mac_path2.rcps
@@ -0,0 +1,3 @@
+# Delete MAC address for path2
+vf 1; classifier_table del mac 52:54:00:12:34:57 ring:4
+vf 1; classifier_table del mac 52:54:00:12:34:59 ring:5
diff --git a/recipes/usecases/spp_vf/ssh_login/shutdown/5-del_ports_path2.rcps b/recipes/usecases/spp_vf/ssh_login/shutdown/5-del_ports_path2.rcps
deleted file mode 100644
index 0d0a235..0000000
--- a/recipes/usecases/spp_vf/ssh_login/shutdown/5-del_ports_path2.rcps
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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/usecases/spp_vf/ssh_login/shutdown/5_del_ports_path2.rcps b/recipes/usecases/spp_vf/ssh_login/shutdown/5_del_ports_path2.rcps
new file mode 100644
index 0000000..acf9e19
--- /dev/null
+++ b/recipes/usecases/spp_vf/ssh_login/shutdown/5_del_ports_path2.rcps
@@ -0,0 +1,17 @@
+# classifier2
+vf 1; port del phy:1 rx cls2
+vf 1; port del ring:4 tx cls2
+vf 1; port del ring:5 tx cls2
+# forwarder
+vf 1; port del ring:4 rx fwd5
+vf 1; port del vhost:1 tx fwd5
+vf 1; port del ring:5 rx fwd6
+vf 1; port del vhost:3 tx fwd6
+vf 1; port del vhost:1 rx fwd7
+vf 1; port del ring:6 tx fwd7
+vf 1; port del vhost:3 rx fwd8
+vf 1; port del ring:7 tx fwd8
+# merger
+vf 1; port del ring:6 rx mgr2
+vf 1; port del ring:7 rx mgr2
+vf 1; port del phy:1 tx mgr2
diff --git a/recipes/usecases/spp_vf/ssh_login/shutdown/6-stop_components.rcps b/recipes/usecases/spp_vf/ssh_login/shutdown/6-stop_components.rcps
deleted file mode 100644
index 535f02b..0000000
--- a/recipes/usecases/spp_vf/ssh_login/shutdown/6-stop_components.rcps
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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/usecases/spp_vf/ssh_login/shutdown/6_stop_components.rcps b/recipes/usecases/spp_vf/ssh_login/shutdown/6_stop_components.rcps
new file mode 100644
index 0000000..732298c
--- /dev/null
+++ b/recipes/usecases/spp_vf/ssh_login/shutdown/6_stop_components.rcps
@@ -0,0 +1,7 @@
+# Stop component to spp_vf
+vf 1; component stop cls2
+vf 1; component stop fwd5
+vf 1; component stop fwd6
+vf 1; component stop fwd7
+vf 1; component stop fwd8
+vf 1; component stop mgr2
diff --git a/recipes/usecases/spp_vf/ssh_login/shutdown/7-flush.rcps b/recipes/usecases/spp_vf/ssh_login/shutdown/7-flush.rcps
deleted file mode 100644
index 9ea2237..0000000
--- a/recipes/usecases/spp_vf/ssh_login/shutdown/7-flush.rcps
+++ /dev/null
@@ -1 +0,0 @@
-sec 1;flush
diff --git a/recipes/usecases/spp_vf/ssh_login/shutdown/7_exit.rcps b/recipes/usecases/spp_vf/ssh_login/shutdown/7_exit.rcps
new file mode 100644
index 0000000..5a70766
--- /dev/null
+++ b/recipes/usecases/spp_vf/ssh_login/shutdown/7_exit.rcps
@@ -0,0 +1 @@
+vf 1; exit
-- 
2.17.1