diff options
| -rw-r--r-- | docker/Dockerfile | 2 | ||||
| -rw-r--r-- | docs/testing/developer/devguide/index.rst | 1 | ||||
| -rw-r--r-- | docs/testing/developer/devguide/overview.rst | 27 | ||||
| -rw-r--r-- | docs/testing/user/userguide/cli.rst | 27 | ||||
| -rw-r--r-- | opt/infra/roles/user/files/akhil.authorized_keys | 2 | ||||
| -rw-r--r-- | qtip/collector/parser/regex.yaml | 4 | ||||
| -rw-r--r-- | test-requirements.txt | 9 |
7 files changed, 58 insertions, 14 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index d609273d..d6f8fdd6 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -62,7 +62,7 @@ RUN git config --global http.sslVerify false RUN git clone -b $BRANCH https://gerrit.opnfv.org/gerrit/qtip $REPOS_DIR/qtip RUN git clone https://gerrit.opnfv.org/gerrit/releng $REPOS_DIR/releng -RUN pip install -U -r $REPOS_DIR/qtip/requirements.txt +RUN cd $REPOS_DIR/qtip && pip install -U . #Config supervisor RUN mkdir -p /var/log/supervisor diff --git a/docs/testing/developer/devguide/index.rst b/docs/testing/developer/devguide/index.rst index 2b4bd9b0..89113e56 100644 --- a/docs/testing/developer/devguide/index.rst +++ b/docs/testing/developer/devguide/index.rst @@ -10,6 +10,7 @@ QTIP Design Specifications .. toctree:: :maxdepth: 2 + overview.rst arch.rst cli.rst api.rst diff --git a/docs/testing/developer/devguide/overview.rst b/docs/testing/developer/devguide/overview.rst new file mode 100644 index 00000000..4ccaae20 --- /dev/null +++ b/docs/testing/developer/devguide/overview.rst @@ -0,0 +1,27 @@ +.. This work is licensed under a Creative Commons Attribution 4.0 International License. +.. http://creativecommons.org/licenses/by/4.0 +.. (c) 2017 ZTE Corp. + + +######## +Overview +######## + +QTIP uses Python as primary programming language. The structure of repository is based on the recommended sample in +`The Hitchhiker's Guide to Python`_ + +============== ========================================================================== +Path Content +============== ========================================================================== +./benchmarks/ builtin benchmark assets including plan, QPI and metrics +./contrib/ independent project/plugin/code contributed to QTIP +./docker/ configuration for building Docker image for QTIP deployment +./docs/ release notes, user and developer documentation, design proposals +./legacy/ legacy obsoleted code that is unmaintained but kept for reference +./opt/ optional component, e.g. scripts to setup infrastructure services for QTIP +./qtip/ the actual package +./tests/ package functional and unit tests +./third-party/ third part included in QTIP project +============== ========================================================================== + +.. _The Hitchhiker's Guide to Python: http://python-guide-pt-br.readthedocs.io/en/latest/writing/structure/ diff --git a/docs/testing/user/userguide/cli.rst b/docs/testing/user/userguide/cli.rst index e18a36f9..96026c5b 100644 --- a/docs/testing/user/userguide/cli.rst +++ b/docs/testing/user/userguide/cli.rst @@ -12,13 +12,13 @@ along with a short description. qtip [-h|--help] -Typically a complete plan is executed at the -target environment. QTIP defaults to a number of sample plans. One may be able to list them using +Typically a complete plan is executed at the target environment. QTIP defaults to a number of sample plans. +A list of all the available plans can be viewed :: qtip plan list -One can also be able to view the details about a specific plan. +In order to view the details about a specific plan. :: qtip plan show <plan_name> @@ -28,9 +28,28 @@ where *plan_name* is one of those listed from the previous command. To execute a complete plan :: - qtip plan run <plan_name> + qtip plan run <plan_name> -p <path_to_result_directory> + +QTIP does not limit result storage at a specific directory. Instead a user may specify his own result storage +as above. An important thing to remember is to provide absolute path of result directory. +:: + + mkdir result + qtip plan run <plan_name> -p $PWD/result Similarly, the same commands can be used for the other two components making up the plans, i.e QPI's and metrics. +For example, in order to run a single metric +:: + + qtip metric run <metric_name> -p $PWD/result + +The same can be applied for a QPI. + +QTIP also provides the utility to view benchmarking results on the console. One just need to provide to where +the results are stored. Extending the example above +:: + + qtip report show <metric_name> -p $PWD/result Debug option helps identify the error by providing a detailed traceback. It can be enabled as :: diff --git a/opt/infra/roles/user/files/akhil.authorized_keys b/opt/infra/roles/user/files/akhil.authorized_keys index 43942621..832595a2 100644 --- a/opt/infra/roles/user/files/akhil.authorized_keys +++ b/opt/infra/roles/user/files/akhil.authorized_keys @@ -1 +1 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJ2zxPZ6gu19QhXlzCdZQjiRIXnzE0Tp2+7LL5hBbl39+dohPwKlSvXzlI9n3MpeDUBkEwUzcS/P4McbTYOU74nOb5vBoNhgayZIebG3gM5cgLwRVD219oOT6mBGNSgfuc54KvmDgIOX4p8o8TLFq+0Qv4YQXcj3uprAR3p5e9NDAfKX8k27M4Ba9Goqorda/0CguAT6b+MdWen554N9PJLWQwtN1Nm4CMf7R9QcDOQEwOXhoZoN+/xmgqQummoo+17IYaAslQhb3Cx16hy2JA8QhZa6k+KnAUvh9GHxGSZpex7w6jyDez5KngROQvIiLfjYkqlgD3O8CDfhrjccZ5 akhil.batra@research.iiit.ac.in +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDPC15Fc+ir0q+qTz1UnN4zxpb0SvfNBOQlVsXSpH2YxHUWFC4Vk6XZb6K9v9GVN2u1iZq9OyFW4o8pIqbNb4JXvhkDr2cmbtWcTMYUkCrOj+rSdOVcJPK2D17Uimu0r2GjrYWghFaCRrQcImuxwFHSAzlKNbCAqizevy+sAg/iGQtdQ9T4+CMupMsZdDSSW3CcJ+H+fa0uz9XVWmdQ8yqwUWZpWdqUANk4gsgChw5dvBCUY/3l+39NKUnxPYI5qk1NUswwMF3s1VzRDsLTycH1tcirbr2T238GHr0VzzpF9UgSmsCsV8kZC89lIVRSKYAtdg6rXsG/ObsFoEDZKomX your_email@youremail.com
\ No newline at end of file diff --git a/qtip/collector/parser/regex.yaml b/qtip/collector/parser/regex.yaml index 397f8973..94271136 100644 --- a/qtip/collector/parser/regex.yaml +++ b/qtip/collector/parser/regex.yaml @@ -25,8 +25,8 @@ dpi: - filename: dpi_dump.txt grep: - |- - ^\s+nDPI throughput:.+?(?P<pps>\d+.\d+)\sM\spps.+ - ?(?P<bps>\d+.\d+)\sGb\/sec + ^\s+nDPI throughput:.+?(?P<pps>\d+.\d+)\s.+\spps.+ + ?(?P<bps>\d+.\d+)\s.+\/sec ramspeed: - filename: Intmem grep: diff --git a/test-requirements.txt b/test-requirements.txt index cfbbdcdd..5b770010 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,15 +2,12 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -tox -pytest -pytest-cov -pytest-mock coverage -pykwalify mock pip_check_reqs -coverage +pykwalify +pytest pytest-cov pytest-faker +pytest-mock tox |