From: helenyao <yaohelan@huawei.com>
Date: Thu, 4 May 2017 06:42:32 +0000 (+0800)
Subject: Put the ubuntu images in new directory
X-Git-Tag: opnfv-5.0.RC1~32^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F05%2F34205%2F3;p=sdnvpn.git

Put the ubuntu images in new directory

To adopt the new change of Functest[1], all images are put under
${HOME}/functest/images. Users are allowed to
pre-download the images and map the local folder to the new directory.

[1] https://gerrit.opnfv.org/gerrit/#/c/34033

Change-Id: Iafee8825af77dfce74ad2ace3346e3f2b70a7c96
Signed-off-by: helenyao <yaohelan@huawei.com>
---

diff --git a/sdnvpn/lib/config.py b/sdnvpn/lib/config.py
index 52e328d..21b848a 100644
--- a/sdnvpn/lib/config.py
+++ b/sdnvpn/lib/config.py
@@ -45,7 +45,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(
-            CONST.dir_functest_data,
+            CONST.dir_functest_images,
             "ubuntu-16.04-server-cloudimg-amd64-disk1.img")
         self.custom_flavor_name = 'm1.custom'
         self.custom_flavor_ram = 1024