diff options
author | SerenaFeng <feng.xiaowei@zte.com.cn> | 2018-03-01 20:03:59 +0800 |
---|---|---|
committer | SerenaFeng <feng.xiaowei@zte.com.cn> | 2018-03-06 09:16:43 +0800 |
commit | b25c1371f82911ea26b8c893b6612bb5ae0c8c19 (patch) | |
tree | 91190d32b9bb723670214b4d91e0bb95cccf5382 /etc/conf | |
parent | c308b9a718b8b4fc5e781f8d2a6dbe714e381834 (diff) |
leverage data_files to eliminate so many hardcoded abs_path_seekings
1. mv conf/ userconfig/ compliance/ patch to etc/
2. after installation etc/ will be put under /etc/dovetail
3. leveraging /etc/dovetail in coding
Change-Id: Icf9cb00ff7fc7cf35755f60d3e258b23e2c70839
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
Diffstat (limited to 'etc/conf')
-rw-r--r-- | etc/conf/__init__.py | 0 | ||||
-rw-r--r-- | etc/conf/bottlenecks_config.yml | 33 | ||||
-rw-r--r-- | etc/conf/cmd_config.yml | 71 | ||||
-rw-r--r-- | etc/conf/dovetail_config.yml | 110 | ||||
-rw-r--r-- | etc/conf/functest_config.yml | 18 | ||||
-rw-r--r-- | etc/conf/yardstick_config.yml | 26 |
6 files changed, 258 insertions, 0 deletions
diff --git a/etc/conf/__init__.py b/etc/conf/__init__.py new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/etc/conf/__init__.py diff --git a/etc/conf/bottlenecks_config.yml b/etc/conf/bottlenecks_config.yml new file mode 100644 index 00000000..f33e50f1 --- /dev/null +++ b/etc/conf/bottlenecks_config.yml @@ -0,0 +1,33 @@ +--- +bottlenecks: + image_name: opnfv/bottlenecks + docker_tag: stable + opts: '-id --privileged=true' + config: + dir: '/home/opnfv/userconfig' + pre_condition: + - 'source /tmp/admin_rc.sh && + (openstack --insecure image list | grep cirros-0.3.5 || + openstack --insecure image create cirros-0.3.5 + --disk-format qcow2 --container-format bare + --file /home/opnfv/userconfig/pre_config/cirros-0.3.5-x86_64-disk.img)' + - 'source /tmp/admin_rc.sh && + (openstack --insecure flavor list | grep yardstick-flavor || + openstack --insecure flavor create --id 100 + --ram 1024 --disk 3 --vcpus 1 yardstick-flavor)' + cmds: + - 'python /home/opnfv/bottlenecks/testsuites/run_testsuite.py testcase {{validate_testcase}} True' + post_condition: + - 'source /tmp/admin_rc.sh && + (! openstack --insecure image list | grep cirros-0.3.5 || + openstack --insecure image delete cirros-0.3.5)' + - 'source /tmp/admin_rc.sh && + (! openstack --insecure flavor list | grep yardstick-flavor || + openstack --insecure flavor delete yardstick-flavor)' + result: + dir: '/tmp' + file_path: 'bottlenecks.log' + openrc: '/tmp/admin_rc.sh' + extra_container: + - 'Bottlenecks-Yardstick' + - 'Bottlenecks-ELK' diff --git a/etc/conf/cmd_config.yml b/etc/conf/cmd_config.yml new file mode 100644 index 00000000..91a44b0b --- /dev/null +++ b/etc/conf/cmd_config.yml @@ -0,0 +1,71 @@ +--- +cli: + arguments: + config: + # This is a simple example of arguments. + # Dovetail has no need of this kind of parameters currently. + # The arguments must be given orderly at the run-time. + # + # docker_tag: + # flags: 'docker_tag' + # path: + # - 'functest/docker_tag' + # - 'yardstick/docker_tag' + control: + + options: + config: + yard_tag: + flags: + - '--yard_tag' + - '-y' + path: + - 'yardstick/docker_tag' + help: 'Overwrite tag for yardstick docker container (e.g. opnfv-5.1.0)' + func_tag: + flags: + - '--func_tag' + - '-f' + path: + - 'functest/docker_tag' + help: 'Overwrite tag for functest docker container (e.g. euphrates)' + bott_tag: + flags: + - '--bott_tag' + - '-b' + path: + - 'bottlenecks/docker_tag' + help: 'Overwrite tag for bottlenecks docker container (e.g. stable)' + control: + testsuite: + flags: + - '--testsuite' + default: 'ovp.1.0.0' + help: 'compliance testsuite.' + testarea: + flags: + - '--testarea' + multiple: 'True' + help: 'compliance testarea within testsuite' + debug: + flags: + - '--debug' + - '-d' + is_flag: 'True' + help: 'Flag for showing debug log on screen.' + stop: + flags: + - '--stop' + - '-s' + is_flag: 'True' + help: 'Flag for stopping on test case failure.' + report: + flags: + - '--report' + - '-r' + help: 'push results to DB (e.g. --report http://192.168.135.2:8000/api/v1/results)' + offline: + flags: + - '--offline' + is_flag: 'True' + help: 'run in offline method, which means not to update the docker upstream images, functest, yardstick, etc.' diff --git a/etc/conf/dovetail_config.yml b/etc/conf/dovetail_config.yml new file mode 100644 index 00000000..47b46503 --- /dev/null +++ b/etc/conf/dovetail_config.yml @@ -0,0 +1,110 @@ +--- +# report_file: 'dovetail_report.txt' +cli_file_name: 'cmd_config.yml' +report_dest: 'file' +result_file: 'results.json' + +# OPENSTACK Credential file +env_file: 'env_config.sh' + +# POD info file +pod_file: 'pod.yaml' + +# JUMPSERVER private key used in pod_file to login hosts +# If use password to login hosts, there's no need to provide the private key +pri_key: 'id_rsa' + +# SDNVPN offline image +sdnvpn_image: 'ubuntu-16.04-server-cloudimg-amd64-disk1.img' + +# Tempest image +cirros_image: 'cirros-0.3.5-x86_64-disk.img' + +# Ubuntu 14.04 image for snaps_smoke +ubuntu14_image: 'ubuntu-14.04-server-cloudimg-amd64-disk1.img' + +# cloudify_ims image +cloudify_image: 'cloudify-manager-premium-4.0.1.qcow2' + +# Trusty image +trusty_image: 'trusty-server-cloudimg-amd64-disk1.img' + +# testsuite supported, should adjust accordingly +testsuite_supported: + - compliance_set + - proposed_tests + - debug + - ovp.1.0.0 +# testarea supported, should adjust accordingly +testarea_supported: + - osinterop + - example + - ha + - ipv6 + - sdnvpn + - vping + - stress + - tempest + - optional + - mandatory + - full + - smoke + - vnf + +functest_testsuite: + - refstack_defcore + - tempest_smoke_serial + - tempest_full_parallel + - tempest_custom + - rally_sanity + - promise + +functest_testcase: + - bgpvpn + - connection_check + - api_check + - snaps_health_check + - vping_ssh + - vping_userdata + - doctor + - copper + - cloudify_ims + - odl + - snaps_smoke + +# used for testcase cmd template in jinja2 format +# we have two variables available now +# parameter path, use this path to walk through python object and get value +# and the python object is "testcase" object by hard-coded +parameters: + - name: testcase + path: '("name",)' + - name: validate_testcase + path: '("validate", "testcase")' + +include_config: + - functest_config.yml + - yardstick_config.yml + - bottlenecks_config.yml + +test_project: + - 'yardstick' + - 'functest' + - 'bottlenecks' + +validate_input: + valid_docker_tag: + - 'stable' + - 'latest' + - 'danube.3.2' + - 'euphrates' + +mandatory: + - osinterop + - ha + - vping + +optional: + - ipv6 + - tempest + - sdnvpn diff --git a/etc/conf/functest_config.yml b/etc/conf/functest_config.yml new file mode 100644 index 00000000..896aeb95 --- /dev/null +++ b/etc/conf/functest_config.yml @@ -0,0 +1,18 @@ +--- +functest: + image_name: opnfv/functest-restapi + docker_tag: euphrates + opts: '-id --privileged=true' + config: + dir: '/home/opnfv/userconfig' + pre_condition: + - 'echo test for precondition in functest' + cmds: + - 'functest env prepare' + - 'functest testcase run {{validate_testcase}} -r' + post_condition: + - 'echo test for postcondition in functest' + result: + dir: '/home/opnfv/functest/results' + file_path: 'functest_results.txt' + openrc: '/home/opnfv/functest/conf/openstack.creds' diff --git a/etc/conf/yardstick_config.yml b/etc/conf/yardstick_config.yml new file mode 100644 index 00000000..bbb2133e --- /dev/null +++ b/etc/conf/yardstick_config.yml @@ -0,0 +1,26 @@ +--- +yardstick: + image_name: opnfv/yardstick + docker_tag: opnfv-5.1.0 + opts: '-id --privileged=true' + config: + dir: '/home/opnfv/userconfig' + pre_condition: + - 'echo this is pre_condition' + cmds: + - 'mkdir -p /home/opnfv/yardstick/results/' + - "cd /home/opnfv/repos/yardstick && source /etc/yardstick/openstack.creds && + yardstick task start tests/opnfv/test_cases/{{validate_testcase}}.yaml + --output-file /home/opnfv/yardstick/results/{{testcase}}.out + --task-args '{'file': '/home/opnfv/userconfig/pre_config/pod.yaml'}'" + post_condition: + - 'echo this is post_condition' + result: + dir: '/home/opnfv/yardstick/results' + log: '/tmp/yardstick' + file_path: 'yardstick.log' + key_path: '/root/.ssh/id_rsa' + openrc: '/etc/yardstick/openstack.creds' + yard_conf: + src_file: '/home/opnfv/repos/yardstick/etc/yardstick/yardstick.conf.sample' + dest_file: '/etc/yardstick/yardstick.conf' |