diff options
| -rw-r--r-- | dovetail/compliance/proposed_tests.yml | 2 | ||||
| -rw-r--r-- | dovetail/conf/dovetail_config.yml | 7 | ||||
| -rw-r--r-- | dovetail/container.py | 15 | ||||
| -rw-r--r-- | dovetail/testcase/vnf.tc001.yml | 11 |
4 files changed, 27 insertions, 8 deletions
diff --git a/dovetail/compliance/proposed_tests.yml b/dovetail/compliance/proposed_tests.yml index ad70cf6a..bae2375e 100644 --- a/dovetail/compliance/proposed_tests.yml +++ b/dovetail/compliance/proposed_tests.yml @@ -10,3 +10,5 @@ proposed_tests: - dovetail.ha.tc009 - dovetail.ha.tc010 - dovetail.ha.tc011 + # vnf + - dovetail.vnf.tc001 diff --git a/dovetail/conf/dovetail_config.yml b/dovetail/conf/dovetail_config.yml index ed11a6bd..e3b58d9f 100644 --- a/dovetail/conf/dovetail_config.yml +++ b/dovetail/conf/dovetail_config.yml @@ -23,6 +23,12 @@ 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' + COMPLIANCE_PATH: compliance/ TESTCASE_PATH: testcase/ # testsuite supported, should adjust accordingly @@ -45,6 +51,7 @@ testarea_supported: - mandatory - full - smoke + - vnf functest_testsuite: - refstack_defcore diff --git a/dovetail/container.py b/dovetail/container.py index 8069ea47..4c0d8c33 100644 --- a/dovetail/container.py +++ b/dovetail/container.py @@ -232,14 +232,13 @@ class Container(object): if type.lower() == 'functest': prefix_path = dt_cfg.dovetail_config[type]['config']['dir'] - file_name = dt_cfg.dovetail_config['cirros_image'] - src_path = os.path.join(prefix_path, 'pre_config', file_name) - dest_path = '/home/opnfv/functest/images' - Container.pre_copy(container_id, src_path, dest_path) - file_name = dt_cfg.dovetail_config['ubuntu14_image'] - src_path = os.path.join(prefix_path, 'pre_config', file_name) - dest_path = '/home/opnfv/functest/images' - Container.pre_copy(container_id, src_path, dest_path) + images = ['cirros_image', 'ubuntu14_image', 'cloudify_image', + 'trusty_image'] + for image in images: + file_name = dt_cfg.dovetail_config[image] + src_path = os.path.join(prefix_path, 'pre_config', file_name) + dest_path = '/home/opnfv/functest/images' + Container.pre_copy(container_id, src_path, dest_path) if type.lower() == 'yardstick': cls.set_yardstick_conf_file(container_id) diff --git a/dovetail/testcase/vnf.tc001.yml b/dovetail/testcase/vnf.tc001.yml new file mode 100644 index 00000000..e0f39582 --- /dev/null +++ b/dovetail/testcase/vnf.tc001.yml @@ -0,0 +1,11 @@ +--- +dovetail.vnf.tc001: + name: dovetail.vnf.tc001 + objective: testing for Cleawater IMS deployment using Cloudify orchestrator + validate: + type: functest + testcase: cloudify_ims + pre_condition: + - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml' + report: + sub_testcase_list: |