X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=docs%2Freport%2Fvpp_performance_tests%2Fdocumentation%2Fcontainers.rst;h=5ec7d9c112d0ff28bb4e608b7b4007b6c2e93904;hb=c7b2541ae5ff737691547daef2e4b25f9d232eba;hp=a61738653a648cbf2a952f414e18f6b6d40046c5;hpb=1c66ee7e4d3c0ac6375c1c5ca15bc349d8cb3bfa;p=csit.git
diff --git a/docs/report/vpp_performance_tests/documentation/containers.rst b/docs/report/vpp_performance_tests/documentation/containers.rst
index a61738653a..5ec7d9c112 100644
--- a/docs/report/vpp_performance_tests/documentation/containers.rst
+++ b/docs/report/vpp_performance_tests/documentation/containers.rst
@@ -1,5 +1,5 @@
-.. _containter_orchestration_in_csit:
+.. _container_orchestration_in_csit:
Container Orchestration in CSIT
===============================
@@ -140,8 +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.
-- CSIT code is currently using cgroup control the range of CPU cores the
- container must run on. VPP thread pinning defined vpp startup.conf.
+- CSIT code is currently using cgroup to control the range of CPU cores the
+ LXC container runs on. VPP thread pinning is defined vpp startup.conf.
Docker
~~~~~~
@@ -176,10 +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.
-**Open Questions**
-
-- Clarify the functions provided by Contiv and Calico in Ligato system?
-
Ligato
~~~~~~
@@ -189,8 +185,6 @@ using goVPP [govpp]_ and vpp-agent [vpp-agent]_.
**Known Issues**
-**Open Questions**
-
- Currently using a separate LF Jenkins job for building csit-centric
prod_vpp_agent docker images vs. dockerhub/ligato ones.
@@ -510,7 +504,7 @@ Listed CSIT container networking test topologies are defined with DUT
containerized VPP switch forwarding packets between NF containers. Each
NF container runs their own instance of VPP in L2XC configuration.
-Following container networking topologies are tested in CSIT |release|:
+Following container networking topologies are tested in |csit-release|:
- LXC topologies:
@@ -523,14 +517,19 @@ Following container networking topologies are tested in CSIT |release|:
- Kubernetes/Ligato topologies:
- - eth-1drcl2xcbase-eth-2memif-1drcl2xc.
- - eth-1drcl2xcbase-eth-4memif-2drcl2xc.
- - eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc.
- - eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc.
-
+ - 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
-----------
+~~~~~~~~~~
.. [lxc] `Linux Containers `_
.. [lxc-namespace] `Resource management: Linux kernel Namespaces and cgroups `_.