diff options
16 files changed, 18 insertions, 9 deletions
diff --git a/resources/libraries/python/ContainerUtils.py b/resources/libraries/python/ContainerUtils.py index ae4e01eba7..4d5f8ee4d6 100644 --- a/resources/libraries/python/ContainerUtils.py +++ b/resources/libraries/python/ContainerUtils.py @@ -279,17 +279,11 @@ class ContainerEngine(object): self.execute('supervisord -c {config_file}'. format(config_file=SUPERVISOR_CONF)) - def install_vpp(self, install_dkms=False): - """Install VPP inside a container. - - :param install_dkms: If install dkms package. This will impact - install time. Dkms is required for installation of vpp-dpdk-dkms. - Default is false. - :type install_dkms: bool - """ + def install_vpp(self): + """Install VPP inside a container.""" self.execute('ln -s /dev/null /etc/sysctl.d/80-vpp.conf') self.execute('apt-get update') - if install_dkms: + if self.container.install_dkms: self.execute( 'apt-get install -y dkms && ' 'dpkg -i --force-all {guest_dir}/install_dir/*.deb'. diff --git a/resources/libraries/robot/shared/container.robot b/resources/libraries/robot/shared/container.robot index a3d7c99392..b44e4386a6 100644 --- a/resources/libraries/robot/shared/container.robot +++ b/resources/libraries/robot/shared/container.robot @@ -36,6 +36,7 @@ | | | ... | image=${container_image} | cpu_count=${container_cpus} | | | ... | cpu_skip=${skip_cpus} | smt_used=${False} | cpuset_mems=${cpu_node} | | | ... | cpu_shared=${False} | env=${env} | count=${container_count} +| | | ... | install_dkms=${container_install_dkms} | | Append To List | ${container_groups} | ${group} | Construct ETCD containers on all DUTs diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot index 2b23565b77..6a07820a9b 100644 --- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot +++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot @@ -59,6 +59,7 @@ | ${container_count}= | ${1} | ${container_engine}= | LXC | ${container_image}= | ${EMPTY} +| ${container_install_dkms}= | ${FALSE} # CPU settings | ${system_cpus}= | ${1} | ${vpp_cpus}= | ${5} diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot index b2811f2c10..b180107346 100644 --- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot +++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot @@ -67,6 +67,7 @@ | ${container_count}= | ${1} | ${container_engine}= | LXC | ${container_image}= | ${EMPTY} +| ${container_install_dkms}= | ${FALSE} # CPU settings | ${system_cpus}= | ${1} | ${vpp_cpus}= | ${5} diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1dcr-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1dcr-mrr.robot index 7cf5293d3a..faf400450e 100644 --- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1dcr-mrr.robot +++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1dcr-mrr.robot @@ -59,6 +59,7 @@ | ${container_count}= | ${1} | ${container_engine}= | Docker | ${container_image}= | ubuntu:xenial-20180412 +| ${container_install_dkms}= | ${FALSE} # CPU settings | ${system_cpus}= | ${1} | ${vpp_cpus}= | ${5} diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.robot index 37c6753956..b3824d6b0d 100644 --- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.robot +++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.robot @@ -67,6 +67,7 @@ | ${container_count}= | ${1} | ${container_engine}= | Docker | ${container_image}= | ubuntu:xenial-20180412 +| ${container_install_dkms}= | ${FALSE} # CPU settings | ${system_cpus}= | ${1} | ${vpp_cpus}= | ${5} diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-mrr.robot index 3eb51a1c54..e7cd18e2d2 100644 --- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-mrr.robot +++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-mrr.robot @@ -58,6 +58,7 @@ | ${container_count}= | ${1} | ${container_engine}= | LXC | ${container_image}= | ${EMPTY} +| ${container_install_dkms}= | ${FALSE} # CPU settings | ${system_cpus}= | ${1} | ${vpp_cpus}= | ${5} diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot index e81198ede5..91108f8c17 100644 --- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot +++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot @@ -66,6 +66,7 @@ | ${container_count}= | ${1} | ${container_engine}= | LXC | ${container_image}= | ${EMPTY} +| ${container_install_dkms}= | ${FALSE} # CPU settings | ${system_cpus}= | ${1} | ${vpp_cpus}= | ${5} diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot index 680be42e85..83f85da875 100644 --- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot +++ b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot @@ -59,6 +59,7 @@ | ${container_count}= | ${1} | ${container_engine}= | LXC | ${container_image}= | ${EMPTY} +| ${container_install_dkms}= | ${FALSE} # CPU settings | ${system_cpus}= | ${1} | ${vpp_cpus}= | ${5} diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot index cd9f6c2aa6..580563a628 100644 --- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot +++ b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot @@ -59,6 +59,7 @@ | ${container_count}= | ${1} | ${container_engine}= | Docker | ${container_image}= | ubuntu:xenial-20180412 +| ${container_install_dkms}= | ${FALSE} # CPU settings | ${system_cpus}= | ${1} | ${vpp_cpus}= | ${5} diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot index bcc15b4ee5..df8dddb148 100644 --- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot +++ b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot @@ -58,6 +58,7 @@ | ${container_count}= | ${1} | ${container_engine}= | LXC | ${container_image}= | ${EMPTY} +| ${container_install_dkms}= | ${FALSE} # CPU settings | ${system_cpus}= | ${1} | ${vpp_cpus}= | ${5} diff --git a/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot b/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot index 5f1d49080d..de4e7a9eb1 100644 --- a/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot +++ b/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot @@ -61,6 +61,7 @@ | ${container_count}= | ${1} | ${container_engine}= | LXC | ${container_image}= | ${EMPTY} +| ${container_install_dkms}= | ${FALSE} # CPU settings | ${system_cpus}= | ${1} | ${vpp_cpus}= | ${5} diff --git a/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot b/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot index a34dca595d..82b981c30d 100644 --- a/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot +++ b/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot @@ -60,6 +60,7 @@ | ${container_count}= | ${1} | ${container_engine}= | LXC | ${container_image}= | ${EMPTY} +| ${container_install_dkms}= | ${FALSE} # CPU settings | ${system_cpus}= | ${1} | ${vpp_cpus}= | ${5} diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdrdisc.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdrdisc.robot index 5488d8a935..0c1b93b7d3 100644 --- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdrdisc.robot +++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdrdisc.robot @@ -96,6 +96,7 @@ | ${container_count}= | ${1} | ${container_engine}= | LXC | ${container_image}= | ${EMPTY} +| ${container_install_dkms}= | ${FALSE} # CPU settings | ${system_cpus}= | ${1} | ${vpp_cpus}= | ${5} diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdrdisc.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdrdisc.robot index 85089c57a0..798875fb15 100644 --- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdrdisc.robot +++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdrdisc.robot @@ -96,6 +96,7 @@ | ${container_count}= | ${1} | ${container_engine}= | LXC | ${container_image}= | ${EMPTY} +| ${container_install_dkms}= | ${FALSE} # CPU settings | ${system_cpus}= | ${1} | ${vpp_cpus}= | ${5} diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdrdisc.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdrdisc.robot index 0c9f57d564..fe0cbe2375 100644 --- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdrdisc.robot +++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdrdisc.robot @@ -96,6 +96,7 @@ | ${container_count}= | ${1} | ${container_engine}= | LXC | ${container_image}= | ${EMPTY} +| ${container_install_dkms}= | ${FALSE} # CPU settings | ${system_cpus}= | ${1} | ${vpp_cpus}= | ${5} |