aboutsummaryrefslogtreecommitdiffstats
path: root/testcases/OpenStack/vPing
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2016-08-23 12:03:26 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-23 12:03:26 +0000
commita01dbcf5d10a2433eb4cb29d03677820996b9eb5 (patch)
tree4d98e94158b5342833f7d311c6d270d161f55644 /testcases/OpenStack/vPing
parentda6398642446f98240d9d1bf924e959e64a73d63 (diff)
parent73053cd38fed875e3e5d64cabfb7fbfeb2839a80 (diff)
Merge "delete useless image_exists in vping"
Diffstat (limited to 'testcases/OpenStack/vPing')
-rwxr-xr-xtestcases/OpenStack/vPing/vping.py5
-rw-r--r--testcases/OpenStack/vPing/vping_util.py4
2 files changed, 2 insertions, 7 deletions
diff --git a/testcases/OpenStack/vPing/vping.py b/testcases/OpenStack/vPing/vping.py
index 039e7ec5a..168ed4f8f 100755
--- a/testcases/OpenStack/vPing/vping.py
+++ b/testcases/OpenStack/vPing/vping.py
@@ -23,8 +23,6 @@ import functest.utils.functest_logger as ft_logger
import vping_util as util
parser = argparse.ArgumentParser()
-image_exists = False
-
parser.add_argument("-d", "--debug", help="Debug mode", action="store_true")
parser.add_argument("-r", "--report",
help="Create json result file",
@@ -52,8 +50,7 @@ def main():
vmname_1 = util.get_vmname_1()
vmname_2 = util.get_vmname_2()
- global image_exists
- image_exists, image_id = util.create_image()
+ image_id = util.create_image()
flavor = util.get_flavor()
diff --git a/testcases/OpenStack/vPing/vping_util.py b/testcases/OpenStack/vPing/vping_util.py
index d3e081f6d..c16c5d659 100644
--- a/testcases/OpenStack/vPing/vping_util.py
+++ b/testcases/OpenStack/vPing/vping_util.py
@@ -153,7 +153,6 @@ def create_image():
image_id = os_utils.get_image_id(glance_client, GLANCE_IMAGE_NAME)
if image_id != '':
logger.info("Using existing image '%s'..." % GLANCE_IMAGE_NAME)
- image_exists = True
else:
logger.info("Creating image '%s' from '%s'..." % (GLANCE_IMAGE_NAME,
GLANCE_IMAGE_PATH))
@@ -166,9 +165,8 @@ def create_image():
exit(EXIT_CODE)
logger.debug("Image '%s' with ID=%s created successfully."
% (GLANCE_IMAGE_NAME, image_id))
- image_exists = True
- return image_exists, image_id
+ return image_id
def get_flavor():