From 7de465c09018b1cf739a28992fe198ccd5f5699d Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Wed, 13 Nov 2019 13:30:48 +0000 Subject: LIGATO: Remove Signed-off-by: Peter Mikus Change-Id: I0c9b8b07ed3a113e24a38faaddd5ed06fae67768 --- .../cot_performance_results/index.rst | 6 - .../cot_performance_results_3n_hsw/index.rst | 12 -- docs/report/index.html.template | 3 - docs/report/introduction/methodology.rst | 1 - .../methodology_k8s_container_memif.rst | 23 ---- .../introduction/test_scenarios_overview.rst | 5 - .../documentation/containers.rst | 142 ++------------------- docs/tag_documentation.rst | 14 -- 8 files changed, 9 insertions(+), 197 deletions(-) delete mode 100644 docs/report/detailed_test_results/cot_performance_results/index.rst delete mode 100644 docs/report/detailed_test_results/cot_performance_results_3n_hsw/index.rst delete mode 100644 docs/report/introduction/methodology_k8s_container_memif.rst (limited to 'docs') diff --git a/docs/report/detailed_test_results/cot_performance_results/index.rst b/docs/report/detailed_test_results/cot_performance_results/index.rst deleted file mode 100644 index 69ea95b593..0000000000 --- a/docs/report/detailed_test_results/cot_performance_results/index.rst +++ /dev/null @@ -1,6 +0,0 @@ -VPP K8s Container Memif -======================= - -.. toctree:: - - ../cot_performance_results_3n_hsw/index diff --git a/docs/report/detailed_test_results/cot_performance_results_3n_hsw/index.rst b/docs/report/detailed_test_results/cot_performance_results_3n_hsw/index.rst deleted file mode 100644 index 4bdb21e045..0000000000 --- a/docs/report/detailed_test_results/cot_performance_results_3n_hsw/index.rst +++ /dev/null @@ -1,12 +0,0 @@ -3n-hsw ------- - -.. note:: - - Data sources for reported test results: i) `FD.io test executor ligato - performance jobs`_, ii) archived FD.io jobs test result `output files - <../../_static/archive/>`_. - -.. toctree:: - - cot_performance_results_3n_hsw diff --git a/docs/report/index.html.template b/docs/report/index.html.template index 8a01129982..a5e57e9617 100644 --- a/docs/report/index.html.template +++ b/docs/report/index.html.template @@ -103,7 +103,6 @@ CSIT-1908 .. detailed_test_results/honeycomb_functional_results/index detailed_test_results/dmm_functional_results/index - detailed_test_results/cot_performance_results/index detailed_test_results/nshsfc_functional_results/index .. toctree:: @@ -114,8 +113,6 @@ CSIT-1908 test_configuration/vpp_mrr_configuration/index test_configuration/vpp_functional_configuration/index test_configuration/vpp_device_configuration_ubuntu/index -.. - test_configuration/cot_performance_configuration/index .. toctree:: :maxdepth: 2 diff --git a/docs/report/introduction/methodology.rst b/docs/report/introduction/methodology.rst index af9bfc661a..5c54bb9d84 100644 --- a/docs/report/introduction/methodology.rst +++ b/docs/report/introduction/methodology.rst @@ -26,5 +26,4 @@ Test Methodology methodology_trex_traffic_generator .. - methodology_k8s_container_memif methodology_http_tcp_with_wrk_tool diff --git a/docs/report/introduction/methodology_k8s_container_memif.rst b/docs/report/introduction/methodology_k8s_container_memif.rst deleted file mode 100644 index ec7a3c9ccc..0000000000 --- a/docs/report/introduction/methodology_k8s_container_memif.rst +++ /dev/null @@ -1,23 +0,0 @@ -K8s Container Memif -------------------- - -CSIT includes tests of VPP topologies running in K8s -orchestrated Pods/Containers and connected over memif virtual -interfaces. In order to provide simple topology coding flexibility and -extensibility container orchestration is done with `Kubernetes -`_ using `Docker -`_ images for all container applications -including VPP. `Ligato `_ is used for the -Pod/Container networking orchestration that is integrated with K8s, -including memif support. - -In these tests VPP vswitch runs in a K8s Pod with Docker Container (DRC) -handling NIC interfaces and connecting over memif to more instances of -VPP running in Pods/DRCs. All DRCs run in a priviliged mode with VPP -data plane worker threads pinned to dedicated physical CPU cores per -usual CSIT practice. All VPP instances run the same version of software. -This test topology is equivalent to existing tests with vhost-user and -VMs as described earlier in :ref:`tested_physical_topologies`. - -Further documentation is available in -:ref:`container_orchestration_in_csit`. diff --git a/docs/report/introduction/test_scenarios_overview.rst b/docs/report/introduction/test_scenarios_overview.rst index 8d66836e9d..318d86c376 100644 --- a/docs/report/introduction/test_scenarios_overview.rst +++ b/docs/report/introduction/test_scenarios_overview.rst @@ -57,11 +57,6 @@ Brief overview of test scenarios covered in this report: FD.io testbeds demonstrating a single server (DUT1) and single client (DUT2) scenario using DMM framework and Linux kernel TCP/IP stack. - #. **K8s Container/Pod Topologies Performance**: VPP container - performance tests using memif for interconnecting VPP-in- - Container/Pod instances orchestrated by K8s integrated with `Ligato - `_ for container networking. TRex is - used as a traffic generator. #. **NSH_SFC Functional**: NSH_SFC functional tests are executed in virtual FD.io testbeds focusing on VPP nsh-plugin data plane functionality. Scapy is used as a traffic generator. diff --git a/docs/report/vpp_performance_tests/documentation/containers.rst b/docs/report/vpp_performance_tests/documentation/containers.rst index 313b5b7575..2d025171db 100644 --- a/docs/report/vpp_performance_tests/documentation/containers.rst +++ b/docs/report/vpp_performance_tests/documentation/containers.rst @@ -111,8 +111,6 @@ Current CSIT testing framework integrates following Linux container orchestration mechanisms: - LXC/Docker for complete VPP container lifecycle control. -- Combination of Kubernetes (container orchestration), Docker (container - images) and Ligato (container networking). LXC ~~~ @@ -163,31 +161,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. -Kubernetes -~~~~~~~~~~ - -Kubernetes [k8sdoc]_, or K8s, is a production-grade container orchestration -platform for automating the deployment, scaling and operating -application containers. Kubernetes groups containers that make up an -application into logical units, pods, for easy management and discovery. -K8s pod definitions including compute resource allocation is provided in -.yaml files. - -CSIT uses K8s and its infrastructure components like etcd to control all -phases of container based virtualized network topologies. - -Ligato -~~~~~~ - -Ligato [ligato]_ is an open-source project developing a set of cloud-native -tools for orchestrating container networking. Ligato integrates with FD.io VPP -using goVPP [govpp]_ and vpp-agent [vppagent]_. - -**Known Issues** - -- Currently using a separate LF Jenkins job for building csit-centric - prod_vpp_agent docker images vs. dockerhub/ligato ones. - Implementation -------------- @@ -386,110 +359,30 @@ correct cpu placement. See documentation for the full reference. Kubernetes ~~~~~~~~~~ -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`` -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. +For the future use, 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`` +does reset/init kubectl, 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. Kubernetes utility is based on YAML templates to avoid crafting the huge YAML configuration files, what would lower the readability of code and -requires complicated algorithms. The templates can be found in -``resources/templates/kubernetes`` and can be leveraged in the future -for other separate tasks. +requires complicated algorithms. Two types of YAML templates are defined: - Static - do not change between deployments, that is infrastructure containers like Kafka, Calico, ETCD. -- Dynamic - per test suite/case topology YAML files e.g. SFC_controller, - VNF, VSWITCH. +- Dynamic - per test suite/case topology YAML files. Making own python wrapper library of ``kubectl`` instead of using the official Python package allows to control and deploy environment over the SSH library without the need of using isolated driver running on each of DUTs. -Ligato -~~~~~~ - -Ligato integration does require to compile the ``vpp-agent`` tool and build the -bundled Docker image. Compilation of ``vpp-agent`` depends on specific VPP. In -``ligato/vpp-agent`` repository there are well prepared scripts for building the -Docker image. Building docker image is possible via series of commands: - -:: - - git clone https://github.com/ligato/vpp-agent - cd vpp_agent/docker/dev_vpp_agent - sudo docker build -t dev_vpp_agent --build-arg AGENT_COMMIT=\ - --build-arg VPP_COMMIT= --no-cache . - sudo ./shrink.sh - cd ../prod_vpp_agent - sudo ./build.sh - sudo ./shrink.sh - -CSIT requires Docker image to include the desired VPP version (per patch -testing, nightly testing, on demand testing). - -The entire build process of building ``dev_vpp_agent`` image heavily depends -on internet connectivity and also takes a significant amount of time (~1-1.5h -based on internet bandwidth and allocated resources). The optimal solution would -be to build the image on jenkins slave, transfer the Docker image to DUTs and -execute separate suite of tests. - -To adress the amount of time required to build ``dev_vpp_agent`` image, we can -pull existing specific version of ```dev_vpp_agent``` and exctract the -```vpp-agent``` from it. - -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. -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. - -:: - - +-----------------------------------------------+ - | ubuntu:16.04 <-----| Base image on Dockerhub - +------------------------^----------------------+ - | - | - +------------------------+----------------------+ - | ligato/dev_vpp_agent <------| Pull this image from - +------------------------^----------------------+ | Dockerhub ligato/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 - | or built by JJB) and - | agent.tar.gz extracted - | from ligato/dev_vpp_agent - - -Approximate size of vnf-agent docker images: - -:: - - REPOSITORY TAG IMAGE ID CREATED SIZE - 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 -to standard perf tests. This is due to reason that VPP will act as vswitch in -Docker image and not as standalone installed service. - Tested Topologies ~~~~~~~~~~~~~~~~~ @@ -509,19 +402,6 @@ Following container networking topologies are tested in |csit-release|: - eth-l2xcbase-eth-2memif-1docker. - eth-l2xcbase-eth-1memif-1docker -- Kubernetes/Ligato topologies: - - - eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral - - eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz - - eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz - - eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain - - eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain - - eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral - - eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz - - eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz - - eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain - - eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain - References ~~~~~~~~~~ @@ -539,7 +419,3 @@ References .. [seccomp] `SECure COMPuting with filters `_. .. [docker] `Docker `_. .. [k8sdoc] `Kubernetes documentation `_. -.. [ligato] `Ligato `_. -.. [govpp] `FD.io goVPP project `_. -.. [vppagent] `Ligato vpp-agent `_. -.. [imagevar] Image parameter is required in initial commit version. There is plan to implement container build class to build Docker/LXC image. diff --git a/docs/tag_documentation.rst b/docs/tag_documentation.rst index fd5b6c9d6e..6cca914811 100644 --- a/docs/tag_documentation.rst +++ b/docs/tag_documentation.rst @@ -767,20 +767,6 @@ Client-Workload Tags Container Orchestration Tags ---------------------------- -.. topic:: K8S - - All test cases which use Kubernetes for orchestration. - -.. topic:: SFC_CONTROLLER - - All test cases which use ligato/sfc_controller for driving configuration - of vpp inside container. - -.. topic:: VPP_AGENT - - All test cases which use Golang implementation of a control/management plane - for VPP - .. topic:: 1VSWITCH VPP running in Docker container acting as VSWITCH. -- cgit 1.2.3-korg