CSIT Report update

Change-Id: I42efd42ec577723ef2b17a1753ae744986bb66ff
Signed-off-by: Peter Mikus <pmikus@cisco.com>

diff --git a/docs/report/csit_framework_documentation/csit_design.rst b/docs/report/csit_framework_documentation/csit_design.rst
index d8ea2c8..fef0285 100644 (file)
--- a/docs/report/csit_framework_documentation/csit_design.rst
+++ b/docs/report/csit_framework_documentation/csit_design.rst
@@ -107,6 +107,8 @@ A brief bottom-up description is provided here:
      - VPP;
      - DPDK-Testpmd;
      - DPDK-L3Fwd;
      - VPP;
      - DPDK-Testpmd;
      - DPDK-L3Fwd;

+     - Honeycomb;
+     - VPP Container orchestrated topologies;

 
    - Tools:
 
 
    - Tools:
 

diff --git a/docs/report/dpdk_performance_tests/overview.rst b/docs/report/dpdk_performance_tests/overview.rst
index 6af7fe9..a61d853 100644 (file)
--- a/docs/report/dpdk_performance_tests/overview.rst
+++ b/docs/report/dpdk_performance_tests/overview.rst
@@ -215,7 +215,7 @@ TRex is installed and run on the TG compute node. The typical procedure is:
 - TRex is started in the background mode
   ::
 
 - TRex is started in the background mode
   ::
 

-  $ sh -c 'cd /opt/trex-core-2.25/scripts/ && sudo nohup ./t-rex-64 -i -c 7 --iom 0 > /dev/null 2>&1 &' > /dev/null
+  $ sh -c 'cd <t-rex-install-dir>/scripts/ && sudo nohup ./t-rex-64 -i -c 7 --iom 0 > /tmp/trex.log 2>&1 &' > /dev/null

 
 - There are traffic streams dynamically prepared for each test, based on traffic
   profiles. The traffic is sent and the statistics obtained using
 
 - There are traffic streams dynamically prepared for each test, based on traffic
   profiles. The traffic is sent and the statistics obtained using

diff --git a/docs/report/introduction/general_notes.rst b/docs/report/introduction/general_notes.rst
index 461e186..5213a6a 100644 (file)
--- a/docs/report/introduction/general_notes.rst
+++ b/docs/report/introduction/general_notes.rst
@@ -31,18 +31,17 @@ is listed separately, as follows:
    side). Tested across a range of multi-thread and multi-core
    configurations. TRex is used as a traffic generator.
 
    side). Tested across a range of multi-thread and multi-core
    configurations. TRex is used as a traffic generator.
 

-#. **Container Topologies Orchestrated by K8s - Performance** - 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). All containers are orchestrated
-   by Kubernetes, with Ligato for container networking. TRex is used as a
-   traffic generator.
+#. **Container Topologies Orchestrated by K8s - Performance** - CSIT 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). All containers are
+   orchestrated by Kubernetes, with `Ligato <https://github.com/ligato>`_ for
+   container networking. TRex is used as a traffic generator.

 
 #. **DPDK Performance** - VPP is using DPDK code to control and drive
 
 #. **DPDK Performance** - VPP is using DPDK code to control and drive

-   the NICs and physical interfaces. Testpmd tests are used as a baseline to
+   the NICs and physical interfaces. Tests are used as a baseline to

    profile the DPDK sub-system of VPP. DPDK performance tests executed in
    physical FD.io testbeds, focusing on Testpmd/L3FWD data plane performance for
    Phy-to-Phy (NIC-to-NIC). Tests cover a range of NICs, 10GE and 40GE
    profile the DPDK sub-system of VPP. DPDK performance tests executed in
    physical FD.io testbeds, focusing on Testpmd/L3FWD data plane performance for
    Phy-to-Phy (NIC-to-NIC). Tests cover a range of NICs, 10GE and 40GE

diff --git a/docs/report/vpp_performance_tests/csit_release_notes.rst b/docs/report/vpp_performance_tests/csit_release_notes.rst
index 3ee4ff3..d029bd0 100644 (file)
--- a/docs/report/vpp_performance_tests/csit_release_notes.rst
+++ b/docs/report/vpp_performance_tests/csit_release_notes.rst
@@ -6,41 +6,40 @@ Changes in CSIT |release|
 \r
 #. Added VPP performance tests\r
 \r
 \r
 #. Added VPP performance tests\r
 \r

-   - **L2BD MAC scale tests**\r
+   - **Container Topologies Orchestrated by K8s with VPP memif tests**\r

 \r
 \r

-     - VPP L2 Bridge-Domain with MAC learning and large size L2FIB (10k,\r
-       100k, 1M MACs), tested in NIC-to-NIC and VM vhost topologies.\r
+     - Added tests with VPP in L2 Cross-Connect and Bridge-Domain configurations\r
+       connecting over memif virtual interfaces VPPs running in Docker\r
+       containers, with service chain topologies orchestrated by Kubernetes.\r
+       Chained, horizontal and standalone linked topologies added;\r

 \r
 \r

-   - **Linux Container VPP memif tests**\r
+   - **VPP TCP/IP stack**\r

 \r
 \r

-     - Tests with VPP in L2 Bridge-Domain configuration connecting over\r
-       memif virtual interfaces to VPPs running in LXCs;\r
+     - Added tests with VPP builtin TCP based HTTP server. WRK traffic generator\r
+       is used.\r

 \r
 \r

-   - **Docker Container VPP memif tests**\r
+   - **SRv6 tests**\r

 \r
 \r

-     - Tests with VPP in L2 Cross-Connect configuration connecting over\r
-       memif virtual interfaces VPPs running in Docker containers;\r
+     - [placeholder]\r

 \r
 \r

-   - **Container Topologies Orchestrated by K8s with VPP memif tests**\r
+   - **IPSecSW tests**\r

 \r
 \r

-     - Tests with VPP in L2 Cross-Connect and Bridge-Domain configurations\r
-       connecting over memif virtual interfaces VPPs running in Docker\r
-       containers, with service chain topologies orchestrated by Kubernetes;\r
+     - SW computed IPSec encryption with AES-GCM, CBC-SHA1 ciphers, in\r
+       combination with IPv4 routed-forwarding.\r

 \r
 \r

-   - **Stateful Security Groups**\r
+#. Presentation and Analytics Layer\r

 \r
 \r

-     - m-thread m-core VPP stateful and stateless security-groups tests;\r
+     - Added multi-core scale-up analysis into Presentation and Analytics Layer\r
+       (PAL) for automated CSIT test results analysis;\r

 \r
 \r

-   - **MAC-IP binding**\r

 \r
 \r

-     - MACIP input access-lists, single-thread single-core and m-thread\r
-       m-core tests;\r
+#. Other improvements\r

 \r
 \r

-#. Presentation and Analytics Layer\r
+     - **Framework optimizations**\r
+\r
+       - Ability to run CSIT framework on ARM architecture.\r

 \r
 \r

-     - New Presentation and Analytics Layer (PAL) for automated CSIT test\r
-       results analysis and presentation, including statistical analysis\r
-       of results repeatibility and test report auto-generation;\r
+       - Overall stability improvements.\r

 \r
 Performance Improvements\r
 ------------------------\r
 \r
 Performance Improvements\r
 ------------------------\r


@@ -205,7 +204,7 @@ Here is the list of known issues in CSIT |release| for VPP performance tests:
 | 1 | Vic1385 and Vic1227 low performance.            | VPP-664    | Low NDR performance.                                            |\r
 |   |                                                 |            |                                                                 |\r
 +---+-------------------------------------------------+------------+-----------------------------------------------------------------+\r
 | 1 | Vic1385 and Vic1227 low performance.            | VPP-664    | Low NDR performance.                                            |\r
 |   |                                                 |            |                                                                 |\r
 +---+-------------------------------------------------+------------+-----------------------------------------------------------------+\r

-| 2 | Sporadic NDR discovery test failures on x520.   | CSIT-750   | Suspected issue with HW settings (BIOS, FW) in LF               |\r
+| 2 | Sporadic NDR discovery test failures on x520.   | CSIT-750   | Suspected issue with HW combination of X710-X520 in LF          |\r

 |   |                                                 |            | infrastructure. Issue can't be replicated outside LF.           |\r
 +---+-------------------------------------------------+------------+-----------------------------------------------------------------+\r
 | 3 | VPP in 2t2c setups - large variation            | CSIT-568   | Suspected NIC firmware or DPDK driver issue affecting NDR       |\r
 |   |                                                 |            | infrastructure. Issue can't be replicated outside LF.           |\r
 +---+-------------------------------------------------+------------+-----------------------------------------------------------------+\r
 | 3 | VPP in 2t2c setups - large variation            | CSIT-568   | Suspected NIC firmware or DPDK driver issue affecting NDR       |\r

diff --git a/docs/report/vpp_performance_tests/documentation/containers.rst b/docs/report/vpp_performance_tests/documentation/containers.rst
index d3eeb71..a617386 100644 (file)
--- a/docs/report/vpp_performance_tests/documentation/containers.rst
+++ b/docs/report/vpp_performance_tests/documentation/containers.rst
@@ -140,11 +140,8 @@ a range of virtual networking topologies.
   of functionality is better supported in LXC 2.1 but can be done is current
   version as well.
 
   of functionality is better supported in LXC 2.1 but can be done is current
   version as well.
 

-**Open Questions**
-
-- CSIT code is currently using cgroup to pin lxc data plane thread to
-  cpu cores after lxc container is created. In the future may find a
-  more universal way to do it.
+- CSIT code is currently using cgroup control the range of CPU cores the
+  container must run on. VPP thread pinning defined vpp startup.conf.

 
 Docker
 ~~~~~~
 
 Docker
 ~~~~~~


@@ -166,7 +163,6 @@ containerized applications used in CSIT performance tests.
   configuration file controls the range of CPU cores the Docker image
   must run on. VPP thread pinning defined vpp startup.conf.
 
   configuration file controls the range of CPU cores the Docker image
   must run on. VPP thread pinning defined vpp startup.conf.
 

-

 Kubernetes
 ~~~~~~~~~~
 
 Kubernetes
 ~~~~~~~~~~
 


@@ -180,11 +176,6 @@ K8s pod definitions including compute resource allocation is provided in
 CSIT uses K8s and its infrastructure components like etcd to control all
 phases of container based virtualized network topologies.
 
 CSIT uses K8s and its infrastructure components like etcd to control all
 phases of container based virtualized network topologies.
 

-**Known Issues**
-
-- Unable to properly pin k8s pods and containers to cpu cores. This will be
-  addressed in Kubernetes 1.8+ in alpha testing.
-

 **Open Questions**
 
 - Clarify the functions provided by Contiv and Calico in Ligato system?
 **Open Questions**
 
 - Clarify the functions provided by Contiv and Calico in Ligato system?


@@ -201,7 +192,7 @@ using goVPP [govpp]_ and vpp-agent [vpp-agent]_.
 **Open Questions**
 
 - Currently using a separate LF Jenkins job for building csit-centric
 **Open Questions**
 
 - Currently using a separate LF Jenkins job for building csit-centric

-  vpp_agent docker images vs. dockerhub/ligato ones.
+  prod_vpp_agent docker images vs. dockerhub/ligato ones.

 
 Implementation
 --------------
 
 Implementation
 --------------


@@ -286,9 +277,6 @@ Current CSIT implementation is illustrated using UML Class diagram:
 
 Sequentional diagram that illustrates the creation of a single container.
 
 
 Sequentional diagram that illustrates the creation of a single container.
 

-.. mk: what "RF KW" is meant below?
-.. mk: the flow sequence should adhere to the lifecycle events listed earlier in this doc.
-

 ::
 
  Legend:
 ::
 
  Legend:


@@ -415,7 +403,7 @@ Kubernetes is implemented as separate library ``KubernetesUtils.py``,
 with a class with the same name. This utility provides an API for L2
 Robot Keywords to control ``kubectl`` installed on each of DUTs. One
 time initialization script, ``resources/libraries/bash/k8s_setup.sh``
 with a class with the same name. This utility provides an API for L2
 Robot Keywords to control ``kubectl`` installed on each of DUTs. One
 time initialization script, ``resources/libraries/bash/k8s_setup.sh``

-does reset/init kubectl, applies Calico v2.4.1 and initializes the
+does reset/init kubectl, applies Calico v2.6.3 and initializes the

 ``csit`` namespace. CSIT namespace is required to not to interfere with
 existing setups and it further simplifies apply/get/delete
 Pod/ConfigMap operations on SUTs.
 ``csit`` namespace. CSIT namespace is required to not to interfere with
 existing setups and it further simplifies apply/get/delete
 Pod/ConfigMap operations on SUTs.


@@ -475,10 +463,12 @@ We created separate sets of Jenkins jobs, that will be executing following:
 
 1. Clone latest CSIT and Ligato repositaries.
 2. Pull specific version of ``dev_vpp_agent`` image from Dockerhub.
 
 1. Clone latest CSIT and Ligato repositaries.
 2. Pull specific version of ``dev_vpp_agent`` image from Dockerhub.

-3. Build ``prod_vpp_image`` Docker image from ``dev_vpp_agent`` image.
-4. Shrink image using ``docker/dev_vpp_agent/shrink.sh`` script.
-5. Transfer ``prod_vpp_agent_shrink`` image to DUTs.
-6. Execute subset of performance tests designed for Ligato testing.
+3. Extract VPP API (from ``.deb`` package) and copy into ``dev_vpp_agent``
+   image
+4. Rebuild vpp-agent and extract outside image.
+5. Build ``prod_vpp_image`` Docker image from ``dev_vpp_agent`` image.
+6. Transfer ``prod_vpp_agent`` image to DUTs.
+7. Execute subset of performance tests designed for Ligato testing.

 
 ::
 
 
 ::
 


@@ -491,7 +481,7 @@ We created separate sets of Jenkins jobs, that will be executing following:
  |               ligato/dev_vpp_agent            <------| Pull this image from
  +------------------------^----------------------+      | Dockerhub ligato/dev_vpp_agent:<version>
                           |
  |               ligato/dev_vpp_agent            <------| Pull this image from
  +------------------------^----------------------+      | Dockerhub ligato/dev_vpp_agent:<version>
                           |

-                          | Extract agent.tar.gz from dev_vpp_agent
+                          | Rebuild and extract agent.tar.gz from dev_vpp_agent

  +------------------------+----------------------+
  |                 prod_vpp_agent                <------| Build by passing own
  +-----------------------------------------------+      | vpp.tar.gz (from nexus
  +------------------------+----------------------+
  |                 prod_vpp_agent                <------| Build by passing own
  +-----------------------------------------------+      | vpp.tar.gz (from nexus


@@ -505,10 +495,8 @@ Approximate size of vnf-agent docker images:
 ::
 
   REPOSITORY            TAG       IMAGE ID        CREATED        SIZE
 ::
 
   REPOSITORY            TAG       IMAGE ID        CREATED        SIZE

-  dev_vpp_agent         latest    442771972e4a    8 hours ago    3.57 GB
-  dev_vpp_agent_shrink  latest    bd2e76980236    8 hours ago    1.68 GB
-  prod_vpp_agent        latest    e33a5551b504    2 days ago     404 MB
-  prod_vpp_agent_shrink latest    446b271cce26    2 days ago     257 MB
+  dev-vpp-agent         latest    78c53bd57e2     6 weeks ago    9.79GB
+  prod_vpp_agent        latest    f68af5afe601    5 weeks ago    443MB

 
 In CSIT we need to create separate performance suite under
 ``tests/kubernetes/perf`` which contains modified Suite setup in comparison
 
 In CSIT we need to create separate performance suite under
 ``tests/kubernetes/perf`` which contains modified Suite setup in comparison

diff --git a/docs/report/vpp_performance_tests/overview.rst b/docs/report/vpp_performance_tests/overview.rst
index 8692b8b..38e76d2 100644 (file)
--- a/docs/report/vpp_performance_tests/overview.rst
+++ b/docs/report/vpp_performance_tests/overview.rst
@@ -54,7 +54,7 @@ performance labs to address larger scale multi-interface and multi-NIC
 performance testing scenarios.
 
 For test cases that require DUT (VPP) to communicate with
 performance testing scenarios.
 
 For test cases that require DUT (VPP) to communicate with

-VirtualMachines (VMs) / Containers (Linux or Docker Containers) over
+VirtualMachines (VMs) / Linux or Docker Containers (Ctrs) over

 vhost-user/memif interfaces, N of VM/Ctr instances are created on SUT1
 and SUT2. For N=1 DUT forwards packets between vhost/memif and physical
 interfaces. For N>1 DUT a logical service chain forwarding topology is
 vhost-user/memif interfaces, N of VM/Ctr instances are created on SUT1
 and SUT2. For N=1 DUT forwards packets between vhost/memif and physical
 interfaces. For N>1 DUT a logical service chain forwarding topology is


@@ -175,10 +175,14 @@ CSIT |release| includes following performance test suites, listed per NIC type:
   - **VMs with vhost-user** - virtual topologies with 1 VM and service chains
     of 2 VMs using vhost-user interfaces, with VPP forwarding modes incl. L2
     Cross-Connect, L2 Bridge-Domain, VXLAN with L2BD, IPv4 routed-forwarding.
   - **VMs with vhost-user** - virtual topologies with 1 VM and service chains
     of 2 VMs using vhost-user interfaces, with VPP forwarding modes incl. L2
     Cross-Connect, L2 Bridge-Domain, VXLAN with L2BD, IPv4 routed-forwarding.

-  - **IPSec** - IPSec encryption with AES-GCM, CBC-SHA1 ciphers, in combination
-    with IPv4 routed-forwarding.
+  - **IPSecSW** - IPSec encryption with AES-GCM, CBC-SHA1 ciphers, in
+    combination with IPv4 routed-forwarding.
+  - **IPSecHW** - IPSec encryption with AES-GCM, CBC-SHA1 ciphers, in
+    combination with IPv4 routed-forwarding. Intel QAT HW acceleration.

   - **IPSec+LISP** - IPSec encryption with CBC-SHA1 ciphers, in combination
     with LISP-GPE overlay tunneling for IPv4-over-IPv4.
   - **IPSec+LISP** - IPSec encryption with CBC-SHA1 ciphers, in combination
     with LISP-GPE overlay tunneling for IPv4-over-IPv4.

+  - **VPP TCP/IP stack** - VPP builtin TCP based HTTP server. WRK traffic
+    generator is used.

 
 - 2port10GE X710 Intel
 
 
 - 2port10GE X710 Intel
 


@@ -399,7 +403,7 @@ TRex is installed and run on the TG compute node. The typical procedure is:
 - TRex is started in the background mode
   ::
 
 - TRex is started in the background mode
   ::
 

-  $ sh -c 'cd /opt/trex-core-2.25/scripts/ && sudo nohup ./t-rex-64 -i -c 7 --iom 0 > /dev/null 2>&1 &' > /dev/null
+  $ sh -c 'cd <t-rex-install-dir>/scripts/ && sudo nohup ./t-rex-64 -i -c 7 --iom 0 > /tmp/trex.log 2>&1 &' > /dev/null

 
 - There are traffic streams dynamically prepared for each test, based on traffic
   profiles. The traffic is sent and the statistics obtained using
 
 - There are traffic streams dynamically prepared for each test, based on traffic
   profiles. The traffic is sent and the statistics obtained using

diff --git a/docs/report/vpp_performance_tests/test_environment.rst b/docs/report/vpp_performance_tests/test_environment.rst
index 48d45e5..5090530 100644 (file)
--- a/docs/report/vpp_performance_tests/test_environment.rst
+++ b/docs/report/vpp_performance_tests/test_environment.rst
@@ -328,7 +328,9 @@ Below a subset of the running configuration:
     adduser: 3.113+nmu3ubuntu4\r
     apparmor: 2.10.95-0ubuntu2.6\r
     apt: 1.2.12~ubuntu16.04.1\r
     adduser: 3.113+nmu3ubuntu4\r
     apparmor: 2.10.95-0ubuntu2.6\r
     apt: 1.2.12~ubuntu16.04.1\r

+    apt-transport-https: 1.2.24\r

     apt-utils: 1.2.12~ubuntu16.04.1\r
     apt-utils: 1.2.12~ubuntu16.04.1\r

+    aufs-tools: 1:3.2+20130722-1.1ubuntu1\r

     autoconf: 2.69-9\r
     automake: 1:1.15-4ubuntu1\r
     autotools-dev: 20150820.1\r
     autoconf: 2.69-9\r
     automake: 1:1.15-4ubuntu1\r
     autotools-dev: 20150820.1\r


@@ -342,6 +344,8 @@ Below a subset of the running configuration:
     busybox-initramfs: 1:1.22.0-15ubuntu1\r
     busybox-static: 1:1.22.0-15ubuntu1\r
     bzip2: 1.0.6-8\r
     busybox-initramfs: 1:1.22.0-15ubuntu1\r
     busybox-static: 1:1.22.0-15ubuntu1\r
     bzip2: 1.0.6-8\r

+    busybox-static: 1:1.22.0-15ubuntu1\r
+    bzip2: 1.0.6-8\r

     ca-certificates: 20160104ubuntu1\r
     ca-certificates-java: 20160321\r
     cgroup-bin: 0.41-7ubuntu1\r
     ca-certificates: 20160104ubuntu1\r
     ca-certificates-java: 20160321\r
     cgroup-bin: 0.41-7ubuntu1\r


@@ -350,6 +354,7 @@ Below a subset of the running configuration:
     cloud-image-utils: 0.27-0ubuntu24\r
     console-setup: 1.108ubuntu15.2\r
     console-setup-linux: 1.108ubuntu15.2\r
     cloud-image-utils: 0.27-0ubuntu24\r
     console-setup: 1.108ubuntu15.2\r
     console-setup-linux: 1.108ubuntu15.2\r

+    corekeeper: 1.6\r

     coreutils: 8.25-2ubuntu2\r
     cpio: 2.11+dfsg-5ubuntu1\r
     cpp: 4:5.3.1-1ubuntu1\r
     coreutils: 8.25-2ubuntu2\r
     cpio: 2.11+dfsg-5ubuntu1\r
     cpp: 4:5.3.1-1ubuntu1\r


@@ -373,23 +378,30 @@ Below a subset of the running configuration:
     dmidecode: 3.0-2ubuntu0.1\r
     dns-root-data: 2015052300+h+1\r
     dnsmasq-base: 2.75-1ubuntu0.16.04.2\r
     dmidecode: 3.0-2ubuntu0.1\r
     dns-root-data: 2015052300+h+1\r
     dnsmasq-base: 2.75-1ubuntu0.16.04.2\r

+    docker-ce: 17.09.0~ce-0~ubuntu\r

     dpkg: 1.18.4ubuntu1.1\r
     dpkg-dev: 1.18.4ubuntu1.1\r
     e2fslibs:amd64: 1.42.13-1ubuntu1\r
     e2fsprogs: 1.42.13-1ubuntu1\r
     dpkg: 1.18.4ubuntu1.1\r
     dpkg-dev: 1.18.4ubuntu1.1\r
     e2fslibs:amd64: 1.42.13-1ubuntu1\r
     e2fsprogs: 1.42.13-1ubuntu1\r

+    ebtables: 2.0.10.4-3.4ubuntu2\r

     eject: 2.1.5+deb1+cvs20081104-13.1\r
     eject: 2.1.5+deb1+cvs20081104-13.1\r

+    ethtool: 1:4.5-1\r

     expect: 5.45-7\r
     fakeroot: 1.20.2-1ubuntu1\r
     file: 1:5.25-2ubuntu1\r
     findutils: 4.6.0+git+20160126-2\r
     expect: 5.45-7\r
     fakeroot: 1.20.2-1ubuntu1\r
     file: 1:5.25-2ubuntu1\r
     findutils: 4.6.0+git+20160126-2\r

+    fontconfig: 2.11.94-0ubuntu1.1\r

     fontconfig-config: 2.11.94-0ubuntu1.1\r
     fonts-dejavu-core: 2.35-1\r
     fontconfig-config: 2.11.94-0ubuntu1.1\r
     fonts-dejavu-core: 2.35-1\r

+    fonts-dejavu-extra: 2.35-1\r

     g++: 4:5.3.1-1ubuntu1\r
     g++-5: 5.4.0-6ubuntu1~16.04.2\r
     gcc: 4:5.3.1-1ubuntu1\r
     gcc-5: 5.4.0-6ubuntu1~16.04.2\r
     gcc-5-base:amd64: 5.4.0-6ubuntu1~16.04.2\r
     gcc-6-base:amd64: 6.0.1-0ubuntu1\r
     g++: 4:5.3.1-1ubuntu1\r
     g++-5: 5.4.0-6ubuntu1~16.04.2\r
     gcc: 4:5.3.1-1ubuntu1\r
     gcc-5: 5.4.0-6ubuntu1~16.04.2\r
     gcc-5-base:amd64: 5.4.0-6ubuntu1~16.04.2\r
     gcc-6-base:amd64: 6.0.1-0ubuntu1\r

+    gdb: 7.11.1-0ubuntu1~16.5\r
+    gdbserver: 7.11.1-0ubuntu1~16.5\r

     genisoimage: 9:1.1.11-3ubuntu1\r
     gettext-base: 0.19.7-2ubuntu3\r
     gir1.2-glib-2.0:amd64: 1.46.0-3ubuntu1\r
     genisoimage: 9:1.1.11-3ubuntu1\r
     gettext-base: 0.19.7-2ubuntu3\r
     gir1.2-glib-2.0:amd64: 1.46.0-3ubuntu1\r


@@ -404,6 +416,7 @@ Below a subset of the running configuration:
     grub-pc-bin: 2.02~beta2-36ubuntu3.1\r
     grub2-common: 2.02~beta2-36ubuntu3.1\r
     gzip: 1.6-4ubuntu1\r
     grub-pc-bin: 2.02~beta2-36ubuntu3.1\r
     grub2-common: 2.02~beta2-36ubuntu3.1\r
     gzip: 1.6-4ubuntu1\r

+    hicolor-icon-theme: 0.15-0ubuntu1\r

     hostname: 3.16ubuntu2\r
     ifupdown: 0.8.10ubuntu1\r
     init: 1.29ubuntu2\r
     hostname: 3.16ubuntu2\r
     ifupdown: 0.8.10ubuntu1\r
     init: 1.29ubuntu2\r


@@ -428,6 +441,10 @@ Below a subset of the running configuration:
     klibc-utils: 2.0.4-8ubuntu1.16.04.1\r
     kmod: 22-1ubuntu4\r
     krb5-locales: 1.13.2+dfsg-5\r
     klibc-utils: 2.0.4-8ubuntu1.16.04.1\r
     kmod: 22-1ubuntu4\r
     krb5-locales: 1.13.2+dfsg-5\r

+    kubeadm: 1.8.4-00\r
+    kubectl: 1.8.4-00\r
+    kubelet: 1.8.4-00\r
+    kubernetes-cni: 0.5.1-00\r

     language-selector-common: 0.165.3\r
     laptop-detect: 0.13.7ubuntu2\r
     less: 481-2.1\r
     language-selector-common: 0.165.3\r
     laptop-detect: 0.13.7ubuntu2\r
     less: 481-2.1\r


@@ -448,6 +465,8 @@ Below a subset of the running configuration:
     libasound2-data: 1.1.0-0ubuntu1\r
     libasprintf0v5:amd64: 0.19.7-2ubuntu3\r
     libasyncns0:amd64: 0.8-5build1\r
     libasound2-data: 1.1.0-0ubuntu1\r
     libasprintf0v5:amd64: 0.19.7-2ubuntu3\r
     libasyncns0:amd64: 0.8-5build1\r

+    libatk1.0-0:amd64: 2.18.0-1\r
+    libatk1.0-data: 2.18.0-1\r

     libatm1:amd64: 1:2.5.1-1.5\r
     libatomic1:amd64: 5.4.0-6ubuntu1~16.04.2\r
     libattr1:amd64: 1:2.4.47-2\r
     libatm1:amd64: 1:2.5.1-1.5\r
     libatomic1:amd64: 5.4.0-6ubuntu1~16.04.2\r
     libattr1:amd64: 1:2.4.47-2\r


@@ -456,6 +475,8 @@ Below a subset of the running configuration:
     libavahi-client3:amd64: 0.6.32~rc+dfsg-1ubuntu2\r
     libavahi-common-data:amd64: 0.6.32~rc+dfsg-1ubuntu2\r
     libavahi-common3:amd64: 0.6.32~rc+dfsg-1ubuntu2\r
     libavahi-client3:amd64: 0.6.32~rc+dfsg-1ubuntu2\r
     libavahi-common-data:amd64: 0.6.32~rc+dfsg-1ubuntu2\r
     libavahi-common3:amd64: 0.6.32~rc+dfsg-1ubuntu2\r

+    libbabeltrace-ctf1:amd64: 1.3.2-1\r
+    libbabeltrace1:amd64: 1.3.2-1\r

     libblkid1:amd64: 2.27.1-6ubuntu3.1\r
     libbluetooth3:amd64: 5.37-0ubuntu5\r
     libboost-iostreams1.58.0:amd64: 1.58.0+dfsg-5ubuntu3.1\r
     libblkid1:amd64: 2.27.1-6ubuntu3.1\r
     libbluetooth3:amd64: 5.37-0ubuntu5\r
     libboost-iostreams1.58.0:amd64: 1.58.0+dfsg-5ubuntu3.1\r


@@ -466,11 +487,12 @@ Below a subset of the running configuration:
     libbsd0:amd64: 0.8.2-1\r
     libbz2-1.0:amd64: 1.0.6-8\r
     libc-bin: 2.23-0ubuntu3\r
     libbsd0:amd64: 0.8.2-1\r
     libbz2-1.0:amd64: 1.0.6-8\r
     libc-bin: 2.23-0ubuntu3\r

-    libc-dev-bin: 2.23-0ubuntu3\r
-    libc6:amd64: 2.23-0ubuntu3\r
-    libc6-dev:amd64: 2.23-0ubuntu3\r
+    libc-dev-bin: 2.23-0ubuntu9\r
+    libc6-dbg:amd64: 2.23-0ubuntu9\r
+    libc6-dev:amd64: 2.23-0ubuntu9\r

     libcaca0:amd64: 0.99.beta19-2build2~gcc5.2\r
     libcacard0:amd64: 1:2.5.0-2\r
     libcaca0:amd64: 0.99.beta19-2build2~gcc5.2\r
     libcacard0:amd64: 1:2.5.0-2\r

+    libcairo2:amd64: 1.14.6-1\r

     libcap-ng0:amd64: 0.7.7-1\r
     libcap2:amd64: 1:2.24-12\r
     libcap2-bin: 1:2.24-12\r
     libcap-ng0:amd64: 0.7.7-1\r
     libcap2:amd64: 1:2.24-12\r
     libcap2-bin: 1:2.24-12\r


@@ -482,6 +504,7 @@ Below a subset of the running configuration:
     libcryptsetup4:amd64: 2:1.6.6-5ubuntu2\r
     libcups2:amd64: 2.1.3-4\r
     libcurl3-gnutls:amd64: 7.47.0-1ubuntu2.1\r
     libcryptsetup4:amd64: 2:1.6.6-5ubuntu2\r
     libcups2:amd64: 2.1.3-4\r
     libcurl3-gnutls:amd64: 7.47.0-1ubuntu2.1\r

+    libdatrie1:amd64: 0.2.10-2\r

     libdb5.3:amd64: 5.3.28-11\r
     libdbus-1-3:amd64: 1.10.6-1ubuntu3\r
     libdbus-glib-1-2:amd64: 0.106-1\r
     libdb5.3:amd64: 5.3.28-11\r
     libdbus-1-3:amd64: 1.10.6-1ubuntu3\r
     libdbus-glib-1-2:amd64: 0.106-1\r


@@ -515,6 +538,9 @@ Below a subset of the running configuration:
     libgcc1:amd64: 1:6.0.1-0ubuntu1\r
     libgcrypt20:amd64: 1.6.5-2ubuntu0.2\r
     libgdbm3:amd64: 1.8.3-13.1\r
     libgcc1:amd64: 1:6.0.1-0ubuntu1\r
     libgcrypt20:amd64: 1.6.5-2ubuntu0.2\r
     libgdbm3:amd64: 1.8.3-13.1\r

+    libgdk-pixbuf2.0-0:amd64: 2.32.2-1ubuntu1.2\r
+    libgdk-pixbuf2.0-common: 2.32.2-1ubuntu1.2\r
+    libgif7:amd64: 5.1.4-0.3~16.04\r

     libgirepository-1.0-1:amd64: 1.46.0-3ubuntu1\r
     libgl1-mesa-dri:amd64: 11.2.0-1ubuntu2.2\r
     libgl1-mesa-glx:amd64: 11.2.0-1ubuntu2.2\r
     libgirepository-1.0-1:amd64: 1.46.0-3ubuntu1\r
     libgl1-mesa-dri:amd64: 11.2.0-1ubuntu2.2\r
     libgl1-mesa-glx:amd64: 11.2.0-1ubuntu2.2\r


@@ -528,13 +554,19 @@ Below a subset of the running configuration:
     libgnutls30:amd64: 3.4.10-4ubuntu1.1\r
     libgomp1:amd64: 5.4.0-6ubuntu1~16.04.2\r
     libgpg-error0:amd64: 1.21-2ubuntu1\r
     libgnutls30:amd64: 3.4.10-4ubuntu1.1\r
     libgomp1:amd64: 5.4.0-6ubuntu1~16.04.2\r
     libgpg-error0:amd64: 1.21-2ubuntu1\r

+    libgraphite2-3:amd64: 1.3.6-1ubuntu1\r

     libgssapi-krb5-2:amd64: 1.13.2+dfsg-5\r
     libgssapi3-heimdal:amd64: 1.7~git20150920+dfsg-4ubuntu1\r
     libgssapi-krb5-2:amd64: 1.13.2+dfsg-5\r
     libgssapi3-heimdal:amd64: 1.7~git20150920+dfsg-4ubuntu1\r

+    libgtk2.0-0:amd64: 2.24.30-1ubuntu1.16.04.2\r
+    libgtk2.0-bin: 2.24.30-1ubuntu1.16.04.2\r
+    libgtk2.0-common: 2.24.30-1ubuntu1.16.04.2\r
+    libharfbuzz0b:amd64: 1.0.1-1ubuntu0.1\r

     libhcrypto4-heimdal:amd64: 1.7~git20150920+dfsg-4ubuntu1\r
     libheimbase1-heimdal:amd64: 1.7~git20150920+dfsg-4ubuntu1\r
     libheimntlm0-heimdal:amd64: 1.7~git20150920+dfsg-4ubuntu1\r
     libhogweed4:amd64: 3.2-1\r
     libhx509-5-heimdal:amd64: 1.7~git20150920+dfsg-4ubuntu1\r
     libhcrypto4-heimdal:amd64: 1.7~git20150920+dfsg-4ubuntu1\r
     libheimbase1-heimdal:amd64: 1.7~git20150920+dfsg-4ubuntu1\r
     libheimntlm0-heimdal:amd64: 1.7~git20150920+dfsg-4ubuntu1\r
     libhogweed4:amd64: 3.2-1\r
     libhx509-5-heimdal:amd64: 1.7~git20150920+dfsg-4ubuntu1\r

+    libice-dev:amd64: 2:1.0.9-1\r

     libice6:amd64: 2:1.0.9-1\r
     libicu55:amd64: 55.1-7\r
     libidn11:amd64: 1.32-3ubuntu1.1\r
     libice6:amd64: 2:1.0.9-1\r
     libicu55:amd64: 55.1-7\r
     libidn11:amd64: 1.32-3ubuntu1.1\r


@@ -542,6 +574,7 @@ Below a subset of the running configuration:
     libiscsi2:amd64: 1.12.0-2\r
     libisl15:amd64: 0.16.1-1\r
     libitm1:amd64: 5.4.0-6ubuntu1~16.04.2\r
     libiscsi2:amd64: 1.12.0-2\r
     libisl15:amd64: 0.16.1-1\r
     libitm1:amd64: 5.4.0-6ubuntu1~16.04.2\r

+    libjbig0:amd64: 2.1-3.1\r

     libjpeg-turbo8:amd64: 1.4.2-0ubuntu3\r
     libjpeg8:amd64: 8c-2ubuntu8\r
     libjson-c2:amd64: 0.11-4ubuntu2\r
     libjpeg-turbo8:amd64: 1.4.2-0ubuntu3\r
     libjpeg8:amd64: 8c-2ubuntu8\r
     libjson-c2:amd64: 0.11-4ubuntu2\r


@@ -582,6 +615,7 @@ Below a subset of the running configuration:
     libnspr4:amd64: 2:4.12-0ubuntu0.16.04.1\r
     libnss3:amd64: 2:3.23-0ubuntu0.16.04.1\r
     libnss3-nssdb: 2:3.23-0ubuntu0.16.04.1\r
     libnspr4:amd64: 2:4.12-0ubuntu0.16.04.1\r
     libnss3:amd64: 2:3.23-0ubuntu0.16.04.1\r
     libnss3-nssdb: 2:3.23-0ubuntu0.16.04.1\r

+    libnuma-dev:amd64: 2.0.11-1ubuntu1\r

     libnuma1:amd64: 2.0.11-1ubuntu1\r
     libogg0:amd64: 1.3.2-1\r
     libopus0:amd64: 1.1.2-1ubuntu1\r
     libnuma1:amd64: 2.0.11-1ubuntu1\r
     libogg0:amd64: 1.3.2-1\r
     libopus0:amd64: 1.1.2-1ubuntu1\r


@@ -591,6 +625,9 @@ Below a subset of the running configuration:
     libpam-modules-bin: 1.1.8-3.2ubuntu2\r
     libpam-runtime: 1.1.8-3.2ubuntu2\r
     libpam0g:amd64: 1.1.8-3.2ubuntu2\r
     libpam-modules-bin: 1.1.8-3.2ubuntu2\r
     libpam-runtime: 1.1.8-3.2ubuntu2\r
     libpam0g:amd64: 1.1.8-3.2ubuntu2\r

+    libpango-1.0-0:amd64: 1.38.1-1\r
+    libpangocairo-1.0-0:amd64: 1.38.1-1\r
+    libpangoft2-1.0-0:amd64: 1.38.1-1\r

     libpcap-dev: 1.7.4-2\r
     libpcap0.8:amd64: 1.7.4-2\r
     libpcap0.8-dev: 1.7.4-2\r
     libpcap-dev: 1.7.4-2\r
     libpcap0.8:amd64: 1.7.4-2\r
     libpcap0.8-dev: 1.7.4-2\r


@@ -609,6 +646,7 @@ Below a subset of the running configuration:
     libpolkit-gobject-1-0:amd64: 0.105-14.1\r
     libpopt0:amd64: 1.16-10\r
     libprocps4:amd64: 2:3.3.10-4ubuntu2\r
     libpolkit-gobject-1-0:amd64: 0.105-14.1\r
     libpopt0:amd64: 1.16-10\r
     libprocps4:amd64: 2:3.3.10-4ubuntu2\r

+    libpthread-stubs0-dev:amd64: 0.3-4\r

     libpulse0:amd64: 1:8.0-0ubuntu3\r
     libpython-all-dev:amd64: 2.7.11-1\r
     libpython-dev:amd64: 2.7.11-1\r
     libpulse0:amd64: 1:8.0-0ubuntu3\r
     libpython-all-dev:amd64: 2.7.11-1\r
     libpython-dev:amd64: 2.7.11-1\r


@@ -618,8 +656,9 @@ Below a subset of the running configuration:
     libpython2.7-minimal:amd64: 2.7.12-1~16.04\r
     libpython2.7-stdlib:amd64: 2.7.12-1~16.04\r
     libpython3-stdlib:amd64: 3.5.1-3\r
     libpython2.7-minimal:amd64: 2.7.12-1~16.04\r
     libpython2.7-stdlib:amd64: 2.7.12-1~16.04\r
     libpython3-stdlib:amd64: 3.5.1-3\r

-    libpython3.5-minimal:amd64: 3.5.2-2~16.01\r
-    libpython3.5-stdlib:amd64: 3.5.2-2~16.01\r
+    libpython3.5:amd64: 3.5.2-2ubuntu0~16.04.1\r
+    libpython3.5-minimal:amd64: 3.5.2-2ubuntu0~16.04.1\r
+    libpython3.5-stdlib:amd64: 3.5.2-2ubuntu0~16.04.1\r

     libquadmath0:amd64: 5.4.0-6ubuntu1~16.04.2\r
     librados2: 10.2.2-0ubuntu0.16.04.2\r
     librbd1: 10.2.2-0ubuntu0.16.04.2\r
     libquadmath0:amd64: 5.4.0-6ubuntu1~16.04.2\r
     librados2: 10.2.2-0ubuntu0.16.04.2\r
     librbd1: 10.2.2-0ubuntu0.16.04.2\r


@@ -637,6 +676,7 @@ Below a subset of the running configuration:
     libsepol1:amd64: 2.4-2\r
     libsigsegv2:amd64: 2.10-4\r
     libslang2:amd64: 2.3.0-2ubuntu1\r
     libsepol1:amd64: 2.4-2\r
     libsigsegv2:amd64: 2.10-4\r
     libslang2:amd64: 2.3.0-2ubuntu1\r

+    libsm-dev:amd64: 2:1.2.2-1\r

     libsm6:amd64: 2:1.2.2-1\r
     libsmartcols1:amd64: 2.27.1-6ubuntu3.1\r
     libsndfile1:amd64: 1.0.25-10\r
     libsm6:amd64: 2:1.2.2-1\r
     libsmartcols1:amd64: 2.27.1-6ubuntu3.1\r
     libsndfile1:amd64: 1.0.25-10\r


@@ -652,6 +692,9 @@ Below a subset of the running configuration:
     libtext-charwidth-perl: 0.04-7build5\r
     libtext-iconv-perl: 1.7-5build4\r
     libtext-wrapi18n-perl: 0.06-7.1\r
     libtext-charwidth-perl: 0.04-7build5\r
     libtext-iconv-perl: 1.7-5build4\r
     libtext-wrapi18n-perl: 0.06-7.1\r

+    libthai-data: 0.1.24-2\r
+    libthai0:amd64: 0.1.24-2\r
+    libtiff5:amd64: 4.0.6-1ubuntu0.2\r

     libtinfo5:amd64: 6.0+20160213-1ubuntu1\r
     libtk8.6:amd64: 8.6.5-1\r
     libtool: 2.4.6-0.1\r
     libtinfo5:amd64: 6.0+20160213-1ubuntu1\r
     libtk8.6:amd64: 8.6.5-1\r
     libtool: 2.4.6-0.1\r


@@ -671,21 +714,29 @@ Below a subset of the running configuration:
     libwrap0:amd64: 7.6.q-25\r
     libx11-6:amd64: 2:1.6.3-1ubuntu2\r
     libx11-data: 2:1.6.3-1ubuntu2\r
     libwrap0:amd64: 7.6.q-25\r
     libx11-6:amd64: 2:1.6.3-1ubuntu2\r
     libx11-data: 2:1.6.3-1ubuntu2\r

+    libx11-dev:amd64: 2:1.6.3-1ubuntu2\r
+    libx11-doc: 2:1.6.3-1ubuntu2\r

     libx11-xcb1:amd64: 2:1.6.3-1ubuntu2\r
     libx11-xcb1:amd64: 2:1.6.3-1ubuntu2\r

+    libxau-dev:amd64: 1:1.0.8-1\r

     libxau6:amd64: 1:1.0.8-1\r
     libxaw7:amd64: 2:1.0.13-1\r
     libxcb-dri2-0:amd64: 1.11.1-1ubuntu1\r
     libxcb-dri3-0:amd64: 1.11.1-1ubuntu1\r
     libxcb-glx0:amd64: 1.11.1-1ubuntu1\r
     libxcb-present0:amd64: 1.11.1-1ubuntu1\r
     libxau6:amd64: 1:1.0.8-1\r
     libxaw7:amd64: 2:1.0.13-1\r
     libxcb-dri2-0:amd64: 1.11.1-1ubuntu1\r
     libxcb-dri3-0:amd64: 1.11.1-1ubuntu1\r
     libxcb-glx0:amd64: 1.11.1-1ubuntu1\r
     libxcb-present0:amd64: 1.11.1-1ubuntu1\r

+    libxcb-render0:amd64: 1.11.1-1ubuntu1\r

     libxcb-shape0:amd64: 1.11.1-1ubuntu1\r
     libxcb-shape0:amd64: 1.11.1-1ubuntu1\r

+    libxcb-shm0:amd64: 1.11.1-1ubuntu1\r

     libxcb-sync1:amd64: 1.11.1-1ubuntu1\r
     libxcb1:amd64: 1.11.1-1ubuntu1\r
     libxcb-sync1:amd64: 1.11.1-1ubuntu1\r
     libxcb1:amd64: 1.11.1-1ubuntu1\r

+    libxcb1-dev:amd64: 1.11.1-1ubuntu1\r

     libxcomposite1:amd64: 1:0.4.4-1\r
     libxcomposite1:amd64: 1:0.4.4-1\r

+    libxcursor1:amd64: 1:1.1.14-1\r

     libxdamage1:amd64: 1:1.1.4-2\r
     libxdamage1:amd64: 1:1.1.4-2\r

+    libxdmcp-dev:amd64: 1:1.1.2-1.1\r

     libxdmcp6:amd64: 1:1.1.2-1.1\r
     libxdmcp6:amd64: 1:1.1.2-1.1\r

-    libxen-4.6:amd64: 4.6.0-1ubuntu4.2\r
-    libxenstore3.0:amd64: 4.6.0-1ubuntu4.2\r
+    libxen-4.6:amd64: 4.6.0-1ubuntu4.1\r
+    libxenstore3.0:amd64: 4.6.0-1ubuntu4.1\r

     libxext6:amd64: 2:1.3.3-1\r
     libxfixes3:amd64: 1:5.0.1-2\r
     libxft2:amd64: 2.3.2-1\r
     libxext6:amd64: 2:1.3.3-1\r
     libxfixes3:amd64: 1:5.0.1-2\r
     libxft2:amd64: 2.3.2-1\r


@@ -699,6 +750,7 @@ Below a subset of the running configuration:
     libxrender1:amd64: 1:0.9.9-0ubuntu1\r
     libxshmfence1:amd64: 1.2-1\r
     libxss1:amd64: 1:1.2.2-1\r
     libxrender1:amd64: 1:0.9.9-0ubuntu1\r
     libxshmfence1:amd64: 1.2-1\r
     libxss1:amd64: 1:1.2.2-1\r

+    libxt-dev:amd64: 1:1.1.5-0ubuntu1\r

     libxt6:amd64: 1:1.1.5-0ubuntu1\r
     libxtables11:amd64: 1.6.0-2ubuntu3\r
     libxtst6:amd64: 2:1.2.2-1\r
     libxt6:amd64: 1:1.1.5-0ubuntu1\r
     libxtables11:amd64: 1.6.0-2ubuntu3\r
     libxtst6:amd64: 2:1.2.2-1\r


@@ -743,7 +795,10 @@ Below a subset of the running configuration:
     net-tools: 1.60-26ubuntu1\r
     netbase: 5.3\r
     netcat-openbsd: 1.105-7ubuntu1\r
     net-tools: 1.60-26ubuntu1\r
     netbase: 5.3\r
     netcat-openbsd: 1.105-7ubuntu1\r

-    openjdk-8-jre-headless:amd64: 8u131-b11-0ubuntu1.16.04.2\r
+    openjdk-8-jdk:amd64: 8u131-b11-2ubuntu1.16.04.3\r
+    openjdk-8-jdk-headless:amd64: 8u131-b11-2ubuntu1.16.04.3\r
+    openjdk-8-jre:amd64: 8u131-b11-2ubuntu1.16.04.3\r
+    openjdk-8-jre-headless:amd64: 8u131-b11-2ubuntu1.16.04.3\r

     openssh-client: 1:7.2p2-4ubuntu2.1\r
     openssh-server: 1:7.2p2-4ubuntu2.1\r
     openssh-sftp-server: 1:7.2p2-4ubuntu2.1\r
     openssh-client: 1:7.2p2-4ubuntu2.1\r
     openssh-server: 1:7.2p2-4ubuntu2.1\r
     openssh-sftp-server: 1:7.2p2-4ubuntu2.1\r


@@ -789,8 +844,8 @@ Below a subset of the running configuration:
     python3-six: 1.10.0-3\r
     python3-urllib3: 1.13.1-2ubuntu0.16.04.1\r
     python3-virtualenv: 15.0.1+ds-3\r
     python3-six: 1.10.0-3\r
     python3-urllib3: 1.13.1-2ubuntu0.16.04.1\r
     python3-virtualenv: 15.0.1+ds-3\r

-    python3.5: 3.5.2-2~16.01\r
-    python3.5-minimal: 3.5.2-2~16.01\r
+    python3.5: 3.5.2-2ubuntu0~16.04.1\r
+    python3.5-minimal: 3.5.2-2ubuntu0~16.04.1\r

     qemu-block-extra:amd64: 1:2.5+dfsg-5ubuntu10.5\r
     qemu-system-common: 1:2.5+dfsg-5ubuntu10.5\r
     qemu-system-x86: 1:2.5+dfsg-5ubuntu10.5\r
     qemu-block-extra:amd64: 1:2.5+dfsg-5ubuntu10.5\r
     qemu-system-common: 1:2.5+dfsg-5ubuntu10.5\r
     qemu-system-x86: 1:2.5+dfsg-5ubuntu10.5\r


@@ -820,8 +875,9 @@ Below a subset of the running configuration:
     tcl-expect:amd64: 5.45-7\r
     tcl8.6: 8.6.5+dfsg-2\r
     tcpd: 7.6.q-25\r
     tcl-expect:amd64: 5.45-7\r
     tcl8.6: 8.6.5+dfsg-2\r
     tcpd: 7.6.q-25\r

+    telnet: 0.17-40\r

     tk8.6: 8.6.5-1\r
     tk8.6: 8.6.5-1\r

-    tzdata: 2016g-0ubuntu0.16.04\r
+    tzdata: 2016f-0ubuntu0.16.04\r

     ubuntu-keyring: 2012.05.19\r
     ubuntu-minimal: 1.361\r
     ucf: 3.0036\r
     ubuntu-keyring: 2012.05.19\r
     ubuntu-minimal: 1.361\r
     ucf: 3.0036\r


@@ -834,24 +890,23 @@ Below a subset of the running configuration:
     vim-common: 2:7.4.1689-3ubuntu1.1\r
     vim-tiny: 2:7.4.1689-3ubuntu1.1\r
     virtualenv: 15.0.1+ds-3\r
     vim-common: 2:7.4.1689-3ubuntu1.1\r
     vim-tiny: 2:7.4.1689-3ubuntu1.1\r
     virtualenv: 15.0.1+ds-3\r

-    vpp: 17.10-rc0~89-g7c35f19~b2621\r
-    vpp-dbg: 17.10-rc0~89-g7c35f19~b2621\r
-    vpp-dev: 17.10-rc0~89-g7c35f19~b2621\r
-    vpp-dpdk-dkms: 17.05-vpp6\r
-    vpp-lib: 17.10-rc0~89-g7c35f19~b2621\r
-    vpp-plugins: 17.10-rc0~89-g7c35f19~b2621\r

     wamerican: 7.1-1\r
     wget: 1.17.1-1ubuntu1.1\r
     whiptail: 0.52.18-1ubuntu2\r
     wireless-regdb: 2015.07.20-1ubuntu1\r
     x11-common: 1:7.7+13ubuntu3\r
     x11-utils: 7.7+3\r
     wamerican: 7.1-1\r
     wget: 1.17.1-1ubuntu1.1\r
     whiptail: 0.52.18-1ubuntu2\r
     wireless-regdb: 2015.07.20-1ubuntu1\r
     x11-common: 1:7.7+13ubuntu3\r
     x11-utils: 7.7+3\r

+    x11proto-core-dev: 7.0.31-1~ubuntu16.04.1\r
+    x11proto-input-dev: 2.3.1-1\r
+    x11proto-kb-dev: 1.0.7-0ubuntu1\r

     xauth: 1:1.0.9-1ubuntu2\r
     xbitmaps: 1.1.1-2\r
     xdg-user-dirs: 0.15-2ubuntu6\r
     xkb-data: 2.16-1ubuntu1\r
     xml-core: 0.13+nmu2\r
     xauth: 1:1.0.9-1ubuntu2\r
     xbitmaps: 1.1.1-2\r
     xdg-user-dirs: 0.15-2ubuntu6\r
     xkb-data: 2.16-1ubuntu1\r
     xml-core: 0.13+nmu2\r

+    xorg-sgml-doctools: 1:1.11-1\r

     xterm: 322-1ubuntu1\r
     xterm: 322-1ubuntu1\r

+    xtrans-dev: 1.3.5-1\r

     xz-utils: 5.1.1alpha+20120614-2ubuntu2\r
     zlib1g:amd64: 1:1.2.8.dfsg-2ubuntu4\r
     zlib1g-dev:amd64: 1:1.2.8.dfsg-2ubuntu4\r
     xz-utils: 5.1.1alpha+20120614-2ubuntu2\r
     zlib1g:amd64: 1:1.2.8.dfsg-2ubuntu4\r
     zlib1g-dev:amd64: 1:1.2.8.dfsg-2ubuntu4\r


@@ -1907,6 +1962,8 @@ Below a subset of the running configuration:
      [ + ]  cpufrequtils\r
      [ + ]  cron\r
      [ + ]  dbus\r
      [ + ]  cpufrequtils\r
      [ + ]  cron\r
      [ + ]  dbus\r

+     [ + ]  docker\r
+     [ + ]  ebtables\r

      [ + ]  grub-common\r
      [ - ]  hostname.sh\r
      [ - ]  hwclock.sh\r
      [ + ]  grub-common\r
      [ - ]  hostname.sh\r
      [ - ]  hwclock.sh\r


@@ -1927,7 +1984,7 @@ Below a subset of the running configuration:
      [ - ]  plymouth-log\r
      [ + ]  procps\r
      [ + ]  qemu-kvm\r
      [ - ]  plymouth-log\r
      [ + ]  procps\r
      [ + ]  qemu-kvm\r

-     [ + ]  rc.local\r
+     [ - ]  rc.local\r

      [ + ]  resolvconf\r
      [ - ]  rsync\r
      [ + ]  rsyslog\r
      [ + ]  resolvconf\r
      [ - ]  rsync\r
      [ + ]  rsyslog\r


@@ -1939,7 +1996,7 @@ Below a subset of the running configuration:
      [ - ]  umountnfs.sh\r
      [ - ]  umountroot\r
      [ + ]  urandom\r
      [ - ]  umountnfs.sh\r
      [ - ]  umountroot\r
      [ + ]  urandom\r

-     [ + ]  uuidd\r
+     [ - ]  uuidd\r

      [ - ]  x11-common\r
 \r
 **Host CFS optimizations (QEMU+VPP)**\r
      [ - ]  x11-common\r
 \r
 **Host CFS optimizations (QEMU+VPP)**\r


@@ -2037,31 +2094,37 @@ Tagged by **1T1C**
 \r
     unix\r
     {\r
 \r
     unix\r
     {\r

-        cli-listen localhost:5002\r
-        log /tmp/vpe.log\r
-        nodaemon\r
+      cli-listen localhost:5002\r
+      log /tmp/vpe.log\r
+      nodaemon\r

     }\r
     cpu\r
     {\r
     }\r
     cpu\r
     {\r

-        corelist-workers 2\r
-        main-core 1\r
+      corelist-workers 2\r
+      main-core 1\r
+    }\r
+    ip4\r
+    {\r
+      heap-size "4G"\r

     }\r
     ip6\r
     {\r
     }\r
     ip6\r
     {\r

-        heap-size 3G\r
-        hash-buckets 2000000\r
+      heap-size "4G"\r
+      hash-buckets "2000000"\r

     }\r
     }\r

-    heapsize 3G\r
+    heapsize "4G"\r

     dpdk\r
     {\r
     dpdk\r
     {\r

-        dev default\r
-        {\r
-            num-rx-queues 1\r
-        }\r
-        dev 0000:0a:00.0\r
-        dev 0000:0a:00.1\r
-        socket-mem 1024,1024\r
-        no-multi-seg\r
+      dev 0000:88:00.1\r
+      dev 0000:88:00.0\r
+      no-multi-seg\r
+      dev default\r
+      {\r
+        num-rx-desc 2048\r
+        num-rx-queues 1\r
+        num-tx-desc 2048\r
+      }\r
+      socket-mem "1024,1024\r

     }\r
 \r
 Tagged by **2T1C**\r
     }\r
 \r
 Tagged by **2T1C**\r


@@ -2070,31 +2133,37 @@ Tagged by **2T1C**
 \r
     unix\r
     {\r
 \r
     unix\r
     {\r

-        cli-listen localhost:5002\r
-        log /tmp/vpe.log\r
-        nodaemon\r
+      cli-listen localhost:5002\r
+      log /tmp/vpe.log\r
+      nodaemon\r

     }\r
     cpu\r
     {\r
     }\r
     cpu\r
     {\r

-        corelist-workers 2,3\r
-        main-core 1\r
+      corelist-workers 2,3\r
+      main-core 1\r
+    }\r
+    ip4\r
+    {\r
+      heap-size "4G"\r

     }\r
     ip6\r
     {\r
     }\r
     ip6\r
     {\r

-        heap-size 3G\r
-        hash-buckets 2000000\r
+      heap-size "4G"\r
+      hash-buckets "2000000"\r

     }\r
     }\r

-    heapsize 3G\r
+    heapsize "4G"\r

     dpdk\r
     {\r
     dpdk\r
     {\r

-        dev default\r
-        {\r
-            num-rx-queues 1\r
-        }\r
-        dev 0000:0a:00.0\r
-        dev 0000:0a:00.1\r
-        socket-mem 1024,1024\r
-        no-multi-seg\r
+      dev 0000:88:00.1\r
+      dev 0000:88:00.0\r
+      no-multi-seg\r
+      dev default\r
+      {\r
+        num-rx-desc 2048\r
+        num-rx-queues 1\r
+        num-tx-desc 2048\r
+      }\r
+      socket-mem "1024,1024\r

     }\r
 \r
 Tagged by **4T4C**\r
     }\r
 \r
 Tagged by **4T4C**\r


@@ -2103,31 +2172,37 @@ Tagged by **4T4C**
 \r
     unix\r
     {\r
 \r
     unix\r
     {\r

-        cli-listen localhost:5002\r
-        log /tmp/vpe.log\r
-        nodaemon\r
+      cli-listen localhost:5002\r
+      log /tmp/vpe.log\r
+      nodaemon\r

     }\r
     cpu\r
     {\r
     }\r
     cpu\r
     {\r

-        corelist-workers 2,3,4,5\r
-        main-core 1\r
+      corelist-workers 2,3,4,5\r
+      main-core 1\r
+    }\r
+    ip4\r
+    {\r
+      heap-size "4G"\r

     }\r
     ip6\r
     {\r
     }\r
     ip6\r
     {\r

-        heap-size 3G\r
-        hash-buckets 2000000\r
+      heap-size "4G"\r
+      hash-buckets "2000000"\r

     }\r
     }\r

-    heapsize 3G\r
+    heapsize "4G"\r

     dpdk\r
     {\r
     dpdk\r
     {\r

-        dev default\r
-        {\r
-            num-rx-queues 2\r
-        }\r
-        dev 0000:0a:00.0\r
-        dev 0000:0a:00.1\r
-        socket-mem 1024,1024\r
-        no-multi-seg\r
+      dev 0000:88:00.1\r
+      dev 0000:88:00.0\r
+      no-multi-seg\r
+      dev default\r
+      {\r
+        num-rx-desc 2048\r
+        num-rx-queues 2\r
+        num-tx-desc 2048\r
+      }\r
+      socket-mem "1024,1024\r

     }\r
 \r
 \r
     }\r
 \r
 \r


@@ -2164,7 +2239,7 @@ DPDK v17.11
 \r
 ::\r
 \r
 \r
 ::\r
 \r

-    $ sh -c 'cd <t-rex-install-dir>/scripts/ && sudo nohup ./t-rex-64 -i -c 7 --iom 0 > /dev/null 2>&1 &'> /dev/null\r
+    $ sh -c 'cd <t-rex-install-dir>/scripts/ && sudo nohup ./t-rex-64 -i -c 7 --iom 0 > /tmp/trex.log 2>&1 &'> /dev/null\r

 \r
 **TG common API - pointer to driver**\r
 \r
 \r
 **TG common API - pointer to driver**\r
 \r

diff --git a/docs/tag_documentation.rst b/docs/tag_documentation.rst
index 165feee..e54fdc8 100644 (file)
--- a/docs/tag_documentation.rst
+++ b/docs/tag_documentation.rst
@@ -503,6 +503,10 @@ Container orchestration tags
 
     2 VPP running in 2 Docker containers acting as VNF work load.
 
 
     2 VPP running in 2 Docker containers acting as VNF work load.
 

+.. topic:: 4VNF
+
+    4 VPP running in 4 Docker containers acting as VNF work load.
+

 Multi-threading tags
 --------------------
 
 Multi-threading tags
 --------------------
 

diff --git a/resources/tools/presentation/conf.py b/resources/tools/presentation/conf.py
index e833b64..8c266c2 100644 (file)
--- a/resources/tools/presentation/conf.py
+++ b/resources/tools/presentation/conf.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 #
 # -*- coding: utf-8 -*-
 #

-# CSIT 17.01 report documentation build configuration file, created by
-# sphinx-quickstart on Sun Jan 15 09:49:36 2017.
+# CSIT report documentation build configuration file

 #
 # This file is execfile()d with the current directory set to its
 # containing dir.
 #
 # This file is execfile()d with the current directory set to its
 # containing dir.


@@ -46,7 +45,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'FD.io CSIT'
 
 # General information about the project.
 project = u'FD.io CSIT'

-copyright = u'2017, FD.io'
+copyright = u'2018, FD.io'

 author = u'FD.io CSIT'
 
 # The version info for the project you're documenting, acts as replacement for
 author = u'FD.io CSIT'
 
 # The version info for the project you're documenting, acts as replacement for


@@ -59,38 +58,38 @@ author = u'FD.io CSIT'
 #release = u''
 
 rst_epilog = """
 #release = u''
 
 rst_epilog = """

-.. |release-1| replace:: rls1704
-.. |vpp-release| replace:: VPP-17.10 release
-.. |vpp-release-1| replace:: VPP-17.04 release
-.. |dpdk-release| replace:: DPDK 17.05
-.. |trex-release| replace:: TRex v2.25
-.. |virl-image-ubuntu| replace:: ubuntu-16.04.1_2017-02-23_1.8
+.. |release-1| replace:: rls1710
+.. |vpp-release| replace:: VPP-{vpprelease} release
+.. |vpp-release-1| replace:: VPP-17.10 release
+.. |dpdk-release| replace:: DPDK 17.11
+.. |trex-release| replace:: TRex v2.35
+.. |virl-image-ubuntu| replace:: ubuntu-16.04.1_2017-10-21_2.0

 .. |virl-image-centos| replace:: centos-7.3-1611_2017-02-23_1.4
 
 .. |virl-image-centos| replace:: centos-7.3-1611_2017-02-23_1.4
 

-.. _pdf version of this report: https://docs.fd.io/csit/rls1710/report/_static/archive/csit_rls1710.pdf
-.. _tag documentation rst file: https://git.fd.io/csit/tree/docs/tag_documentation.rst?h=rls1710
-.. _TRex intallation: https://git.fd.io/csit/tree/resources/tools/trex/trex_installer.sh?h=rls1710
-.. _TRex driver: https://git.fd.io/csit/tree/resources/tools/trex/trex_stateless_profile.py?h=rls1710
-.. _VIRL topologies directory: https://git.fd.io/csit/tree/resources/tools/virl/topologies/?h=rls1710
-.. _VIRL images lists: https://git.fd.io/csit/tree/resources/tools/disk-image-builder/ubuntu/lists/?h=rls1710
-.. _VIRL nested: https://git.fd.io/csit/tree/resources/tools/disk-image-builder/nested/?h=rls1710
-.. _CSIT Honeycomb Functional Tests Documentation: https://docs.fd.io/csit/rls1710/doc/tests.vpp.func.honeycomb.html
-.. _CSIT Honeycomb Performance Tests Documentation: https://docs.fd.io/csit/rls1710/doc/tests.vpp.perf.honeycomb.html
-.. _CSIT DPDK Performance Tests Documentation: https://docs.fd.io/csit/rls1710/doc/tests.dpdk.perf.html
-.. _CSIT VPP Functional Tests Documentation: https://docs.fd.io/csit/rls1710/doc/tests.vpp.func.html
-.. _CSIT VPP Performance Tests Documentation: https://docs.fd.io/csit/rls1710/doc/tests.vpp.perf.html
-.. _CSIT NSH_SFC Functional Tests Documentation: https://docs.fd.io/csit/rls1710/doc/tests.nsh_sfc.func.html
-.. _VPP test framework documentation: https://docs.fd.io/vpp/17.10/vpp_make_test/html/
-.. _FD.io test executor vpp performance jobs: https://jenkins.fd.io/view/csit/job/csit-vpp-perf-1710-all
-.. _FD.io test executor ligato performance jobs: https://jenkins.fd.io/job/csit-ligato-perf-1710-all
-.. _FD.io test executor vpp functional jobs: https://jenkins.fd.io/view/csit/job/csit-vpp-functional-1710-ubuntu1604-virl/lastSuccessfulBuild
-.. _FD.io test executor dpdk performance jobs: https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-1710-all
-.. _FD.io test executor Honeycomb functional jobs: https://jenkins.fd.io/view/csit/job/hc2vpp-csit-integration-1710-ubuntu1604/lastSuccessfulBuild
+.. _pdf version of this report: https://docs.fd.io/csit/{release}/report/_static/archive/csit_{release}.pdf
+.. _tag documentation rst file: https://git.fd.io/csit/tree/docs/tag_documentation.rst?h={release}
+.. _TRex intallation: https://git.fd.io/csit/tree/resources/tools/trex/trex_installer.sh?h={release}
+.. _TRex driver: https://git.fd.io/csit/tree/resources/tools/trex/trex_stateless_profile.py?h={release}
+.. _VIRL topologies directory: https://git.fd.io/csit/tree/resources/tools/virl/topologies/?h={release}
+.. _VIRL images lists: https://git.fd.io/csit/tree/resources/tools/disk-image-builder/ubuntu/lists/?h={release}
+.. _VIRL nested: https://git.fd.io/csit/tree/resources/tools/disk-image-builder/nested/?h={release}
+.. _CSIT Honeycomb Functional Tests Documentation: https://docs.fd.io/csit/{release}/doc/tests.vpp.func.honeycomb.html
+.. _CSIT Honeycomb Performance Tests Documentation: https://docs.fd.io/csit/{release}/doc/tests.vpp.perf.honeycomb.html
+.. _CSIT DPDK Performance Tests Documentation: https://docs.fd.io/csit/{release}/doc/tests.dpdk.perf.html
+.. _CSIT VPP Functional Tests Documentation: https://docs.fd.io/csit/{release}/doc/tests.vpp.func.html
+.. _CSIT VPP Performance Tests Documentation: https://docs.fd.io/csit/{release}/doc/tests.vpp.perf.html
+.. _CSIT NSH_SFC Functional Tests Documentation: https://docs.fd.io/csit/{release}/doc/tests.nsh_sfc.func.html
+.. _VPP test framework documentation: https://docs.fd.io/vpp/{vpprelease}/vpp_make_test/html/
+.. _FD.io test executor vpp performance jobs: https://jenkins.fd.io/view/csit/job/csit-vpp-perf-{srelease}-all
+.. _FD.io test executor ligato performance jobs: https://jenkins.fd.io/job/csit-ligato-perf-{srelease}-all
+.. _FD.io test executor vpp functional jobs: https://jenkins.fd.io/view/csit/job/csit-vpp-functional-{srelease}-ubuntu1604-virl/lastSuccessfulBuild
+.. _FD.io test executor dpdk performance jobs: https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-{srelease}-all
+.. _FD.io test executor Honeycomb functional jobs: https://jenkins.fd.io/view/csit/job/hc2vpp-csit-integration-{srelease}-ubuntu1604/lastSuccessfulBuild

 .. _FD.io test executor honeycomb performance jobs: https://jenkins.fd.io/view/hc2vpp/job/hc2vpp-csit-perf-master-ubuntu1604/lastSuccessfulBuild
 .. _FD.io test executor honeycomb performance jobs: https://jenkins.fd.io/view/hc2vpp/job/hc2vpp-csit-perf-master-ubuntu1604/lastSuccessfulBuild

-.. _FD.io test executor NSH_SFC functional jobs: https://jenkins.fd.io/view/csit/job/csit-nsh_sfc-verify-func-1710-ubuntu1604-virl/lastSuccessfulBuild
-.. _FD.io VPP compile job: https://jenkins.fd.io/view/vpp/job/vpp-merge-1710-ubuntu1604/
-.. _CSIT Testbed Setup: https://git.fd.io/csit/tree/resources/tools/testbed-setup/README.md?h=rls1710
-"""
+.. _FD.io test executor NSH_SFC functional jobs: https://jenkins.fd.io/view/csit/job/csit-nsh_sfc-verify-func-{srelease}-ubuntu1604-virl/lastSuccessfulBuild
+.. _FD.io VPP compile job: https://jenkins.fd.io/view/vpp/job/vpp-merge-{srelease}-ubuntu1604/
+.. _CSIT Testbed Setup: https://git.fd.io/csit/tree/resources/tools/testbed-setup/README.md?h={release}
+""".format(release='rls1801', srelease='1801', vpprelease='18.01')

 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.