summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore3
-rw-r--r--docker/Dockerfile4
-rw-r--r--docs/testing/user/userguide/advanced.rst2
-rw-r--r--docs/testing/user/userguide/faq.rst1
-rw-r--r--docs/testing/user/userguide/fluentd.rst4
-rw-r--r--docs/testing/user/userguide/hw_requirements.rst2
-rw-r--r--docs/testing/user/userguide/images/extchain-config.pngbin0 -> 227354 bytes
-rw-r--r--docs/testing/user/userguide/images/extchain-config.svg239
-rw-r--r--docs/testing/user/userguide/images/nfvbench-all-sriov-pvvp.pngbin0 -> 34850 bytes
-rw-r--r--docs/testing/user/userguide/images/nfvbench-npvp.pngbin0 -> 30328 bytes
-rw-r--r--docs/testing/user/userguide/images/nfvbench-npvp.svg107
-rw-r--r--docs/testing/user/userguide/images/nfvbench-pvp.pngbin0 -> 20770 bytes
-rw-r--r--docs/testing/user/userguide/images/nfvbench-pvp.svg94
-rw-r--r--docs/testing/user/userguide/images/nfvbench-pvvp-inter.svg132
-rw-r--r--docs/testing/user/userguide/images/nfvbench-pvvp-intra.svg114
-rw-r--r--docs/testing/user/userguide/images/nfvbench-pvvp.pngbin0 -> 31338 bytes
-rw-r--r--docs/testing/user/userguide/images/nfvbench-pvvp2.pngbin0 -> 42583 bytes
-rw-r--r--docs/testing/user/userguide/images/nfvbench-sriov-pvp.pngbin0 -> 19982 bytes
-rw-r--r--docs/testing/user/userguide/images/nfvbench-sriov-pvvp.pngbin0 -> 31769 bytes
-rw-r--r--docs/testing/user/userguide/images/nfvbench-sriov-pvvp2.pngbin0 -> 44101 bytes
-rw-r--r--docs/testing/user/userguide/images/nfvbench-trex-setup.pngbin0 -> 34090 bytes
-rw-r--r--docs/testing/user/userguide/images/nfvbench-trex-setup.svg101
-rw-r--r--docs/testing/user/userguide/quickstart_docker.rst2
-rw-r--r--docs/testing/user/userguide/readme.rst44
-rw-r--r--docs/testing/user/userguide/server.rst18
25 files changed, 56 insertions, 811 deletions
diff --git a/.gitignore b/.gitignore
index f2f94b4..322c5b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,6 @@ nfvbenchvm/dib/nfvbenchvm_centos-*.d/
docs/_build
docs/conf.py
docs/_static
+build/
+AUTHORS
+ChangeLog
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 6043d8a..67898ab 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,8 +2,8 @@
FROM ubuntu:16.04
ENV TREX_VER "v2.29"
-ENV NFVBENCH_TAG "1.1.2"
-ENV VM_IMAGE_VER "0.4"
+ENV NFVBENCH_TAG "1.2.0"
+ENV VM_IMAGE_VER "0.5"
RUN apt-get update && apt-get install -y \
git \
diff --git a/docs/testing/user/userguide/advanced.rst b/docs/testing/user/userguide/advanced.rst
index 896affb..252cbc9 100644
--- a/docs/testing/user/userguide/advanced.rst
+++ b/docs/testing/user/userguide/advanced.rst
@@ -225,7 +225,7 @@ To run NFVbench on such external service chains:
- specify the packet source and destination IPs for the virtual devices that are simulated (10.0.0.0/8 and 20.0.0.0/8)
-.. image:: images/extchain-config.svg
+.. image:: images/extchain-config.png
L3 routing must be enabled in the VNF and configured to:
diff --git a/docs/testing/user/userguide/faq.rst b/docs/testing/user/userguide/faq.rst
index f5ff6b3..7daa8c9 100644
--- a/docs/testing/user/userguide/faq.rst
+++ b/docs/testing/user/userguide/faq.rst
@@ -38,6 +38,7 @@ This exception means that NFVbench cannot pass any traffic in the service chain.
The most common issues that prevent traffic from passing are:
- incorrect wiring of the NFVbench/TRex interfaces
- incorrect vlan_tagging setting in the NFVbench configuration, this needs to match how the NFVbench ports on the switch are configured (trunk or access port)
+
- if the switch port is configured as access port, you must disable vlan_tagging in the NFVbench configuration
- of the switch port is configured as trunk (recommended method), you must enable it
diff --git a/docs/testing/user/userguide/fluentd.rst b/docs/testing/user/userguide/fluentd.rst
index 889d598..e1ff37f 100644
--- a/docs/testing/user/userguide/fluentd.rst
+++ b/docs/testing/user/userguide/fluentd.rst
@@ -20,6 +20,7 @@ running at localhost:9200.
.. code-block:: bash
+
<match nfvbench.**>
@type copy
<store>
@@ -40,6 +41,7 @@ under NFVbench configuration), and storage backend is elasticsearch which is
running at localhost:9200.
.. code-block:: bash
+
<match resultnfvbench.**>
@type copy
<store>
@@ -77,6 +79,7 @@ An example of configuration for Fluentd working at 127.0.0.1:24224 and tags for
and result is resultnfvbench
.. code-block:: bash
+
fluentd:
# by default (logging_tag is empty) nfvbench log messages are not sent to fluentd
# to enable logging to fluents, specify a valid fluentd tag name to be used for the
@@ -126,6 +129,7 @@ For each packet size and rate a result record is sent. Users can label those res
--user-label parameter to NFVbench run
.. code-block::bash
+
nfvbench --rate 1% --user-label nfvbench-label
And the results of this command obtained from fluentd by elasticsearch:
diff --git a/docs/testing/user/userguide/hw_requirements.rst b/docs/testing/user/userguide/hw_requirements.rst
index 29fcd5c..1ebb19e 100644
--- a/docs/testing/user/userguide/hw_requirements.rst
+++ b/docs/testing/user/userguide/hw_requirements.rst
@@ -20,7 +20,7 @@ To run the TRex traffic generator (that is bundled with NFVbench) you will need
- if you have only 1 TOR, wire both interfaces to that same TOR
- 1 interface to each TOR if you have 2 TORs and want to use bonded links to your compute nodes
-.. image:: images/nfvbench-trex-setup.svg
+.. image:: images/nfvbench-trex-setup.png
Switch Configuration
diff --git a/docs/testing/user/userguide/images/extchain-config.png b/docs/testing/user/userguide/images/extchain-config.png
new file mode 100644
index 0000000..2fd39ba
--- /dev/null
+++ b/docs/testing/user/userguide/images/extchain-config.png
Binary files differ
diff --git a/docs/testing/user/userguide/images/extchain-config.svg b/docs/testing/user/userguide/images/extchain-config.svg
deleted file mode 100644
index e519946..0000000
--- a/docs/testing/user/userguide/images/extchain-config.svg
+++ /dev/null
@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xl="http://www.w3.org/1999/xlink" version="1.1" viewBox="63 81 740 531" width="740pt" height="531pt" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <metadata> Produced by OmniGraffle 7.4.1
- <dc:date>2017-08-08 22:08:48 +0000</dc:date>
- </metadata>
- <defs>
- <filter id="Shadow" filterUnits="userSpaceOnUse">
- <feGaussianBlur in="SourceAlpha" result="blur" stdDeviation="1.308"/>
- <feOffset in="blur" result="offset" dx="0" dy="2"/>
- <feFlood flood-color="black" flood-opacity=".5" result="flood"/>
- <feComposite in="flood" in2="offset" operator="in"/>
- </filter>
- <font-face font-family="Lucida Sans" font-size="10" panose-1="2 11 6 2 3 5 4 2 2 4" units-per-em="1000" underline-position="-97.65625" underline-thickness="48.828125" slope="0" x-height="541.9922" cap-height="740.7227" ascent="966.7969" descent="-210.9375" font-weight="500">
- <font-face-src>
- <font-face-name name="LucidaSans"/>
- </font-face-src>
- </font-face>
- <font-face font-family="Futura" font-size="10" panose-1="2 11 6 2 2 2 4 2 3 3" units-per-em="1000" underline-position="-97.65625" underline-thickness="78.125" slope="0" x-height="482.4219" cap-height="761.2305" ascent="1038.5742" descent="-259.76562" font-weight="600">
- <font-face-src>
- <font-face-name name="Futura-Medium"/>
- </font-face-src>
- </font-face>
- <marker orient="auto" overflow="visible" markerUnits="strokeWidth" id="Box_Marker" viewBox="-1 -2 4 4" markerWidth="4" markerHeight="4" color="#cec3fa">
- <g>
- <rect x="0" y="-.9" width="1.8" height="1.8" fill="none" stroke="currentColor" stroke-width="1"/>
- </g>
- </marker>
- <marker orient="auto" overflow="visible" markerUnits="strokeWidth" id="Box_Marker_2" viewBox="-3 -2 4 4" markerWidth="4" markerHeight="4" color="#cec3fa">
- <g>
- <rect x="-1.8" y="-.9" width="1.8" height="1.8" fill="none" stroke="currentColor" stroke-width="1"/>
- </g>
- </marker>
- <marker orient="auto" overflow="visible" markerUnits="strokeWidth" id="Ball_Marker" viewBox="-1 -2 4 4" markerWidth="4" markerHeight="4" color="#929292">
- <g>
- <circle cx=".8999996" cy="0" r=".8999992" fill="none" stroke="currentColor" stroke-width="1"/>
- </g>
- </marker>
- <marker orient="auto" overflow="visible" markerUnits="strokeWidth" id="Ball_Marker_2" viewBox="-3 -2 4 4" markerWidth="4" markerHeight="4" color="#929292">
- <g>
- <circle cx="-.8999996" cy="0" r=".8999992" fill="none" stroke="currentColor" stroke-width="1"/>
- </g>
- </marker>
- <font-face font-family="Gill Sans" font-size="10" panose-1="2 11 5 2 2 1 4 2 2 3" units-per-em="1000" underline-position="-75.19531" underline-thickness="49.80469" slope="0" x-height="449.70703" cap-height="687.0117" ascent="917.9688" descent="-230.46875" font-weight="500">
- <font-face-src>
- <font-face-name name="GillSans"/>
- </font-face-src>
- </font-face>
- <marker orient="auto" overflow="visible" markerUnits="strokeWidth" id="FilledArrow_Marker" viewBox="-1 -2 4 4" markerWidth="4" markerHeight="4" color="#d4c057" opacity=".493177">
- <g>
- <path d="M 1.6 0 L 0 -.6 L 0 .6 Z" fill="currentColor" stroke="currentColor" stroke-width="1"/>
- </g>
- </marker>
- <marker orient="auto" overflow="visible" markerUnits="strokeWidth" id="FilledArrow_Marker_2" viewBox="-3 -2 4 4" markerWidth="4" markerHeight="4" color="#d4c057" opacity=".493177">
- <g>
- <path d="M -1.6 0 L 0 .6 L 0 -.6 Z" fill="currentColor" stroke="currentColor" stroke-width="1"/>
- </g>
- </marker>
- <font-face font-family="Lucida Sans" font-size="10" panose-1="2 11 6 2 3 5 4 9 2 4" units-per-em="1000" underline-position="-97.65625" underline-thickness="48.828125" slope="-1125" x-height="541.9922" cap-height="740.7227" ascent="966.7969" descent="-210.9375" font-style="italic" font-weight="500">
- <font-face-src>
- <font-face-name name="LucidaSans-Italic"/>
- </font-face-src>
- </font-face>
- <font-face font-family="Helvetica" font-size="10" units-per-em="1000" underline-position="-75.68359" underline-thickness="49.316406" slope="0" x-height="522.9492" cap-height="717.28516" ascent="770.0195" descent="-229.98047" font-weight="500">
- <font-face-src>
- <font-face-name name="Helvetica"/>
- </font-face-src>
- </font-face>
- <font-face font-family="Lucida Sans" font-size="10" panose-1="2 11 7 3 4 5 4 2 2 4" units-per-em="1000" underline-position="-97.65625" underline-thickness="48.828125" slope="0" x-height="548.33984" cap-height="740.7227" ascent="966.7969" descent="-210.9375" font-weight="bold">
- <font-face-src>
- <font-face-name name="LucidaSans-Demi"/>
- </font-face-src>
- </font-face>
- <font-face font-family="Osaka" font-size="12" panose-1="2 11 6 0 0 0 0 0 0 0" units-per-em="1000" underline-position="0" underline-thickness="59.037876" slope="0" x-height="464.84375" cap-height="648.4375" ascent="855.4688" descent="-191.40625" font-weight="500">
- <font-face-src>
- <font-face-name name="Osaka-Mono"/>
- </font-face-src>
- </font-face>
- <marker orient="auto" overflow="visible" markerUnits="strokeWidth" id="StickArrow_Marker" viewBox="-1 -4 10 8" markerWidth="10" markerHeight="8" color="#e86fd0">
- <g>
- <path d="M 8 0 L 0 0 M 0 -3 L 8 0 L 0 3" fill="none" stroke="currentColor" stroke-width="1"/>
- </g>
- </marker>
- </defs>
- <g stroke="none" stroke-opacity="1" stroke-dasharray="none" fill="none" fill-opacity="1">
- <title>ext chain</title>
- <g>
- <title>pvvp-intra</title>
- <g>
- <xl:use xl:href="#id49_Graphic" filter="url(#Shadow)"/>
- <xl:use xl:href="#id48_Graphic" filter="url(#Shadow)"/>
- <xl:use xl:href="#id46_Graphic" filter="url(#Shadow)"/>
- </g>
- <g id="id49_Graphic">
- <rect x="82.125" y="148.5" width="247.32675" height="182.87344" fill="#f0f0f0"/>
- <rect x="82.125" y="148.5" width="247.32675" height="182.87344" stroke="#a5a5a5" stroke-linecap="round" stroke-linejoin="round" stroke-width=".5"/>
- <text transform="translate(87.125 148.5)" fill="black">
- <tspan font-family="Lucida Sans" font-size="10" font-weight="500" x="79.13457" y="10" textLength="79.05762">traffic generator</tspan>
- </text>
- </g>
- <g id="id48_Graphic">
- <rect x="476.66667" y="167.625" width="176.625" height="151.875" fill="#f5f5eb"/>
- <path d="M 476.66667 167.625 L 653.2917 167.625 L 653.2917 319.5 L 476.66667 319.5 Z" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width=".5" stroke-dasharray="4,4"/>
- <text transform="translate(481.66667 167.625)" fill="black">
- <tspan font-family="Lucida Sans" font-size="10" font-weight="500" x="93.13867" y="10" textLength="73.48633">SERVICE CHAIN</tspan>
- </text>
- </g>
- <line x1="507.125" y1="260" x2="507.125" y2="186.20833" stroke="#929292" stroke-linecap="round" stroke-linejoin="round" stroke-width="5"/>
- <g id="id46_Graphic">
- <rect x="379.125" y="166.5" width="57.68741" height="159.7121" fill="#d1d9e6" fill-opacity=".10672624"/>
- <rect x="379.125" y="166.5" width="57.68741" height="159.7121" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width=".5"/>
- <text transform="translate(384.125 166.5)" fill="black" fill-opacity=".4152397">
- <tspan font-family="Futura" font-size="10" font-weight="600" fill="black" fill-opacity=".4152397" x="7.4130395" y="10" textLength="22.27539">DC-S</tspan>
- <tspan font-family="Futura" font-size="10" font-weight="600" fill="black" fill-opacity=".4152397" x="29.6689" y="10" textLength="10.605469">W</tspan>
- </text>
- </g>
- <line x1="274.14287" y1="292.33777" x2="626.52315" y2="293.47495" marker-end="url(#Box_Marker)" marker-start="url(#Box_Marker_2)" stroke="#cec3fa" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
- <line x1="631.3333" y1="308.625" x2="630" y2="212.625" stroke="#cec3fa" stroke-linecap="round" stroke-linejoin="round" stroke-width="5"/>
- <line x1="273.76087" y1="205.73606" x2="502.52503" y2="206.58753" marker-end="url(#Ball_Marker)" marker-start="url(#Ball_Marker_2)" stroke="#929292" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
- <line x1="546.1047" y1="223.56943" x2="511.6805" y2="228.3918" marker-end="url(#Ball_Marker)" stroke="#929292" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
- <line x1="588.7675" y1="235.58714" x2="625.8919" y2="242.1629" marker-end="url(#Box_Marker)" stroke="#cec3fa" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
- <ellipse cx="567.4375" cy="229.5" rx="21.812535" ry="20.250032" fill="#eaf2bf"/>
- <ellipse cx="567.4375" cy="229.5" rx="21.812535" ry="20.250032" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(554.9875 218.5)" fill="black">
- <tspan font-family="Gill Sans" font-size="10" font-weight="500" x="7.498828" y="9" textLength="12.680664">L3 </tspan>
- <tspan font-family="Gill Sans" font-size="10" font-weight="500" x="3.1799805" y="20" textLength="18.54004">VNF</tspan>
- </text>
- <ellipse cx="244.20895" cy="205.40873" rx="24.458986" ry="12.852811" fill="#eaf2bf"/>
- <ellipse cx="244.20895" cy="205.40873" rx="24.458986" ry="12.852811" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(229.6418 198.7598)" fill="black">
- <tspan font-family="Futura" font-size="10" font-weight="600" x="4.000751" y="10" textLength="21.132812">gwA</tspan>
- </text>
- <line x1="218.17016" y1="204.90873" x2="123.03817" y2="204.90873" stroke="#847b5a" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
- <line x1="124.875" y1="289.3752" x2="223.16667" y2="289.3752" stroke="#8e3bae" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
- <ellipse cx="245.08395" cy="290.853" rx="24.458986" ry="12.852811" fill="#eaf2bf"/>
- <ellipse cx="245.08395" cy="290.853" rx="24.458986" ry="12.852811" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(230.5168 284.20406)" fill="black">
- <tspan font-family="Futura" font-size="10" font-weight="600" x="4.747821" y="10" textLength="19.638672">gwB</tspan>
- </text>
- <path d="M 287.06743 305.7484 C 383.5292 303.84953 517.4412 309.08555 536.8379 307.16983 C 557.0879 305.16983 623.125 308.875 621.7917 272.875 C 620.4583 236.875 506.8675 259.29167 502.08333 252.625 C 497.29917 245.95833 494.08333 258.625 494.08333 229.95833 C 494.08333 201.29167 497.34544 216.1918 487.1968 204.85848 C 477.6795 194.23016 353.7978 198.7745 286.9911 197.26211" marker-end="url(#FilledArrow_Marker)" marker-start="url(#FilledArrow_Marker_2)" stroke="#d4c057" stroke-opacity=".493177" stroke-linecap="butt" stroke-linejoin="round" stroke-width="4"/>
- <text transform="translate(453.875 345.875)" fill="black">
- <tspan font-family="Lucida Sans" font-size="10" font-style="italic" font-weight="500" x="0" y="10" textLength="67.944336">right public IP</tspan>
- <tspan font-family="Lucida Sans" font-size="10" font-style="italic" font-weight="500" x="0" y="22" textLength="34.785156">2.2.0.2</tspan>
- </text>
- <text transform="translate(155.875 357.625)" fill="black">
- <tspan font-family="Lucida Sans" font-size="10" font-style="italic" font-weight="500" x=".4501953" y="10" textLength="97.09961">right virtual devices</tspan>
- </text>
- <line x1="155.375" y1="283.97184" x2="197.7284" y2="352.125" stroke="#847b5a" stroke-linecap="round" stroke-linejoin="round" stroke-width="1" stroke-dasharray="4,4"/>
- <text transform="translate(677.75 127.625)" fill="black">
- <tspan font-family="Lucida Sans" font-size="10" font-style="italic" font-weight="500" x="0" y="10" textLength="63.53516">static routes:</tspan>
- <tspan font-family="Lucida Sans" font-size="10" font-style="italic" font-weight="500" x="0" y="22" textLength="119.90723">20.0.0.0/8 gw 2.2.0.102</tspan>
- <tspan font-family="Lucida Sans" font-size="10" font-style="italic" font-weight="500" x="0" y="34" textLength="119.90723">10.0.0.0/8 gw 1.1.0.102</tspan>
- </text>
- <line x1="586.2303" y1="219.21042" x2="690.3907" y2="168.625" stroke="#847b5a" stroke-linecap="round" stroke-linejoin="round" stroke-width="1" stroke-dasharray="4,4"/>
- <text transform="translate(272.375 361.625)" fill="black">
- <tspan font-family="Lucida Sans" font-size="10" font-style="italic" font-weight="500" x=".057128906" y="10" textLength="102.88574">right virtual gateway</tspan>
- <tspan font-family="Lucida Sans" font-size="10" font-style="italic" font-weight="500" x="27.78418" y="22" textLength="47.43164">2.2.0.102</tspan>
- </text>
- <line x1="269.5429" y1="292.32292" x2="312.51433" y2="356.625" stroke="#847b5a" stroke-linecap="round" stroke-linejoin="round" stroke-width="1" stroke-dasharray="4,4"/>
- <rect x="100.26389" y="269.51805" width="55.11111" height="42.857143" fill="white"/>
- <rect x="100.26389" y="269.51805" width="55.11111" height="42.857143" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <rect x="96.81944" y="265.94663" width="55.11111" height="42.857143" fill="white"/>
- <rect x="96.81944" y="265.94663" width="55.11111" height="42.857143" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <rect x="93.375" y="262.3752" width="55.11111" height="42.857143" fill="white"/>
- <rect x="93.375" y="262.3752" width="55.11111" height="42.857143" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(98.375 271.80377)" fill="black">
- <tspan font-family="Helvetica" font-size="10" font-weight="500" x=".3143446" y="10" textLength="44.48242">20.0.0.0/8</tspan>
- <tspan font-family="Helvetica" font-size="10" font-weight="500" x="5.6024306" y="22" textLength="33.90625">devices</tspan>
- </text>
- <rect x="101.38889" y="185.87466" width="55.11111" height="42.857143" fill="white"/>
- <rect x="101.38889" y="185.87466" width="55.11111" height="42.857143" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <rect x="97.94444" y="182.30323" width="55.11111" height="42.857143" fill="white"/>
- <rect x="97.94444" y="182.30323" width="55.11111" height="42.857143" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <rect x="94.5" y="178.7318" width="55.11111" height="42.857143" fill="white"/>
- <rect x="94.5" y="178.7318" width="55.11111" height="42.857143" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(99.5 188.16037)" fill="black">
- <tspan font-family="Helvetica" font-size="10" font-weight="500" x=".3143446" y="10" textLength="44.48242">10.0.0.0/8</tspan>
- <tspan font-family="Helvetica" font-size="10" font-weight="500" x="5.6024306" y="22" textLength="33.90625">devices</tspan>
- </text>
- <text transform="translate(375.125 86)" fill="black">
- <tspan font-family="Lucida Sans" font-size="10" font-style="italic" font-weight="500" x="44.68994" y="10" textLength="35.620117">’marin’</tspan>
- <tspan font-family="Lucida Sans" font-size="10" font-style="italic" font-weight="500" x=".16601562" y="22" textLength="124.66797">service chain left network</tspan>
- <tspan font-family="Lucida Sans" font-size="10" font-style="italic" font-weight="500" x="36.37451" y="34" textLength="52.250977">1.1.0.0/24</tspan>
- </text>
- <line x1="507.125" y1="192.32936" x2="455.72204" y2="127" stroke="#847b5a" stroke-linecap="round" stroke-linejoin="round" stroke-width="1" stroke-dasharray="4,4"/>
- <text transform="translate(647.375 345.875)" fill="black">
- <tspan font-family="Lucida Sans" font-size="10" font-style="italic" font-weight="500" x="0" y="10" textLength="30.786133">‘napa’</tspan>
- <tspan font-family="Lucida Sans" font-size="10" font-style="italic" font-weight="500" x="0" y="22" textLength="132.61719">service chain right network</tspan>
- <tspan font-family="Lucida Sans" font-size="10" font-style="italic" font-weight="500" x="0" y="34" textLength="52.250977">2.2.0.0/24</tspan>
- </text>
- <line x1="631.2763" y1="304.51667" x2="681.8699" y2="340.875" stroke="#847b5a" stroke-linecap="round" stroke-linejoin="round" stroke-width="1" stroke-dasharray="4,4"/>
- <text transform="translate(502.5 116.375)" fill="black">
- <tspan font-family="Lucida Sans" font-size="10" font-style="italic" font-weight="500" x=".0024414062" y="10" textLength="59.99512">left public IP</tspan>
- <tspan font-family="Lucida Sans" font-size="10" font-style="italic" font-weight="500" x="12.607422" y="22" textLength="34.785156">1.1.0.2</tspan>
- </text>
- <line x1="546.5265" y1="223.00546" x2="535.0198" y2="145.375" stroke="#847b5a" stroke-linecap="round" stroke-linejoin="round" stroke-width="1" stroke-dasharray="4,4"/>
- <text transform="translate(249 95)" fill="black">
- <tspan font-family="Lucida Sans" font-size="10" font-style="italic" font-weight="500" x=".03173828" y="10" textLength="94.93652">left virtual gateway</tspan>
- <tspan font-family="Lucida Sans" font-size="10" font-style="italic" font-weight="500" x="23.78418" y="22" textLength="47.43164">1.1.0.102</tspan>
- </text>
- <line x1="271.58333" y1="206.31494" x2="292.23495" y2="124" stroke="#847b5a" stroke-linecap="round" stroke-linejoin="round" stroke-width="1" stroke-dasharray="4,4"/>
- <text transform="translate(115.75 95.5)" fill="black">
- <tspan font-family="Lucida Sans" font-size="10" font-style="italic" font-weight="500" x=".4248047" y="10" textLength="89.15039">left virtual devices</tspan>
- </text>
- <line x1="122.453" y1="178.7318" x2="155.04748" y2="113" stroke="#847b5a" stroke-linecap="round" stroke-linejoin="round" stroke-width="1" stroke-dasharray="4,4"/>
- <text transform="translate(68 400.375)" fill="black">
- <tspan font-family="Lucida Sans" font-size="10" font-weight="bold" x="0" y="10" textLength="142.47559">nfvbench configuration file:</tspan>
- </text>
- <text transform="translate(91.625 425.75)" fill="black">
- <tspan font-family="Osaka" font-size="12" font-weight="500" x="0" y="10" textLength="108">traffic_generator:</tspan>
- <tspan font-family="Osaka" font-size="12" font-weight="500" x="0" y="22" textLength="252"> ip_addrs: [&apos;10.0.0.0/8&apos;, &apos;20.0.0.0/8&apos;]</tspan>
- <tspan font-family="Osaka" font-size="12" font-weight="500" x="0" y="34" textLength="318"> tg_gateway_ip_addrs: [&apos;1.1.0.102’, &apos;2.2.0.102’]</tspan>
- <tspan font-family="Osaka" font-size="12" font-weight="500" x="0" y="46" textLength="264"> gateway_ip_addrs: [&apos;1.1.0.2&apos;, &apos;2.2.0.2&apos;]</tspan>
- </text>
- <path d="M 702.8684 386.875 C 704.3708 431.30164 739.1638 481.572 644.4365 524.10205" marker-end="url(#StickArrow_Marker)" stroke="#e86fd0" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <path d="M 466.88135 374.875 C 421.04833 375.3943 419.39485 537.2865 349.49473 482.4735" marker-end="url(#StickArrow_Marker)" stroke="#e86fd0" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <path d="M 333.823 390.625 C 322.2158 416.3434 350.7126 419.0818 361.1498 434.07423" marker-end="url(#StickArrow_Marker)" stroke="#e86fd0" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <path d="M 219.74693 375.125 C 215.90936 415.2706 275.1279 389.9882 295.55615 427.5162" marker-end="url(#StickArrow_Marker)" stroke="#e86fd0" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(483.125 414.5)" fill="black">
- <tspan font-family="Osaka" font-size="12" font-weight="500" x="0" y="10" textLength="108">internal_networks:</tspan>
- <tspan font-family="Osaka" font-size="12" font-weight="500" x="0" y="22" textLength="54"> left:</tspan>
- <tspan font-family="Osaka" font-size="12" font-weight="500" x="0" y="34" textLength="138"> name: ‘marin’</tspan>
- <tspan font-family="Osaka" font-size="12" font-weight="500" x="0" y="46" textLength="204"> subnet: &apos;nfvbench-subnet0&apos;</tspan>
- <tspan font-family="Osaka" font-size="12" font-weight="500" x="0" y="58" textLength="162"> cidr: ‘1.1.0.0/24&apos;</tspan>
- <tspan font-family="Osaka" font-size="12" font-weight="500" x="0" y="70" textLength="168"> network_type: &apos;vlan&apos;</tspan>
- <tspan font-family="Osaka" font-size="12" font-weight="500" x="0" y="82" textLength="144"> segmentation_id:</tspan>
- <tspan font-family="Osaka" font-size="12" font-weight="500" x="0" y="94" textLength="150"> physical_network:</tspan>
- <tspan font-family="Osaka" font-size="12" font-weight="500" x="0" y="106" textLength="60"> right:</tspan>
- <tspan font-family="Osaka" font-size="12" font-weight="500" x="0" y="118" textLength="132"> name: ‘napa’</tspan>
- <tspan font-family="Osaka" font-size="12" font-weight="500" x="0" y="130" textLength="204"> subnet: &apos;nfvbench-subnet1&apos;</tspan>
- <tspan font-family="Osaka" font-size="12" font-weight="500" x="0" y="142" textLength="162"> cidr: ’2.2.0.0/24&apos;</tspan>
- <tspan font-family="Osaka" font-size="12" font-weight="500" x="0" y="154" textLength="168"> network_type: &apos;vlan&apos;</tspan>
- <tspan font-family="Osaka" font-size="12" font-weight="500" x="0" y="166" textLength="144"> segmentation_id:</tspan>
- <tspan font-family="Osaka" font-size="12" font-weight="500" x="0" y="178" textLength="150"> physical_network:</tspan>
- </text>
- <path d="M 590 234 L 590 276 L 509.0796 340.875" stroke="#847b5a" stroke-linecap="round" stroke-linejoin="round" stroke-width="1" stroke-dasharray="4,4"/>
- </g>
- </g>
-</svg>
diff --git a/docs/testing/user/userguide/images/nfvbench-all-sriov-pvvp.png b/docs/testing/user/userguide/images/nfvbench-all-sriov-pvvp.png
new file mode 100644
index 0000000..d7b1cbb
--- /dev/null
+++ b/docs/testing/user/userguide/images/nfvbench-all-sriov-pvvp.png
Binary files differ
diff --git a/docs/testing/user/userguide/images/nfvbench-npvp.png b/docs/testing/user/userguide/images/nfvbench-npvp.png
new file mode 100644
index 0000000..53d7b00
--- /dev/null
+++ b/docs/testing/user/userguide/images/nfvbench-npvp.png
Binary files differ
diff --git a/docs/testing/user/userguide/images/nfvbench-npvp.svg b/docs/testing/user/userguide/images/nfvbench-npvp.svg
deleted file mode 100644
index f72af34..0000000
--- a/docs/testing/user/userguide/images/nfvbench-npvp.svg
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xl="http://www.w3.org/1999/xlink" version="1.1" viewBox="120 486 399 148" width="399pt" height="148pt" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <metadata> Produced by OmniGraffle 7.2
- <dc:date>2016-11-13 19:58:51 +0000</dc:date>
- </metadata>
- <defs>
- <font-face font-family="Futura" font-size="15" panose-1="2 11 6 2 2 2 4 2 3 3" units-per-em="1000" underline-position="-97.65625" underline-thickness="78.125" slope="0" x-height="482.4219" cap-height="761.2305" ascent="1038.5742" descent="-259.76562" font-weight="600">
- <font-face-src>
- <font-face-name name="Futura-Medium"/>
- </font-face-src>
- </font-face>
- <filter id="Shadow" filterUnits="userSpaceOnUse">
- <feGaussianBlur in="SourceAlpha" result="blur" stdDeviation="1.308"/>
- <feOffset in="blur" result="offset" dx="0" dy="2"/>
- <feFlood flood-color="black" flood-opacity=".5" result="flood"/>
- <feComposite in="flood" in2="offset" operator="in"/>
- </filter>
- <font-face font-family="Futura" font-size="11" panose-1="2 11 6 2 2 2 4 2 3 3" units-per-em="1000" underline-position="-97.65625" underline-thickness="78.125" slope="0" x-height="482.4219" cap-height="761.2305" ascent="1038.5742" descent="-259.76562" font-weight="600">
- <font-face-src>
- <font-face-name name="Futura-Medium"/>
- </font-face-src>
- </font-face>
- <font-face font-family="Futura" font-size="10" panose-1="2 11 6 2 2 2 4 2 3 3" units-per-em="1000" underline-position="-97.65625" underline-thickness="78.125" slope="0" x-height="482.4219" cap-height="761.2305" ascent="1038.5742" descent="-259.76562" font-weight="600">
- <font-face-src>
- <font-face-name name="Futura-Medium"/>
- </font-face-src>
- </font-face>
- <font-face font-family="Futura" font-size="12" panose-1="2 11 6 2 2 2 4 2 3 3" units-per-em="1000" underline-position="-97.65625" underline-thickness="78.125" slope="0" x-height="482.4219" cap-height="761.2305" ascent="1038.5742" descent="-259.76562" font-weight="600">
- <font-face-src>
- <font-face-name name="Futura-Medium"/>
- </font-face-src>
- </font-face>
- </defs>
- <g stroke="none" stroke-opacity="1" stroke-dasharray="none" fill="none" fill-opacity="1">
- <title>nfvbench-flows 2</title>
- <g>
- <title>pvvp-intra</title>
- <text transform="translate(129.0625 491.65665)" fill="black">
- <tspan font-family="Futura" font-size="15" font-weight="600" fill="black" x=".07739258" y="16" textLength="103.19092">N single VNF c</tspan>
- <tspan font-family="Futura" font-size="15" font-weight="600" fill="black" x="103.6565" y="16" textLength="35.266113">hains</tspan>
- <tspan font-family="Futura" font-size="15" font-weight="600" fill="black" x="16.000244" y="36.446777" textLength="62.13135">(N x PVP</tspan>
- <tspan font-family="Futura" font-size="15" font-weight="600" fill="black" x="77.06958" y="36.446777" textLength="45.930176">, N=2)</tspan>
- </text>
- </g>
- <g>
- <title>nxpvp</title>
- <g>
- <xl:use xl:href="#id38354_Graphic" filter="url(#Shadow)"/>
- <xl:use xl:href="#id38328_Graphic" filter="url(#Shadow)"/>
- <xl:use xl:href="#id38334_Graphic" filter="url(#Shadow)"/>
- </g>
- <g id="id38354_Graphic">
- <rect x="214.03778" y="541" width="57.68741" height="56.25" fill="#d1d9e6"/>
- <rect x="214.03778" y="541" width="57.68741" height="56.25" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(219.03778 583.4224)" fill="black">
- <tspan font-family="Futura" font-size="11" font-weight="600" fill="black" x="5.769973" y="11" textLength="24.50293">DC-S</tspan>
- <tspan font-family="Futura" font-size="11" font-weight="600" fill="black" x="30.25142" y="11" textLength="11.666016">W</tspan>
- </text>
- </g>
- <g id="id38328_Graphic">
- <rect x="295.57012" y="505.6288" width="218.99238" height="121.75641" fill="#dae68e"/>
- <rect x="295.57012" y="505.6288" width="218.99238" height="121.75641" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(300.57012 614.58734)" fill="black">
- <tspan font-family="Futura" font-size="10" font-weight="600" fill="black" x="71.01718" y="10" textLength="20.927734">Com</tspan>
- <tspan font-family="Futura" font-size="10" font-weight="600" fill="black" x="92.06699" y="10" textLength="14.179688">put</tspan>
- <tspan font-family="Futura" font-size="10" font-weight="600" fill="black" x="106.33457" y="10" textLength="31.640625">e node</tspan>
- </text>
- </g>
- <path d="M 352.57017 532.96637 L 402.2576 532.96637 C 404.4667 532.96637 406.2576 534.7572 406.2576 536.96637 L 406.2576 590.3585 C 406.2576 592.5677 404.4667 594.3585 402.2576 594.3585 L 352.57017 594.3585 C 350.36103 594.3585 348.57017 592.5677 348.57017 590.3585 L 348.57017 536.96637 C 348.57017 534.7572 350.36103 532.96637 352.57017 532.96637 Z" fill="#bbcee3"/>
- <path d="M 352.57017 532.96637 L 402.2576 532.96637 C 404.4667 532.96637 406.2576 534.7572 406.2576 536.96637 L 406.2576 590.3585 C 406.2576 592.5677 404.4667 594.3585 402.2576 594.3585 L 352.57017 594.3585 C 350.36103 594.3585 348.57017 592.5677 348.57017 590.3585 L 348.57017 536.96637 C 348.57017 534.7572 350.36103 532.96637 352.57017 532.96637 Z" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(353.57017 557.0135)" fill="black">
- <tspan font-family="Futura" font-size="10" font-weight="600" fill="black" x="7.566848" y="10" textLength="26.811523">vswitc</tspan>
- <tspan font-family="Futura" font-size="10" font-weight="600" fill="black" x="34.63716" y="10" textLength="5.4833984">h</tspan>
- </text>
- <ellipse cx="463.7071" cy="536.9195" rx="30.93755" ry="21.300585" fill="#eaf2bf"/>
- <ellipse cx="463.7071" cy="536.9195" rx="30.93755" ry="21.300585" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(443.9571 530.27055)" fill="black">
- <tspan font-family="Futura" font-size="10" font-weight="600" fill="black" x="6.5200195" y="10" textLength="26.45996">VNF1</tspan>
- </text>
- <ellipse cx="463.7071" cy="589.8623" rx="30.93755" ry="21.300585" fill="#eaf2bf"/>
- <ellipse cx="463.7071" cy="589.8623" rx="30.93755" ry="21.300585" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(443.9571 583.2134)" fill="black">
- <tspan font-family="Futura" font-size="10" font-weight="600" fill="black" x="6.5200195" y="10" textLength="26.45996">VNF2</tspan>
- </text>
- <rect x="295.57012" y="505.6288" width="29.25" height="121.75641" fill="#eae9dd"/>
- <rect x="295.57012" y="505.6288" width="29.25" height="121.75641" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(300.57012 614.58734)" fill="black">
- <tspan font-family="Futura" font-size="10" font-weight="600" fill="black" x=".42578125" y="10" textLength="18.398438">NIC</tspan>
- </text>
- <path d="M 169.92628 548.013 C 233.42628 548.013 333.63258 545.382 381.6326 538.382 C 429.6326 531.382 445.6882 531.18676 446.9104 537.68676 C 448.1326 544.18676 417.4888 544.1532 381.9888 549.6532 C 346.4888 555.1532 227.80128 558.76214 169.80128 558.1532" stroke="#aaa" stroke-linecap="round" stroke-linejoin="round" stroke-width="3"/>
- <path d="M 170.41727 578.7688 C 233.91727 578.7688 334.12356 581.3998 382.12356 588.3998 C 430.12356 595.3998 446.0076 596.56276 446.7576 589.56276 C 447.5076 582.56276 417.97977 582.6286 382.47977 577.1286 C 346.97977 571.6286 228.29227 568.01965 170.29227 568.6286" stroke="#929292" stroke-linecap="round" stroke-linejoin="round" stroke-width="3"/>
- <g id="id38334_Graphic">
- <rect x="124.0625" y="541" width="68.5" height="56.25" fill="#f0f0f0"/>
- <rect x="124.0625" y="541" width="68.5" height="56.25" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(129.0625 553.7676)" fill="black">
- <tspan font-family="Futura" font-size="12" font-weight="600" fill="black" x="13.983398" y="12" textLength="7.769531">tr</tspan>
- <tspan font-family="Futura" font-size="12" font-weight="600" fill="black" x="21.670898" y="12" textLength="17.126953">affi</tspan>
- <tspan font-family="Futura" font-size="12" font-weight="600" fill="black" x="38.79785" y="12" textLength="5.71875">c</tspan>
- <tspan font-family="Futura" font-size="12" font-weight="600" fill="black" x="2.3964844" y="27.357422" textLength="31.529297">gener</tspan>
- <tspan font-family="Futura" font-size="12" font-weight="600" fill="black" x="33.84375" y="27.357422" textLength="10.476562">at</tspan>
- <tspan font-family="Futura" font-size="12" font-weight="600" fill="black" x="44.402344" y="27.357422" textLength="11.701172">or</tspan>
- </text>
- </g>
- </g>
- </g>
-</svg>
diff --git a/docs/testing/user/userguide/images/nfvbench-pvp.png b/docs/testing/user/userguide/images/nfvbench-pvp.png
new file mode 100644
index 0000000..b460beb
--- /dev/null
+++ b/docs/testing/user/userguide/images/nfvbench-pvp.png
Binary files differ
diff --git a/docs/testing/user/userguide/images/nfvbench-pvp.svg b/docs/testing/user/userguide/images/nfvbench-pvp.svg
deleted file mode 100644
index e023b1f..0000000
--- a/docs/testing/user/userguide/images/nfvbench-pvp.svg
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xl="http://www.w3.org/1999/xlink" version="1.1" viewBox="114 61 405 103" width="405pt" height="103pt" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <metadata> Produced by OmniGraffle 7.2
- <dc:date>2016-11-13 19:58:51 +0000</dc:date>
- </metadata>
- <defs>
- <font-face font-family="Futura" font-size="15" panose-1="2 11 6 2 2 2 4 2 3 3" units-per-em="1000" underline-position="-97.65625" underline-thickness="78.125" slope="0" x-height="482.4219" cap-height="761.2305" ascent="1038.5742" descent="-259.76562" font-weight="600">
- <font-face-src>
- <font-face-name name="Futura-Medium"/>
- </font-face-src>
- </font-face>
- <filter id="Shadow" filterUnits="userSpaceOnUse">
- <feGaussianBlur in="SourceAlpha" result="blur" stdDeviation="1.308"/>
- <feOffset in="blur" result="offset" dx="0" dy="2"/>
- <feFlood flood-color="black" flood-opacity=".5" result="flood"/>
- <feComposite in="flood" in2="offset" operator="in"/>
- </filter>
- <font-face font-family="Futura" font-size="10" panose-1="2 11 6 2 2 2 4 2 3 3" units-per-em="1000" underline-position="-97.65625" underline-thickness="78.125" slope="0" x-height="482.4219" cap-height="761.2305" ascent="1038.5742" descent="-259.76562" font-weight="600">
- <font-face-src>
- <font-face-name name="Futura-Medium"/>
- </font-face-src>
- </font-face>
- <font-face font-family="Futura" font-size="12" panose-1="2 11 6 2 2 2 4 2 3 3" units-per-em="1000" underline-position="-97.65625" underline-thickness="78.125" slope="0" x-height="482.4219" cap-height="761.2305" ascent="1038.5742" descent="-259.76562" font-weight="600">
- <font-face-src>
- <font-face-name name="Futura-Medium"/>
- </font-face-src>
- </font-face>
- </defs>
- <g stroke="none" stroke-opacity="1" stroke-dasharray="none" fill="none" fill-opacity="1">
- <title>nfvbench-flows 2</title>
- <g>
- <title>pvvp-intra</title>
- <text transform="translate(119.5625 67.15161)" fill="black">
- <tspan font-family="Futura" font-size="15" font-weight="600" x=".2866211" y="16" textLength="85.89844">single VNF c</tspan>
- <tspan font-family="Futura" font-size="15" font-weight="600" x="86.57324" y="16" textLength="71.14014">hain (PVP)</tspan>
- </text>
- </g>
- <g>
- <title>pvp</title>
- <g>
- <xl:use xl:href="#id38285_Graphic" filter="url(#Shadow)"/>
- <xl:use xl:href="#id38287_Graphic" filter="url(#Shadow)"/>
- <xl:use xl:href="#id38291_Graphic" filter="url(#Shadow)"/>
- </g>
- <g id="id38285_Graphic">
- <rect x="308.6875" y="72.34412" width="205.875" height="85.5" fill="#dae68e"/>
- <rect x="308.6875" y="72.34412" width="205.875" height="85.5" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(313.6875 72.34412)" fill="black">
- <tspan font-family="Futura" font-size="10" font-weight="600" fill="black" x="64.458496" y="10" textLength="20.927734">Com</tspan>
- <tspan font-family="Futura" font-size="10" font-weight="600" fill="black" x="85.5083" y="10" textLength="14.179688">put</tspan>
- <tspan font-family="Futura" font-size="10" font-weight="600" fill="black" x="99.77588" y="10" textLength="31.640625">e node</tspan>
- </text>
- </g>
- <rect x="308.6875" y="72.34412" width="29.25" height="85.5" fill="#eae9dd"/>
- <rect x="308.6875" y="72.34412" width="29.25" height="85.5" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(313.6875 72.34412)" fill="black">
- <tspan font-family="Futura" font-size="10" font-weight="600" fill="black" x=".42578125" y="10" textLength="18.398438">NIC</tspan>
- </text>
- <g id="id38287_Graphic">
- <rect x="217.125" y="101.25" width="61.875" height="50.28088" fill="#d1d9e6"/>
- <rect x="217.125" y="101.25" width="61.875" height="50.28088" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(222.125 101.25)" fill="black">
- <tspan font-family="Futura" font-size="10" font-weight="600" fill="black" x="9.506836" y="10" textLength="22.27539">DC-S</tspan>
- <tspan font-family="Futura" font-size="10" font-weight="600" fill="black" x="31.762695" y="10" textLength="10.605469">W</tspan>
- </text>
- </g>
- <path d="M 360.4375 99.73456 L 399 99.73456 C 403.97056 99.73456 408 103.764 408 108.73456 L 408 141.01544 C 408 145.986 403.97056 150.01544 399 150.01544 L 360.4375 150.01544 C 355.46694 150.01544 351.4375 145.986 351.4375 141.01544 L 351.4375 108.73456 C 351.4375 103.764 355.46694 99.73456 360.4375 99.73456 Z" fill="#bbcee3"/>
- <path d="M 360.4375 99.73456 L 399 99.73456 C 403.97056 99.73456 408 103.764 408 108.73456 L 408 141.01544 C 408 145.986 403.97056 150.01544 399 150.01544 L 360.4375 150.01544 C 355.46694 150.01544 351.4375 145.986 351.4375 141.01544 L 351.4375 108.73456 C 351.4375 103.764 355.46694 99.73456 360.4375 99.73456 Z" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(356.4375 99.73456)" fill="black">
- <tspan font-family="Futura" font-size="10" font-weight="600" fill="black" x="7.0043945" y="10" textLength="26.811523">vswitc</tspan>
- <tspan font-family="Futura" font-size="10" font-weight="600" fill="black" x="34.074707" y="10" textLength="5.4833984">h</tspan>
- </text>
- <ellipse cx="475.26203" cy="126.39044" rx="30.93755" ry="25.14048" fill="#eaf2bf"/>
- <ellipse cx="475.26203" cy="126.39044" rx="30.93755" ry="25.14048" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(455.51203 119.74152)" fill="black">
- <tspan font-family="Futura" font-size="10" font-weight="600" fill="black" x="9.605957" y="10" textLength="20.288086">VNF</tspan>
- </text>
- <path d="M 182.62498 119.31252 L 452.75 119.31252 C 455.8221 119.31252 458.3125 121.80293 458.3125 124.875 L 458.3125 124.875 C 458.3125 127.94707 455.8221 130.43748 452.75 130.43748 L 182.62498 130.43748 C 179.5529 130.43748 177.0625 127.94707 177.0625 124.875 L 177.0625 124.875 C 177.0625 121.80293 179.5529 119.31252 182.62498 119.31252 Z" stroke="#aaa" stroke-linecap="round" stroke-linejoin="round" stroke-width="3"/>
- <g id="id38291_Graphic">
- <rect x="125.0625" y="101.25" width="68.5" height="50.28088" fill="#f0f0f0"/>
- <rect x="125.0625" y="101.25" width="68.5" height="50.28088" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(130.0625 111.03302)" fill="black">
- <tspan font-family="Futura" font-size="12" font-weight="600" fill="black" x="13.983398" y="12" textLength="7.769531">tr</tspan>
- <tspan font-family="Futura" font-size="12" font-weight="600" fill="black" x="21.670898" y="12" textLength="17.126953">affi</tspan>
- <tspan font-family="Futura" font-size="12" font-weight="600" fill="black" x="38.79785" y="12" textLength="5.71875">c</tspan>
- <tspan font-family="Futura" font-size="12" font-weight="600" fill="black" x="2.3964844" y="27.357422" textLength="31.529297">gener</tspan>
- <tspan font-family="Futura" font-size="12" font-weight="600" fill="black" x="33.84375" y="27.357422" textLength="10.476562">at</tspan>
- <tspan font-family="Futura" font-size="12" font-weight="600" fill="black" x="44.402344" y="27.357422" textLength="11.701172">or</tspan>
- </text>
- </g>
- </g>
- </g>
-</svg>
diff --git a/docs/testing/user/userguide/images/nfvbench-pvvp-inter.svg b/docs/testing/user/userguide/images/nfvbench-pvvp-inter.svg
deleted file mode 100644
index 3371346..0000000
--- a/docs/testing/user/userguide/images/nfvbench-pvvp-inter.svg
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xl="http://www.w3.org/1999/xlink" version="1.1" viewBox="581 205 359 200" width="359pt" height="200pt" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <metadata> Produced by OmniGraffle 7.2
- <dc:date>2016-11-13 19:58:51 +0000</dc:date>
- </metadata>
- <defs>
- <filter id="Shadow" filterUnits="userSpaceOnUse">
- <feGaussianBlur in="SourceAlpha" result="blur" stdDeviation="1.308"/>
- <feOffset in="blur" result="offset" dx="0" dy="2"/>
- <feFlood flood-color="black" flood-opacity=".5" result="flood"/>
- <feComposite in="flood" in2="offset" operator="in"/>
- </filter>
- <font-face font-family="Futura" font-size="15" panose-1="2 11 6 2 2 2 4 2 3 3" units-per-em="1000" underline-position="-97.65625" underline-thickness="78.125" slope="0" x-height="482.4219" cap-height="761.2305" ascent="1038.5742" descent="-259.76562" font-weight="600">
- <font-face-src>
- <font-face-name name="Futura-Medium"/>
- </font-face-src>
- </font-face>
- <font-face font-family="Futura" font-size="10" panose-1="2 11 6 2 2 2 4 2 3 3" units-per-em="1000" underline-position="-97.65625" underline-thickness="78.125" slope="0" x-height="482.4219" cap-height="761.2305" ascent="1038.5742" descent="-259.76562" font-weight="600">
- <font-face-src>
- <font-face-name name="Futura-Medium"/>
- </font-face-src>
- </font-face>
- <font-face font-family="Futura" font-size="11" panose-1="2 11 6 2 2 2 4 2 3 3" units-per-em="1000" underline-position="-97.65625" underline-thickness="78.125" slope="0" x-height="482.4219" cap-height="761.2305" ascent="1038.5742" descent="-259.76562" font-weight="600">
- <font-face-src>
- <font-face-name name="Futura-Medium"/>
- </font-face-src>
- </font-face>
- <font-face font-family="Futura" font-size="12" panose-1="2 11 6 2 2 2 4 2 3 3" units-per-em="1000" underline-position="-97.65625" underline-thickness="78.125" slope="0" x-height="482.4219" cap-height="761.2305" ascent="1038.5742" descent="-259.76562" font-weight="600">
- <font-face-src>
- <font-face-name name="Futura-Medium"/>
- </font-face-src>
- </font-face>
- </defs>
- <g stroke="none" stroke-opacity="1" stroke-dasharray="none" fill="none" fill-opacity="1">
- <title>nfvbench-flows 2</title>
- <g>
- <title>pvvp-intra</title>
- <g>
- <xl:use xl:href="#id38374_Graphic" filter="url(#Shadow)"/>
- <xl:use xl:href="#id38375_Graphic" filter="url(#Shadow)"/>
- </g>
- <text transform="translate(590.2153 212.05322)" fill="black">
- <tspan font-family="Futura" font-size="15" font-weight="600" fill="black" x="17.86377" y="16" textLength="12.524414">2-</tspan>
- <tspan font-family="Futura" font-size="15" font-weight="600" fill="black" x="30.358887" y="16" textLength="42.209473">VNF c</tspan>
- <tspan font-family="Futura" font-size="15" font-weight="600" fill="black" x="72.95654" y="16" textLength="29.179688">hain</tspan>
- <tspan font-family="Futura" font-size="15" font-weight="600" fill="black" x=".08056641" y="36.446777" textLength="21.555176">(int</tspan>
- <tspan font-family="Futura" font-size="15" font-weight="600" fill="black" x="21.767578" y="36.446777" textLength="13.908691">er</tspan>
- <tspan font-family="Futura" font-size="15" font-weight="600" fill="black" x="35.507812" y="36.446777" textLength="84.41162">-node PVVP)</tspan>
- </text>
- <g id="id38374_Graphic">
- <rect x="764.0202" y="207" width="172.13258" height="85.5" fill="#dae68e"/>
- <rect x="764.0202" y="207" width="172.13258" height="85.5" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(769.0202 207)" fill="black">
- <tspan font-family="Futura" font-size="10" font-weight="600" fill="black" x="42.340703" y="10" textLength="20.927734">Com</tspan>
- <tspan font-family="Futura" font-size="10" font-weight="600" fill="black" x="63.39051" y="10" textLength="14.179688">put</tspan>
- <tspan font-family="Futura" font-size="10" font-weight="600" fill="black" x="77.65809" y="10" textLength="42.13379">e node A</tspan>
- </text>
- </g>
- <g id="id38375_Graphic">
- <rect x="763.0202" y="312.3848" width="173.13258" height="85.5" fill="#dae68e"/>
- <rect x="763.0202" y="312.3848" width="173.13258" height="85.5" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(768.0202 385.08695)" fill="black">
- <tspan font-family="Futura" font-size="10" font-weight="600" x="43.587773" y="10" textLength="20.927734">Com</tspan>
- <tspan font-family="Futura" font-size="10" font-weight="600" x="64.63758" y="10" textLength="14.179688">put</tspan>
- <tspan font-family="Futura" font-size="10" font-weight="600" x="78.90516" y="10" textLength="40.63965">e node B</tspan>
- </text>
- </g>
- </g>
- <g>
- <title>pvv-inter</title>
- <g>
- <xl:use xl:href="#id38306_Graphic" filter="url(#Shadow)"/>
- <xl:use xl:href="#id38310_Graphic" filter="url(#Shadow)"/>
- </g>
- <rect x="764.0202" y="207" width="29.25" height="85.5" fill="#eae9dd"/>
- <rect x="764.0202" y="207" width="29.25" height="85.5" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(769.0202 207)" fill="black">
- <tspan font-family="Futura" font-size="10" font-weight="600" fill="black" x=".42578125" y="10" textLength="18.398438">NIC</tspan>
- </text>
- <g id="id38306_Graphic">
- <rect x="671.625" y="280.125" width="57.68741" height="56.25" fill="#d1d9e6"/>
- <rect x="671.625" y="280.125" width="57.68741" height="56.25" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(676.625 301.08618)" fill="black">
- <tspan font-family="Futura" font-size="11" font-weight="600" fill="black" x="5.769973" y="11" textLength="24.50293">DC-S</tspan>
- <tspan font-family="Futura" font-size="11" font-weight="600" fill="black" x="30.25142" y="11" textLength="11.666016">W</tspan>
- </text>
- </g>
- <path d="M 806.496 233.4918 L 843.4956 233.4918 C 846.257 233.4918 848.4956 235.73038 848.4956 238.4918 L 848.4956 278.7727 C 848.4956 281.5341 846.257 283.7727 843.4956 283.7727 L 806.496 283.7727 C 803.73455 283.7727 801.496 281.5341 801.496 278.7727 L 801.496 238.4918 C 801.496 235.73038 803.73455 233.4918 806.496 233.4918 Z" fill="#bbcee3"/>
- <path d="M 806.496 233.4918 L 843.4956 233.4918 C 846.257 233.4918 848.4956 235.73038 848.4956 238.4918 L 848.4956 278.7727 C 848.4956 281.5341 846.257 283.7727 843.4956 283.7727 L 806.496 283.7727 C 803.73455 283.7727 801.496 281.5341 801.496 278.7727 L 801.496 238.4918 C 801.496 235.73038 803.73455 233.4918 806.496 233.4918 Z" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(806.496 233.4918)" fill="black">
- <tspan font-family="Futura" font-size="10" font-weight="600" fill="black" x="2.2229413" y="10" textLength="26.811523">vswitc</tspan>
- <tspan font-family="Futura" font-size="10" font-weight="600" fill="black" x="29.293254" y="10" textLength="5.4833984">h</tspan>
- </text>
- <ellipse cx="897.3403" cy="253.4073" rx="30.93755" ry="21.300585" fill="#eaf2bf"/>
- <ellipse cx="897.3403" cy="253.4073" rx="30.93755" ry="21.300585" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(877.5903 238.4969)" fill="black">
- <tspan font-family="Futura" font-size="10" font-weight="600" fill="black" x="3.5219727" y="10" textLength="32.456055">VNF1a</tspan>
- </text>
- <ellipse cx="897.3403" cy="362.5323" rx="30.93755" ry="21.300585" fill="#eaf2bf"/>
- <ellipse cx="897.3403" cy="362.5323" rx="30.93755" ry="21.300585" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(877.5903 364.64482)" fill="black">
- <tspan font-family="Futura" font-size="10" font-weight="600" fill="black" x="3.5219727" y="10" textLength="32.456055">VNF1b</tspan>
- </text>
- <rect x="762.9653" y="312.3848" width="29.25" height="85.5" fill="#eae9dd"/>
- <rect x="762.9653" y="312.3848" width="29.25" height="85.5" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(767.9653 385.08695)" fill="black">
- <tspan font-family="Futura" font-size="10" font-weight="600" fill="black" x=".42578125" y="10" textLength="18.398438">NIC</tspan>
- </text>
- <path d="M 807.4024 329.71157 L 842.0227 329.71157 C 844.7841 329.71157 847.0227 331.95015 847.0227 334.71157 L 847.0227 374.99245 C 847.0227 377.75388 844.7841 379.99245 842.0227 379.99245 L 807.4024 379.99245 C 804.641 379.99245 802.4024 377.75388 802.4024 374.99245 L 802.4024 334.71157 C 802.4024 331.95015 804.641 329.71157 807.4024 329.71157 Z" fill="#bbcee3"/>
- <path d="M 807.4024 329.71157 L 842.0227 329.71157 C 844.7841 329.71157 847.0227 331.95015 847.0227 334.71157 L 847.0227 374.99245 C 847.0227 377.75388 844.7841 379.99245 842.0227 379.99245 L 807.4024 379.99245 C 804.641 379.99245 802.4024 377.75388 802.4024 374.99245 L 802.4024 334.71157 C 802.4024 331.95015 804.641 329.71157 807.4024 329.71157 Z" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(807.4024 367.1946)" fill="black">
- <tspan font-family="Futura" font-size="10" font-weight="600" fill="black" x="1.0333076" y="10" textLength="26.811523">vswitc</tspan>
- <tspan font-family="Futura" font-size="10" font-weight="600" fill="black" x="28.10362" y="10" textLength="5.4833984">h</tspan>
- </text>
- <path d="M 636.55465 318.22146 C 700.05465 318.22146 742.74215 337.67113 777.74215 345.67113 C 812.74215 353.67113 886.0206 366.93505 890.0206 355.62176 C 894.0206 344.30847 843.2908 342.9551 814.6797 339.17113 C 786.0687 335.38717 724.49215 318.90186 724.49215 307.17113" stroke="#aaa" stroke-linecap="round" stroke-linejoin="round" stroke-width="3"/>
- <path d="M 636.7778 296.02245 C 700.2778 296.02245 742.9653 276.57278 777.9653 268.57278 C 812.9653 260.57278 886.0278 244.75948 890.0278 256.07278 C 894.0278 267.38607 841.4653 269.07278 814.9029 275.07278 C 788.3405 281.07278 724.7153 295.34205 724.7153 307.07278" stroke="#aaa" stroke-linecap="round" stroke-linejoin="round" stroke-width="3"/>
- <g id="id38310_Graphic">
- <rect x="585.2153" y="280.125" width="68.5" height="56.25" fill="#f0f0f0"/>
- <rect x="585.2153" y="280.125" width="68.5" height="56.25" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(590.2153 292.89258)" fill="black">
- <tspan font-family="Futura" font-size="12" font-weight="600" fill="black" x="13.983398" y="12" textLength="7.769531">tr</tspan>
- <tspan font-family="Futura" font-size="12" font-weight="600" fill="black" x="21.670898" y="12" textLength="17.126953">affi</tspan>
- <tspan font-family="Futura" font-size="12" font-weight="600" fill="black" x="38.79785" y="12" textLength="5.71875">c</tspan>
- <tspan font-family="Futura" font-size="12" font-weight="600" fill="black" x="2.3964844" y="27.357422" textLength="31.529297">gener</tspan>
- <tspan font-family="Futura" font-size="12" font-weight="600" fill="black" x="33.84375" y="27.357422" textLength="10.476562">at</tspan>
- <tspan font-family="Futura" font-size="12" font-weight="600" fill="black" x="44.402344" y="27.357422" textLength="11.701172">or</tspan>
- </text>
- </g>
- </g>
- </g>
-</svg>
diff --git a/docs/testing/user/userguide/images/nfvbench-pvvp-intra.svg b/docs/testing/user/userguide/images/nfvbench-pvvp-intra.svg
deleted file mode 100644
index 6c454b2..0000000
--- a/docs/testing/user/userguide/images/nfvbench-pvvp-intra.svg
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xl="http://www.w3.org/1999/xlink" version="1.1" viewBox="121 227 398 139" width="398pt" height="139pt" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <metadata> Produced by OmniGraffle 7.2
- <dc:date>2016-11-13 19:58:51 +0000</dc:date>
- </metadata>
- <defs>
- <filter id="Shadow" filterUnits="userSpaceOnUse">
- <feGaussianBlur in="SourceAlpha" result="blur" stdDeviation="1.308"/>
- <feOffset in="blur" result="offset" dx="0" dy="2"/>
- <feFlood flood-color="black" flood-opacity=".5" result="flood"/>
- <feComposite in="flood" in2="offset" operator="in"/>
- </filter>
- <filter id="Shadow_2" filterUnits="userSpaceOnUse">
- <feGaussianBlur in="SourceAlpha" result="blur" stdDeviation="1.308"/>
- <feOffset in="blur" result="offset" dx="0" dy="2"/>
- <feFlood flood-color="black" flood-opacity=".5" result="flood"/>
- <feComposite in="flood" in2="offset" operator="in" result="color"/>
- <feMerge>
- <feMergeNode in="color"/>
- <feMergeNode in="SourceGraphic"/>
- </feMerge>
- </filter>
- <font-face font-family="Futura" font-size="10" panose-1="2 11 6 2 2 2 4 2 3 3" units-per-em="1000" underline-position="-97.65625" underline-thickness="78.125" slope="0" x-height="482.4219" cap-height="761.2305" ascent="1038.5742" descent="-259.76562" font-weight="600">
- <font-face-src>
- <font-face-name name="Futura-Medium"/>
- </font-face-src>
- </font-face>
- <font-face font-family="Futura" font-size="11" panose-1="2 11 6 2 2 2 4 2 3 3" units-per-em="1000" underline-position="-97.65625" underline-thickness="78.125" slope="0" x-height="482.4219" cap-height="761.2305" ascent="1038.5742" descent="-259.76562" font-weight="600">
- <font-face-src>
- <font-face-name name="Futura-Medium"/>
- </font-face-src>
- </font-face>
- <font-face font-family="Futura" font-size="15" panose-1="2 11 6 2 2 2 4 2 3 3" units-per-em="1000" underline-position="-97.65625" underline-thickness="78.125" slope="0" x-height="482.4219" cap-height="761.2305" ascent="1038.5742" descent="-259.76562" font-weight="600">
- <font-face-src>
- <font-face-name name="Futura-Medium"/>
- </font-face-src>
- </font-face>
- <font-face font-family="Futura" font-size="12" panose-1="2 11 6 2 2 2 4 2 3 3" units-per-em="1000" underline-position="-97.65625" underline-thickness="78.125" slope="0" x-height="482.4219" cap-height="761.2305" ascent="1038.5742" descent="-259.76562" font-weight="600">
- <font-face-src>
- <font-face-name name="Futura-Medium"/>
- </font-face-src>
- </font-face>
- </defs>
- <g stroke="none" stroke-opacity="1" stroke-dasharray="none" fill="none" fill-opacity="1">
- <title>nfvbench-flows 2</title>
- <g>
- <title>pvvp-intra</title>
- <g>
- <xl:use xl:href="#id38276_Graphic" filter="url(#Shadow)"/>
- </g>
- <g filter="url(#Shadow_2)">
- <rect x="307.6875" y="233.82794" width="206.875" height="126.17206" fill="#dae68e"/>
- <rect x="307.6875" y="233.82794" width="206.875" height="126.17206" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(312.6875 233.82794)" fill="black">
- <tspan font-family="Futura" font-size="10" font-weight="600" fill="black" x="64.958496" y="10" textLength="20.927734">Com</tspan>
- <tspan font-family="Futura" font-size="10" font-weight="600" fill="black" x="86.0083" y="10" textLength="14.179688">put</tspan>
- <tspan font-family="Futura" font-size="10" font-weight="600" fill="black" x="100.27588" y="10" textLength="31.640625">e node</tspan>
- </text>
- </g>
- <rect x="307.6875" y="233.82794" width="29.25" height="126.17206" fill="#eae9dd"/>
- <rect x="307.6875" y="233.82794" width="29.25" height="126.17206" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(312.6875 233.82794)" fill="black">
- <tspan font-family="Futura" font-size="10" font-weight="600" fill="black" x=".42578125" y="10" textLength="18.398438">NIC</tspan>
- </text>
- <g filter="url(#Shadow_2)">
- <rect x="217.125" y="271.77353" width="61.875" height="50.28088" fill="#d1d9e6"/>
- <rect x="217.125" y="271.77353" width="61.875" height="50.28088" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(222.125 289.75015)" fill="black">
- <tspan font-family="Futura" font-size="11" font-weight="600" fill="black" x="7.8637695" y="11" textLength="24.50293">DC-S</tspan>
- <tspan font-family="Futura" font-size="11" font-weight="600" fill="black" x="32.345215" y="11" textLength="11.666016">W</tspan>
- </text>
- </g>
- <path d="M 356.4375 272.44522 L 403 272.44522 C 405.7614 272.44522 408 274.6838 408 277.44522 L 408 317.7261 C 408 320.48753 405.7614 322.7261 403 322.7261 L 356.4375 322.7261 C 353.67608 322.7261 351.4375 320.48753 351.4375 317.7261 L 351.4375 277.44522 C 351.4375 274.6838 353.67608 272.44522 356.4375 272.44522 Z" fill="#bbcee3"/>
- <path d="M 356.4375 272.44522 L 403 272.44522 C 405.7614 272.44522 408 274.6838 408 277.44522 L 408 317.7261 C 408 320.48753 405.7614 322.7261 403 322.7261 L 356.4375 322.7261 C 353.67608 322.7261 351.4375 320.48753 351.4375 317.7261 L 351.4375 277.44522 C 351.4375 274.6838 353.67608 272.44522 356.4375 272.44522 Z" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(356.4375 290.93674)" fill="black">
- <tspan font-family="Futura" font-size="10" font-weight="600" fill="black" x="7.0043945" y="10" textLength="26.811523">vswitc</tspan>
- <tspan font-family="Futura" font-size="10" font-weight="600" fill="black" x="34.074707" y="10" textLength="5.4833984">h</tspan>
- </text>
- <ellipse cx="475.26203" cy="262.05055" rx="30.93755" ry="21.300585" fill="#eaf2bf"/>
- <ellipse cx="475.26203" cy="262.05055" rx="30.93755" ry="21.300585" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(455.51203 247.14017)" fill="black">
- <tspan font-family="Futura" font-size="10" font-weight="600" fill="black" x="3.5219727" y="10" textLength="32.456055">VNF1a</tspan>
- </text>
- <ellipse cx="475.26203" cy="333.4872" rx="30.93755" ry="21.300585" fill="#eaf2bf"/>
- <ellipse cx="475.26203" cy="333.4872" rx="30.93755" ry="21.300585" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(455.51203 335.59974)" fill="black">
- <tspan font-family="Futura" font-size="10" font-weight="600" fill="black" x="3.5219727" y="10" textLength="32.456055">VNF1b</tspan>
- </text>
- <text transform="translate(130.0625 232.5266)" fill="black">
- <tspan font-family="Futura" font-size="15" font-weight="600" fill="black" x=".31152344" y="16" textLength="12.524414">2-</tspan>
- <tspan font-family="Futura" font-size="15" font-weight="600" fill="black" x="12.80664" y="16" textLength="42.209473">VNF c</tspan>
- <tspan font-family="Futura" font-size="15" font-weight="600" fill="black" x="55.4043" y="16" textLength="81.28418">hain (PVVP)</tspan>
- </text>
- <path d="M 182 307.60514 C 245.5 307.60514 348.18945 305.48077 386.18945 315.0207 C 424.18945 324.56065 461.68945 339.06065 465.18945 330.06065 C 468.68945 321.06065 436.68945 314.06065 422.68945 310.56065 C 408.68945 307.06065 402.87695 308.06065 402.68945 299.06065" stroke="#aaa" stroke-linecap="round" stroke-linejoin="round" stroke-width="3"/>
- <g id="id38276_Graphic">
- <rect x="125.0625" y="272.44522" width="69.5" height="50.28088" fill="#f0f0f0"/>
- <rect x="125.0625" y="272.44522" width="69.5" height="50.28088" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(130.0625 282.22824)" fill="black">
- <tspan font-family="Futura" font-size="12" font-weight="600" fill="black" x="14.483398" y="12" textLength="7.769531">tr</tspan>
- <tspan font-family="Futura" font-size="12" font-weight="600" fill="black" x="22.170898" y="12" textLength="17.126953">affi</tspan>
- <tspan font-family="Futura" font-size="12" font-weight="600" fill="black" x="39.29785" y="12" textLength="5.71875">c</tspan>
- <tspan font-family="Futura" font-size="12" font-weight="600" fill="black" x="2.8964844" y="27.357422" textLength="31.529297">gener</tspan>
- <tspan font-family="Futura" font-size="12" font-weight="600" fill="black" x="34.34375" y="27.357422" textLength="10.476562">at</tspan>
- <tspan font-family="Futura" font-size="12" font-weight="600" fill="black" x="44.902344" y="27.357422" textLength="11.701172">or</tspan>
- </text>
- </g>
- </g>
- <g>
- <title>pvp</title>
- <path d="M 195.06213 289.18618 C 258.56213 289.18618 348.18945 291.32988 386.18945 281.78994 C 424.18945 272.25 461.68945 257.75 465.18945 266.75 C 468.68945 275.75 436.68945 282.75 422.68945 286.25 C 408.68945 289.75 402.87695 288.75 402.68945 297.75" stroke="#aaa" stroke-linecap="round" stroke-linejoin="round" stroke-width="3"/>
- </g>
- </g>
-</svg>
diff --git a/docs/testing/user/userguide/images/nfvbench-pvvp.png b/docs/testing/user/userguide/images/nfvbench-pvvp.png
new file mode 100644
index 0000000..d412b20
--- /dev/null
+++ b/docs/testing/user/userguide/images/nfvbench-pvvp.png
Binary files differ
diff --git a/docs/testing/user/userguide/images/nfvbench-pvvp2.png b/docs/testing/user/userguide/images/nfvbench-pvvp2.png
new file mode 100644
index 0000000..94f84de
--- /dev/null
+++ b/docs/testing/user/userguide/images/nfvbench-pvvp2.png
Binary files differ
diff --git a/docs/testing/user/userguide/images/nfvbench-sriov-pvp.png b/docs/testing/user/userguide/images/nfvbench-sriov-pvp.png
new file mode 100644
index 0000000..7faec17
--- /dev/null
+++ b/docs/testing/user/userguide/images/nfvbench-sriov-pvp.png
Binary files differ
diff --git a/docs/testing/user/userguide/images/nfvbench-sriov-pvvp.png b/docs/testing/user/userguide/images/nfvbench-sriov-pvvp.png
new file mode 100644
index 0000000..5faf8b2
--- /dev/null
+++ b/docs/testing/user/userguide/images/nfvbench-sriov-pvvp.png
Binary files differ
diff --git a/docs/testing/user/userguide/images/nfvbench-sriov-pvvp2.png b/docs/testing/user/userguide/images/nfvbench-sriov-pvvp2.png
new file mode 100644
index 0000000..f0c1e93
--- /dev/null
+++ b/docs/testing/user/userguide/images/nfvbench-sriov-pvvp2.png
Binary files differ
diff --git a/docs/testing/user/userguide/images/nfvbench-trex-setup.png b/docs/testing/user/userguide/images/nfvbench-trex-setup.png
new file mode 100644
index 0000000..6268068
--- /dev/null
+++ b/docs/testing/user/userguide/images/nfvbench-trex-setup.png
Binary files differ
diff --git a/docs/testing/user/userguide/images/nfvbench-trex-setup.svg b/docs/testing/user/userguide/images/nfvbench-trex-setup.svg
deleted file mode 100644
index a313916..0000000
--- a/docs/testing/user/userguide/images/nfvbench-trex-setup.svg
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xl="http://www.w3.org/1999/xlink" version="1.1" viewBox="224 243 408 211" width="34pc" height="211pt" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <metadata> Produced by OmniGraffle 7.5
- <dc:date>2017-11-04 10:05:35 +0000</dc:date>
- </metadata>
- <defs>
- <font-face font-family="Calibri" font-size="10" panose-1="2 15 5 2 2 2 4 3 2 4" units-per-em="1000" underline-position="-113.28125" underline-thickness="65.42969" slope="0" x-height="464.35547" cap-height="631.8359" ascent="952.1484" descent="-268.5547" font-weight="500">
- <font-face-src>
- <font-face-name name="Calibri"/>
- </font-face-src>
- </font-face>
- <font-face font-family="Calibri" font-size="12" panose-1="2 15 5 2 2 2 4 3 2 4" units-per-em="1000" underline-position="-113.28125" underline-thickness="65.42969" slope="0" x-height="464.35547" cap-height="631.8359" ascent="952.1484" descent="-268.5547" font-weight="500">
- <font-face-src>
- <font-face-name name="Calibri"/>
- </font-face-src>
- </font-face>
- <font-face font-family="Calibri" font-size="14" panose-1="2 15 5 2 2 2 4 3 2 4" units-per-em="1000" underline-position="-113.28125" underline-thickness="65.42969" slope="0" x-height="464.35547" cap-height="631.8359" ascent="952.1484" descent="-268.5547" font-weight="500">
- <font-face-src>
- <font-face-name name="Calibri"/>
- </font-face-src>
- </font-face>
- </defs>
- <g stroke="none" stroke-opacity="1" stroke-dasharray="none" fill="none" fill-opacity="1">
- <title>nfvbench-trex-setup</title>
- <g>
- <title>Layer 1</title>
- <rect x="468" y="414" width="108" height="27" fill="#dae68e" fill-opacity=".5"/>
- <path d="M 468 414 L 576 414 L 576 441 L 468 441 Z" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1" stroke-dasharray="4,4"/>
- <rect x="225" y="288" width="117" height="123.75" fill="#afb2e0"/>
- <rect x="225" y="288" width="117" height="123.75" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(230 288)" fill="black">
- <tspan font-family="Calibri" font-size="10" font-weight="500" x="9.728027" y="10" textLength="87.54395">Linux Server (x86_64)</tspan>
- </text>
- <rect x="234.59375" y="324" width="62.40625" height="27" fill="#e7d9fe"/>
- <rect x="234.59375" y="324" width="62.40625" height="27" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(234.59375 330.5)" fill="black">
- <tspan font-family="Calibri" font-size="12" font-weight="500" x="6.189453" y="11" textLength="50.027344">NFVbench</tspan>
- </text>
- <rect x="468" y="396" width="108" height="21.375" fill="#dae68e"/>
- <rect x="468" y="396" width="108" height="21.375" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(473 400.1875)" fill="black">
- <tspan font-family="Calibri" font-size="10" font-weight="500" x="15.113281" y="10" textLength="67.77344">Compute node 1</tspan>
- </text>
- <rect x="297" y="324" width="45" height="54" fill="#eae9dd"/>
- <rect x="297" y="324" width="45" height="54" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(302 331.5)" fill="black">
- <tspan font-family="Calibri" font-size="10" font-weight="500" x="8.40332" y="10" textLength="7.7734375">In</tspan>
- <tspan font-family="Calibri" font-size="10" font-weight="500" x="16.083984" y="10" textLength="3.3496094">t</tspan>
- <tspan font-family="Calibri" font-size="10" font-weight="500" x="19.326172" y="10" textLength="7.270508">el</tspan>
- <tspan font-family="Calibri" font-size="10" font-weight="500" x="7.302246" y="23" textLength="20.395508">X710</tspan>
- <tspan font-family="Calibri" font-size="10" font-weight="500" x="10.34668" y="36" textLength="14.30664">NIC</tspan>
- </text>
- <path d="M 468 360 L 460 360 L 350 360 L 342 360" stroke="#82645f" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
- <rect x="468" y="369" width="108" height="27.049658" fill="#fcc1b3"/>
- <rect x="468" y="369" width="108" height="27.049658" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(473 369.52483)" fill="black">
- <tspan font-family="Calibri" font-size="10" font-weight="500" x="11.312012" y="10" textLength="77.63672">Controller/storage </tspan>
- <tspan font-family="Calibri" font-size="10" font-weight="500" x="36.666016" y="23" textLength="24.66797">nodes</tspan>
- </text>
- <rect x="468" y="351" width="108" height="18" fill="#d1d9e6"/>
- <rect x="468" y="351" width="108" height="18" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(473 353.5)" fill="black">
- <tspan font-family="Calibri" font-size="10" font-weight="500" x="36.68799" y="10" textLength="24.624023">TOR B</tspan>
- </text>
- <rect x="468" y="432" width="108" height="21.375" fill="#dae68e"/>
- <rect x="468" y="432" width="108" height="21.375" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(473 436.1875)" fill="black">
- <tspan font-family="Calibri" font-size="10" font-weight="500" x="14.419922" y="10" textLength="69.16016">Compute node N</tspan>
- </text>
- <text transform="translate(491 311.5)" fill="black">
- <tspan font-family="Calibri" font-size="14" font-weight="500" x=".05761719" y="13" textLength="51.884766">NFVi pod</tspan>
- </text>
- <path d="M 468 342 L 460 342 L 350 342 L 342 342" stroke="#82645f" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
- <rect x="468" y="333" width="108" height="18" fill="#d1d9e6"/>
- <rect x="468" y="333" width="108" height="18" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
- <text transform="translate(473 335.5)" fill="black">
- <tspan font-family="Calibri" font-size="10" font-weight="500" x="36.51465" y="10" textLength="24.970703">TOR A</tspan>
- </text>
- <path d="M 468 342 C 438.89153 324.4881 408.46154 306 426.46154 297" stroke="#82645f" stroke-linecap="round" stroke-linejoin="round" stroke-width=".5" stroke-dasharray="4,4"/>
- <path d="M 342 342 C 387 315 356.98352 287.8373 360.94737 270" stroke="#82645f" stroke-linecap="round" stroke-linejoin="round" stroke-width=".5" stroke-dasharray="4,4"/>
- </g>
- <g>
- <title>Layer 3</title>
- <text transform="translate(419 270.5)" fill="#2370ba">
- <tspan font-family="Calibri" font-size="10" font-weight="500" fill="#2370ba" x="0" y="10" textLength="47.6416">trunk mode</tspan>
- <tspan font-family="Calibri" font-size="10" font-weight="500" fill="#2370ba" x="0" y="23" textLength="39.418945">if only 1 T</tspan>
- <tspan font-family="Calibri" font-size="10" font-weight="500" fill="#2370ba" x="39.13574" y="23" textLength="18.222656">OR s</tspan>
- <tspan font-family="Calibri" font-size="10" font-weight="500" fill="#2370ba" x="57.30957" y="23" textLength="12.792969">wit</tspan>
- <tspan font-family="Calibri" font-size="10" font-weight="500" fill="#2370ba" x="69.98047" y="23" textLength="18.466797">ch, c</tspan>
- <tspan font-family="Calibri" font-size="10" font-weight="500" fill="#2370ba" x="88.36426" y="23" textLength="66.37695">onnect both link</tspan>
- <tspan font-family="Calibri" font-size="10" font-weight="500" fill="#2370ba" x="154.64844" y="23" textLength="9.521484">s t</tspan>
- <tspan font-family="Calibri" font-size="10" font-weight="500" fill="#2370ba" x="164.07227" y="23" textLength="36.333008">o same T</tspan>
- <tspan font-family="Calibri" font-size="10" font-weight="500" fill="#2370ba" x="200.12207" y="23" textLength="12.050781">OR</tspan>
- </text>
- <text transform="translate(320 250)" fill="#2370ba">
- <tspan font-family="Calibri" font-size="10" font-weight="500" fill="#2370ba" x="0" y="10" textLength="88.63281">2x10G or higher ports</tspan>
- </text>
- </g>
- </g>
-</svg>
diff --git a/docs/testing/user/userguide/quickstart_docker.rst b/docs/testing/user/userguide/quickstart_docker.rst
index 0ab657c..2bd8f4c 100644
--- a/docs/testing/user/userguide/quickstart_docker.rst
+++ b/docs/testing/user/userguide/quickstart_docker.rst
@@ -50,6 +50,7 @@ The NFVbench container requires the following Docker options to operate properly
+------------------------------------------------------+------------------------------------------------------+
| -e CONFIG_FILE="/root/nfvbenchconfig.json | (optional) required if REST server is enabled |
+------------------------------------------------------+------------------------------------------------------+
+
It can be convenient to write a shell script (or an alias) to automatically insert the necessary options.
The minimal configuration file required must specify the openrc file to use (using in-container path), the PCI addresses of the 2 NIC ports to use
@@ -60,6 +61,7 @@ the openrc file is located on the host current directory which is mapped under /
the 2 NIC ports to use for generating traffic have the PCI addresses "04:00.0" and "04:00.1"
.. code-block:: bash
+
{
"openrc_file": "/tmp/nfvbench/openrc",
"traffic_generator": {
diff --git a/docs/testing/user/userguide/readme.rst b/docs/testing/user/userguide/readme.rst
index 17ce889..9d3c915 100644
--- a/docs/testing/user/userguide/readme.rst
+++ b/docs/testing/user/userguide/readme.rst
@@ -14,7 +14,7 @@ NFVbench supports the following main measurement capabilities:
- *fixed rate* mode to generate traffic at a fixed rate for a fixed duration
- NDR (No Drop Rate) and PDR (Partial Drop Rate) measurement mode
- configurable frame sizes (any list of fixed sizes or 'IMIX')
-- built-in packet paths
+- built-in packet paths (PVP, PVVP)
- built-in loopback VNFs based on fast L2 or L3 forwarders running in VMs
- configurable number of flows and service chains
- configurable traffic direction (single or bi-directional)
@@ -96,7 +96,7 @@ PVP Packet Path
This packet path represents a single service chain with 1 loopback VNF and 2 Neutron networks:
-.. image:: images/nfvbench-pvp.svg
+.. image:: images/nfvbench-pvp.png
PVVP Packet Path
@@ -105,12 +105,11 @@ PVVP Packet Path
This packet path represents a single service chain with 2 loopback VNFs in sequence and 3 Neutron networks.
The 2 VNFs can run on the same compute node (PVVP intra-node):
-.. image:: images/nfvbench-pvvp-intra.svg
+.. image:: images/nfvbench-pvvp.png
or on different compute nodes (PVVP inter-node) based on a configuration option:
-.. image:: images/nfvbench-pvvp-inter.svg
-
+.. image:: images/nfvbench-pvvp2.png
Multi-Chaining (N*PVP or N*PVVP)
@@ -121,20 +120,45 @@ In the case of multiple service chains, NFVbench will instruct the traffic gener
Example of multi-chaining with 2 concurrent PVP service chains:
-.. image:: images/nfvbench-npvp.svg
+.. image:: images/nfvbench-npvp.png
This innovative feature will allow to measure easily the performance of a fully loaded compute node running multiple service chains.
Multi-chaining is currently limited to 1 compute node (PVP or PVVP intra-node) or 2 compute nodes (for PVVP inter-node).
The 2 edge interfaces for all service chains will share the same 2 networks.
+SR-IOV
+^^^^^^
+
+By default, service chains will be based on virtual switch interfaces.
+
+NFVbench provides an option to select SR-IOV based virtual interfaces instead (thus bypassing any virtual switch) for those OpenStack system that include and support SR-IOV capable NICs on compute nodes.
+
+The PVP packet path will bypass the virtual switch completely when the SR-IOV option is selected:
+
+.. image:: images/nfvbench-sriov-pvp.png
+
+The PVVP packet path will use SR-IOV for the left and right networks and the virtual switch for the middle network by default:
+
+.. image:: images/nfvbench-sriov-pvvp.png
+
+Or in the case of inter-node:
+
+.. image:: images/nfvbench-sriov-pvvp2.png
+
+This packet path is a good way to approximate VM to VM (V2V) performance (middle network) given the high efficiency of the left and right networks. The V2V throughput will likely be very close to the PVVP throughput while its latency will be very close to the difference between the SR-IOV PVVP latency and the SR-IOV PVP latency.
+
+It is possible to also force the middle network to use SR-IOV (in this version, the middle network is limited to use the same SR-IOV phys net):
+
+.. image:: images/nfvbench-all-sriov-pvvp.png
+
Other Misc Packet Paths
^^^^^^^^^^^^^^^^^^^^^^^
P2P (Physical interface to Physical interface - no VM) can be supported using the external chain/L2 forwarding mode.
-V2V (VM to VM) is not supported but PVVP provides a more complete (and mroe realistic) alternative.
+V2V (VM to VM) is not supported but PVVP provides a more complete (and more realistic) alternative.
Supported Neutron Network Plugins and vswitches
@@ -149,12 +173,6 @@ NFVbench is agnostic of the virtual switch implementation and has been tested wi
- OVS/VLAN and OVS-DPDK/VLAN
- ML2/ODL/VPP (OPNFV Fast Data Stack)
-SR-IOV
-^^^^^^
-
-By default, service chains will be based on virtual switch interfaces.
-
-NFVbench provides an option to select SR-IOV based virtual interfaces instead (thus bypassing any virtual switch) for those OpenStack system that include and support SR-IOV capable NICs on compute nodes.
diff --git a/docs/testing/user/userguide/server.rst b/docs/testing/user/userguide/server.rst
index 1c1e052..70c5fdd 100644
--- a/docs/testing/user/userguide/server.rst
+++ b/docs/testing/user/userguide/server.rst
@@ -44,11 +44,15 @@ HTTP Interface
This request simply returns whatever content is sent in the body of the request (body should be in json format, only used for testing)
-Example request: curl -XGET '127.0.0.1:7556/echo' -H "Content-Type: application/json" -d '{"nfvbench": "test"}'
-Response:
-{
- "nfvbench": "test"
-}
+Example request:
+
+.. code-block:: bash
+
+ curl -XGET '127.0.0.1:7556/echo' -H "Content-Type: application/json" -d '{"nfvbench": "test"}'
+ Response:
+ {
+ "nfvbench": "test"
+ }
<http-url>/status (GET)
@@ -82,7 +86,7 @@ Example of return when the run completes:
<http-url>/start_run (POST)
-^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
This request starts an NFVBench run with passed configurations. If no configuration is passed, a run with default configurations will be executed.
@@ -101,7 +105,7 @@ Example of return when the submission is successful:
"status": "PENDING"
}
-If there is already an NFVBench running then it will return
+If there is already an NFVBench running then it will return:
.. code-block:: bash