From: Hideyuki Yamashita <yamashita.hideyuki@ntt-tx.co.jp> For SPP 19.08, there are several incorrectness and missing part on both docs and rcps. This patch set fix above. Hideyuki Yamashita (8): recipes: add vhost related rcps for spp_nfv recipes: fix rcps for setting up spp_vf recipes: fix typos for setting up spp_vf recipes: fix rcps for shutting down spp_vf recipes: add rcps for spp_mirror recipes: add rcps for multiple_nodes docs: adds sample Domain XML file for vhost docs: fix incorrect commands in usecases. docs/guides/gsg/howto_use.rst | 89 +++++-------------- docs/guides/usecases/multi_nodes.rst | 6 +- docs/guides/usecases/spp_nfv.rst | 2 +- docs/guides/usecases/spp_vf.rst | 10 +-- docs/samples/gsg/spp-vm1.xml | 81 +++++++++++++++++ .../multiple_nodes/10_host3_stop_fwd.rcps | 6 ++ .../multiple_nodes/11_host4_stop_fwd.rcps | 6 ++ .../multiple_nodes/3_host1_start_fwd.rcps | 7 ++ .../multiple_nodes/4_host2_start_fwd.rcps | 8 ++ .../multiple_nodes/5_host3_start_fwd.rcps | 8 ++ .../multiple_nodes/6_host4_start_fwd.rcps | 8 ++ .../multiple_nodes/7_config_change_path.rcps | 11 +++ .../multiple_nodes/8_host1_stop_fwd.rcps | 6 ++ .../multiple_nodes/9_host2_stop_fwd.rcps | 6 ++ .../monitoring/1_vf_start_comp.rcps | 8 ++ .../spp_mirror/monitoring/2_vf_add_ports.rcps | 21 +++++ .../spp_mirror/monitoring/3_vf_reg_mac.rcps | 3 + .../monitoring/4_mir_start_monitoring.rcps | 7 ++ .../monitoring/5_mir_stop_monitoring.rcps | 10 +++ .../spp_mirror/monitoring/6_vf_del_mac.rcps | 3 + .../spp_mirror/monitoring/7_vf_del_ports.rcps | 21 +++++ .../spp_mirror/monitoring/8_vf_stop_comp.rcps | 11 +++ .../1_vhost_single_unidir.rcps | 10 +++ .../spp_nfv/single_with_vhost/2_clean.rcps | 9 ++ .../ssh_login/setup/1_start_components.rcps | 4 +- .../ssh_login/setup/4_start_components.rcps | 4 +- .../ssh_login/setup/6_reg_mac_path2.rcps | 4 +- .../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 | 19 ++++ .../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 | 19 ++++ .../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 + 41 files changed, 347 insertions(+), 142 deletions(-) create mode 100644 docs/samples/gsg/spp-vm1.xml create mode 100644 recipes/usecases/multiple_nodes/10_host3_stop_fwd.rcps create mode 100644 recipes/usecases/multiple_nodes/11_host4_stop_fwd.rcps create mode 100644 recipes/usecases/multiple_nodes/3_host1_start_fwd.rcps create mode 100644 recipes/usecases/multiple_nodes/4_host2_start_fwd.rcps create mode 100644 recipes/usecases/multiple_nodes/5_host3_start_fwd.rcps create mode 100644 recipes/usecases/multiple_nodes/6_host4_start_fwd.rcps create mode 100644 recipes/usecases/multiple_nodes/7_config_change_path.rcps create mode 100644 recipes/usecases/multiple_nodes/8_host1_stop_fwd.rcps create mode 100644 recipes/usecases/multiple_nodes/9_host2_stop_fwd.rcps create mode 100644 recipes/usecases/spp_mirror/monitoring/1_vf_start_comp.rcps create mode 100644 recipes/usecases/spp_mirror/monitoring/2_vf_add_ports.rcps create mode 100644 recipes/usecases/spp_mirror/monitoring/3_vf_reg_mac.rcps create mode 100644 recipes/usecases/spp_mirror/monitoring/4_mir_start_monitoring.rcps create mode 100644 recipes/usecases/spp_mirror/monitoring/5_mir_stop_monitoring.rcps create mode 100644 recipes/usecases/spp_mirror/monitoring/6_vf_del_mac.rcps create mode 100644 recipes/usecases/spp_mirror/monitoring/7_vf_del_ports.rcps create mode 100644 recipes/usecases/spp_mirror/monitoring/8_vf_stop_comp.rcps create mode 100644 recipes/usecases/spp_nfv/single_with_vhost/1_vhost_single_unidir.rcps create mode 100644 recipes/usecases/spp_nfv/single_with_vhost/2_clean.rcps 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 -- 2.17.1
From: Hideyuki Yamashita <yamashita.hideyuki@po.ntt-tx.co.jp> This patch set adds vhost related rcps for spp_nfv. Signed-off-by: Hideyuki Yamashita <yamashita.hideyuki@ntt-tx.co.jp> Signed-off-by: Naoki Takada <ntakada14@gmail.com> --- .../single_with_vhost/1_vhost_single_unidir.rcps | 10 ++++++++++ .../usecases/spp_nfv/single_with_vhost/2_clean.rcps | 9 +++++++++ 2 files changed, 19 insertions(+) create mode 100644 recipes/usecases/spp_nfv/single_with_vhost/1_vhost_single_unidir.rcps create mode 100644 recipes/usecases/spp_nfv/single_with_vhost/2_clean.rcps diff --git a/recipes/usecases/spp_nfv/single_with_vhost/1_vhost_single_unidir.rcps b/recipes/usecases/spp_nfv/single_with_vhost/1_vhost_single_unidir.rcps new file mode 100644 index 0000000..86841f2 --- /dev/null +++ b/recipes/usecases/spp_nfv/single_with_vhost/1_vhost_single_unidir.rcps @@ -0,0 +1,10 @@ +# Add vhost PMDs +nfv 1; add vhost:0 +nfv 1; add vhost:1 + +# Patch ports +nfv 1; patch phy:0 vhost:0 +nfv 1; patch vhost:1 phy:1 + +# Start forwarding +nfv 1; forward diff --git a/recipes/usecases/spp_nfv/single_with_vhost/2_clean.rcps b/recipes/usecases/spp_nfv/single_with_vhost/2_clean.rcps new file mode 100644 index 0000000..aa05798 --- /dev/null +++ b/recipes/usecases/spp_nfv/single_with_vhost/2_clean.rcps @@ -0,0 +1,9 @@ +# Stop forwarding +nfv 1; stop + +# Clear all of patches +nfv 1; patch reset + +# Delete vhost PMDs +nfv 1; del vhost:0 +nfv 1; del vhost:1 -- 2.17.1
From: Hideyuki Yamashita <yamashita.hideyuki@po.ntt-tx.co.jp> This patch set fixes setting up configuration of spp_vf. Signed-off-by: Hideyuki Yamashita <yamashita.hideyuki@ntt-tx.co.jp> Signed-off-by: Naoki Takada <ntakada14@gmail.com> --- .../usecases/spp_vf/ssh_login/setup/1_start_components.rcps | 4 ++-- .../usecases/spp_vf/ssh_login/setup/4_start_components.rcps | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/usecases/spp_vf/ssh_login/setup/1_start_components.rcps b/recipes/usecases/spp_vf/ssh_login/setup/1_start_components.rcps index e864628..b1c63ad 100644 --- a/recipes/usecases/spp_vf/ssh_login/setup/1_start_components.rcps +++ b/recipes/usecases/spp_vf/ssh_login/setup/1_start_components.rcps @@ -1,5 +1,5 @@ -# Start component for path1 -vf 1; component start cls1 2 classifier_mac +# Start components for path1 +vf 1; component start cls1 2 classifier vf 1; component start fwd1 3 forward vf 1; component start fwd2 4 forward vf 1; component start fwd3 5 forward diff --git a/recipes/usecases/spp_vf/ssh_login/setup/4_start_components.rcps b/recipes/usecases/spp_vf/ssh_login/setup/4_start_components.rcps index 7ce2c0d..e784891 100644 --- a/recipes/usecases/spp_vf/ssh_login/setup/4_start_components.rcps +++ b/recipes/usecases/spp_vf/ssh_login/setup/4_start_components.rcps @@ -1,5 +1,5 @@ -# Start component for path2 -vf 1; component start cls2 8 classifier_mac +# Start components for path2 +vf 1; component start cls2 8 classifier vf 1; component start fwd5 9 forward vf 1; component start fwd6 10 forward vf 1; component start fwd7 11 forward -- 2.17.1
From: Hideyuki Yamashita <yamashita.hideyuki@po.ntt-tx.co.jp> This update is to remove unnecessary prompt from rcps file. Fixes: 9caf63aa ("recipes: update old rcps for spp_vf") Signed-off-by: Hideyuki Yamashita <yamashita.hideyuki@ntt-tx.co.jp> Signed-off-by: Naoki Takada <ntakada14@gmail.com> --- recipes/usecases/spp_vf/ssh_login/setup/6_reg_mac_path2.rcps | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/usecases/spp_vf/ssh_login/setup/6_reg_mac_path2.rcps b/recipes/usecases/spp_vf/ssh_login/setup/6_reg_mac_path2.rcps index e812b79..63273d9 100644 --- a/recipes/usecases/spp_vf/ssh_login/setup/6_reg_mac_path2.rcps +++ b/recipes/usecases/spp_vf/ssh_login/setup/6_reg_mac_path2.rcps @@ -1,3 +1,3 @@ # Register MAC address to classifier -spp > vf 1; classifier_table add mac 52:54:00:12:34:57 ring:4 -spp > vf 1; classifier_table add mac 52:54:00:12:34:59 ring:5 +vf 1; classifier_table add mac 52:54:00:12:34:57 ring:4 +vf 1; classifier_table add mac 52:54:00:12:34:59 ring:5 -- 2.17.1
From: Hideyuki Yamashita <yamashita.hideyuki@po.ntt-tx.co.jp> This patch provides the following two things. 1. File name change without content modification. 2. Remove 'flush' because the command is obsolete and put 'exit' command instead. Signed-off-by: Hideyuki Yamashita <yamashita.hideyuki@ntt-tx.co.jp> Signed-off-by: Naoki Takada <ntakada14@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 | 19 ++++++++++++++++++ .../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 | 19 ++++++++++++++++++ .../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, 59 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..b396d66 --- /dev/null +++ b/recipes/usecases/spp_vf/ssh_login/shutdown/2_del_ports_path1.rcps @@ -0,0 +1,19 @@ +# Delete ports on 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 + +# Delete ports on 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 + +# Delete ports on 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..db55ae2 --- /dev/null +++ b/recipes/usecases/spp_vf/ssh_login/shutdown/3_stop_components.rcps @@ -0,0 +1,7 @@ +# Stop components 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..60b5ac8 --- /dev/null +++ b/recipes/usecases/spp_vf/ssh_login/shutdown/5_del_ports_path2.rcps @@ -0,0 +1,19 @@ +# Delete ports on cls2 +vf 1; port del phy:1 rx cls2 +vf 1; port del ring:4 tx cls2 +vf 1; port del ring:5 tx cls2 + +# Delete ports on fwd2 +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 + +# Delete ports on mgr2 +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..52a811a --- /dev/null +++ b/recipes/usecases/spp_vf/ssh_login/shutdown/6_stop_components.rcps @@ -0,0 +1,7 @@ +# Stop components 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
From: Hideyuki Yamashita <yamashita.hideyuki@po.ntt-tx.co.jp> This patch provides rcps for spp_mirror usecase. Signed-off-by: Hideyuki Yamashita <yamashita.hideyuki@ntt-tx.co.jp> Signed-off-by: Naoki Takada <ntakada14@gmail.com> --- .../monitoring/1_vf_start_comp.rcps | 8 +++++++ .../spp_mirror/monitoring/2_vf_add_ports.rcps | 21 +++++++++++++++++++ .../spp_mirror/monitoring/3_vf_reg_mac.rcps | 3 +++ .../monitoring/4_mir_start_monitoring.rcps | 7 +++++++ .../monitoring/5_mir_stop_monitoring.rcps | 10 +++++++++ .../spp_mirror/monitoring/6_vf_del_mac.rcps | 3 +++ .../spp_mirror/monitoring/7_vf_del_ports.rcps | 21 +++++++++++++++++++ .../spp_mirror/monitoring/8_vf_stop_comp.rcps | 11 ++++++++++ 8 files changed, 84 insertions(+) create mode 100644 recipes/usecases/spp_mirror/monitoring/1_vf_start_comp.rcps create mode 100644 recipes/usecases/spp_mirror/monitoring/2_vf_add_ports.rcps create mode 100644 recipes/usecases/spp_mirror/monitoring/3_vf_reg_mac.rcps create mode 100644 recipes/usecases/spp_mirror/monitoring/4_mir_start_monitoring.rcps create mode 100644 recipes/usecases/spp_mirror/monitoring/5_mir_stop_monitoring.rcps create mode 100644 recipes/usecases/spp_mirror/monitoring/6_vf_del_mac.rcps create mode 100644 recipes/usecases/spp_mirror/monitoring/7_vf_del_ports.rcps create mode 100644 recipes/usecases/spp_mirror/monitoring/8_vf_stop_comp.rcps diff --git a/recipes/usecases/spp_mirror/monitoring/1_vf_start_comp.rcps b/recipes/usecases/spp_mirror/monitoring/1_vf_start_comp.rcps new file mode 100644 index 0000000..4852398 --- /dev/null +++ b/recipes/usecases/spp_mirror/monitoring/1_vf_start_comp.rcps @@ -0,0 +1,8 @@ +# Start components +vf 1; component start cls 2 classifier +vf 1; component start mgr 3 merge +vf 1; component start fwd1 4 forward +vf 1; component start fwd2 5 forward +vf 1; component start fwd3 6 forward +vf 1; component start fwd4 7 forward +vf 1; component start fwd5 8 forward diff --git a/recipes/usecases/spp_mirror/monitoring/2_vf_add_ports.rcps b/recipes/usecases/spp_mirror/monitoring/2_vf_add_ports.rcps new file mode 100644 index 0000000..2156ecb --- /dev/null +++ b/recipes/usecases/spp_mirror/monitoring/2_vf_add_ports.rcps @@ -0,0 +1,21 @@ +# Configure classifier +vf 1; port add phy:0 rx cls +vf 1; port add ring:0 tx cls +vf 1; port add ring:1 tx cls + +# Configure merger +vf 1; port add ring:2 rx mgr +vf 1; port add ring:3 rx mgr +vf 1; port add phy:0 tx mgr + +# Configure forwarders +vf 1; port add ring:5 rx fwd1 +vf 1; port add vhost:0 tx fwd1 +vf 1; port add ring:1 rx fwd2 +vf 1; port add vhost:2 tx fwd2 +vf 1; port add vhost:1 rx fwd3 +vf 1; port add ring:2 tx fwd3 +vf 1; port add vhost:3 rx fwd4 +vf 1; port add ring:3 tx fwd4 +vf 1; port add ring:4 rx fwd5 +vf 1; port add vhost:4 tx fwd5 diff --git a/recipes/usecases/spp_mirror/monitoring/3_vf_reg_mac.rcps b/recipes/usecases/spp_mirror/monitoring/3_vf_reg_mac.rcps new file mode 100644 index 0000000..4731f91 --- /dev/null +++ b/recipes/usecases/spp_mirror/monitoring/3_vf_reg_mac.rcps @@ -0,0 +1,3 @@ +# Register MAC address for classifier +vf 1; classifier_table add mac 52:54:00:12:34:56 ring:0 +vf 1; classifier_table add mac 52:54:00:12:34:58 ring:1 diff --git a/recipes/usecases/spp_mirror/monitoring/4_mir_start_monitoring.rcps b/recipes/usecases/spp_mirror/monitoring/4_mir_start_monitoring.rcps new file mode 100644 index 0000000..20fe64b --- /dev/null +++ b/recipes/usecases/spp_mirror/monitoring/4_mir_start_monitoring.rcps @@ -0,0 +1,7 @@ +# Start component +mirror 2; component start mir 9 mirror + +# Add port for mirror +mirror 2; port add ring:0 rx mir +mirror 2; port add ring:4 tx mir +mirror 2; port add ring:5 tx mir diff --git a/recipes/usecases/spp_mirror/monitoring/5_mir_stop_monitoring.rcps b/recipes/usecases/spp_mirror/monitoring/5_mir_stop_monitoring.rcps new file mode 100644 index 0000000..a13004f --- /dev/null +++ b/recipes/usecases/spp_mirror/monitoring/5_mir_stop_monitoring.rcps @@ -0,0 +1,10 @@ +# Delete port for mirror +mirror 2; port del ring:0 rx mir +mirror 2; port del ring:4 tx mir +mirror 2; port del ring:5 tx mir + +# Stop component +mirror 2; component stop mir 9 mirror + +# Exit spp_mirror +mirror 2; exit diff --git a/recipes/usecases/spp_mirror/monitoring/6_vf_del_mac.rcps b/recipes/usecases/spp_mirror/monitoring/6_vf_del_mac.rcps new file mode 100644 index 0000000..d042e7c --- /dev/null +++ b/recipes/usecases/spp_mirror/monitoring/6_vf_del_mac.rcps @@ -0,0 +1,3 @@ +# Delete MAC address for classifier +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_mirror/monitoring/7_vf_del_ports.rcps b/recipes/usecases/spp_mirror/monitoring/7_vf_del_ports.rcps new file mode 100644 index 0000000..e1bdbd3 --- /dev/null +++ b/recipes/usecases/spp_mirror/monitoring/7_vf_del_ports.rcps @@ -0,0 +1,21 @@ +# Delete ports on classifier +vf 1; port del phy:0 rx cls +vf 1; port del ring:0 tx cls +vf 1; port del ring:1 tx cls + +# Delete ports on forwarders +vf 1; port del ring:5 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:1 rx fwd3 +vf 1; port del ring:2 tx fwd3 +vf 1; port del vhost:3 rx fwd4 +vf 1; port del ring:3 tx fwd4 +vf 1; port del ring:4 rx fwd5 +vf 1; port del vhost:4 tx fwd5 + +# Delete ports on merger +vf 1; port del ring:2 rx mgr +vf 1; port del ring:3 rx mgr +vf 1; port del phy:0 tx mgr diff --git a/recipes/usecases/spp_mirror/monitoring/8_vf_stop_comp.rcps b/recipes/usecases/spp_mirror/monitoring/8_vf_stop_comp.rcps new file mode 100644 index 0000000..739e7e6 --- /dev/null +++ b/recipes/usecases/spp_mirror/monitoring/8_vf_stop_comp.rcps @@ -0,0 +1,11 @@ +# Stop components +vf 1; component stop cls +vf 1; component stop mgr +vf 1; component stop fwd1 +vf 1; component stop fwd2 +vf 1; component stop fwd3 +vf 1; component stop fwd4 +vf 1; component stop fwd5 + +# Exit spp_vf +vf 1; exit -- 2.17.1
From: Hideyuki Yamashita <yamashita.hideyuki@po.ntt-tx.co.jp> This patch provides rcps for multiple_nodes usecase. Signed-off-by: Hideyuki Yamashita <yamashita.hideyuki@ntt-tx.co.jp> Signed-off-by: Naoki Takada <ntakada14@gmail.com> --- .../usecases/multiple_nodes/10_host3_stop_fwd.rcps | 6 ++++++ .../usecases/multiple_nodes/11_host4_stop_fwd.rcps | 6 ++++++ .../usecases/multiple_nodes/3_host1_start_fwd.rcps | 7 +++++++ .../usecases/multiple_nodes/4_host2_start_fwd.rcps | 8 ++++++++ .../usecases/multiple_nodes/5_host3_start_fwd.rcps | 8 ++++++++ .../usecases/multiple_nodes/6_host4_start_fwd.rcps | 8 ++++++++ .../usecases/multiple_nodes/7_config_change_path.rcps | 11 +++++++++++ recipes/usecases/multiple_nodes/8_host1_stop_fwd.rcps | 6 ++++++ recipes/usecases/multiple_nodes/9_host2_stop_fwd.rcps | 6 ++++++ 9 files changed, 66 insertions(+) create mode 100644 recipes/usecases/multiple_nodes/10_host3_stop_fwd.rcps create mode 100644 recipes/usecases/multiple_nodes/11_host4_stop_fwd.rcps create mode 100644 recipes/usecases/multiple_nodes/3_host1_start_fwd.rcps create mode 100644 recipes/usecases/multiple_nodes/4_host2_start_fwd.rcps create mode 100644 recipes/usecases/multiple_nodes/5_host3_start_fwd.rcps create mode 100644 recipes/usecases/multiple_nodes/6_host4_start_fwd.rcps create mode 100644 recipes/usecases/multiple_nodes/7_config_change_path.rcps create mode 100644 recipes/usecases/multiple_nodes/8_host1_stop_fwd.rcps create mode 100644 recipes/usecases/multiple_nodes/9_host2_stop_fwd.rcps diff --git a/recipes/usecases/multiple_nodes/10_host3_stop_fwd.rcps b/recipes/usecases/multiple_nodes/10_host3_stop_fwd.rcps new file mode 100644 index 0000000..d3389d0 --- /dev/null +++ b/recipes/usecases/multiple_nodes/10_host3_stop_fwd.rcps @@ -0,0 +1,6 @@ +# Switch to server 3 +server 3 + +# Stop forwarding +nfv 1; stop +nfv 1; patch reset diff --git a/recipes/usecases/multiple_nodes/11_host4_stop_fwd.rcps b/recipes/usecases/multiple_nodes/11_host4_stop_fwd.rcps new file mode 100644 index 0000000..d894f74 --- /dev/null +++ b/recipes/usecases/multiple_nodes/11_host4_stop_fwd.rcps @@ -0,0 +1,6 @@ +# Switch to server 4 +server 4 + +# Stop forwarding +nfv 1; stop +nfv 1; patch reset diff --git a/recipes/usecases/multiple_nodes/3_host1_start_fwd.rcps b/recipes/usecases/multiple_nodes/3_host1_start_fwd.rcps new file mode 100644 index 0000000..552ca03 --- /dev/null +++ b/recipes/usecases/multiple_nodes/3_host1_start_fwd.rcps @@ -0,0 +1,7 @@ +# Switch to server 1 +server 1 + +# Configure forwarding +nfv 1; patch phy:1 phy:2 +nfv 1; patch phy:3 phy:0 +nfv 1; forward diff --git a/recipes/usecases/multiple_nodes/4_host2_start_fwd.rcps b/recipes/usecases/multiple_nodes/4_host2_start_fwd.rcps new file mode 100644 index 0000000..7959551 --- /dev/null +++ b/recipes/usecases/multiple_nodes/4_host2_start_fwd.rcps @@ -0,0 +1,8 @@ +# Switch to server 2 +server 2 + +# Configure forwarding +nfv 1; add vhost:0 +nfv 1; patch phy:0 vhost:0 +nfv 1; patch vhost:0 phy:1 +nfv 1; forward diff --git a/recipes/usecases/multiple_nodes/5_host3_start_fwd.rcps b/recipes/usecases/multiple_nodes/5_host3_start_fwd.rcps new file mode 100644 index 0000000..97215da --- /dev/null +++ b/recipes/usecases/multiple_nodes/5_host3_start_fwd.rcps @@ -0,0 +1,8 @@ +# Switch to server 3 +server 3 + +# Configure forwarding +nfv 1; add vhost:0 +nfv 1; patch phy:0 vhost:0 +nfv 1; patch vhost:0 phy:1 +nfv 1; forward diff --git a/recipes/usecases/multiple_nodes/6_host4_start_fwd.rcps b/recipes/usecases/multiple_nodes/6_host4_start_fwd.rcps new file mode 100644 index 0000000..eee55f9 --- /dev/null +++ b/recipes/usecases/multiple_nodes/6_host4_start_fwd.rcps @@ -0,0 +1,8 @@ +# Switch to server 4 +server 4 + +# Configure forwarding +nfv 1; add vhost:0 +nfv 1; patch phy:0 vhost:0 +nfv 1; patch vhost:0 phy:1 +nfv 1; forward diff --git a/recipes/usecases/multiple_nodes/7_config_change_path.rcps b/recipes/usecases/multiple_nodes/7_config_change_path.rcps new file mode 100644 index 0000000..ad3cc9c --- /dev/null +++ b/recipes/usecases/multiple_nodes/7_config_change_path.rcps @@ -0,0 +1,11 @@ +# Switch to server 1 +server 1 + +# Remove blue path +nfv 1; stop +nfv 1; patch reset + +# Configure forwarding +nfv 2; patch phy:1 phy:4 +nfv 2; patch phy:5 phy:0 +nfv 2; forward diff --git a/recipes/usecases/multiple_nodes/8_host1_stop_fwd.rcps b/recipes/usecases/multiple_nodes/8_host1_stop_fwd.rcps new file mode 100644 index 0000000..6498d56 --- /dev/null +++ b/recipes/usecases/multiple_nodes/8_host1_stop_fwd.rcps @@ -0,0 +1,6 @@ +# Switch to server 1 +server 1 + +# Stop forwarding +nfv 2; stop +nfv 2; patch reset diff --git a/recipes/usecases/multiple_nodes/9_host2_stop_fwd.rcps b/recipes/usecases/multiple_nodes/9_host2_stop_fwd.rcps new file mode 100644 index 0000000..5b2287c --- /dev/null +++ b/recipes/usecases/multiple_nodes/9_host2_stop_fwd.rcps @@ -0,0 +1,6 @@ +# Switch to server 2 +server 2 + +# Stop forwarding +nfv 1; stop +nfv 1; patch reset -- 2.17.1
From: Hideyuki Yamashita <yamashita.hideyuki@po.ntt-tx.co.jp> This patch introduce sample Domain XML file for vhost use case. Document description is also modified to refer this newly introduced file. Signed-off-by: Hideyuki Yamashita <yamashita.hideyuki@ntt-tx.co.jp> Signed-off-by: Naoki Takada <ntakada14@gmail.com> --- docs/guides/gsg/howto_use.rst | 80 +++++++--------------------------- docs/samples/gsg/spp-vm1.xml | 81 +++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 64 deletions(-) create mode 100644 docs/samples/gsg/spp-vm1.xml diff --git a/docs/guides/gsg/howto_use.rst b/docs/guides/gsg/howto_use.rst index f4f1f08..4e42c58 100644 --- a/docs/guides/gsg/howto_use.rst +++ b/docs/guides/gsg/howto_use.rst @@ -924,6 +924,11 @@ Edit configuration of VM with virsh command. The name of VMs are found from You need to define namespace ``qemu`` to use tags such as ``<qemu:commandline>``. +In ``libvirt``, ``<qemu:commandline>`` tag is supported to utilize qemu specific +features. In this example configuration of hugepage and/or network device is +done via modifying domain XML file. +Please see details in +`libvirt document <https://libvirt.org/drvqemu.html#qemucommand>`_. .. code-block:: none @@ -945,6 +950,10 @@ registering destinations for classifier's table. Here is an example of XML config for using with SPP. +The following example is just excerpt from complete +sample. +The complete sample can be found in +`spp-vm1.xml <http://git.dpdk.org/apps/spp/tree/docs/samples/spp-vm1.xml>`_. .. code-block:: xml @@ -953,85 +962,28 @@ Here is an example of XML config for using with SPP. <uuid>d90f5420-861a-4479-8559-62d7a1545cb9</uuid> <memory unit='KiB'>4194304</memory> <currentMemory unit='KiB'>4194304</currentMemory> - <memoryBacking> - <hugepages/> - </memoryBacking> - <vcpu placement='static'>4</vcpu> - <os> - <type arch='x86_64' machine='pc-i440fx-2.3'>hvm</type> - <boot dev='hd'/> - </os> - <features> - <acpi/> - <apic/> - <pae/> - </features> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> - <devices> - <emulator>/usr/local/bin/qemu-system-x86_64</emulator> - <disk type='file' device='disk'> - <driver name='qemu' type='raw'/> - <source file='/var/lib/libvirt/images/spp-vm1.qcow2'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='block' device='cdrom'> - <driver name='qemu' type='raw'/> - <target dev='hdc' bus='ide'/> - <readonly/> - <address type='drive' controller='0' bus='1' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' - function='0x2'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <controller type='ide' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' - function='0x1'/> - </controller> - <interface type='network'> - <mac address='52:54:00:99:aa:7f'/> - <source network='default'/> - <model type='rtl8139'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' - function='0x0'/> - </interface> - <serial type='pty'> - <target type='isa-serial' port='0'/> - </serial> - <console type='pty'> - <target type='serial' port='0'/> - </console> - <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' - function='0x0'/> - </memballoon> - </devices> + "..." <qemu:commandline> <qemu:arg value='-cpu'/> <qemu:arg value='host'/> <qemu:arg value='-object'/> - <qemu:arg - value='memory-backend-file,id=mem,size=4096M,mem-path=/run/hugepages/kvm,share=on'/> + <qemu:arg value='memory-backend-file, + id=mem,size=4096M,mem-path=/run/hugepages/kvm,share=on'/> <qemu:arg value='-numa'/> <qemu:arg value='node,memdev=mem'/> <qemu:arg value='-mem-prealloc'/> <qemu:arg value='-chardev'/> <qemu:arg value='socket,id=chr0,path=/tmp/sock0,server'/> <qemu:arg value='-device'/> - <qemu:arg - value='virtio-net-pci,netdev=vhost-net0,mac=52:54:00:12:34:56'/> + <qemu:arg value='virtio-net-pci,netdev=vhost-net0, + mac=52:54:00:12:34:56'/> <qemu:arg value='-netdev'/> <qemu:arg value='vhost-user,id=vhost-net0,chardev=chr0,vhostforce'/> <qemu:arg value='-chardev'/> <qemu:arg value='socket,id=chr1,path=/tmp/sock1,server'/> <qemu:arg value='-device'/> - <qemu:arg - value='virtio-net-pci,netdev=vhost-net1,mac=52:54:00:12:34:57'/> + <qemu:arg value='virtio-net-pci,netdev=vhost-net1, + mac=52:54:00:12:34:57'/> <qemu:arg value='-netdev'/> <qemu:arg value='vhost-user,id=vhost-net1,chardev=chr1,vhostforce'/> </qemu:commandline> diff --git a/docs/samples/gsg/spp-vm1.xml b/docs/samples/gsg/spp-vm1.xml new file mode 100644 index 0000000..0b5e126 --- /dev/null +++ b/docs/samples/gsg/spp-vm1.xml @@ -0,0 +1,81 @@ +<domain type='kvm' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'> + <name>spp-vm1</name> + <uuid>d90f5420-861a-4479-8559-62d7a1545cb9</uuid> + <memory unit='KiB'>4194304</memory> + <currentMemory unit='KiB'>4194304</currentMemory> + <memoryBacking> + <hugepages/> + </memoryBacking> + <vcpu placement='static'>4</vcpu> + <os> + <type arch='x86_64' machine='pc-i440fx-2.3'>hvm</type> + <boot dev='hd'/> + </os> + <features> + <acpi/> + <apic/> + <pae/> + </features> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/local/bin/qemu-system-x86_64</emulator> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/var/lib/libvirt/images/spp-vm1.qcow2'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <interface type='network'> + <mac address='52:54:00:99:aa:7f'/> + <source network='default'/> + <model type='rtl8139'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </interface> + <serial type='pty'> + <target type='isa-serial' port='0'/> + </serial> + <console type='pty'> + <target type='serial' port='0'/> + </console> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </memballoon> + </devices> + <qemu:commandline> + <qemu:arg value='-cpu'/> + <qemu:arg value='host'/> + <qemu:arg value='-object'/> + <qemu:arg value='memory-backend-file,id=mem,size=4096M,mem-path=/run/hugepages/kvm,share=on'/> + <qemu:arg value='-numa'/> + <qemu:arg value='node,memdev=mem'/> + <qemu:arg value='-mem-prealloc'/> + <qemu:arg value='-chardev'/> + <qemu:arg value='socket,id=chr0,path=/tmp/sock0,server'/> + <qemu:arg value='-device'/> + <qemu:arg value='virtio-net-pci,netdev=vhost-net0,mac=52:54:00:12:34:56'/> + <qemu:arg value='-netdev'/> + <qemu:arg value='vhost-user,id=vhost-net0,chardev=chr0,vhostforce'/> + <qemu:arg value='-chardev'/> + <qemu:arg value='socket,id=chr1,path=/tmp/sock1,server'/> + <qemu:arg value='-device'/> + <qemu:arg value='virtio-net-pci,netdev=vhost-net1,mac=52:54:00:12:34:57'/> + <qemu:arg value='-netdev'/> + <qemu:arg value='vhost-user,id=vhost-net1,chardev=chr1,vhostforce'/> + </qemu:commandline> +</domain> \ No newline at end of file -- 2.17.1
From: Hideyuki Yamashita <yamashita.hideyuki@po.ntt-tx.co.jp> There are several incorrectness whih regards to usecases, how to use parts. So this patch set provides the fix. Fixes: d76cb64c ("docs: update how to use section for using spp-ctl") Fixes: 359d5a3b ("docs: add multiple nodes section in usecases") Fixes: e3fecafd ("docs: remove spp_vm from usecases") Fixes: 454c7ef2 ("docs: move usecase of spp_vf") Fixes: 215c18f4 ("docs: update usecase of ssh with spp_vf") Signed-off-by: Hideyuki Yamashita <yamashita.hideyuki@ntt-tx.co.jp> Signed-off-by: Naoki Takada <ntakada14@gmail.com> --- docs/guides/gsg/howto_use.rst | 9 ++++++--- docs/guides/usecases/multi_nodes.rst | 6 ++++-- docs/guides/usecases/spp_nfv.rst | 2 +- docs/guides/usecases/spp_vf.rst | 10 +++++----- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/docs/guides/gsg/howto_use.rst b/docs/guides/gsg/howto_use.rst index 4e42c58..965b8c7 100644 --- a/docs/guides/gsg/howto_use.rst +++ b/docs/guides/gsg/howto_use.rst @@ -219,8 +219,9 @@ All of options can be referred with help option ``-h``. .. code-block:: console - python3 ./src/spp-ctl/spp-ctl -h - usage: spp-ctl [-h] [-b BIND_ADDR] [-p PRI_PORT] [-s SEC_PORT] [-a API_PORT] + $ python3 ./src/spp-ctl/spp-ctl -h + usage: spp-ctl [-h] [-b BIND_ADDR] [-p PRI_PORT] + [-s SEC_PORT] [-a API_PORT] SPP Controller @@ -322,7 +323,7 @@ All of options can be referred with help option ``-h``. .. code-block:: console $ python3 src/spp.py -h - usage: spp.py [-h] [-b BIND_ADDR] [-a API_PORT] + usage: spp.py [-h] [-b BIND_ADDR] [--wait-pri] [--config CONFIG] SPP Controller @@ -330,6 +331,8 @@ All of options can be referred with help option ``-h``. -h, --help show this help message and exit -b BIND_ADDR, --bind-addr BIND_ADDR bind address, default=127.0.0.1:7777 + --wait-pri Wait for spp_primary is launched + --config CONFIG Config file path All of SPP CLI commands are described in :doc:`../../commands/index`. diff --git a/docs/guides/usecases/multi_nodes.rst b/docs/guides/usecases/multi_nodes.rst index 3eaed0c..e380620 100644 --- a/docs/guides/usecases/multi_nodes.rst +++ b/docs/guides/usecases/multi_nodes.rst @@ -156,6 +156,8 @@ For host2, swith server to host2 and run nfv commands. Switch spp-ctl to "2: 192.168.1.102:7777". # configure + spp > nfv 1; add vhost:0 + Add vhost:0. spp > nfv 1; patch phy:0 vhost:0 Patch ports (phy:0 -> vhost:0). spp > nfv 1; patch vhost:0 phy:1 @@ -173,8 +175,8 @@ Finally, change path from blue lines to red lines. .. code-block:: console # switch to server 1 - spp > server 2 - Switch spp-ctl to "2: 192.168.1.102:7777". + spp > server 1 + Switch spp-ctl to "1: 192.168.1.101:7777". # remove blue path spp > nfv 1; stop diff --git a/docs/guides/usecases/spp_nfv.rst b/docs/guides/usecases/spp_nfv.rst index cc18b08..488fdec 100644 --- a/docs/guides/usecases/spp_nfv.rst +++ b/docs/guides/usecases/spp_nfv.rst @@ -385,7 +385,7 @@ to confirm that network on host is configured. .. code-block:: console - $ sudo $RE_SDK/examples/build/l2fwd -l 0-1 -- -p 0x03 + $ sudo $RTE_SDK/examples/build/l2fwd -l 0-1 -- -p 0x03 .. _figure_spp_nfv_l2fwd_vhost: diff --git a/docs/guides/usecases/spp_vf.rst b/docs/guides/usecases/spp_vf.rst index ee18439..c45feb8 100644 --- a/docs/guides/usecases/spp_vf.rst +++ b/docs/guides/usecases/spp_vf.rst @@ -199,14 +199,14 @@ First, delete entries of ``classifier_table`` and ports of components. # forwarders spp > vf 1; port del ring:0 rx fwd1 - spp > vf 1; port del vhost:0 tx fwd1 + spp > vf 1; port del ring:2 tx fwd1 spp > vf 1; port del ring:1 rx fwd2 - spp > vf 1; port del vhost:2 tx fwd2 + spp > vf 1; port del ring:3 tx fwd2 # mergers spp > vf 1; port del ring:2 rx mgr spp > vf 1; port del ring:3 rx mgr - spp > vf 1; port del phy:0 tx mgr + spp > vf 1; port del phy:1 tx mgr Then, stop components. @@ -587,8 +587,8 @@ Delete entries from the table and ports from each of components. spp > vf 1; port del vhost:3 tx fwd6 spp > vf 1; port del vhost:1 rx fwd7 spp > vf 1; port del ring:6 tx fwd7 - spp > vf 1; port del vhost:3 tx fwd8 - spp > vf 1; port del ring:7 rx fwd8 + spp > vf 1; port del vhost:3 rx fwd8 + spp > vf 1; port del ring:7 tx fwd8 # merger spp > vf 1; port del ring:6 rx mgr2 -- 2.17.1
> From: Hideyuki Yamashita <yamashita.hideyuki@ntt-tx.co.jp> > > For SPP 19.08, there are several incorrectness and missing part on > both docs and rcps. > This patch set fix above. Hi, All of patches in the set is warned because email addresses of "From" and "Signed-off-by" are different as following. Could you fix this issue? ### [PATCH 1/8] recipes: add vhost related rcps for spp_nfv WARNING:NO_AUTHOR_SIGN_OFF: Missing Signed-off-by: line by nominal patch author 'Hideyuki Yamashita <yamashita.hideyuki@po.ntt-tx.co.jp>' Thanks > > Hideyuki Yamashita (8): > recipes: add vhost related rcps for spp_nfv > recipes: fix rcps for setting up spp_vf > recipes: fix typos for setting up spp_vf > recipes: fix rcps for shutting down spp_vf > recipes: add rcps for spp_mirror > recipes: add rcps for multiple_nodes > docs: adds sample Domain XML file for vhost > docs: fix incorrect commands in usecases. > > docs/guides/gsg/howto_use.rst | 89 +++++-------------- > docs/guides/usecases/multi_nodes.rst | 6 +- > docs/guides/usecases/spp_nfv.rst | 2 +- > docs/guides/usecases/spp_vf.rst | 10 +-- > docs/samples/gsg/spp-vm1.xml | 81 +++++++++++++++++ > .../multiple_nodes/10_host3_stop_fwd.rcps | 6 ++ > .../multiple_nodes/11_host4_stop_fwd.rcps | 6 ++ > .../multiple_nodes/3_host1_start_fwd.rcps | 7 ++ > .../multiple_nodes/4_host2_start_fwd.rcps | 8 ++ > .../multiple_nodes/5_host3_start_fwd.rcps | 8 ++ > .../multiple_nodes/6_host4_start_fwd.rcps | 8 ++ > .../multiple_nodes/7_config_change_path.rcps | 11 +++ > .../multiple_nodes/8_host1_stop_fwd.rcps | 6 ++ > .../multiple_nodes/9_host2_stop_fwd.rcps | 6 ++ > .../monitoring/1_vf_start_comp.rcps | 8 ++ > .../spp_mirror/monitoring/2_vf_add_ports.rcps | 21 +++++ > .../spp_mirror/monitoring/3_vf_reg_mac.rcps | 3 + > .../monitoring/4_mir_start_monitoring.rcps | 7 ++ > .../monitoring/5_mir_stop_monitoring.rcps | 10 +++ > .../spp_mirror/monitoring/6_vf_del_mac.rcps | 3 + > .../spp_mirror/monitoring/7_vf_del_ports.rcps | 21 +++++ > .../spp_mirror/monitoring/8_vf_stop_comp.rcps | 11 +++ > .../1_vhost_single_unidir.rcps | 10 +++ > .../spp_nfv/single_with_vhost/2_clean.rcps | 9 ++ > .../ssh_login/setup/1_start_components.rcps | 4 +- > .../ssh_login/setup/4_start_components.rcps | 4 +- > .../ssh_login/setup/6_reg_mac_path2.rcps | 4 +- > .../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 | 19 ++++ > .../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 | 19 ++++ > .../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 + > 41 files changed, 347 insertions(+), 142 deletions(-) > create mode 100644 docs/samples/gsg/spp-vm1.xml > create mode 100644 recipes/usecases/multiple_nodes/10_host3_stop_fwd.rcps > create mode 100644 recipes/usecases/multiple_nodes/11_host4_stop_fwd.rcps > create mode 100644 recipes/usecases/multiple_nodes/3_host1_start_fwd.rcps > create mode 100644 recipes/usecases/multiple_nodes/4_host2_start_fwd.rcps > create mode 100644 recipes/usecases/multiple_nodes/5_host3_start_fwd.rcps > create mode 100644 recipes/usecases/multiple_nodes/6_host4_start_fwd.rcps > create mode 100644 recipes/usecases/multiple_nodes/7_config_change_path.rcps > create mode 100644 recipes/usecases/multiple_nodes/8_host1_stop_fwd.rcps > create mode 100644 recipes/usecases/multiple_nodes/9_host2_stop_fwd.rcps > create mode 100644 recipes/usecases/spp_mirror/monitoring/1_vf_start_comp.rcps > create mode 100644 recipes/usecases/spp_mirror/monitoring/2_vf_add_ports.rcps > create mode 100644 recipes/usecases/spp_mirror/monitoring/3_vf_reg_mac.rcps > create mode 100644 recipes/usecases/spp_mirror/monitoring/4_mir_start_monitoring.rcps > create mode 100644 recipes/usecases/spp_mirror/monitoring/5_mir_stop_monitoring.rcps > create mode 100644 recipes/usecases/spp_mirror/monitoring/6_vf_del_mac.rcps > create mode 100644 recipes/usecases/spp_mirror/monitoring/7_vf_del_ports.rcps > create mode 100644 recipes/usecases/spp_mirror/monitoring/8_vf_stop_comp.rcps > create mode 100644 recipes/usecases/spp_nfv/single_with_vhost/1_vhost_single_unidir.rcps > create mode 100644 recipes/usecases/spp_nfv/single_with_vhost/2_clean.rcps > 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 >
From: Hideyuki Yamashita <yamashita.hideyuki@ntt-tx.co.jp> For SPP 19.08, there are several incorrectness and missing part on both docs and rcps. This patch set fix above. V2 patch set fixes inconsistency between "From" and "Signed-off-by" of v1 patch. Hideyuki Yamashita (8): recipes: add vhost related rcps for spp_nfv recipes: fix rcps for setting up spp_vf recipes: fix typos for setting up spp_vf recipes: fix rcps for shutting down spp_vf recipes: add rcps for spp_mirror recipes: add rcps for multiple_nodes docs: adds sample Domain XML file for vhost docs: fix incorrect commands in usecases. docs/guides/gsg/howto_use.rst | 89 +++++-------------- docs/guides/usecases/multi_nodes.rst | 6 +- docs/guides/usecases/spp_nfv.rst | 2 +- docs/guides/usecases/spp_vf.rst | 10 +-- docs/samples/gsg/spp-vm1.xml | 81 +++++++++++++++++ .../multiple_nodes/10_host3_stop_fwd.rcps | 6 ++ .../multiple_nodes/11_host4_stop_fwd.rcps | 6 ++ .../multiple_nodes/3_host1_start_fwd.rcps | 7 ++ .../multiple_nodes/4_host2_start_fwd.rcps | 8 ++ .../multiple_nodes/5_host3_start_fwd.rcps | 8 ++ .../multiple_nodes/6_host4_start_fwd.rcps | 8 ++ .../multiple_nodes/7_config_change_path.rcps | 11 +++ .../multiple_nodes/8_host1_stop_fwd.rcps | 6 ++ .../multiple_nodes/9_host2_stop_fwd.rcps | 6 ++ .../monitoring/1_vf_start_comp.rcps | 8 ++ .../spp_mirror/monitoring/2_vf_add_ports.rcps | 21 +++++ .../spp_mirror/monitoring/3_vf_reg_mac.rcps | 3 + .../monitoring/4_mir_start_monitoring.rcps | 7 ++ .../monitoring/5_mir_stop_monitoring.rcps | 10 +++ .../spp_mirror/monitoring/6_vf_del_mac.rcps | 3 + .../spp_mirror/monitoring/7_vf_del_ports.rcps | 21 +++++ .../spp_mirror/monitoring/8_vf_stop_comp.rcps | 11 +++ .../1_vhost_single_unidir.rcps | 10 +++ .../spp_nfv/single_with_vhost/2_clean.rcps | 9 ++ .../ssh_login/setup/1_start_components.rcps | 4 +- .../ssh_login/setup/4_start_components.rcps | 4 +- .../ssh_login/setup/6_reg_mac_path2.rcps | 4 +- .../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 | 19 ++++ .../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 | 19 ++++ .../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 + 41 files changed, 347 insertions(+), 142 deletions(-) create mode 100644 docs/samples/gsg/spp-vm1.xml create mode 100644 recipes/usecases/multiple_nodes/10_host3_stop_fwd.rcps create mode 100644 recipes/usecases/multiple_nodes/11_host4_stop_fwd.rcps create mode 100644 recipes/usecases/multiple_nodes/3_host1_start_fwd.rcps create mode 100644 recipes/usecases/multiple_nodes/4_host2_start_fwd.rcps create mode 100644 recipes/usecases/multiple_nodes/5_host3_start_fwd.rcps create mode 100644 recipes/usecases/multiple_nodes/6_host4_start_fwd.rcps create mode 100644 recipes/usecases/multiple_nodes/7_config_change_path.rcps create mode 100644 recipes/usecases/multiple_nodes/8_host1_stop_fwd.rcps create mode 100644 recipes/usecases/multiple_nodes/9_host2_stop_fwd.rcps create mode 100644 recipes/usecases/spp_mirror/monitoring/1_vf_start_comp.rcps create mode 100644 recipes/usecases/spp_mirror/monitoring/2_vf_add_ports.rcps create mode 100644 recipes/usecases/spp_mirror/monitoring/3_vf_reg_mac.rcps create mode 100644 recipes/usecases/spp_mirror/monitoring/4_mir_start_monitoring.rcps create mode 100644 recipes/usecases/spp_mirror/monitoring/5_mir_stop_monitoring.rcps create mode 100644 recipes/usecases/spp_mirror/monitoring/6_vf_del_mac.rcps create mode 100644 recipes/usecases/spp_mirror/monitoring/7_vf_del_ports.rcps create mode 100644 recipes/usecases/spp_mirror/monitoring/8_vf_stop_comp.rcps create mode 100644 recipes/usecases/spp_nfv/single_with_vhost/1_vhost_single_unidir.rcps create mode 100644 recipes/usecases/spp_nfv/single_with_vhost/2_clean.rcps 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 -- 2.17.1
From: Hideyuki Yamashita <yamashita.hideyuki@ntt-tx.co.jp> This patch set adds vhost related rcps for spp_nfv. Signed-off-by: Hideyuki Yamashita <yamashita.hideyuki@ntt-tx.co.jp> Signed-off-by: Naoki Takada <ntakada14@gmail.com> --- .../single_with_vhost/1_vhost_single_unidir.rcps | 10 ++++++++++ .../usecases/spp_nfv/single_with_vhost/2_clean.rcps | 9 +++++++++ 2 files changed, 19 insertions(+) create mode 100644 recipes/usecases/spp_nfv/single_with_vhost/1_vhost_single_unidir.rcps create mode 100644 recipes/usecases/spp_nfv/single_with_vhost/2_clean.rcps diff --git a/recipes/usecases/spp_nfv/single_with_vhost/1_vhost_single_unidir.rcps b/recipes/usecases/spp_nfv/single_with_vhost/1_vhost_single_unidir.rcps new file mode 100644 index 0000000..86841f2 --- /dev/null +++ b/recipes/usecases/spp_nfv/single_with_vhost/1_vhost_single_unidir.rcps @@ -0,0 +1,10 @@ +# Add vhost PMDs +nfv 1; add vhost:0 +nfv 1; add vhost:1 + +# Patch ports +nfv 1; patch phy:0 vhost:0 +nfv 1; patch vhost:1 phy:1 + +# Start forwarding +nfv 1; forward diff --git a/recipes/usecases/spp_nfv/single_with_vhost/2_clean.rcps b/recipes/usecases/spp_nfv/single_with_vhost/2_clean.rcps new file mode 100644 index 0000000..aa05798 --- /dev/null +++ b/recipes/usecases/spp_nfv/single_with_vhost/2_clean.rcps @@ -0,0 +1,9 @@ +# Stop forwarding +nfv 1; stop + +# Clear all of patches +nfv 1; patch reset + +# Delete vhost PMDs +nfv 1; del vhost:0 +nfv 1; del vhost:1 -- 2.17.1
From: Hideyuki Yamashita <yamashita.hideyuki@ntt-tx.co.jp> This patch set fixes setting up configuration of spp_vf. Signed-off-by: Hideyuki Yamashita <yamashita.hideyuki@ntt-tx.co.jp> Signed-off-by: Naoki Takada <ntakada14@gmail.com> --- .../usecases/spp_vf/ssh_login/setup/1_start_components.rcps | 4 ++-- .../usecases/spp_vf/ssh_login/setup/4_start_components.rcps | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/usecases/spp_vf/ssh_login/setup/1_start_components.rcps b/recipes/usecases/spp_vf/ssh_login/setup/1_start_components.rcps index e864628..b1c63ad 100644 --- a/recipes/usecases/spp_vf/ssh_login/setup/1_start_components.rcps +++ b/recipes/usecases/spp_vf/ssh_login/setup/1_start_components.rcps @@ -1,5 +1,5 @@ -# Start component for path1 -vf 1; component start cls1 2 classifier_mac +# Start components for path1 +vf 1; component start cls1 2 classifier vf 1; component start fwd1 3 forward vf 1; component start fwd2 4 forward vf 1; component start fwd3 5 forward diff --git a/recipes/usecases/spp_vf/ssh_login/setup/4_start_components.rcps b/recipes/usecases/spp_vf/ssh_login/setup/4_start_components.rcps index 7ce2c0d..e784891 100644 --- a/recipes/usecases/spp_vf/ssh_login/setup/4_start_components.rcps +++ b/recipes/usecases/spp_vf/ssh_login/setup/4_start_components.rcps @@ -1,5 +1,5 @@ -# Start component for path2 -vf 1; component start cls2 8 classifier_mac +# Start components for path2 +vf 1; component start cls2 8 classifier vf 1; component start fwd5 9 forward vf 1; component start fwd6 10 forward vf 1; component start fwd7 11 forward -- 2.17.1
From: Hideyuki Yamashita <yamashita.hideyuki@ntt-tx.co.jp> This update is to remove unnecessary prompt from rcps file. Fixes: 9caf63aa ("recipes: update old rcps for spp_vf") Signed-off-by: Hideyuki Yamashita <yamashita.hideyuki@ntt-tx.co.jp> Signed-off-by: Naoki Takada <ntakada14@gmail.com> --- recipes/usecases/spp_vf/ssh_login/setup/6_reg_mac_path2.rcps | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/usecases/spp_vf/ssh_login/setup/6_reg_mac_path2.rcps b/recipes/usecases/spp_vf/ssh_login/setup/6_reg_mac_path2.rcps index e812b79..63273d9 100644 --- a/recipes/usecases/spp_vf/ssh_login/setup/6_reg_mac_path2.rcps +++ b/recipes/usecases/spp_vf/ssh_login/setup/6_reg_mac_path2.rcps @@ -1,3 +1,3 @@ # Register MAC address to classifier -spp > vf 1; classifier_table add mac 52:54:00:12:34:57 ring:4 -spp > vf 1; classifier_table add mac 52:54:00:12:34:59 ring:5 +vf 1; classifier_table add mac 52:54:00:12:34:57 ring:4 +vf 1; classifier_table add mac 52:54:00:12:34:59 ring:5 -- 2.17.1
From: Hideyuki Yamashita <yamashita.hideyuki@ntt-tx.co.jp> This patch provides the following two things. 1. File name change without content modification. 2. Remove 'flush' because the command is obsolete and put 'exit' command instead. Signed-off-by: Hideyuki Yamashita <yamashita.hideyuki@ntt-tx.co.jp> Signed-off-by: Naoki Takada <ntakada14@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 | 19 ++++++++++++++++++ .../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 | 19 ++++++++++++++++++ .../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, 59 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..b396d66 --- /dev/null +++ b/recipes/usecases/spp_vf/ssh_login/shutdown/2_del_ports_path1.rcps @@ -0,0 +1,19 @@ +# Delete ports on 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 + +# Delete ports on 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 + +# Delete ports on 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..db55ae2 --- /dev/null +++ b/recipes/usecases/spp_vf/ssh_login/shutdown/3_stop_components.rcps @@ -0,0 +1,7 @@ +# Stop components 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..60b5ac8 --- /dev/null +++ b/recipes/usecases/spp_vf/ssh_login/shutdown/5_del_ports_path2.rcps @@ -0,0 +1,19 @@ +# Delete ports on cls2 +vf 1; port del phy:1 rx cls2 +vf 1; port del ring:4 tx cls2 +vf 1; port del ring:5 tx cls2 + +# Delete ports on fwd2 +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 + +# Delete ports on mgr2 +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..52a811a --- /dev/null +++ b/recipes/usecases/spp_vf/ssh_login/shutdown/6_stop_components.rcps @@ -0,0 +1,7 @@ +# Stop components 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
From: Hideyuki Yamashita <yamashita.hideyuki@ntt-tx.co.jp> This patch provides rcps for spp_mirror usecase. Signed-off-by: Hideyuki Yamashita <yamashita.hideyuki@ntt-tx.co.jp> Signed-off-by: Naoki Takada <ntakada14@gmail.com> --- .../monitoring/1_vf_start_comp.rcps | 8 +++++++ .../spp_mirror/monitoring/2_vf_add_ports.rcps | 21 +++++++++++++++++++ .../spp_mirror/monitoring/3_vf_reg_mac.rcps | 3 +++ .../monitoring/4_mir_start_monitoring.rcps | 7 +++++++ .../monitoring/5_mir_stop_monitoring.rcps | 10 +++++++++ .../spp_mirror/monitoring/6_vf_del_mac.rcps | 3 +++ .../spp_mirror/monitoring/7_vf_del_ports.rcps | 21 +++++++++++++++++++ .../spp_mirror/monitoring/8_vf_stop_comp.rcps | 11 ++++++++++ 8 files changed, 84 insertions(+) create mode 100644 recipes/usecases/spp_mirror/monitoring/1_vf_start_comp.rcps create mode 100644 recipes/usecases/spp_mirror/monitoring/2_vf_add_ports.rcps create mode 100644 recipes/usecases/spp_mirror/monitoring/3_vf_reg_mac.rcps create mode 100644 recipes/usecases/spp_mirror/monitoring/4_mir_start_monitoring.rcps create mode 100644 recipes/usecases/spp_mirror/monitoring/5_mir_stop_monitoring.rcps create mode 100644 recipes/usecases/spp_mirror/monitoring/6_vf_del_mac.rcps create mode 100644 recipes/usecases/spp_mirror/monitoring/7_vf_del_ports.rcps create mode 100644 recipes/usecases/spp_mirror/monitoring/8_vf_stop_comp.rcps diff --git a/recipes/usecases/spp_mirror/monitoring/1_vf_start_comp.rcps b/recipes/usecases/spp_mirror/monitoring/1_vf_start_comp.rcps new file mode 100644 index 0000000..4852398 --- /dev/null +++ b/recipes/usecases/spp_mirror/monitoring/1_vf_start_comp.rcps @@ -0,0 +1,8 @@ +# Start components +vf 1; component start cls 2 classifier +vf 1; component start mgr 3 merge +vf 1; component start fwd1 4 forward +vf 1; component start fwd2 5 forward +vf 1; component start fwd3 6 forward +vf 1; component start fwd4 7 forward +vf 1; component start fwd5 8 forward diff --git a/recipes/usecases/spp_mirror/monitoring/2_vf_add_ports.rcps b/recipes/usecases/spp_mirror/monitoring/2_vf_add_ports.rcps new file mode 100644 index 0000000..2156ecb --- /dev/null +++ b/recipes/usecases/spp_mirror/monitoring/2_vf_add_ports.rcps @@ -0,0 +1,21 @@ +# Configure classifier +vf 1; port add phy:0 rx cls +vf 1; port add ring:0 tx cls +vf 1; port add ring:1 tx cls + +# Configure merger +vf 1; port add ring:2 rx mgr +vf 1; port add ring:3 rx mgr +vf 1; port add phy:0 tx mgr + +# Configure forwarders +vf 1; port add ring:5 rx fwd1 +vf 1; port add vhost:0 tx fwd1 +vf 1; port add ring:1 rx fwd2 +vf 1; port add vhost:2 tx fwd2 +vf 1; port add vhost:1 rx fwd3 +vf 1; port add ring:2 tx fwd3 +vf 1; port add vhost:3 rx fwd4 +vf 1; port add ring:3 tx fwd4 +vf 1; port add ring:4 rx fwd5 +vf 1; port add vhost:4 tx fwd5 diff --git a/recipes/usecases/spp_mirror/monitoring/3_vf_reg_mac.rcps b/recipes/usecases/spp_mirror/monitoring/3_vf_reg_mac.rcps new file mode 100644 index 0000000..4731f91 --- /dev/null +++ b/recipes/usecases/spp_mirror/monitoring/3_vf_reg_mac.rcps @@ -0,0 +1,3 @@ +# Register MAC address for classifier +vf 1; classifier_table add mac 52:54:00:12:34:56 ring:0 +vf 1; classifier_table add mac 52:54:00:12:34:58 ring:1 diff --git a/recipes/usecases/spp_mirror/monitoring/4_mir_start_monitoring.rcps b/recipes/usecases/spp_mirror/monitoring/4_mir_start_monitoring.rcps new file mode 100644 index 0000000..20fe64b --- /dev/null +++ b/recipes/usecases/spp_mirror/monitoring/4_mir_start_monitoring.rcps @@ -0,0 +1,7 @@ +# Start component +mirror 2; component start mir 9 mirror + +# Add port for mirror +mirror 2; port add ring:0 rx mir +mirror 2; port add ring:4 tx mir +mirror 2; port add ring:5 tx mir diff --git a/recipes/usecases/spp_mirror/monitoring/5_mir_stop_monitoring.rcps b/recipes/usecases/spp_mirror/monitoring/5_mir_stop_monitoring.rcps new file mode 100644 index 0000000..a13004f --- /dev/null +++ b/recipes/usecases/spp_mirror/monitoring/5_mir_stop_monitoring.rcps @@ -0,0 +1,10 @@ +# Delete port for mirror +mirror 2; port del ring:0 rx mir +mirror 2; port del ring:4 tx mir +mirror 2; port del ring:5 tx mir + +# Stop component +mirror 2; component stop mir 9 mirror + +# Exit spp_mirror +mirror 2; exit diff --git a/recipes/usecases/spp_mirror/monitoring/6_vf_del_mac.rcps b/recipes/usecases/spp_mirror/monitoring/6_vf_del_mac.rcps new file mode 100644 index 0000000..d042e7c --- /dev/null +++ b/recipes/usecases/spp_mirror/monitoring/6_vf_del_mac.rcps @@ -0,0 +1,3 @@ +# Delete MAC address for classifier +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_mirror/monitoring/7_vf_del_ports.rcps b/recipes/usecases/spp_mirror/monitoring/7_vf_del_ports.rcps new file mode 100644 index 0000000..e1bdbd3 --- /dev/null +++ b/recipes/usecases/spp_mirror/monitoring/7_vf_del_ports.rcps @@ -0,0 +1,21 @@ +# Delete ports on classifier +vf 1; port del phy:0 rx cls +vf 1; port del ring:0 tx cls +vf 1; port del ring:1 tx cls + +# Delete ports on forwarders +vf 1; port del ring:5 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:1 rx fwd3 +vf 1; port del ring:2 tx fwd3 +vf 1; port del vhost:3 rx fwd4 +vf 1; port del ring:3 tx fwd4 +vf 1; port del ring:4 rx fwd5 +vf 1; port del vhost:4 tx fwd5 + +# Delete ports on merger +vf 1; port del ring:2 rx mgr +vf 1; port del ring:3 rx mgr +vf 1; port del phy:0 tx mgr diff --git a/recipes/usecases/spp_mirror/monitoring/8_vf_stop_comp.rcps b/recipes/usecases/spp_mirror/monitoring/8_vf_stop_comp.rcps new file mode 100644 index 0000000..739e7e6 --- /dev/null +++ b/recipes/usecases/spp_mirror/monitoring/8_vf_stop_comp.rcps @@ -0,0 +1,11 @@ +# Stop components +vf 1; component stop cls +vf 1; component stop mgr +vf 1; component stop fwd1 +vf 1; component stop fwd2 +vf 1; component stop fwd3 +vf 1; component stop fwd4 +vf 1; component stop fwd5 + +# Exit spp_vf +vf 1; exit -- 2.17.1
From: Hideyuki Yamashita <yamashita.hideyuki@ntt-tx.co.jp> This patch provides rcps for multiple_nodes usecase. Signed-off-by: Hideyuki Yamashita <yamashita.hideyuki@ntt-tx.co.jp> Signed-off-by: Naoki Takada <ntakada14@gmail.com> --- .../usecases/multiple_nodes/10_host3_stop_fwd.rcps | 6 ++++++ .../usecases/multiple_nodes/11_host4_stop_fwd.rcps | 6 ++++++ .../usecases/multiple_nodes/3_host1_start_fwd.rcps | 7 +++++++ .../usecases/multiple_nodes/4_host2_start_fwd.rcps | 8 ++++++++ .../usecases/multiple_nodes/5_host3_start_fwd.rcps | 8 ++++++++ .../usecases/multiple_nodes/6_host4_start_fwd.rcps | 8 ++++++++ .../usecases/multiple_nodes/7_config_change_path.rcps | 11 +++++++++++ recipes/usecases/multiple_nodes/8_host1_stop_fwd.rcps | 6 ++++++ recipes/usecases/multiple_nodes/9_host2_stop_fwd.rcps | 6 ++++++ 9 files changed, 66 insertions(+) create mode 100644 recipes/usecases/multiple_nodes/10_host3_stop_fwd.rcps create mode 100644 recipes/usecases/multiple_nodes/11_host4_stop_fwd.rcps create mode 100644 recipes/usecases/multiple_nodes/3_host1_start_fwd.rcps create mode 100644 recipes/usecases/multiple_nodes/4_host2_start_fwd.rcps create mode 100644 recipes/usecases/multiple_nodes/5_host3_start_fwd.rcps create mode 100644 recipes/usecases/multiple_nodes/6_host4_start_fwd.rcps create mode 100644 recipes/usecases/multiple_nodes/7_config_change_path.rcps create mode 100644 recipes/usecases/multiple_nodes/8_host1_stop_fwd.rcps create mode 100644 recipes/usecases/multiple_nodes/9_host2_stop_fwd.rcps diff --git a/recipes/usecases/multiple_nodes/10_host3_stop_fwd.rcps b/recipes/usecases/multiple_nodes/10_host3_stop_fwd.rcps new file mode 100644 index 0000000..d3389d0 --- /dev/null +++ b/recipes/usecases/multiple_nodes/10_host3_stop_fwd.rcps @@ -0,0 +1,6 @@ +# Switch to server 3 +server 3 + +# Stop forwarding +nfv 1; stop +nfv 1; patch reset diff --git a/recipes/usecases/multiple_nodes/11_host4_stop_fwd.rcps b/recipes/usecases/multiple_nodes/11_host4_stop_fwd.rcps new file mode 100644 index 0000000..d894f74 --- /dev/null +++ b/recipes/usecases/multiple_nodes/11_host4_stop_fwd.rcps @@ -0,0 +1,6 @@ +# Switch to server 4 +server 4 + +# Stop forwarding +nfv 1; stop +nfv 1; patch reset diff --git a/recipes/usecases/multiple_nodes/3_host1_start_fwd.rcps b/recipes/usecases/multiple_nodes/3_host1_start_fwd.rcps new file mode 100644 index 0000000..552ca03 --- /dev/null +++ b/recipes/usecases/multiple_nodes/3_host1_start_fwd.rcps @@ -0,0 +1,7 @@ +# Switch to server 1 +server 1 + +# Configure forwarding +nfv 1; patch phy:1 phy:2 +nfv 1; patch phy:3 phy:0 +nfv 1; forward diff --git a/recipes/usecases/multiple_nodes/4_host2_start_fwd.rcps b/recipes/usecases/multiple_nodes/4_host2_start_fwd.rcps new file mode 100644 index 0000000..7959551 --- /dev/null +++ b/recipes/usecases/multiple_nodes/4_host2_start_fwd.rcps @@ -0,0 +1,8 @@ +# Switch to server 2 +server 2 + +# Configure forwarding +nfv 1; add vhost:0 +nfv 1; patch phy:0 vhost:0 +nfv 1; patch vhost:0 phy:1 +nfv 1; forward diff --git a/recipes/usecases/multiple_nodes/5_host3_start_fwd.rcps b/recipes/usecases/multiple_nodes/5_host3_start_fwd.rcps new file mode 100644 index 0000000..97215da --- /dev/null +++ b/recipes/usecases/multiple_nodes/5_host3_start_fwd.rcps @@ -0,0 +1,8 @@ +# Switch to server 3 +server 3 + +# Configure forwarding +nfv 1; add vhost:0 +nfv 1; patch phy:0 vhost:0 +nfv 1; patch vhost:0 phy:1 +nfv 1; forward diff --git a/recipes/usecases/multiple_nodes/6_host4_start_fwd.rcps b/recipes/usecases/multiple_nodes/6_host4_start_fwd.rcps new file mode 100644 index 0000000..eee55f9 --- /dev/null +++ b/recipes/usecases/multiple_nodes/6_host4_start_fwd.rcps @@ -0,0 +1,8 @@ +# Switch to server 4 +server 4 + +# Configure forwarding +nfv 1; add vhost:0 +nfv 1; patch phy:0 vhost:0 +nfv 1; patch vhost:0 phy:1 +nfv 1; forward diff --git a/recipes/usecases/multiple_nodes/7_config_change_path.rcps b/recipes/usecases/multiple_nodes/7_config_change_path.rcps new file mode 100644 index 0000000..ad3cc9c --- /dev/null +++ b/recipes/usecases/multiple_nodes/7_config_change_path.rcps @@ -0,0 +1,11 @@ +# Switch to server 1 +server 1 + +# Remove blue path +nfv 1; stop +nfv 1; patch reset + +# Configure forwarding +nfv 2; patch phy:1 phy:4 +nfv 2; patch phy:5 phy:0 +nfv 2; forward diff --git a/recipes/usecases/multiple_nodes/8_host1_stop_fwd.rcps b/recipes/usecases/multiple_nodes/8_host1_stop_fwd.rcps new file mode 100644 index 0000000..6498d56 --- /dev/null +++ b/recipes/usecases/multiple_nodes/8_host1_stop_fwd.rcps @@ -0,0 +1,6 @@ +# Switch to server 1 +server 1 + +# Stop forwarding +nfv 2; stop +nfv 2; patch reset diff --git a/recipes/usecases/multiple_nodes/9_host2_stop_fwd.rcps b/recipes/usecases/multiple_nodes/9_host2_stop_fwd.rcps new file mode 100644 index 0000000..5b2287c --- /dev/null +++ b/recipes/usecases/multiple_nodes/9_host2_stop_fwd.rcps @@ -0,0 +1,6 @@ +# Switch to server 2 +server 2 + +# Stop forwarding +nfv 1; stop +nfv 1; patch reset -- 2.17.1
From: Hideyuki Yamashita <yamashita.hideyuki@ntt-tx.co.jp> This patch introduce sample Domain XML file for vhost use case. Document description is also modified to refer this newly introduced file. Signed-off-by: Hideyuki Yamashita <yamashita.hideyuki@ntt-tx.co.jp> Signed-off-by: Naoki Takada <ntakada14@gmail.com> --- docs/guides/gsg/howto_use.rst | 80 +++++++--------------------------- docs/samples/gsg/spp-vm1.xml | 81 +++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 64 deletions(-) create mode 100644 docs/samples/gsg/spp-vm1.xml diff --git a/docs/guides/gsg/howto_use.rst b/docs/guides/gsg/howto_use.rst index f4f1f08..4e42c58 100644 --- a/docs/guides/gsg/howto_use.rst +++ b/docs/guides/gsg/howto_use.rst @@ -924,6 +924,11 @@ Edit configuration of VM with virsh command. The name of VMs are found from You need to define namespace ``qemu`` to use tags such as ``<qemu:commandline>``. +In ``libvirt``, ``<qemu:commandline>`` tag is supported to utilize qemu specific +features. In this example configuration of hugepage and/or network device is +done via modifying domain XML file. +Please see details in +`libvirt document <https://libvirt.org/drvqemu.html#qemucommand>`_. .. code-block:: none @@ -945,6 +950,10 @@ registering destinations for classifier's table. Here is an example of XML config for using with SPP. +The following example is just excerpt from complete +sample. +The complete sample can be found in +`spp-vm1.xml <http://git.dpdk.org/apps/spp/tree/docs/samples/spp-vm1.xml>`_. .. code-block:: xml @@ -953,85 +962,28 @@ Here is an example of XML config for using with SPP. <uuid>d90f5420-861a-4479-8559-62d7a1545cb9</uuid> <memory unit='KiB'>4194304</memory> <currentMemory unit='KiB'>4194304</currentMemory> - <memoryBacking> - <hugepages/> - </memoryBacking> - <vcpu placement='static'>4</vcpu> - <os> - <type arch='x86_64' machine='pc-i440fx-2.3'>hvm</type> - <boot dev='hd'/> - </os> - <features> - <acpi/> - <apic/> - <pae/> - </features> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> - <devices> - <emulator>/usr/local/bin/qemu-system-x86_64</emulator> - <disk type='file' device='disk'> - <driver name='qemu' type='raw'/> - <source file='/var/lib/libvirt/images/spp-vm1.qcow2'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='block' device='cdrom'> - <driver name='qemu' type='raw'/> - <target dev='hdc' bus='ide'/> - <readonly/> - <address type='drive' controller='0' bus='1' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' - function='0x2'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <controller type='ide' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' - function='0x1'/> - </controller> - <interface type='network'> - <mac address='52:54:00:99:aa:7f'/> - <source network='default'/> - <model type='rtl8139'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' - function='0x0'/> - </interface> - <serial type='pty'> - <target type='isa-serial' port='0'/> - </serial> - <console type='pty'> - <target type='serial' port='0'/> - </console> - <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' - function='0x0'/> - </memballoon> - </devices> + "..." <qemu:commandline> <qemu:arg value='-cpu'/> <qemu:arg value='host'/> <qemu:arg value='-object'/> - <qemu:arg - value='memory-backend-file,id=mem,size=4096M,mem-path=/run/hugepages/kvm,share=on'/> + <qemu:arg value='memory-backend-file, + id=mem,size=4096M,mem-path=/run/hugepages/kvm,share=on'/> <qemu:arg value='-numa'/> <qemu:arg value='node,memdev=mem'/> <qemu:arg value='-mem-prealloc'/> <qemu:arg value='-chardev'/> <qemu:arg value='socket,id=chr0,path=/tmp/sock0,server'/> <qemu:arg value='-device'/> - <qemu:arg - value='virtio-net-pci,netdev=vhost-net0,mac=52:54:00:12:34:56'/> + <qemu:arg value='virtio-net-pci,netdev=vhost-net0, + mac=52:54:00:12:34:56'/> <qemu:arg value='-netdev'/> <qemu:arg value='vhost-user,id=vhost-net0,chardev=chr0,vhostforce'/> <qemu:arg value='-chardev'/> <qemu:arg value='socket,id=chr1,path=/tmp/sock1,server'/> <qemu:arg value='-device'/> - <qemu:arg - value='virtio-net-pci,netdev=vhost-net1,mac=52:54:00:12:34:57'/> + <qemu:arg value='virtio-net-pci,netdev=vhost-net1, + mac=52:54:00:12:34:57'/> <qemu:arg value='-netdev'/> <qemu:arg value='vhost-user,id=vhost-net1,chardev=chr1,vhostforce'/> </qemu:commandline> diff --git a/docs/samples/gsg/spp-vm1.xml b/docs/samples/gsg/spp-vm1.xml new file mode 100644 index 0000000..0b5e126 --- /dev/null +++ b/docs/samples/gsg/spp-vm1.xml @@ -0,0 +1,81 @@ +<domain type='kvm' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'> + <name>spp-vm1</name> + <uuid>d90f5420-861a-4479-8559-62d7a1545cb9</uuid> + <memory unit='KiB'>4194304</memory> + <currentMemory unit='KiB'>4194304</currentMemory> + <memoryBacking> + <hugepages/> + </memoryBacking> + <vcpu placement='static'>4</vcpu> + <os> + <type arch='x86_64' machine='pc-i440fx-2.3'>hvm</type> + <boot dev='hd'/> + </os> + <features> + <acpi/> + <apic/> + <pae/> + </features> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/local/bin/qemu-system-x86_64</emulator> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/var/lib/libvirt/images/spp-vm1.qcow2'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <interface type='network'> + <mac address='52:54:00:99:aa:7f'/> + <source network='default'/> + <model type='rtl8139'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </interface> + <serial type='pty'> + <target type='isa-serial' port='0'/> + </serial> + <console type='pty'> + <target type='serial' port='0'/> + </console> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </memballoon> + </devices> + <qemu:commandline> + <qemu:arg value='-cpu'/> + <qemu:arg value='host'/> + <qemu:arg value='-object'/> + <qemu:arg value='memory-backend-file,id=mem,size=4096M,mem-path=/run/hugepages/kvm,share=on'/> + <qemu:arg value='-numa'/> + <qemu:arg value='node,memdev=mem'/> + <qemu:arg value='-mem-prealloc'/> + <qemu:arg value='-chardev'/> + <qemu:arg value='socket,id=chr0,path=/tmp/sock0,server'/> + <qemu:arg value='-device'/> + <qemu:arg value='virtio-net-pci,netdev=vhost-net0,mac=52:54:00:12:34:56'/> + <qemu:arg value='-netdev'/> + <qemu:arg value='vhost-user,id=vhost-net0,chardev=chr0,vhostforce'/> + <qemu:arg value='-chardev'/> + <qemu:arg value='socket,id=chr1,path=/tmp/sock1,server'/> + <qemu:arg value='-device'/> + <qemu:arg value='virtio-net-pci,netdev=vhost-net1,mac=52:54:00:12:34:57'/> + <qemu:arg value='-netdev'/> + <qemu:arg value='vhost-user,id=vhost-net1,chardev=chr1,vhostforce'/> + </qemu:commandline> +</domain> \ No newline at end of file -- 2.17.1
From: Hideyuki Yamashita <yamashita.hideyuki@ntt-tx.co.jp> There are several incorrectness whih regards to usecases, how to use parts. So this patch set provides the fix. Fixes: d76cb64c ("docs: update how to use section for using spp-ctl") Fixes: 359d5a3b ("docs: add multiple nodes section in usecases") Fixes: e3fecafd ("docs: remove spp_vm from usecases") Fixes: 454c7ef2 ("docs: move usecase of spp_vf") Fixes: 215c18f4 ("docs: update usecase of ssh with spp_vf") Signed-off-by: Hideyuki Yamashita <yamashita.hideyuki@ntt-tx.co.jp> Signed-off-by: Naoki Takada <ntakada14@gmail.com> --- docs/guides/gsg/howto_use.rst | 9 ++++++--- docs/guides/usecases/multi_nodes.rst | 6 ++++-- docs/guides/usecases/spp_nfv.rst | 2 +- docs/guides/usecases/spp_vf.rst | 10 +++++----- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/docs/guides/gsg/howto_use.rst b/docs/guides/gsg/howto_use.rst index 4e42c58..965b8c7 100644 --- a/docs/guides/gsg/howto_use.rst +++ b/docs/guides/gsg/howto_use.rst @@ -219,8 +219,9 @@ All of options can be referred with help option ``-h``. .. code-block:: console - python3 ./src/spp-ctl/spp-ctl -h - usage: spp-ctl [-h] [-b BIND_ADDR] [-p PRI_PORT] [-s SEC_PORT] [-a API_PORT] + $ python3 ./src/spp-ctl/spp-ctl -h + usage: spp-ctl [-h] [-b BIND_ADDR] [-p PRI_PORT] + [-s SEC_PORT] [-a API_PORT] SPP Controller @@ -322,7 +323,7 @@ All of options can be referred with help option ``-h``. .. code-block:: console $ python3 src/spp.py -h - usage: spp.py [-h] [-b BIND_ADDR] [-a API_PORT] + usage: spp.py [-h] [-b BIND_ADDR] [--wait-pri] [--config CONFIG] SPP Controller @@ -330,6 +331,8 @@ All of options can be referred with help option ``-h``. -h, --help show this help message and exit -b BIND_ADDR, --bind-addr BIND_ADDR bind address, default=127.0.0.1:7777 + --wait-pri Wait for spp_primary is launched + --config CONFIG Config file path All of SPP CLI commands are described in :doc:`../../commands/index`. diff --git a/docs/guides/usecases/multi_nodes.rst b/docs/guides/usecases/multi_nodes.rst index 3eaed0c..e380620 100644 --- a/docs/guides/usecases/multi_nodes.rst +++ b/docs/guides/usecases/multi_nodes.rst @@ -156,6 +156,8 @@ For host2, swith server to host2 and run nfv commands. Switch spp-ctl to "2: 192.168.1.102:7777". # configure + spp > nfv 1; add vhost:0 + Add vhost:0. spp > nfv 1; patch phy:0 vhost:0 Patch ports (phy:0 -> vhost:0). spp > nfv 1; patch vhost:0 phy:1 @@ -173,8 +175,8 @@ Finally, change path from blue lines to red lines. .. code-block:: console # switch to server 1 - spp > server 2 - Switch spp-ctl to "2: 192.168.1.102:7777". + spp > server 1 + Switch spp-ctl to "1: 192.168.1.101:7777". # remove blue path spp > nfv 1; stop diff --git a/docs/guides/usecases/spp_nfv.rst b/docs/guides/usecases/spp_nfv.rst index cc18b08..488fdec 100644 --- a/docs/guides/usecases/spp_nfv.rst +++ b/docs/guides/usecases/spp_nfv.rst @@ -385,7 +385,7 @@ to confirm that network on host is configured. .. code-block:: console - $ sudo $RE_SDK/examples/build/l2fwd -l 0-1 -- -p 0x03 + $ sudo $RTE_SDK/examples/build/l2fwd -l 0-1 -- -p 0x03 .. _figure_spp_nfv_l2fwd_vhost: diff --git a/docs/guides/usecases/spp_vf.rst b/docs/guides/usecases/spp_vf.rst index ee18439..c45feb8 100644 --- a/docs/guides/usecases/spp_vf.rst +++ b/docs/guides/usecases/spp_vf.rst @@ -199,14 +199,14 @@ First, delete entries of ``classifier_table`` and ports of components. # forwarders spp > vf 1; port del ring:0 rx fwd1 - spp > vf 1; port del vhost:0 tx fwd1 + spp > vf 1; port del ring:2 tx fwd1 spp > vf 1; port del ring:1 rx fwd2 - spp > vf 1; port del vhost:2 tx fwd2 + spp > vf 1; port del ring:3 tx fwd2 # mergers spp > vf 1; port del ring:2 rx mgr spp > vf 1; port del ring:3 rx mgr - spp > vf 1; port del phy:0 tx mgr + spp > vf 1; port del phy:1 tx mgr Then, stop components. @@ -587,8 +587,8 @@ Delete entries from the table and ports from each of components. spp > vf 1; port del vhost:3 tx fwd6 spp > vf 1; port del vhost:1 rx fwd7 spp > vf 1; port del ring:6 tx fwd7 - spp > vf 1; port del vhost:3 tx fwd8 - spp > vf 1; port del ring:7 rx fwd8 + spp > vf 1; port del vhost:3 rx fwd8 + spp > vf 1; port del ring:7 tx fwd8 # merger spp > vf 1; port del ring:6 rx mgr2 -- 2.17.1
> From: Hideyuki Yamashita <yamashita.hideyuki@ntt-tx.co.jp> > > For SPP 19.08, there are several incorrectness and missing part on > both docs and rcps. > This patch set fix above. > > V2 patch set fixes inconsistency between "From" and "Signed-off-by" > of v1 patch. Applied, thanks. > > Hideyuki Yamashita (8): > recipes: add vhost related rcps for spp_nfv > recipes: fix rcps for setting up spp_vf > recipes: fix typos for setting up spp_vf > recipes: fix rcps for shutting down spp_vf > recipes: add rcps for spp_mirror > recipes: add rcps for multiple_nodes > docs: adds sample Domain XML file for vhost > docs: fix incorrect commands in usecases. > > docs/guides/gsg/howto_use.rst | 89 +++++-------------- > docs/guides/usecases/multi_nodes.rst | 6 +- > docs/guides/usecases/spp_nfv.rst | 2 +- > docs/guides/usecases/spp_vf.rst | 10 +-- > docs/samples/gsg/spp-vm1.xml | 81 +++++++++++++++++ > .../multiple_nodes/10_host3_stop_fwd.rcps | 6 ++ > .../multiple_nodes/11_host4_stop_fwd.rcps | 6 ++ > .../multiple_nodes/3_host1_start_fwd.rcps | 7 ++ > .../multiple_nodes/4_host2_start_fwd.rcps | 8 ++ > .../multiple_nodes/5_host3_start_fwd.rcps | 8 ++ > .../multiple_nodes/6_host4_start_fwd.rcps | 8 ++ > .../multiple_nodes/7_config_change_path.rcps | 11 +++ > .../multiple_nodes/8_host1_stop_fwd.rcps | 6 ++ > .../multiple_nodes/9_host2_stop_fwd.rcps | 6 ++ > .../monitoring/1_vf_start_comp.rcps | 8 ++ > .../spp_mirror/monitoring/2_vf_add_ports.rcps | 21 +++++ > .../spp_mirror/monitoring/3_vf_reg_mac.rcps | 3 + > .../monitoring/4_mir_start_monitoring.rcps | 7 ++ > .../monitoring/5_mir_stop_monitoring.rcps | 10 +++ > .../spp_mirror/monitoring/6_vf_del_mac.rcps | 3 + > .../spp_mirror/monitoring/7_vf_del_ports.rcps | 21 +++++ > .../spp_mirror/monitoring/8_vf_stop_comp.rcps | 11 +++ > .../1_vhost_single_unidir.rcps | 10 +++ > .../spp_nfv/single_with_vhost/2_clean.rcps | 9 ++ > .../ssh_login/setup/1_start_components.rcps | 4 +- > .../ssh_login/setup/4_start_components.rcps | 4 +- > .../ssh_login/setup/6_reg_mac_path2.rcps | 4 +- > .../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 | 19 ++++ > .../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 | 19 ++++ > .../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 + > 41 files changed, 347 insertions(+), 142 deletions(-) > create mode 100644 docs/samples/gsg/spp-vm1.xml > create mode 100644 recipes/usecases/multiple_nodes/10_host3_stop_fwd.rcps > create mode 100644 recipes/usecases/multiple_nodes/11_host4_stop_fwd.rcps > create mode 100644 recipes/usecases/multiple_nodes/3_host1_start_fwd.rcps > create mode 100644 recipes/usecases/multiple_nodes/4_host2_start_fwd.rcps > create mode 100644 recipes/usecases/multiple_nodes/5_host3_start_fwd.rcps > create mode 100644 recipes/usecases/multiple_nodes/6_host4_start_fwd.rcps > create mode 100644 recipes/usecases/multiple_nodes/7_config_change_path.rcps > create mode 100644 recipes/usecases/multiple_nodes/8_host1_stop_fwd.rcps > create mode 100644 recipes/usecases/multiple_nodes/9_host2_stop_fwd.rcps > create mode 100644 recipes/usecases/spp_mirror/monitoring/1_vf_start_comp.rcps > create mode 100644 recipes/usecases/spp_mirror/monitoring/2_vf_add_ports.rcps > create mode 100644 recipes/usecases/spp_mirror/monitoring/3_vf_reg_mac.rcps > create mode 100644 recipes/usecases/spp_mirror/monitoring/4_mir_start_monitoring.rcps > create mode 100644 recipes/usecases/spp_mirror/monitoring/5_mir_stop_monitoring.rcps > create mode 100644 recipes/usecases/spp_mirror/monitoring/6_vf_del_mac.rcps > create mode 100644 recipes/usecases/spp_mirror/monitoring/7_vf_del_ports.rcps > create mode 100644 recipes/usecases/spp_mirror/monitoring/8_vf_stop_comp.rcps > create mode 100644 recipes/usecases/spp_nfv/single_with_vhost/1_vhost_single_unidir.rcps > create mode 100644 recipes/usecases/spp_nfv/single_with_vhost/2_clean.rcps > 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 >