From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from tama50.ecl.ntt.co.jp (tama50.ecl.ntt.co.jp [129.60.39.147]) by dpdk.org (Postfix) with ESMTP id 1D4FA4C8D for ; Fri, 31 Aug 2018 11:14:47 +0200 (CEST) Received: from vc1.ecl.ntt.co.jp (vc1.ecl.ntt.co.jp [129.60.86.153]) by tama50.ecl.ntt.co.jp (8.13.8/8.13.8) with ESMTP id w7V9Eljw030932; Fri, 31 Aug 2018 18:14:47 +0900 Received: from vc1.ecl.ntt.co.jp (localhost [127.0.0.1]) by vc1.ecl.ntt.co.jp (Postfix) with ESMTP id ED93EEA8115; Fri, 31 Aug 2018 18:14:46 +0900 (JST) Received: from localhost.localdomain (unknown [129.60.13.51]) by vc1.ecl.ntt.co.jp (Postfix) with ESMTP id 90439EA6DDE; Fri, 31 Aug 2018 18:14:46 +0900 (JST) From: ogawa.yasufumi@lab.ntt.co.jp To: spp@dpdk.org, ferruh.yigit@intel.com Cc: Yasufumi Ogawa Date: Fri, 31 Aug 2018 18:14:31 +0900 Message-Id: <20180831091441.39055-2-ogawa.yasufumi@lab.ntt.co.jp> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20180831091441.39055-1-ogawa.yasufumi@lab.ntt.co.jp> References: <20180831091441.39055-1-ogawa.yasufumi@lab.ntt.co.jp> X-TM-AS-MML: disable X-Mailman-Approved-At: Sat, 01 Sep 2018 11:25:22 +0200 Subject: [spp] [PATCH 01/11] docs: move SPP VF images 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: Fri, 31 Aug 2018 09:14:52 -0000 From: Yasufumi Ogawa Images of SPP VF are included in different directory from others. All of images should be included in 'docs/guides/images' to be maintained in a consistent way. This patch is to move the images for the purpose. Signed-off-by: Yasufumi Ogawa --- docs/guides/images/spp_vf/spp_sample_config.svg | 1916 +++++++++++++++++++++++ docs/guides/images/spp_vf/spp_vf_overview.svg | 1149 ++++++++++++++ docs/guides/images/spp_vf/usecase1_nwconfig.svg | 1916 +++++++++++++++++++++++ docs/guides/images/spp_vf/usecase1_overview.svg | 411 +++++ docs/guides/spp_vf/design.rst | 7 +- docs/guides/spp_vf/images/spp_sample_config.svg | 1916 ----------------------- docs/guides/spp_vf/images/spp_vf_overview.svg | 1149 -------------- docs/guides/spp_vf/images/usecase1_nwconfig.svg | 1916 ----------------------- docs/guides/spp_vf/images/usecase1_overview.svg | 411 ----- docs/guides/spp_vf/overview.rst | 7 +- docs/guides/spp_vf/use_cases/usecase1.rst | 10 +- 11 files changed, 5404 insertions(+), 5404 deletions(-) create mode 100644 docs/guides/images/spp_vf/spp_sample_config.svg create mode 100644 docs/guides/images/spp_vf/spp_vf_overview.svg create mode 100644 docs/guides/images/spp_vf/usecase1_nwconfig.svg create mode 100644 docs/guides/images/spp_vf/usecase1_overview.svg delete mode 100644 docs/guides/spp_vf/images/spp_sample_config.svg delete mode 100644 docs/guides/spp_vf/images/spp_vf_overview.svg delete mode 100644 docs/guides/spp_vf/images/usecase1_nwconfig.svg delete mode 100644 docs/guides/spp_vf/images/usecase1_overview.svg diff --git a/docs/guides/images/spp_vf/spp_sample_config.svg b/docs/guides/images/spp_vf/spp_sample_config.svg new file mode 100644 index 0000000..f6ad3f4 --- /dev/null +++ b/docs/guides/images/spp_vf/spp_sample_config.svg @@ -0,0 +1,1916 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + host1 + + NIC0 + + host2 + + NIC1 + + + + + + + + + + + + + network + + + + spp_vf + + + + guest vm1 + + guest vm2 + + vNIC + + vNIC + + + + + + + classifier + + + + vhost1 + + + + + + + + + + + merger + + + forwarder + + + + forwarder + + + + forwarder + + + + forwarder + + + traffic generator + + + + app2 + + + + app1 + + + + + + vhost0 + + + + + ring + + ring0 + + + ring + + ring1 + + + ring + + ring2 + + + ring + + ring3 + + diff --git a/docs/guides/images/spp_vf/spp_vf_overview.svg b/docs/guides/images/spp_vf/spp_vf_overview.svg new file mode 100644 index 0000000..a172403 --- /dev/null +++ b/docs/guides/images/spp_vf/spp_vf_overview.svg @@ -0,0 +1,1149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + host1 + host2 + NIC + NIC + + + NIC + NIC + VM2 + VM1 + Network + + + SPP VF + Traffic Generator + App1 + App2 + + + forwarder + forwarder + forwarder + forwarder + merger + classifier + + + ring + ring + ring + ring + vhost + vhost + + diff --git a/docs/guides/images/spp_vf/usecase1_nwconfig.svg b/docs/guides/images/spp_vf/usecase1_nwconfig.svg new file mode 100644 index 0000000..65ac3b8 --- /dev/null +++ b/docs/guides/images/spp_vf/usecase1_nwconfig.svg @@ -0,0 +1,1916 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + host1 + host2 + NIC2 + NIC3 + NIC0 + NIC1 + ring0 + ring1 + ring2 + ring3 + ring4 + ring5 + ring6 + ring7 + vhost0 + vhost1 + vhost2 + vhost3 + + + VM1 + VM2 + vNIC0 + vNIC1 + vNIC2 + vNIC3 + + + classifier1 + merger1 + classifier2 + merger2 + forwarder1 + SSHclient + SSHserver1 + SSHServer2 + forwarder2 + forwarder3 + forwarder4 + forwarder5 + forwarder6 + forwarder7 + forwarder8 + + diff --git a/docs/guides/images/spp_vf/usecase1_overview.svg b/docs/guides/images/spp_vf/usecase1_overview.svg new file mode 100644 index 0000000..8a2638f --- /dev/null +++ b/docs/guides/images/spp_vf/usecase1_overview.svg @@ -0,0 +1,411 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SSHclient + SSHserver1 + SSHserver2 + Merger + Classifier + + + host2 + host1 + VM1 + VM2 + + diff --git a/docs/guides/spp_vf/design.rst b/docs/guides/spp_vf/design.rst index 3c81134..193647d 100644 --- a/docs/guides/spp_vf/design.rst +++ b/docs/guides/spp_vf/design.rst @@ -41,9 +41,10 @@ threads called component. There are three types of components, ``forwarder``, ``merger`` and ``classifier``. -.. image:: images/spp_vf_overview.svg - :height: 550 em - :width: 550 em +.. figure:: ../images/spp_vf/spp_vf_overview.* + :width: 70% + + SPP VF components Forwarder ~~~~~~~~~ diff --git a/docs/guides/spp_vf/images/spp_sample_config.svg b/docs/guides/spp_vf/images/spp_sample_config.svg deleted file mode 100644 index f6ad3f4..0000000 --- a/docs/guides/spp_vf/images/spp_sample_config.svg +++ /dev/null @@ -1,1916 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - host1 - - NIC0 - - host2 - - NIC1 - - - - - - - - - - - - - network - - - - spp_vf - - - - guest vm1 - - guest vm2 - - vNIC - - vNIC - - - - - - - classifier - - - - vhost1 - - - - - - - - - - - merger - - - forwarder - - - - forwarder - - - - forwarder - - - - forwarder - - - traffic generator - - - - app2 - - - - app1 - - - - - - vhost0 - - - - - ring - - ring0 - - - ring - - ring1 - - - ring - - ring2 - - - ring - - ring3 - - diff --git a/docs/guides/spp_vf/images/spp_vf_overview.svg b/docs/guides/spp_vf/images/spp_vf_overview.svg deleted file mode 100644 index a172403..0000000 --- a/docs/guides/spp_vf/images/spp_vf_overview.svg +++ /dev/null @@ -1,1149 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - host1 - host2 - NIC - NIC - - - NIC - NIC - VM2 - VM1 - Network - - - SPP VF - Traffic Generator - App1 - App2 - - - forwarder - forwarder - forwarder - forwarder - merger - classifier - - - ring - ring - ring - ring - vhost - vhost - - diff --git a/docs/guides/spp_vf/images/usecase1_nwconfig.svg b/docs/guides/spp_vf/images/usecase1_nwconfig.svg deleted file mode 100644 index 65ac3b8..0000000 --- a/docs/guides/spp_vf/images/usecase1_nwconfig.svg +++ /dev/null @@ -1,1916 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - host1 - host2 - NIC2 - NIC3 - NIC0 - NIC1 - ring0 - ring1 - ring2 - ring3 - ring4 - ring5 - ring6 - ring7 - vhost0 - vhost1 - vhost2 - vhost3 - - - VM1 - VM2 - vNIC0 - vNIC1 - vNIC2 - vNIC3 - - - classifier1 - merger1 - classifier2 - merger2 - forwarder1 - SSHclient - SSHserver1 - SSHServer2 - forwarder2 - forwarder3 - forwarder4 - forwarder5 - forwarder6 - forwarder7 - forwarder8 - - diff --git a/docs/guides/spp_vf/images/usecase1_overview.svg b/docs/guides/spp_vf/images/usecase1_overview.svg deleted file mode 100644 index 8a2638f..0000000 --- a/docs/guides/spp_vf/images/usecase1_overview.svg +++ /dev/null @@ -1,411 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SSHclient - SSHserver1 - SSHserver2 - Merger - Classifier - - - host2 - host1 - VM1 - VM2 - - diff --git a/docs/guides/spp_vf/overview.rst b/docs/guides/spp_vf/overview.rst index d951d19..fa6e8b9 100644 --- a/docs/guides/spp_vf/overview.rst +++ b/docs/guides/spp_vf/overview.rst @@ -55,6 +55,7 @@ for two destinations of vhost interface. Incoming packets from rx on host1 are sent to each of vhosts of VM by looking up destination MAC address in the packet. -.. image:: images/spp_vf_overview.svg - :height: 550 em - :width: 550 em +.. figure:: ../images/spp_vf/spp_vf_overview.* + :width: 80% + + Overview of SPP VF diff --git a/docs/guides/spp_vf/use_cases/usecase1.rst b/docs/guides/spp_vf/use_cases/usecase1.rst index 5109518..84efa34 100644 --- a/docs/guides/spp_vf/use_cases/usecase1.rst +++ b/docs/guides/spp_vf/use_cases/usecase1.rst @@ -41,9 +41,8 @@ port. .. _figure_simple_ssh_login: -.. figure:: ../images/usecase1_overview.* - :height: 400 em - :width: 400 em +.. figure:: ../../images/spp_vf/usecase1_overview.* + :width: 60% Simple SSH Login @@ -106,9 +105,8 @@ sent to SSH clinet via NIC0. .. _figure_network_config: -.. figure:: ../images/usecase1_nwconfig.* - :height: 720 em - :width: 720 em +.. figure:: ../../images/spp_vf/usecase1_nwconfig.* + :width: 100% Network Configuration -- 2.7.4