summaryrefslogtreecommitdiffstats
path: root/etc/conf
diff options
context:
space:
mode:
authorMoshe <moshehoa@amdocs.com>2018-03-04 15:42:23 +0200
committerMoshe <moshehoa@amdocs.com>2018-03-29 14:04:48 +0300
commit698cd3f4246c4e472c306fcad57d8d7b6431333f (patch)
tree5dd2ba4d4e571941c0d0c1e6d191b1045278e9c1 /etc/conf
parentcaf95e09ef0206354b46d51f83690e20bc69e848 (diff)
Integrate dovetail with ONAP
Change-Id: I6a1fa5f27df2f5127eb00156b3135dc79caf5e77 Issue-ID: DOVETAIL-629 Signed-off-by: Moshe <moshehoa@amdocs.com>
Diffstat (limited to 'etc/conf')
-rw-r--r--etc/conf/cmd_config.yml7
-rw-r--r--etc/conf/dovetail_config.yml4
-rw-r--r--etc/conf/vnftest_config.yml31
3 files changed, 42 insertions, 0 deletions
diff --git a/etc/conf/cmd_config.yml b/etc/conf/cmd_config.yml
index 4dbfbbc8..cd8bfe93 100644
--- a/etc/conf/cmd_config.yml
+++ b/etc/conf/cmd_config.yml
@@ -36,6 +36,13 @@ cli:
path:
- 'bottlenecks/docker_tag'
help: 'Overwrite tag for bottlenecks docker container (e.g. stable)'
+ vnf_tag:
+ flags:
+ - '--vnf_tag'
+ - '-v'
+ path:
+ - 'vnftest/docker_tag'
+ help: 'Overwrite tag for vnftest docker container (e.g. beijing.0)'
control:
testsuite:
flags:
diff --git a/etc/conf/dovetail_config.yml b/etc/conf/dovetail_config.yml
index 464d046c..a77ac2af 100644
--- a/etc/conf/dovetail_config.yml
+++ b/etc/conf/dovetail_config.yml
@@ -35,6 +35,7 @@ testsuite_supported:
- proposed_tests
- debug
- ovp.1.0.0
+ - onap.1.0.0
# testarea supported, should adjust accordingly
testarea_supported:
- osinterop
@@ -50,6 +51,7 @@ testarea_supported:
- full
- smoke
- vnf
+ - lifecycle
functest_testsuite:
- refstack_defcore
@@ -86,11 +88,13 @@ include_config:
- functest_config.yml
- yardstick_config.yml
- bottlenecks_config.yml
+ - vnftest_config.yml
test_project:
- 'yardstick'
- 'functest'
- 'bottlenecks'
+ - 'vnftest'
validate_input:
valid_functest_tags:
diff --git a/etc/conf/vnftest_config.yml b/etc/conf/vnftest_config.yml
new file mode 100644
index 00000000..25a84c7b
--- /dev/null
+++ b/etc/conf/vnftest_config.yml
@@ -0,0 +1,31 @@
+---
+vnftest:
+ image_name: onap/vnfsdk/vnftest
+ docker_tag: latest
+ opts: '-id --privileged=true'
+ config:
+ dir: '/home/onap/userconfig'
+ pre_condition:
+ - 'echo this is pre_condition'
+ cmds:
+ - 'mkdir -p /home/onap/vnftest/results/'
+ - "cd /home/onap/repos/vnftest && source /etc/vnftest/openstack.creds &&
+ export CONF_FILE=/etc/vnftest/vnftest.yaml &&
+ vnftest task start --output-file /home/onap/vnftest/results/{{testcase}}.out
+ /etc/vnftest/vnf_descriptor.yaml
+ tests/onap/test_cases/{{validate_testcase}}.yaml"
+ post_condition:
+ - 'echo this is post_condition'
+ result:
+ dir: '/home/onap/vnftest/results'
+ log: '/tmp/vnftest'
+ file_path: 'vnftest.log'
+ key_path: '/root/.ssh/id_rsa'
+ openrc: '/etc/vnftest/openstack.creds'
+ vnftest_conf:
+ -
+ src_file: '/home/opnfv/dovetail/pre_config/vnftest_conf.yaml'
+ dest_file: '/etc/vnftest/vnftest.yaml'
+ -
+ src_file: '/home/opnfv/dovetail/pre_config/vnf_descriptor.yaml'
+ dest_file: '/etc/vnftest/vnf_descriptor.yaml'