diff options
author | Luc Provoost <luc.provoost@intel.com> | 2021-05-07 18:06:05 +0200 |
---|---|---|
committer | Luc Provoost <luc.provoost@intel.com> | 2021-05-10 09:14:45 +0200 |
commit | 1492024f49f6952fb9f99ac70d0ae1c26fb946ad (patch) | |
tree | a47373f099b38d76f54a767a5825f20b3c4c3295 /VNFs | |
parent | 0e9709a99633737364e8f3f5b475f30f0cfbddcb (diff) |
Fixing rapidxt for Xtesting
Changes were needed for installing the python rapid python package by
adding 2 new files: pyproject.toml & setup.cfg. Also fixed a bug in
rapidxt.py
Change-Id: Iac98b6068afef4a5f1a97459ea1109211607d53d
Signed-off-by: Luc Provoost <luc.provoost@intel.com>
Diffstat (limited to 'VNFs')
5 files changed, 25 insertions, 4 deletions
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/pyproject.toml b/VNFs/DPPD-PROX/helper-scripts/rapid/pyproject.toml new file mode 100644 index 00000000..374b58cb --- /dev/null +++ b/VNFs/DPPD-PROX/helper-scripts/rapid/pyproject.toml @@ -0,0 +1,6 @@ +[build-system] +requires = [ + "setuptools>=42", + "wheel" +] +build-backend = "setuptools.build_meta" diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/rapidxt.py b/VNFs/DPPD-PROX/helper-scripts/rapid/rapidxt.py index b9b1dc78..2f6b9443 100644 --- a/VNFs/DPPD-PROX/helper-scripts/rapid/rapidxt.py +++ b/VNFs/DPPD-PROX/helper-scripts/rapid/rapidxt.py @@ -41,7 +41,7 @@ class RapidXt(testcase.TestCase): _, environment_file_name = os.path.split( test_params['environment_file']) log_file = '{}/RUN{}.{}.log'.format(self.res_dir, - environment_file_name, test_file) + environment_file_name, test_file_name) RapidLog.log_init(log_file, test_params['loglevel'], test_params['screenloglevel'] , test_params['version'] ) test_manager = RapidTestManager() diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/setup.cfg b/VNFs/DPPD-PROX/helper-scripts/rapid/setup.cfg new file mode 100644 index 00000000..2f9542e1 --- /dev/null +++ b/VNFs/DPPD-PROX/helper-scripts/rapid/setup.cfg @@ -0,0 +1,13 @@ +[metadata] +name = rapidxt +version = 1 + +[files] +packages = . +package_dir = . + +[entry_points] +xtesting.testcase = + rapidxt = rapidxt:RapidXt +[options.packages.find] +where = . diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/xtesting/Dockerfile b/VNFs/DPPD-PROX/helper-scripts/rapid/xtesting/Dockerfile index 299f8ef3..8a092def 100644 --- a/VNFs/DPPD-PROX/helper-scripts/rapid/xtesting/Dockerfile +++ b/VNFs/DPPD-PROX/helper-scripts/rapid/xtesting/Dockerfile @@ -1,5 +1,5 @@ ## -## Copyright (c) 2020 Intel Corporation +## Copyright (c) 2020-2021 Intel Corporation ## ## Licensed under the Apache License, Version 2.0 (the "License"); ## you may not use this file except in compliance with the License. @@ -22,8 +22,7 @@ ENV RAPID_TEST =rapid_tst009_throughput RUN git clone https://git.opnfv.org/samplevnf /samplevnf WORKDIR /samplevnf/VNFs/DPPD-PROX/helper-scripts/rapid -COPY rapid.env /samplevnf/VNFs/DPPD-PROX/helper-scripts/rapid/. -COPY rapid_key.pem /samplevnf/VNFs/DPPD-PROX/helper-scripts/rapid/. +RUN chmod 400 /samplevnf/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_rsa_key COPY testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml RUN apk add python3-dev openssh-client && cd /samplevnf/VNFs/DPPD-PROX/helper-scripts/rapid/ && git init && pip3 install . CMD ["run_tests", "-t", "all"] diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/xtesting/testcases.yaml b/VNFs/DPPD-PROX/helper-scripts/rapid/xtesting/testcases.yaml index f753e8e8..3cdda7d7 100644 --- a/VNFs/DPPD-PROX/helper-scripts/rapid/xtesting/testcases.yaml +++ b/VNFs/DPPD-PROX/helper-scripts/rapid/xtesting/testcases.yaml @@ -18,6 +18,7 @@ tiers: args: test_file: tests/irq.test runtime: 5 + environment_file: config/rapid.env - name: TST009_rapid_benchmarking order: 2 @@ -36,6 +37,7 @@ tiers: args: test_file: tests/TST009_Throughput_64B_64F.test runtime: 5 + environment_file: config/rapid.env - case_name: rapid_tst009_acaeab_16384f project_name: rapidxt @@ -49,3 +51,4 @@ tiers: args: test_file: tests/TST009_Throughput_acaeab_16384F.test runtime: 5 + environment_file: config/rapid.env |