diff options
Diffstat (limited to 'testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py')
| -rwxr-xr-x | testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py | 44 |
1 files changed, 27 insertions, 17 deletions
diff --git a/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py b/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py index 13066b3df..1c27b0273 100755 --- a/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py +++ b/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py @@ -49,12 +49,19 @@ parser.add_argument("-r", "--report", parser.add_argument("-s", "--smoke", help="Smoke test mode", action="store_true") +parser.add_argument("-v", "--verbose", + help="Print verbose info about the progress", + action="store_true") args = parser.parse_args() client_dict = {} -FNULL = open(os.devnull, 'w') +if args.verbose: + RALLY_STDERR = subprocess.STDOUT +else: + RALLY_STDERR = open(os.devnull, 'w') + """ logging configuration """ logger = logging.getLogger("run_rally") logger.setLevel(logging.DEBUG) @@ -211,7 +218,7 @@ def run_task(test_name): "--task-args \"{}\" ".format(build_task_args(test_name)) logger.debug('running command line : {}'.format(cmd_line)) - p = subprocess.Popen(cmd_line, stdout=subprocess.PIPE, stderr=FNULL, shell=True) + p = subprocess.Popen(cmd_line, stdout=subprocess.PIPE, stderr=RALLY_STDERR, shell=True) result = "" while p.poll() is None: l = p.stdout.readline() @@ -282,20 +289,22 @@ def main(): client_dict['neutron'] = neutron_client - logger.debug("Creating image '%s' from '%s'..." % (GLANCE_IMAGE_NAME, GLANCE_IMAGE_PATH)) - image_id = functest_utils.create_glance_image(glance_client, - GLANCE_IMAGE_NAME,GLANCE_IMAGE_PATH) - if not image_id: - logger.error("Failed to create a Glance image...") - exit(-1) - # Check if the given image exists - try: - nova_client.images.find(name=GLANCE_IMAGE_NAME) - logger.info("Glance image found '%s'" % GLANCE_IMAGE_NAME) - except: - logger.error("ERROR: Glance image '%s' not found." % GLANCE_IMAGE_NAME) - logger.info("Available images are: ") - exit(-1) + image_id = functest_utils.get_image_id(glance_client, GLANCE_IMAGE_NAME) + + if image_id == '': + logger.debug("Creating image '%s' from '%s'..." % (GLANCE_IMAGE_NAME, \ + GLANCE_IMAGE_PATH)) + image_id = functest_utils.create_glance_image(glance_client,\ + GLANCE_IMAGE_NAME,GLANCE_IMAGE_PATH) + if not image_id: + logger.error("Failed to create the Glance image...") + exit(-1) + else: + logger.debug("Image '%s' with ID '%s' created succesfully ." \ + % (GLANCE_IMAGE_NAME, image_id)) + else: + logger.debug("Using existing image '%s' with ID '%s'..." \ + % (GLANCE_IMAGE_NAME,image_id)) if args.test_name == "all": for test_name in tests: @@ -307,7 +316,8 @@ def main(): print(args.test_name) run_task(args.test_name) - logger.debug("Deleting image...") + logger.debug("Deleting image '%s' with ID '%s'..." \ + % (GLANCE_IMAGE_NAME, image_id)) if not functest_utils.delete_glance_image(nova_client, image_id): logger.error("Error deleting the glance image") |