From 9e0a37dcdf99b52740cdf481c49136ce60e1bd9e Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Wed, 2 Aug 2017 18:36:36 +0200 Subject: Add promise package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It eases how Functest installs/runs it (see testcases.yaml [1]). The former run_tests.py is renamed to avoid duplicated binaries (see [2] and [3]). [1] https://git.opnfv.org/functest/tree/functest/ci/testcases.yaml [2] https://git.opnfv.org/sdnvpn/tree/sdnvpn/test/functest/run_tests.py [3] https://git.opnfv.org/sfc/tree/sfc/tests/functest/run_tests.py Change-Id: I626ce6b425399dc5a0a360782352757c26ca1db3 Signed-off-by: Cédric Ollivier --- promise/test/functest/requirements.txt | 1 + promise/test/functest/run_promise_tests.py | 254 +++++++++++++++++++++++++++++ promise/test/functest/run_tests.py | 254 ----------------------------- promise/test/functest/setup.cfg | 8 + promise/test/functest/setup.py | 22 +++ 5 files changed, 285 insertions(+), 254 deletions(-) create mode 100644 promise/test/functest/requirements.txt create mode 100644 promise/test/functest/run_promise_tests.py delete mode 100644 promise/test/functest/run_tests.py create mode 100644 promise/test/functest/setup.cfg create mode 100644 promise/test/functest/setup.py diff --git a/promise/test/functest/requirements.txt b/promise/test/functest/requirements.txt new file mode 100644 index 0000000..d39c387 --- /dev/null +++ b/promise/test/functest/requirements.txt @@ -0,0 +1 @@ +functest diff --git a/promise/test/functest/run_promise_tests.py b/promise/test/functest/run_promise_tests.py new file mode 100644 index 0000000..f7e9148 --- /dev/null +++ b/promise/test/functest/run_promise_tests.py @@ -0,0 +1,254 @@ +#!/usr/bin/python +# +# Copyright (c) 2015 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 argparse +import json +import logging +import logging.config +import os +import re +import subprocess +import sys +import time + +import functest.utils.openstack_utils as os_utils +from functest.utils.constants import CONST + +parser = argparse.ArgumentParser() + +parser.add_argument("-d", "--debug", help="Debug mode", action="store_true") +parser.add_argument("-r", "--report", + help="Create json result file", + action="store_true") +args = parser.parse_args() + + +PROMISE_REPO_DIR = CONST.dir_repo_promise +RESULTS_DIR = CONST.dir_results + +PROMISE_TENANT_NAME = CONST.promise_tenant_name +TENANT_DESCRIPTION = CONST.promise_tenant_description +PROMISE_USER_NAME = CONST.promise_user_name +PROMISE_USER_PWD = CONST.promise_user_pwd +PROMISE_IMAGE_NAME = CONST.promise_image_name +PROMISE_FLAVOR_NAME = CONST.promise_flavor_name +PROMISE_FLAVOR_VCPUS = CONST.promise_flavor_vcpus +PROMISE_FLAVOR_RAM = CONST.promise_flavor_ram +PROMISE_FLAVOR_DISK = CONST.promise_flavor_disk + + +GLANCE_IMAGE_FILENAME = CONST.openstack_image_file_name +GLANCE_IMAGE_FORMAT = CONST.openstack_image_disk_format +GLANCE_IMAGE_NAME = CONST.openstack_image_file_name +GLANCE_IMAGE_PATH = os.path.join(CONST.dir_functest_images, + GLANCE_IMAGE_FILENAME) + +PROMISE_NET_NAME = CONST.promise_network_name +PROMISE_SUBNET_NAME = CONST.promise_subnet_name +PROMISE_SUBNET_CIDR = CONST.promise_subnet_cidr +PROMISE_ROUTER_NAME = CONST.promise_router_name + + +""" logging configuration """ +logger = logging.getLogger('promise') + + +def main(): + return_code = -1 + change_keystone_version = False + os_auth = os.environ["OS_AUTH_URL"] + + # check keystone version + # if keystone v3, for keystone v2 + if os_utils.is_keystone_v3(): + os.environ["OS_IDENTITY_API_VERSION"] = "2" + # the OS_AUTH_URL may have different format according to the installer + # apex: OS_AUTH_URL=http://192.168.37.17:5000/v2.0 + # fuel: OS_AUTH_URL='http://192.168.0.2:5000/' + # OS_AUTH_URL='http://192.168.10.2:5000/v3 + match = re.findall(r'[0-9]+(?:\.[0-9]+){3}:[0-9]+', + os.environ["OS_AUTH_URL"]) + new_url = "http://" + match[0] + "/v2.0" + + os.environ["OS_AUTH_URL"] = new_url + change_keystone_version = True + logger.info("Force Keystone v2") + + creds = os_utils.get_credentials() + + try: + logger.info("Env variables") + logger.info("OS_AUTH_URL: %s" % os.environ["OS_AUTH_URL"]) + logger.info("OS_IDENTITY_API_VERSION: %s " % + os.environ["OS_IDENTITY_API_VERSION"]) + except KeyError: + logger.error("Please set the OS environment variables") + + keystone_client = os_utils.get_keystone_client() + + user_id = os_utils.get_user_id(keystone_client, creds['username']) + if user_id == '': + logger.error("Error : Failed to get id of %s user" % + creds['username']) + return return_code + + logger.info("Creating tenant '%s'..." % PROMISE_TENANT_NAME) + tenant_id = os_utils.create_tenant( + keystone_client, PROMISE_TENANT_NAME, TENANT_DESCRIPTION) + if not tenant_id: + logger.error("Error : Failed to create %s tenant" + % PROMISE_TENANT_NAME) + return return_code + logger.debug("Tenant '%s' created successfully." % PROMISE_TENANT_NAME) + + roles_name = ["admin", "Admin"] + role_id = '' + for role_name in roles_name: + if role_id == '': + role_id = os_utils.get_role_id(keystone_client, role_name) + + if role_id == '': + logger.error("Error : Failed to get id for %s role" % role_name) + return return_code + + logger.info("Adding role '%s' to tenant '%s'..." + % (role_id, PROMISE_TENANT_NAME)) + if not os_utils.add_role_user(keystone_client, user_id, + role_id, tenant_id): + logger.error("Error : Failed to add %s on tenant %s" % + (creds['username'], PROMISE_TENANT_NAME)) + return return_code + logger.debug("Role added successfully.") + + logger.info("Creating user '%s'..." % PROMISE_USER_NAME) + user_id = os_utils.create_user( + keystone_client, PROMISE_USER_NAME, PROMISE_USER_PWD, None, tenant_id) + + if not user_id: + logger.error("Error : Failed to create %s user" % PROMISE_USER_NAME) + return return_code + logger.debug("User '%s' created successfully." % PROMISE_USER_NAME) + + nova_client = os_utils.get_nova_client() + glance_client = os_utils.get_glance_client() + + logger.info("Creating image '%s' from '%s'..." % (PROMISE_IMAGE_NAME, + GLANCE_IMAGE_PATH)) + + logger.info("Upload some OS images if it doesn't exist") + + image_id = os_utils.get_image_id(glance_client, GLANCE_IMAGE_NAME) + + if image_id == '': + logger.info("%s image doesn't exist on glance repo" % GLANCE_IMAGE_NAME) + logger.info("Try downloading this image and upload on glance !") + image_id = os_utils.create_glance_image( + glance_client, GLANCE_IMAGE_NAME, GLANCE_IMAGE_PATH) + + if image_id == '': + logger.error("Failed to create the Glance image...") + return return_code + + logger.debug("Image '%s' with ID '%s' created successfully." + % (PROMISE_IMAGE_NAME, image_id)) + flavor_id = os_utils.get_flavor_id(nova_client, PROMISE_FLAVOR_NAME) + if flavor_id == '': + logger.info("Creating flavor '%s'..." % PROMISE_FLAVOR_NAME) + flavor_id = os_utils.create_flavor(nova_client, + PROMISE_FLAVOR_NAME, + PROMISE_FLAVOR_RAM, + PROMISE_FLAVOR_DISK, + PROMISE_FLAVOR_VCPUS) + if not flavor_id: + logger.error("Failed to create the Flavor...") + return return_code + logger.debug("Flavor '%s' with ID '%s' created successfully." % + (PROMISE_FLAVOR_NAME, flavor_id)) + else: + logger.debug("Using existing flavor '%s' with ID '%s'..." + % (PROMISE_FLAVOR_NAME, flavor_id)) + + network_dic = os_utils.create_shared_network_full(PROMISE_NET_NAME, + PROMISE_SUBNET_NAME, + PROMISE_ROUTER_NAME, + PROMISE_SUBNET_CIDR) + if not network_dic: + logger.error("Failed to create the private network...") + return return_code + + logger.info("Exporting environment variables...") + os.environ["NODE_ENV"] = "functest" + os.environ["OS_PASSWORD"] = PROMISE_USER_PWD + os.environ["OS_TEST_IMAGE"] = image_id + os.environ["OS_TEST_FLAVOR"] = flavor_id + os.environ["OS_TEST_NETWORK"] = network_dic["net_id"] + os.environ["OS_TENANT_NAME"] = PROMISE_TENANT_NAME + os.environ["OS_USERNAME"] = PROMISE_USER_NAME + + os.chdir(PROMISE_REPO_DIR + '/source/') + results_file_name = os.path.join(RESULTS_DIR, 'promise-results.json') + results_file = open(results_file_name, 'w+') + cmd = 'npm run -s test -- --reporter json' + + logger.info("Running command: %s" % cmd) + ret = subprocess.call(cmd, shell=True, stdout=results_file, + stderr=subprocess.STDOUT) + results_file.close() + + if ret == 0: + logger.info("The test succeeded.") + return_code = 0 + else: + logger.info("The command '%s' failed." % cmd) + + # Print output of file + with open(results_file_name, 'r') as results_file: + data = results_file.read() + logger.debug("\n%s" % data) + json_data = json.loads(data) + + suites = json_data["stats"]["suites"] + tests = json_data["stats"]["tests"] + passes = json_data["stats"]["passes"] + pending = json_data["stats"]["pending"] + failures = json_data["stats"]["failures"] + start_time_json = json_data["stats"]["start"] + end_time = json_data["stats"]["end"] + duration = float(json_data["stats"]["duration"]) / float(1000) + + logger.info("\n" + "****************************************\n" + " Promise test report\n\n" + "****************************************\n" + " Suites: \t%s\n" + " Tests: \t%s\n" + " Passes: \t%s\n" + " Pending: \t%s\n" + " Failures:\t%s\n" + " Start: \t%s\n" + " End: \t%s\n" + " Duration:\t%s\n" + "****************************************\n\n" + % (suites, tests, passes, pending, failures, + start_time_json, end_time, duration)) + end_time = time.time() + + # re set default keysone version to 3 if it has been changed for promise + if change_keystone_version: + os.environ["OS_IDENTITY_API_VERSION"] = "3" + os.environ["OS_AUTH_URL"] = os_auth + logger.info("Revert to Keystone v3") + + return return_code + + +if __name__ == '__main__': + logging.config.fileConfig( + CONST.__getattribute__('dir_functest_logging_cfg')) + sys.exit(main()) diff --git a/promise/test/functest/run_tests.py b/promise/test/functest/run_tests.py deleted file mode 100644 index f7e9148..0000000 --- a/promise/test/functest/run_tests.py +++ /dev/null @@ -1,254 +0,0 @@ -#!/usr/bin/python -# -# Copyright (c) 2015 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 argparse -import json -import logging -import logging.config -import os -import re -import subprocess -import sys -import time - -import functest.utils.openstack_utils as os_utils -from functest.utils.constants import CONST - -parser = argparse.ArgumentParser() - -parser.add_argument("-d", "--debug", help="Debug mode", action="store_true") -parser.add_argument("-r", "--report", - help="Create json result file", - action="store_true") -args = parser.parse_args() - - -PROMISE_REPO_DIR = CONST.dir_repo_promise -RESULTS_DIR = CONST.dir_results - -PROMISE_TENANT_NAME = CONST.promise_tenant_name -TENANT_DESCRIPTION = CONST.promise_tenant_description -PROMISE_USER_NAME = CONST.promise_user_name -PROMISE_USER_PWD = CONST.promise_user_pwd -PROMISE_IMAGE_NAME = CONST.promise_image_name -PROMISE_FLAVOR_NAME = CONST.promise_flavor_name -PROMISE_FLAVOR_VCPUS = CONST.promise_flavor_vcpus -PROMISE_FLAVOR_RAM = CONST.promise_flavor_ram -PROMISE_FLAVOR_DISK = CONST.promise_flavor_disk - - -GLANCE_IMAGE_FILENAME = CONST.openstack_image_file_name -GLANCE_IMAGE_FORMAT = CONST.openstack_image_disk_format -GLANCE_IMAGE_NAME = CONST.openstack_image_file_name -GLANCE_IMAGE_PATH = os.path.join(CONST.dir_functest_images, - GLANCE_IMAGE_FILENAME) - -PROMISE_NET_NAME = CONST.promise_network_name -PROMISE_SUBNET_NAME = CONST.promise_subnet_name -PROMISE_SUBNET_CIDR = CONST.promise_subnet_cidr -PROMISE_ROUTER_NAME = CONST.promise_router_name - - -""" logging configuration """ -logger = logging.getLogger('promise') - - -def main(): - return_code = -1 - change_keystone_version = False - os_auth = os.environ["OS_AUTH_URL"] - - # check keystone version - # if keystone v3, for keystone v2 - if os_utils.is_keystone_v3(): - os.environ["OS_IDENTITY_API_VERSION"] = "2" - # the OS_AUTH_URL may have different format according to the installer - # apex: OS_AUTH_URL=http://192.168.37.17:5000/v2.0 - # fuel: OS_AUTH_URL='http://192.168.0.2:5000/' - # OS_AUTH_URL='http://192.168.10.2:5000/v3 - match = re.findall(r'[0-9]+(?:\.[0-9]+){3}:[0-9]+', - os.environ["OS_AUTH_URL"]) - new_url = "http://" + match[0] + "/v2.0" - - os.environ["OS_AUTH_URL"] = new_url - change_keystone_version = True - logger.info("Force Keystone v2") - - creds = os_utils.get_credentials() - - try: - logger.info("Env variables") - logger.info("OS_AUTH_URL: %s" % os.environ["OS_AUTH_URL"]) - logger.info("OS_IDENTITY_API_VERSION: %s " % - os.environ["OS_IDENTITY_API_VERSION"]) - except KeyError: - logger.error("Please set the OS environment variables") - - keystone_client = os_utils.get_keystone_client() - - user_id = os_utils.get_user_id(keystone_client, creds['username']) - if user_id == '': - logger.error("Error : Failed to get id of %s user" % - creds['username']) - return return_code - - logger.info("Creating tenant '%s'..." % PROMISE_TENANT_NAME) - tenant_id = os_utils.create_tenant( - keystone_client, PROMISE_TENANT_NAME, TENANT_DESCRIPTION) - if not tenant_id: - logger.error("Error : Failed to create %s tenant" - % PROMISE_TENANT_NAME) - return return_code - logger.debug("Tenant '%s' created successfully." % PROMISE_TENANT_NAME) - - roles_name = ["admin", "Admin"] - role_id = '' - for role_name in roles_name: - if role_id == '': - role_id = os_utils.get_role_id(keystone_client, role_name) - - if role_id == '': - logger.error("Error : Failed to get id for %s role" % role_name) - return return_code - - logger.info("Adding role '%s' to tenant '%s'..." - % (role_id, PROMISE_TENANT_NAME)) - if not os_utils.add_role_user(keystone_client, user_id, - role_id, tenant_id): - logger.error("Error : Failed to add %s on tenant %s" % - (creds['username'], PROMISE_TENANT_NAME)) - return return_code - logger.debug("Role added successfully.") - - logger.info("Creating user '%s'..." % PROMISE_USER_NAME) - user_id = os_utils.create_user( - keystone_client, PROMISE_USER_NAME, PROMISE_USER_PWD, None, tenant_id) - - if not user_id: - logger.error("Error : Failed to create %s user" % PROMISE_USER_NAME) - return return_code - logger.debug("User '%s' created successfully." % PROMISE_USER_NAME) - - nova_client = os_utils.get_nova_client() - glance_client = os_utils.get_glance_client() - - logger.info("Creating image '%s' from '%s'..." % (PROMISE_IMAGE_NAME, - GLANCE_IMAGE_PATH)) - - logger.info("Upload some OS images if it doesn't exist") - - image_id = os_utils.get_image_id(glance_client, GLANCE_IMAGE_NAME) - - if image_id == '': - logger.info("%s image doesn't exist on glance repo" % GLANCE_IMAGE_NAME) - logger.info("Try downloading this image and upload on glance !") - image_id = os_utils.create_glance_image( - glance_client, GLANCE_IMAGE_NAME, GLANCE_IMAGE_PATH) - - if image_id == '': - logger.error("Failed to create the Glance image...") - return return_code - - logger.debug("Image '%s' with ID '%s' created successfully." - % (PROMISE_IMAGE_NAME, image_id)) - flavor_id = os_utils.get_flavor_id(nova_client, PROMISE_FLAVOR_NAME) - if flavor_id == '': - logger.info("Creating flavor '%s'..." % PROMISE_FLAVOR_NAME) - flavor_id = os_utils.create_flavor(nova_client, - PROMISE_FLAVOR_NAME, - PROMISE_FLAVOR_RAM, - PROMISE_FLAVOR_DISK, - PROMISE_FLAVOR_VCPUS) - if not flavor_id: - logger.error("Failed to create the Flavor...") - return return_code - logger.debug("Flavor '%s' with ID '%s' created successfully." % - (PROMISE_FLAVOR_NAME, flavor_id)) - else: - logger.debug("Using existing flavor '%s' with ID '%s'..." - % (PROMISE_FLAVOR_NAME, flavor_id)) - - network_dic = os_utils.create_shared_network_full(PROMISE_NET_NAME, - PROMISE_SUBNET_NAME, - PROMISE_ROUTER_NAME, - PROMISE_SUBNET_CIDR) - if not network_dic: - logger.error("Failed to create the private network...") - return return_code - - logger.info("Exporting environment variables...") - os.environ["NODE_ENV"] = "functest" - os.environ["OS_PASSWORD"] = PROMISE_USER_PWD - os.environ["OS_TEST_IMAGE"] = image_id - os.environ["OS_TEST_FLAVOR"] = flavor_id - os.environ["OS_TEST_NETWORK"] = network_dic["net_id"] - os.environ["OS_TENANT_NAME"] = PROMISE_TENANT_NAME - os.environ["OS_USERNAME"] = PROMISE_USER_NAME - - os.chdir(PROMISE_REPO_DIR + '/source/') - results_file_name = os.path.join(RESULTS_DIR, 'promise-results.json') - results_file = open(results_file_name, 'w+') - cmd = 'npm run -s test -- --reporter json' - - logger.info("Running command: %s" % cmd) - ret = subprocess.call(cmd, shell=True, stdout=results_file, - stderr=subprocess.STDOUT) - results_file.close() - - if ret == 0: - logger.info("The test succeeded.") - return_code = 0 - else: - logger.info("The command '%s' failed." % cmd) - - # Print output of file - with open(results_file_name, 'r') as results_file: - data = results_file.read() - logger.debug("\n%s" % data) - json_data = json.loads(data) - - suites = json_data["stats"]["suites"] - tests = json_data["stats"]["tests"] - passes = json_data["stats"]["passes"] - pending = json_data["stats"]["pending"] - failures = json_data["stats"]["failures"] - start_time_json = json_data["stats"]["start"] - end_time = json_data["stats"]["end"] - duration = float(json_data["stats"]["duration"]) / float(1000) - - logger.info("\n" - "****************************************\n" - " Promise test report\n\n" - "****************************************\n" - " Suites: \t%s\n" - " Tests: \t%s\n" - " Passes: \t%s\n" - " Pending: \t%s\n" - " Failures:\t%s\n" - " Start: \t%s\n" - " End: \t%s\n" - " Duration:\t%s\n" - "****************************************\n\n" - % (suites, tests, passes, pending, failures, - start_time_json, end_time, duration)) - end_time = time.time() - - # re set default keysone version to 3 if it has been changed for promise - if change_keystone_version: - os.environ["OS_IDENTITY_API_VERSION"] = "3" - os.environ["OS_AUTH_URL"] = os_auth - logger.info("Revert to Keystone v3") - - return return_code - - -if __name__ == '__main__': - logging.config.fileConfig( - CONST.__getattribute__('dir_functest_logging_cfg')) - sys.exit(main()) diff --git a/promise/test/functest/setup.cfg b/promise/test/functest/setup.cfg new file mode 100644 index 0000000..a05c5a5 --- /dev/null +++ b/promise/test/functest/setup.cfg @@ -0,0 +1,8 @@ +[metadata] +name = promise +version = 2017.9.0 +home-page = https://wiki.opnfv.org/display/promise/Promise + +[files] +packages = . +scripts = run_promise_tests.py diff --git a/promise/test/functest/setup.py b/promise/test/functest/setup.py new file mode 100644 index 0000000..a1e9b3b --- /dev/null +++ b/promise/test/functest/setup.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python + +# Copyright (c) 2017 Orange 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 setuptools + +# In python < 2.7.4, a lazy loading of package `pbr` will break +# setuptools if some other modules registered functions in `atexit`. +# solution from: http://bugs.python.org/issue15881#msg170215 +try: + import multiprocessing # noqa +except ImportError: + pass + +setuptools.setup( + setup_requires=['pbr>=1.8'], + pbr=True) -- cgit 1.2.3-korg