diff options
| author |   Dimitrios Markou <mardim@intracom-telecom.com> | 2018-06-01 16:09:47 +0300 |
|---|---|---|
| committer | Dimitrios Markou <mardim@intracom-telecom.com> | 2018-06-05 09:50:15 +0300 |
| commit | 96d17e018f0b4b4547689a31fb0e4f4af1d65a07 (patch) | |
| tree | f2a0daf12b1bbbe1ea2fff3c9c00888b99a061b3 | |
| parent | e08e7c43c85fa04dc78a1fcf8a11ab877a78dfb9 (diff) | |
[Bug Fix] Use correct image for the Quagga instance
In testcase_3 the Quagga image is downloaded from the
opnfv.artifacts repository to the /home/opnfv/functest/data
directory.
But the testcase_3 after that tries to find the image in the
/home/opnfv/functest/images directory.
This results in using a wrong image
Jira: SDNVPN-213
Change-Id: I99539fc9a7a2d016a97ed51fca0cde81f82b3911
Signed-off-by: Dimitrios Markou <mardim@intracom-telecom.com>
| -rw-r--r-- | sdnvpn/lib/config.py | 2 | ||||
| -rw-r--r-- | sdnvpn/test/functest/testcase_13.py | 12 | ||||
| -rw-r--r-- | sdnvpn/test/functest/testcase_3.py | 4 |
3 files changed, 16 insertions, 2 deletions
diff --git a/sdnvpn/lib/config.py b/sdnvpn/lib/config.py index 81d895b..847b41c 100644 --- a/sdnvpn/lib/config.py +++ b/sdnvpn/lib/config.py @@ -53,7 +53,7 @@ class CommonConfig(object): # TODO does functest have an ubuntu image somewhere? self.ubuntu_image_name = "sdnvpn-ubuntu" self.ubuntu_image_path = '{0}/{1}'.format( - getattr(config.CONF, 'dir_functest_images'), + getattr(config.CONF, 'dir_functest_data'), "ubuntu-16.04-server-cloudimg-amd64-disk1.img") self.custom_flavor_name = 'm1.custom' self.custom_flavor_ram = 1024 diff --git a/sdnvpn/test/functest/testcase_13.py b/sdnvpn/test/functest/testcase_13.py index 35a1a31..8beb1db 100644 --- a/sdnvpn/test/functest/testcase_13.py +++ b/sdnvpn/test/functest/testcase_13.py @@ -9,6 +9,7 @@ # import logging +import os import sys from random import randint @@ -31,6 +32,17 @@ def main(): results.add_to_summary(2, "STATUS", "SUBTEST") results.add_to_summary(0, "=") + if not os.path.isfile(COMMON_CONFIG.ubuntu_image_path): + logger.info("Downloading image") + image_dest_path = '/'.join( + COMMON_CONFIG.ubuntu_image_path.split('/')[:-1]) + os_utils.download_url( + "http://artifacts.opnfv.org/sdnvpn/" + "ubuntu-16.04-server-cloudimg-amd64-disk1.img", + image_dest_path) + else: + logger.info("Using old image") + nova_client = os_utils.get_nova_client() neutron_client = os_utils.get_neutron_client() glance_client = os_utils.get_glance_client() diff --git a/sdnvpn/test/functest/testcase_3.py b/sdnvpn/test/functest/testcase_3.py index 373e5a8..95023c6 100644 --- a/sdnvpn/test/functest/testcase_3.py +++ b/sdnvpn/test/functest/testcase_3.py @@ -140,10 +140,12 @@ def main(): # Taken from the sfc tests if not os.path.isfile(COMMON_CONFIG.ubuntu_image_path): logger.info("Downloading image") + image_dest_path = '/'.join( + COMMON_CONFIG.ubuntu_image_path.split('/')[:-1]) os_utils.download_url( "http://artifacts.opnfv.org/sdnvpn/" "ubuntu-16.04-server-cloudimg-amd64-disk1.img", - "/home/opnfv/functest/data/") + image_dest_path) else: logger.info("Using old image") |