From 1a2b55736da4d18758f81444933181e380202f60 Mon Sep 17 00:00:00 2001 From: "wu.zhihui" Date: Fri, 23 Sep 2016 16:53:55 +0800 Subject: code refactor: run_qtip.sh 1. Add prepare_qtip_image.sh to prepare qtip image before qtip test. 2. Add cleanup_qtip_image.sh to clean up qtip image after finishing qtip test. Both of them are invoked in run_qtip.sh Change-Id: Iba892a2e02e31820ed0525f80a4e2885899557e0 Signed-off-by: wu.zhihui --- func/fetchimg.py | 35 ----------------------------------- func/spawn_vm.py | 32 -------------------------------- 2 files changed, 67 deletions(-) delete mode 100644 func/fetchimg.py (limited to 'func') diff --git a/func/fetchimg.py b/func/fetchimg.py deleted file mode 100644 index 1ed3def6..00000000 --- a/func/fetchimg.py +++ /dev/null @@ -1,35 +0,0 @@ -############################################################################## -# Copyright (c) 2015 Dell Inc and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## -import os -import time - -IMGSTORE = "/home/opnfv/imgstore" - - -class FetchImg: - - def __init__(self): - print 'Fetching Image!' - - @staticmethod - def download(): - time.sleep(2) - os.system('mkdir -p Temp_Img') - filepath = './Temp_Img/QTIP_CentOS.qcow2' - imgstorepath = IMGSTORE + "/QTIP_CentOS.qcow2" - if os.path.isfile(imgstorepath): - os.system("ln -s %s %s" % (imgstorepath, filepath)) - print "QTIP_CentOS.qcow2 exists locally. Skipping the download and using the file from IMG store" - else: - print 'Fetching QTIP_CentOS.qcow2' - os.system('wget http://artifacts.opnfv.org/qtip/QTIP_CentOS.qcow2 -P Temp_Img') - - while not os.path.isfile(filepath): - time.sleep(10) - print 'Download Completed!' diff --git a/func/spawn_vm.py b/func/spawn_vm.py index 5710308b..7ac4340e 100644 --- a/func/spawn_vm.py +++ b/func/spawn_vm.py @@ -11,11 +11,9 @@ import os import sys from collections import defaultdict from func.env_setup import Env_setup -from func.fetchimg import FetchImg import yaml import heatclient.client import keystoneclient -import glanceclient from novaclient import client import time from func.create_zones import create_zones @@ -191,41 +189,12 @@ class SpawnVM(Env_setup): '1', endpoint=heat_endpoint, token=keystone.auth_token) return self._heat_client - def _get_glance_client(self): - if self._glance_client is None: - keystone = self._get_keystone_client() - glance_endpoint = keystone.service_catalog.url_for( - service_type='image') - self._glance_client = glanceclient.Client( - '2', glance_endpoint, token=keystone.auth_token) - return self._glance_client - def create_stack(self, vm_role_ip_dict, heat_template): global sshkey stackname = 'QTIP' heat = self._get_heat_client() - glance = self._get_glance_client() - - available_images = [] - for image_list in glance.images.list(): - available_images.append(image_list.name) - - if 'QTIP_CentOS' in available_images: - print 'Image Present' - - elif 'QTIP_CentOS' not in available_images: - fetchImage = FetchImg() - fetchImage.download() - print 'Uploading Image to Glance. Please wait' - qtip_image = glance.images.create( - name='QTIP_CentOS', - visibility='public', - disk_format='qcow2', - container_format='bare') - glance.images.upload( - qtip_image.id, open('./Temp_Img/QTIP_CentOS.qcow2')) for checks in range(3): print "Try to delete heats %s" % checks for prev_stacks in heat.stacks.list(): @@ -233,7 +202,6 @@ class SpawnVM(Env_setup): print 'QTIP Stacks exists.\nDeleting Existing Stack' heat.stacks.delete('QTIP') time.sleep(10) - print '\nStack Creating Started\n' try: -- cgit 1.2.3-korg