diff options
author | MatthewLi <matthew.lijun@huawei.com> | 2017-05-26 02:35:03 -0400 |
---|---|---|
committer | MatthewLi <matthew.lijun@huawei.com> | 2017-05-30 23:02:30 -0400 |
commit | ab4226ed3c39b8d7b759e93e05e27f1247763ec9 (patch) | |
tree | 91702ad2575f582a8fcaaa1143748c19cbd64308 /dovetail/utils | |
parent | ed7f8ee3697be3751dc6cfb243cc55092ddd1dd5 (diff) |
sdnvpn offline support in dovetail
JIRA: DOVETAIL-441
Change-Id: I709c62a36c65ef0b4da69c5508f7a8273e68dc2b
Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
Diffstat (limited to 'dovetail/utils')
-rw-r--r-- | dovetail/utils/offline/config.yaml | 6 | ||||
-rwxr-xr-x | dovetail/utils/offline/download.py | 8 | ||||
-rwxr-xr-x | dovetail/utils/offline/load.py | 22 |
3 files changed, 35 insertions, 1 deletions
diff --git a/dovetail/utils/offline/config.yaml b/dovetail/utils/offline/config.yaml index ced42296..185686a5 100644 --- a/dovetail/utils/offline/config.yaml +++ b/dovetail/utils/offline/config.yaml @@ -20,3 +20,9 @@ docker_images: tag: 3.5 store_name: image_mongo.docker docker_save_path: /home/opnfv/dovetail/results/ + +wgets: + sdnvpn: + source_url: http://artifacts.opnfv.org/sdnvpn/ubuntu-16.04-server-cloudimg-amd64-disk1.img + save_path: /home/opnfv/dovetail/results/ + file_name: ubuntu-16.04-server-cloudimg-amd64-disk1.img diff --git a/dovetail/utils/offline/download.py b/dovetail/utils/offline/download.py index cda4ecca..3fb0cde2 100755 --- a/dovetail/utils/offline/download.py +++ b/dovetail/utils/offline/download.py @@ -41,6 +41,14 @@ class download(object): cmd = 'sudo chmod og+rw %s' % image_save_path dt_utils.exec_cmd(cmd) + if 'wgets' in keys: + for key, value in self.config['wgets'].items(): + if value is not None: + wget_url = self.config['wgets'][key]['source_url'] + wget_path = self.config['wgets'][key]['save_path'] + cmd = 'sudo wget -nc %s -P %s' % (wget_url, wget_path) + dt_utils.exec_cmd(cmd) + if __name__ == '__main__': download = download() diff --git a/dovetail/utils/offline/load.py b/dovetail/utils/offline/load.py index 9ddf6596..c56868a5 100755 --- a/dovetail/utils/offline/load.py +++ b/dovetail/utils/offline/load.py @@ -1,6 +1,7 @@ #!/usr/bin/env python import os +import sys import yaml import dovetail.utils.dovetail_utils as dt_utils @@ -22,12 +23,31 @@ class load(object): for key, value in self.config['docker_images'].items(): if value is not None: name = self.config['docker_images'][key]['store_name'] - image_save_path = ''.join([save_path, name]) + image_save_path = os.path.join(save_path, name) if os.path.isfile(image_save_path): cmd = 'sudo docker load -i %s' % (image_save_path) dt_utils.exec_cmd(cmd) else: print "file %s not exists" % image_save_path + if 'wgets' in keys: + for key, value in self.config['wgets'].items(): + if value is not None: + try: + dovetail_home = os.environ["DOVETAIL_HOME"] + except KeyError: + print "env variable DOVETAIL_HOME not found" + sys.exit(1) + name = self.config['wgets'][key]['file_name'] + save_path = self.config['wgets'][key]['save_path'] + file_path = os.path.join(save_path, name) + dest_path = os.path.join(dovetail_home, 'pre_config') + if not os.path.isdir(dest_path): + os.mkdir(dest_path) + if os.path.isfile(file_path): + cmd = 'sudo cp %s %s' % (file_path, dest_path) + dt_utils.exec_cmd(cmd) + else: + print "file %s not exists" % file_path if __name__ == '__main__': |