summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore3
-rwxr-xr-xci/build-vsperf.sh18
-rw-r--r--docs/conf.py6
-rw-r--r--docs/conf.yaml3
-rw-r--r--docs/index.rst21
-rw-r--r--docs/requirements.txt2
-rw-r--r--tox.ini17
-rw-r--r--vnfs/qemu/qemu.py2
8 files changed, 61 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore
index 97dbd7d0..c162c945 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,7 +47,6 @@ coverage.xml
*.log
# Sphinx documentation
-docs/_build/
# PyBuilder
target/
@@ -58,7 +57,6 @@ target/
*~
.*.sw?
-/docs_build/
/docs_output/
/releng/
/src/dpdk/dpdk/
@@ -78,3 +76,4 @@ tags
!/src/l2fwd/LICENSE.txt
!/src/l2fwd/Makefile
+docs/_build/*
diff --git a/ci/build-vsperf.sh b/ci/build-vsperf.sh
index a5ee8501..75edbfbb 100755
--- a/ci/build-vsperf.sh
+++ b/ci/build-vsperf.sh
@@ -55,7 +55,9 @@ TESTCASES_MERGE_VPP=$TESTCASES_VERIFY_VPP
TESTPARAM_MERGE_VPP=$TESTPARAM_VERIFY_VPP
# DAILY - run selected TCs for defined packet sizes
TESTCASES_DAILY='phy2phy_tput back2back phy2phy_tput_mod_vlan phy2phy_scalability pvp_tput pvp_back2back pvvp_tput pvvp_back2back'
+TESTCASES_DAILY_MIN='phy2phy_tput'
TESTCASES_DAILY_VPP='phy2phy_tput_vpp phy2phy_back2back_vpp pvp_tput_vpp pvp_back2back_vpp pvvp_tput_vpp pvvp_back2back_vpp'
+TESTCASES_DAILY_VPP_MIN='phy2phy_tput_vpp'
TESTPARAM_DAILY='--test-params TRAFFICGEN_PKT_SIZES=(64,128,512,1024,1518)'
TESTPARAM_DAILY_VPP=$TESTPARAM_DAILY
TESTCASES_SRIOV='pvp_tput'
@@ -184,13 +186,13 @@ function execute_vsperf() {
# by default use daily build and upload results to the OPNFV databse
if [ "$1" == "VPP" ] ; then
TESTPARAM=$TESTPARAM_DAILY_VPP
- TESTCASES=$TESTCASES_DAILY_VPP
+ TESTCASES=$TESTCASES_DAILY_VPP_MIN
# don't report VPP results into testresults DB, until TC name mapping
# for VPP tests will be defined
#OPNFVPOD="--opnfvpod=$NODE_NAME"
else
TESTPARAM=$TESTPARAM_DAILY
- TESTCASES=$TESTCASES_DAILY
+ TESTCASES=$TESTCASES_DAILY_MIN
OPNFVPOD="--opnfvpod=$NODE_NAME"
fi
;;
@@ -547,21 +549,21 @@ case $1 in
terminate_vsperf
execute_vsperf OVS_with_DPDK_and_vHost_User $1
terminate_vsperf
- execute_vsperf OVS_vanilla $1
- terminate_vsperf
+# execute_vsperf OVS_vanilla $1
+# terminate_vsperf
execute_vsperf VPP $1
terminate_vsperf
- execute_vsperf SRIOV $1
- terminate_vsperf
+# execute_vsperf SRIOV $1
+# terminate_vsperf
generate_report
push_results_to_artifactory
generate_and_push_graphs "$TESTCASES_DAILY" ",OvsDpdkVhost,"
- generate_and_push_graphs "$TESTCASES_DAILY" ",OvsVanilla,"
+# generate_and_push_graphs "$TESTCASES_DAILY" ",OvsVanilla,"
generate_and_push_graphs "$TESTCASES_DAILY_VPP" ",VppDpdkVhost,"
- generate_and_push_graphs "$TESTCASES_SRIOV" ",none,"
+# generate_and_push_graphs "$TESTCASES_SRIOV" ",none,"
cleanup
diff --git a/docs/conf.py b/docs/conf.py
new file mode 100644
index 00000000..b281a515
--- /dev/null
+++ b/docs/conf.py
@@ -0,0 +1,6 @@
+""" for docs
+"""
+
+# pylint: disable=import-error
+# flake8: noqa
+from docs_conf.conf import *
diff --git a/docs/conf.yaml b/docs/conf.yaml
new file mode 100644
index 00000000..59448e39
--- /dev/null
+++ b/docs/conf.yaml
@@ -0,0 +1,3 @@
+---
+project_cfg: opnfv
+project: VSWITCHPERF
diff --git a/docs/index.rst b/docs/index.rst
new file mode 100644
index 00000000..d76a1952
--- /dev/null
+++ b/docs/index.rst
@@ -0,0 +1,21 @@
+.. _vswitchperf:
+
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. SPDX-License-Identifier CC-BY-4.0
+.. (c) Open Platform for NFV Project, Inc. and its contributors
+
+*********************************
+OPNFV Vswitchperf
+*********************************
+
+.. toctree::
+ :numbered:
+ :maxdepth: 3
+
+ release/release-notes/index
+ testing/developer/devguide/index
+ testing/developer/devguide/results/index
+ testing/user/configguide/index
+ testing/user/userguide/index
+
diff --git a/docs/requirements.txt b/docs/requirements.txt
new file mode 100644
index 00000000..9fde2df2
--- /dev/null
+++ b/docs/requirements.txt
@@ -0,0 +1,2 @@
+lfdocs-conf
+sphinx_opnfv_theme
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 00000000..69aa1893
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,17 @@
+[tox]
+minversion = 1.6
+envlist =
+ docs,
+ docs-linkcheck
+skipsdist = true
+
+[testenv:docs]
+deps = -rdocs/requirements.txt
+commands =
+ sphinx-build -b html -n -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html
+ echo "Generated docs available in {toxinidir}/docs/_build/html"
+whitelist_externals = echo
+
+[testenv:docs-linkcheck]
+deps = -rdocs/requirements.txt
+commands = sphinx-build -b linkcheck -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/linkcheck
diff --git a/vnfs/qemu/qemu.py b/vnfs/qemu/qemu.py
index 7ba58c05..d3e1b343 100644
--- a/vnfs/qemu/qemu.py
+++ b/vnfs/qemu/qemu.py
@@ -210,7 +210,7 @@ class IVnfQemu(IVnf):
:returns: None
"""
- thread_id = (r'.* CPU #%d: .* thread_id=(\d+)')
+ thread_id = (r'.* CPU #%d:.*? thread_id=(\d+)')
self._logger.info('Affinitizing guest...')