From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mogw0121.ocn.ad.jp (mogw0121.ocn.ad.jp [118.23.109.95]) by dpdk.org (Postfix) with ESMTP id 84D811D9B8 for ; Wed, 13 Jun 2018 04:45:06 +0200 (CEST) Received: from mf-smf-ucb029c2 (mf-smf-ucb029c2.ocn.ad.jp [153.153.66.195]) by mogw0121.ocn.ad.jp (Postfix) with ESMTP id F17303BC2F9; Wed, 13 Jun 2018 11:45:04 +0900 (JST) Received: from ntt.pod01.mv-mta-ucb020 ([153.149.142.83]) by mf-smf-ucb029c2 with ESMTP id SvmKf5AQMNw9HSvmSfEhfP; Wed, 13 Jun 2018 11:45:04 +0900 Received: from smtp.ocn.ne.jp ([153.149.227.134]) by ntt.pod01.mv-mta-ucb020 with id y2l41x00D2ud8JZ012l4HS; Wed, 13 Jun 2018 02:45:04 +0000 Received: from localhost.localdomain (p5164-ipngn8501marunouchi.tokyo.ocn.ne.jp [153.214.228.164]) by smtp.ocn.ne.jp (Postfix) with ESMTPA; Wed, 13 Jun 2018 11:45:04 +0900 (JST) From: ogawa.yasufumi@lab.ntt.co.jp To: ferruh.yigit@intel.com, spp@dpdk.org Cc: Yasufumi Ogawa Date: Wed, 13 Jun 2018 11:44:59 +0900 Message-Id: <20180613024459.31031-4-ogawa.yasufumi@lab.ntt.co.jp> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180613024459.31031-1-ogawa.yasufumi@lab.ntt.co.jp> References: <20180613024459.31031-1-ogawa.yasufumi@lab.ntt.co.jp> Subject: [spp] [PATCH 3/3] recipes: update SPP_VF usecases X-BeenThere: spp@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Soft Patch Panel List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jun 2018 02:45:07 -0000 From: Yasufumi Ogawa In spp_vf documentation, some of commands was invalid and fix in commit 260c390. So, recipes should also be corrected. This update is for correcting invalid commands. It also include revising directory and file names to be more understandable. File extension is changed from 'config' to 'rcps' for SPP recipe script. Signed-off-by: Yasufumi Ogawa --- .../spp_vf/usecase1/2-add_ports_path1.config | 25 ------------------- .../spp_vf/usecase1/5-add_ports_path2.config | 25 ------------------- .../1-start_components.rcps} | 0 .../usecase1/setup/2-add_ports_path1.rcps | 20 +++++++++++++++ .../3-reg_mac_path1.rcps} | 0 .../4-start_components.rcps} | 0 .../usecase1/setup/5-add_ports_path2.rcps | 20 +++++++++++++++ .../6-reg_mac_path2.rcps} | 0 recipes/spp_vf/usecase1/setup/7-flush.rcps | 1 + .../usecase1/shutdown/1-del_mac_path1.rcps | 3 +++ .../usecase1/shutdown/2-del_ports_path1.rcps | 20 +++++++++++++++ .../usecase1/shutdown/3-stop_components.rcps | 7 ++++++ .../usecase1/shutdown/4-del_mac_path2.rcps | 3 +++ .../usecase1/shutdown/5-del_ports_path2.rcps | 20 +++++++++++++++ .../usecase1/shutdown/6-stop_components.rcps | 7 ++++++ recipes/spp_vf/usecase1/shutdown/7-flush.rcps | 1 + .../sppc/{l2fwd.config => samples/l2fwd.rcps} | 0 .../load_balancer.rcps} | 0 18 files changed, 102 insertions(+), 50 deletions(-) delete mode 100644 recipes/spp_vf/usecase1/2-add_ports_path1.config delete mode 100644 recipes/spp_vf/usecase1/5-add_ports_path2.config rename recipes/spp_vf/usecase1/{1-start_components_path1.config => setup/1-start_components.rcps} (100%) create mode 100644 recipes/spp_vf/usecase1/setup/2-add_ports_path1.rcps rename recipes/spp_vf/usecase1/{3-reg_mac_path1.config => setup/3-reg_mac_path1.rcps} (100%) rename recipes/spp_vf/usecase1/{4-start_components_path2.config => setup/4-start_components.rcps} (100%) create mode 100644 recipes/spp_vf/usecase1/setup/5-add_ports_path2.rcps rename recipes/spp_vf/usecase1/{6-reg_mac_path2.config => setup/6-reg_mac_path2.rcps} (100%) create mode 100644 recipes/spp_vf/usecase1/setup/7-flush.rcps create mode 100644 recipes/spp_vf/usecase1/shutdown/1-del_mac_path1.rcps create mode 100644 recipes/spp_vf/usecase1/shutdown/2-del_ports_path1.rcps create mode 100644 recipes/spp_vf/usecase1/shutdown/3-stop_components.rcps create mode 100644 recipes/spp_vf/usecase1/shutdown/4-del_mac_path2.rcps create mode 100644 recipes/spp_vf/usecase1/shutdown/5-del_ports_path2.rcps create mode 100644 recipes/spp_vf/usecase1/shutdown/6-stop_components.rcps create mode 100644 recipes/spp_vf/usecase1/shutdown/7-flush.rcps rename recipes/sppc/{l2fwd.config => samples/l2fwd.rcps} (100%) rename recipes/sppc/{load_balancer.config => samples/load_balancer.rcps} (100%) diff --git a/recipes/spp_vf/usecase1/2-add_ports_path1.config b/recipes/spp_vf/usecase1/2-add_ports_path1.config deleted file mode 100644 index e7c1924..0000000 --- a/recipes/spp_vf/usecase1/2-add_ports_path1.config +++ /dev/null @@ -1,25 +0,0 @@ -# Add ports to classifier1 -sec 1;port add phy:0 rx classifier1 -sec 1;port add ring:0 tx classifier1 -sec 1;port add ring:1 tx classifier1 - -# Add ports to forwarder1 -sec 1;port add ring:0 rx forwarder1 -sec 1;port add vhost:0 tx forwarder1 - -# Add ports to forwarder2 -sec 1;port add vhost:0 rx forwarder2 -sec 1;port add ring:2 tx forwarder2 - -# Add ports to forwarder3 -sec 1;port add ring:1 rx forwarder3 -sec 1;port add vhost:2 rx forwarder3 - -# Add ports to forwarder4 -sec 1;port add vhost:2 tx forwarder4 -sec 1;port add ring:3 rx forwarder4 - -# Add ports to merger1 -sec 1;port add ring:2 rx merger1 -sec 1;port add ring:3 rx merger1 -sec 1;port add phy:0 tx merger1 diff --git a/recipes/spp_vf/usecase1/5-add_ports_path2.config b/recipes/spp_vf/usecase1/5-add_ports_path2.config deleted file mode 100644 index 6e7bec2..0000000 --- a/recipes/spp_vf/usecase1/5-add_ports_path2.config +++ /dev/null @@ -1,25 +0,0 @@ -# Add ports to classifier2 -sec 1;port add phy:1 rx classifier2 -sec 1;port add ring:4 tx classifier2 -sec 1;port add ring:5 tx classifier2 - -# Add ports to forwarder5 -sec 1;port add ring:4 rx forwarder5 -sec 1;port add vhost:1 tx forwarder5 - -# Add ports to forwarder6 -sec 1;port add vhost:1 rx forwarder6 -sec 1;port add ring:6 tx forwarder6 - -# Add ports to forwarder7 -sec 1;port add ring:5 rx forwarder7 -sec 1;port add vhost:3 rx forwarder7 - -# Add ports to forwarder8 -sec 1;port add vhost:3 tx forwarder8 -sec 1;port add ring:7 rx forwarder8 - -# Add ports to merger2 -sec 1;port add ring:6 rx merger2 -sec 1;port add ring:7 rx merger2 -sec 1;port add phy:1 tx merger2 diff --git a/recipes/spp_vf/usecase1/1-start_components_path1.config b/recipes/spp_vf/usecase1/setup/1-start_components.rcps similarity index 100% rename from recipes/spp_vf/usecase1/1-start_components_path1.config rename to recipes/spp_vf/usecase1/setup/1-start_components.rcps diff --git a/recipes/spp_vf/usecase1/setup/2-add_ports_path1.rcps b/recipes/spp_vf/usecase1/setup/2-add_ports_path1.rcps new file mode 100644 index 0000000..bfb59ba --- /dev/null +++ b/recipes/spp_vf/usecase1/setup/2-add_ports_path1.rcps @@ -0,0 +1,20 @@ +# classifier1 +sec 1;port add phy:0 rx classifier1 +sec 1;port add ring:0 tx classifier1 +sec 1;port add ring:1 tx classifier1 +# forwarder1 +sec 1;port add ring:0 rx forwarder1 +sec 1;port add vhost:0 tx forwarder1 +# forwarder2 +sec 1;port add ring:1 rx forwarder2 +sec 1;port add vhost:2 tx forwarder2 +# forwarder3 +sec 1;port add vhost:0 rx forwarder3 +sec 1;port add ring:2 tx forwarder3 +# forwarder4 +sec 1;port add vhost:2 rx forwarder4 +sec 1;port add ring:3 tx forwarder4 +# merger1 +sec 1;port add ring:2 rx merger1 +sec 1;port add ring:3 rx merger1 +sec 1;port add phy:0 tx merger1 diff --git a/recipes/spp_vf/usecase1/3-reg_mac_path1.config b/recipes/spp_vf/usecase1/setup/3-reg_mac_path1.rcps similarity index 100% rename from recipes/spp_vf/usecase1/3-reg_mac_path1.config rename to recipes/spp_vf/usecase1/setup/3-reg_mac_path1.rcps diff --git a/recipes/spp_vf/usecase1/4-start_components_path2.config b/recipes/spp_vf/usecase1/setup/4-start_components.rcps similarity index 100% rename from recipes/spp_vf/usecase1/4-start_components_path2.config rename to recipes/spp_vf/usecase1/setup/4-start_components.rcps diff --git a/recipes/spp_vf/usecase1/setup/5-add_ports_path2.rcps b/recipes/spp_vf/usecase1/setup/5-add_ports_path2.rcps new file mode 100644 index 0000000..d5334a5 --- /dev/null +++ b/recipes/spp_vf/usecase1/setup/5-add_ports_path2.rcps @@ -0,0 +1,20 @@ +# classifier2 +sec 1;port add phy:1 rx classifier2 +sec 1;port add ring:4 tx classifier2 +sec 1;port add ring:5 tx classifier2 +# forwarder5 +sec 1;port add ring:4 rx forwarder5 +sec 1;port add vhost:1 tx forwarder5 +# forwarder6 +sec 1;port add ring:5 rx forwarder6 +sec 1;port add vhost:3 tx forwarder6 +# forwarder7 +sec 1;port add vhost:1 rx forwarder7 +sec 1;port add ring:6 tx forwarder7 +# forwarder8 +sec 1;port add vhost:3 rx forwarder8 +sec 1;port add ring:7 tx forwarder8 +# merger2 +sec 1;port add ring:6 rx merger2 +sec 1;port add ring:7 rx merger2 +sec 1;port add phy:1 tx merger2 diff --git a/recipes/spp_vf/usecase1/6-reg_mac_path2.config b/recipes/spp_vf/usecase1/setup/6-reg_mac_path2.rcps similarity index 100% rename from recipes/spp_vf/usecase1/6-reg_mac_path2.config rename to recipes/spp_vf/usecase1/setup/6-reg_mac_path2.rcps diff --git a/recipes/spp_vf/usecase1/setup/7-flush.rcps b/recipes/spp_vf/usecase1/setup/7-flush.rcps new file mode 100644 index 0000000..9ea2237 --- /dev/null +++ b/recipes/spp_vf/usecase1/setup/7-flush.rcps @@ -0,0 +1 @@ +sec 1;flush diff --git a/recipes/spp_vf/usecase1/shutdown/1-del_mac_path1.rcps b/recipes/spp_vf/usecase1/shutdown/1-del_mac_path1.rcps new file mode 100644 index 0000000..e642ada --- /dev/null +++ b/recipes/spp_vf/usecase1/shutdown/1-del_mac_path1.rcps @@ -0,0 +1,3 @@ +# Delete MAC address for path1 +sec 1;classifier_table del mac 51:54:00:12:34:56 ring:0 +sec 1;classifier_table del mac 51:54:00:12:34:58 ring:1 diff --git a/recipes/spp_vf/usecase1/shutdown/2-del_ports_path1.rcps b/recipes/spp_vf/usecase1/shutdown/2-del_ports_path1.rcps new file mode 100644 index 0000000..eea5b9e --- /dev/null +++ b/recipes/spp_vf/usecase1/shutdown/2-del_ports_path1.rcps @@ -0,0 +1,20 @@ +# classifier1 +sec 1;port del phy:0 rx classifier1 +sec 1;port del ring:0 tx classifier1 +sec 1;port del ring:1 tx classifier1 +# forwarder1 +sec 1;port del ring:0 rx forwarder1 +sec 1;port del vhost:0 tx forwarder1 +# forwarder2 +sec 1;port del ring:1 rx forwarder2 +sec 1;port del vhost:2 tx forwarder2 +# forwarder3 +sec 1;port del vhost:0 rx forwarder3 +sec 1;port del ring:2 tx forwarder3 +# forwarder4 +sec 1;port del vhost:2 rx forwarder4 +sec 1;port del ring:3 tx forwarder4 +# merger1 +sec 1;port del ring:2 rx merger1 +sec 1;port del ring:3 rx merger1 +sec 1;port del phy:0 tx merger1 diff --git a/recipes/spp_vf/usecase1/shutdown/3-stop_components.rcps b/recipes/spp_vf/usecase1/shutdown/3-stop_components.rcps new file mode 100644 index 0000000..c29c740 --- /dev/null +++ b/recipes/spp_vf/usecase1/shutdown/3-stop_components.rcps @@ -0,0 +1,7 @@ +# Stop component for path1 +sec 1;component stop classifier1 +sec 1;component stop forwarder1 +sec 1;component stop forwarder2 +sec 1;component stop forwarder3 +sec 1;component stop forwarder4 +sec 1;component stop merger1 diff --git a/recipes/spp_vf/usecase1/shutdown/4-del_mac_path2.rcps b/recipes/spp_vf/usecase1/shutdown/4-del_mac_path2.rcps new file mode 100644 index 0000000..030a9c7 --- /dev/null +++ b/recipes/spp_vf/usecase1/shutdown/4-del_mac_path2.rcps @@ -0,0 +1,3 @@ +# Delete MAC address for path2 +sec 1;classifier_table del mac 51:54:00:12:34:57 ring:4 +sec 1;classifier_table del mac 51:54:00:12:34:59 ring:5 diff --git a/recipes/spp_vf/usecase1/shutdown/5-del_ports_path2.rcps b/recipes/spp_vf/usecase1/shutdown/5-del_ports_path2.rcps new file mode 100644 index 0000000..0d0a235 --- /dev/null +++ b/recipes/spp_vf/usecase1/shutdown/5-del_ports_path2.rcps @@ -0,0 +1,20 @@ +# classifier2 +sec 1;port del phy:1 rx classifier2 +sec 1;port del ring:4 tx classifier2 +sec 1;port del ring:5 tx classifier2 +# forwarder5 +sec 1;port del ring:4 rx forwarder5 +sec 1;port del vhost:1 tx forwarder5 +# forwarder6 +sec 1;port del ring:5 rx forwarder6 +sec 1;port del vhost:3 tx forwarder6 +# forwarder7 +sec 1;port del vhost:1 rx forwarder7 +sec 1;port del ring:6 tx forwarder7 +# forwarder8 +sec 1;port del vhost:3 tx forwarder8 +sec 1;port del ring:7 rx forwarder8 +# merger2 +sec 1;port del ring:6 rx merger2 +sec 1;port del ring:7 rx merger2 +sec 1;port del phy:1 tx merger2 diff --git a/recipes/spp_vf/usecase1/shutdown/6-stop_components.rcps b/recipes/spp_vf/usecase1/shutdown/6-stop_components.rcps new file mode 100644 index 0000000..535f02b --- /dev/null +++ b/recipes/spp_vf/usecase1/shutdown/6-stop_components.rcps @@ -0,0 +1,7 @@ +# Stop component to spp_vf +sec 1;component stop classifier2 +sec 1;component stop forwarder5 +sec 1;component stop forwarder6 +sec 1;component stop forwarder7 +sec 1;component stop forwarder8 +sec 1;component stop merger2 diff --git a/recipes/spp_vf/usecase1/shutdown/7-flush.rcps b/recipes/spp_vf/usecase1/shutdown/7-flush.rcps new file mode 100644 index 0000000..9ea2237 --- /dev/null +++ b/recipes/spp_vf/usecase1/shutdown/7-flush.rcps @@ -0,0 +1 @@ +sec 1;flush diff --git a/recipes/sppc/l2fwd.config b/recipes/sppc/samples/l2fwd.rcps similarity index 100% rename from recipes/sppc/l2fwd.config rename to recipes/sppc/samples/l2fwd.rcps diff --git a/recipes/sppc/load_balancer.config b/recipes/sppc/samples/load_balancer.rcps similarity index 100% rename from recipes/sppc/load_balancer.config rename to recipes/sppc/samples/load_balancer.rcps -- 2.17.1