Update the static content

Change-Id: I8869bddef992f75707b740533a57ad80a3696e73
Signed-off-by: Tibor Frank <tifrank@cisco.com>
(cherry picked from commit 1d3d8f9027f4e4aeb41ca92e2078066fda946804)

3 files changed, 76 insertions, 51 deletions

diff --git a/docs/report/introduction/general_notes.rst b/docs/report/introduction/general_notes.rst
index 50a9d4c4a3..e6a2a9875f 100644
--- a/docs/report/introduction/general_notes.rst
+++ b/docs/report/introduction/general_notes.rst
@@ -20,7 +20,25 @@ is listed separately, as follows:
    both for Phy-to-Phy (NIC-to-NIC) and Phy-to-VM-to-Phy (NIC-to-VM-to-NIC)
    forwarding topologies. Tested across a range of NICs, 10GE and 40GE
    interfaces, range of multi-thread and multi-core configurations. VPP
-   application runs in host user- mode. TRex is used as a traffic generator.
+   application runs in host user-mode. TRex is used as a traffic generator.
+
+#. **Container memif connections** -  VPP memif virtual interface (shared memory
+   interface) tests to interconnect VPP instances. VPP vswitch instance runs in
+   bare-metal user-mode handling Intel x520 NIC 10GbE interfaces and connecting
+   over memif (Master side) virtual interfaces to more instances of VPP running
+   in LXC or in Docker Containers, both with memif virtual interfaces (Slave
+   side). Tested across a range of NICs, 10GE and 40GE interfaces, range of
+   multi-thread and multi-core configurations. VPP application runs in host
+   user-mode. TRex is used as a traffic generator.
+
+#. **Container Orchestrated Performance Tests** - CSIT |release| introduced new
+   tests of Container topologies connected over the memif virtual interface
+   (shared memory interface). For these tests VPP vswitch instance runs in a
+   Docker Container handling Intel x520 NIC 10GbE interfaces and connecting over
+   memif (Master side) virtual interfaces to more instances of VPP running in
+   Docker Containers with memif virtual interfaces (Slave side). Tested across a
+   range of multi-thread and multi-core configurations. VPP application runs in
+   host user-mode. TRex is used as a traffic generator.
 
 #. **DPDK Performance Tests** - VPP is using DPDK code to control and drive
    the NICs and physical interfaces. Testpmd tests are used as a baseline to
diff --git a/docs/report/vpp_performance_tests/overview.rst b/docs/report/vpp_performance_tests/overview.rst
index 669c5d10b1..d9b31bd10e 100644
--- a/docs/report/vpp_performance_tests/overview.rst
+++ b/docs/report/vpp_performance_tests/overview.rst
@@ -135,6 +135,9 @@ CSIT |release| includes following performance test suites, listed per NIC type:
     VLAN tagged Ethernet frames.
   - **L2BD** - L2 Bridge-Domain switched-forwarding of untagged Ethernet frames
     with MAC learning; disabled MAC learning i.e. static MAC tests to be added.
+  - **L2BD Scale** - L2 Bridge-Domain switched-forwarding of untagged Ethernet
+    frames with MAC learning; disabled MAC learning i.e. static MAC tests to be
+    added with 20k, 200k and 2M FIB entries.
   - **IPv4** - IPv4 routed-forwarding.
   - **IPv6** - IPv6 routed-forwarding.
   - **IPv4 Scale** - IPv4 routed-forwarding with 20k, 200k and 2M FIB entries.
@@ -143,14 +146,18 @@ CSIT |release| includes following performance test suites, listed per NIC type:
     of 2 VMs using vhost-user interfaces, with VPP forwarding modes incl. L2
     Cross-Connect, L2 Bridge-Domain, VXLAN with L2BD, IPv4 routed-forwarding.
   - **COP** - IPv4 and IPv6 routed-forwarding with COP address security.
-  - **iACL** - IPv4 and IPv6 routed-forwarding with iACL address security.
+  - **ACL** - L2, IPv4 and IPv6 routed-forwarding with ACL address security.
   - **LISP** - LISP overlay tunneling for IPv4-over-IPv4, IPv6-over-IPv4,
     IPv6-over-IPv6, IPv4-over-IPv6 in IPv4 and IPv6 routed-forwarding modes.
   - **VXLAN** - VXLAN overlay tunnelling integration with L2XC and L2BD.
   - **QoS Policer** - ingress packet rate measuring, marking and limiting
     (IPv4).
-  - **CGNAT** - Carrier Grade Network Address Translation tests with varying
+  - **NAT** - (Source) Network Address Translation tests with varying
     number of users and ports per user.
+  - **Container memif connections** - VPP memif virtual interface tests to
+    interconnect VPP instances.
+  - **Container Orchestrated Topologies** - Container topologies connected over
+    the memif virtual interface.
 
 - 2port40GE XL710 Intel
 
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 7ca4f2fca3..fff337a8dc 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -160,13 +160,13 @@
     - 1
     csit-vpp-functional-1710-ubuntu1604-virl:
     - 62
+    csit-nsh_sfc-verify-func-1710-ubuntu1604-virl:
+    - 7
     hc2vpp-csit-integration-1710-ubuntu1604:
     - lastSuccessfulBuild
 #    hc2vpp-csit-perf-master-ubuntu1604:  # REMOVE???
 #    - 8
 #    - 9
-#    csit-nsh_sfc-verify-func-1710-ubuntu1604-virl:  # REMOVE???
-#    - 2
 
 -
   type: "output"
@@ -439,32 +439,32 @@
   - "doc"
   - "status"
 
-#-
-#  type: "table"
-#  title: "Detailed Test Results - NSH SFC Functional Results"
-#  algorithm: "table_details"
-#  output-file-ext: ".csv"
-#  output-file: "{DIR[DTR,FUNC,NSHSFC]}/nsh_sfc_functional_results"
-#  columns:
-#  -
-#    title: "Name"
-#    data: "data name"
-#  -
-#    title: "Documentation"
-#    data: "data doc"
-#  -
-#    title: "Status"
-#    data: "data status"
-#  rows: "generated"
-#  data:
-#    csit-nsh_sfc-verify-func-1707-ubuntu1604-virl:
-#    - 2
-#  filter: "all"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "doc"
-#  - "status"
+-
+  type: "table"
+  title: "Detailed Test Results - NSH SFC Functional Results"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,FUNC,NSHSFC]}/nsh_sfc_functional_results"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "Documentation"
+    data: "data doc"
+  -
+    title: "Status"
+    data: "data status"
+  rows: "generated"
+  data:
+    csit-nsh_sfc-verify-func-1710-ubuntu1604-virl:
+    - 7
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "doc"
+  - "status"
 
 ################################################################################
 ###                                F I L E S                                 ###
@@ -626,26 +626,26 @@
   data-start-level: 3  # 0, 1, 2, ...
   chapters-start-level: 2  # 0, 1, 2, ...
 
-#-
-#  type: "file"
-#  title: "NSH SFC Functional Results"
-#  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
-#  output-file: "{DIR[DTR,FUNC,NSHSFC]}/nshsfc_functional_results"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-#  dir-tables: "{DIR[DTR,FUNC,NSHSFC]}"
-#  data:
-#    csit-nsh_sfc-verify-func-1710-ubuntu1604-virl:
-#    - 
-#  filter: "all"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  chapters:
-#  - "suites"
-#  data-start-level: 2  # 0, 1, 2, ...
-#  chapters-start-level: 2  # 0, 1, 2, ...
+-
+  type: "file"
+  title: "NSH SFC Functional Results"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTR,FUNC,NSHSFC]}/nshsfc_functional_results"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTR,FUNC,NSHSFC]}"
+  data:
+    csit-nsh_sfc-verify-func-1710-ubuntu1604-virl:
+    - 7
+  filter: "all"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  chapters:
+  - "suites"
+  data-start-level: 2  # 0, 1, 2, ...
+  chapters-start-level: 2  # 0, 1, 2, ...
 
 ################################################################################
 ###                                P L O T S                                 ###