diff options
| -rwxr-xr-x | functest/ci/config_functest.yaml | 2 | ||||
| -rwxr-xr-x | functest/ci/exec_test.sh | 13 | ||||
| -rwxr-xr-x | functest/ci/testcases.yaml | 27 | ||||
| -rwxr-xr-x | functest/opnfv_tests/features/promise.py | 260 | ||||
| -rw-r--r-- | functest/utils/functest_constants.py | 27 |
5 files changed, 32 insertions, 297 deletions
diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml index 2feab771b..f6cb14cb1 100755 --- a/functest/ci/config_functest.yaml +++ b/functest/ci/config_functest.yaml @@ -20,7 +20,7 @@ general: repo_sdnvpn: /home/opnfv/repos/sdnvpn repo_sfc: /home/opnfv/repos/sfc dir_repo_onos: /home/opnfv/repos/onos - dir_repo_promise: /home/opnfv/repos/promise + repo_promise: /home/opnfv/repos/promise repo_doctor: /home/opnfv/repos/doctor repo_copper: /home/opnfv/repos/copper dir_repo_ovno: /home/opnfv/repos/ovno diff --git a/functest/ci/exec_test.sh b/functest/ci/exec_test.sh index 54a7c624e..b288fe367 100755 --- a/functest/ci/exec_test.sh +++ b/functest/ci/exec_test.sh @@ -90,22 +90,12 @@ function run_test(){ --osusername ${OS_USERNAME} \ ${args} ;; - "vims") - python ${FUNCTEST_TEST_DIR}/vnf/ims/vims.py $clean_flag $report - ;; "onos") python ${FUNCTEST_TEST_DIR}/sdn/onos/teston/onos.py ;; "onos_sfc") python ${FUNCTEST_TEST_DIR}/sdn/onos/teston/onos.py -t sfc ;; - "promise") - python ${FUNCTEST_TEST_DIR}/features/promise.py $report - sleep 10 # to let the instances terminate - ;; - "doctor") - python ${FUNCTEST_TEST_DIR}/features/doctor.py $report - ;; "ovno") # suite under rewritting for colorado # no need to run anything until refactoring done @@ -116,9 +106,6 @@ function run_test(){ source ${FUNCTEST_CONF_DIR}/stackrc python ${FUNCTEST_TEST_DIR}/security_scan/security_scan.py --config ${FUNCTEST_TEST_DIR}/security_scan/config.ini ;; - "copper") - python ${FUNCTEST_TEST_DIR}/features/copper.py $report - ;; "moon") python ${REPOS_DIR}/moon/tests/run_tests.py $report ;; diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index 27d358bf7..0fffb901a 100755 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -185,6 +185,9 @@ tiers: dependencies: installer: '(fuel)|(joid)' scenario: '' + run: + module: 'functest.opnfv_tests.features.promise' + class: 'Promise' - name: doctor @@ -221,18 +224,18 @@ tiers: dependencies: installer: 'apex' scenario: '^((?!fdio).)*$' - - - name: copper - criteria: 'status == "PASS"' - blocking: false - description: >- - Test suite for policy management based on OpenStack Congress - dependencies: - installer: '(apex)|(joid)' - scenario: '^((?!fdio|lxd).)*$' - run: - module: 'functest.opnfv_tests.features.copper' - class: 'Copper' +# - +# name: copper +# criteria: 'status == "PASS"' +# blocking: false +# description: >- +# Test suite for policy management based on OpenStack Congress +# dependencies: +# installer: '(apex)|(joid)' +# scenario: '^((?!fdio|lxd).)*$' +# run: +# module: 'functest.opnfv_tests.features.copper' +# class: 'Copper' - name: moon criteria: 'status == "PASS"' diff --git a/functest/opnfv_tests/features/promise.py b/functest/opnfv_tests/features/promise.py index 0a30e3a19..15636fbfe 100755 --- a/functest/opnfv_tests/features/promise.py +++ b/functest/opnfv_tests/features/promise.py @@ -1,252 +1,24 @@ #!/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 +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # -# Maintainer : jose.lausuch@ericsson.com +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # -import argparse -import json -import os -import subprocess -import time +import functest.core.feature_base as base -import functest.utils.functest_logger as ft_logger -import functest.utils.functest_utils as ft_utils -import functest.utils.openstack_utils as openstack_utils -import keystoneclient.v2_0.client as ksclient -from neutronclient.v2_0 import client as ntclient -import novaclient.client as nvclient -import functest.utils.functest_constants as ft_constants -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 = ft_constants.PROMISE_REPO_DIR -RESULTS_DIR = ft_constants.FUNCTEST_RESULTS_DIR - -PROMISE_TENANT_NAME = ft_constants.PROMISE_TENANT_NAME -TENANT_DESCRIPTION = ft_constants.TENANT_DESCRIPTION -PROMISE_USER_NAME = ft_constants.PROMISE_USER_NAME -PROMISE_USER_PWD = ft_constants.PROMISE_USER_PWD -PROMISE_IMAGE_NAME = ft_constants.PROMISE_IMAGE_NAME -PROMISE_FLAVOR_NAME = ft_constants.PROMISE_FLAVOR_NAME -PROMISE_FLAVOR_VCPUS = ft_constants.PROMISE_FLAVOR_VCPUS -PROMISE_FLAVOR_RAM = ft_constants.PROMISE_FLAVOR_RAM -PROMISE_FLAVOR_DISK = ft_constants.PROMISE_FLAVOR_DISK - - -GLANCE_IMAGE_FILENAME = ft_constants.GLANCE_IMAGE_FILENAME -GLANCE_IMAGE_FORMAT = ft_constants.GLANCE_IMAGE_FORMAT -GLANCE_IMAGE_PATH = os.path.join(ft_constants.FUNCTEST_DATA_DIR, - GLANCE_IMAGE_FILENAME) - -PROMISE_NET_NAME = ft_constants.PROMISE_NET_NAME -PROMISE_SUBNET_NAME = ft_constants.PROMISE_SUBNET_NAME -PROMISE_SUBNET_CIDR = ft_constants.PROMISE_SUBNET_CIDR -PROMISE_ROUTER_NAME = ft_constants.PROMISE_ROUTER_NAME - - -""" logging configuration """ -logger = ft_logger.Logger("promise").getLogger() - - -def main(): - exit_code = -1 - start_time = time.time() - ks_creds = openstack_utils.get_credentials("keystone") - nv_creds = openstack_utils.get_credentials("nova") - nt_creds = openstack_utils.get_credentials("neutron") - - keystone = ksclient.Client(**ks_creds) - - user_id = openstack_utils.get_user_id(keystone, ks_creds['username']) - if user_id == '': - logger.error("Error : Failed to get id of %s user" % - ks_creds['username']) - exit(-1) - - logger.info("Creating tenant '%s'..." % PROMISE_TENANT_NAME) - tenant_id = openstack_utils.create_tenant( - keystone, PROMISE_TENANT_NAME, TENANT_DESCRIPTION) - if not tenant_id: - logger.error("Error : Failed to create %s tenant" - % PROMISE_TENANT_NAME) - exit(-1) - 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 = openstack_utils.get_role_id(keystone, role_name) - - if role_id == '': - logger.error("Error : Failed to get id for %s role" % role_name) - exit(-1) - - logger.info("Adding role '%s' to tenant '%s'..." - % (role_id, PROMISE_TENANT_NAME)) - if not openstack_utils.add_role_user(keystone, user_id, - role_id, tenant_id): - logger.error("Error : Failed to add %s on tenant %s" % - (ks_creds['username'], PROMISE_TENANT_NAME)) - exit(-1) - logger.debug("Role added successfully.") - - logger.info("Creating user '%s'..." % PROMISE_USER_NAME) - user_id = openstack_utils.create_user( - keystone, PROMISE_USER_NAME, PROMISE_USER_PWD, None, tenant_id) - - if not user_id: - logger.error("Error : Failed to create %s user" % PROMISE_USER_NAME) - exit(-1) - logger.debug("User '%s' created successfully." % PROMISE_USER_NAME) - - logger.info("Updating OpenStack credentials...") - ks_creds.update({ - "username": PROMISE_TENANT_NAME, - "password": PROMISE_TENANT_NAME, - "tenant_name": PROMISE_TENANT_NAME, - }) - - nt_creds.update({ - "tenant_name": PROMISE_TENANT_NAME, - }) - - nv_creds.update({ - "project_id": PROMISE_TENANT_NAME, - }) - - glance = openstack_utils.get_glance_client() - nova = nvclient.Client("2", **nv_creds) - - logger.info("Creating image '%s' from '%s'..." % (PROMISE_IMAGE_NAME, - GLANCE_IMAGE_PATH)) - image_id = openstack_utils.create_glance_image(glance, - PROMISE_IMAGE_NAME, - GLANCE_IMAGE_PATH) - if not image_id: - logger.error("Failed to create the Glance image...") - exit(-1) - logger.debug("Image '%s' with ID '%s' created successfully." - % (PROMISE_IMAGE_NAME, image_id)) - flavor_id = openstack_utils.get_flavor_id(nova, PROMISE_FLAVOR_NAME) - if flavor_id == '': - logger.info("Creating flavor '%s'..." % PROMISE_FLAVOR_NAME) - flavor_id = openstack_utils.create_flavor(nova, - PROMISE_FLAVOR_NAME, - PROMISE_FLAVOR_RAM, - PROMISE_FLAVOR_DISK, - PROMISE_FLAVOR_VCPUS) - if not flavor_id: - logger.error("Failed to create the Flavor...") - exit(-1) - 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)) - - neutron = ntclient.Client(**nt_creds) - - network_dic = openstack_utils.create_network_full(neutron, - PROMISE_NET_NAME, - PROMISE_SUBNET_NAME, - PROMISE_ROUTER_NAME, - PROMISE_SUBNET_CIDR) - if not network_dic: - logger.error("Failed to create the private network...") - exit(-1) - - 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.") - # test_status = 'OK' - else: - logger.info("The command '%s' failed." % cmd) - # test_status = "Failed" - - # 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)) - - if args.report: - stop_time = time.time() - json_results = {"timestart": start_time, "duration": duration, - "tests": int(tests), "failures": int(failures)} - logger.debug("Promise Results json: " + str(json_results)) - - # criteria for Promise in Release B was 100% of tests OK - status = "FAIL" - if int(tests) > 32 and int(failures) < 1: - status = "PASS" - exit_code = 0 - - ft_utils.push_results_to_db("promise", - "promise", - start_time, - stop_time, - status, - json_results) - - exit(exit_code) - - -if __name__ == '__main__': - main() +class Promise(base.FeatureBase): + def __init__(self): + super(Promise, self).__init__(project='promise', + case='promise', + repo='dir_repo_promise') + dir_promise_functest = '{}/promise/test/functest'.format(self.repo) + self.cmd = 'cd %s && python ./run_tests.py' % dir_promise_functest diff --git a/functest/utils/functest_constants.py b/functest/utils/functest_constants.py index bd1097855..0a9a03b18 100644 --- a/functest/utils/functest_constants.py +++ b/functest/utils/functest_constants.py @@ -195,33 +195,6 @@ ONOS_INSTALLER_MASTER_USERNAME = get_value( ONOS_INSTALLER_MASTER_PASSWORD = get_value( 'ONOS.environment.installer_master_password', 'ONOS_INSTALLER_MASTER_PASSWORD') -PROMISE_REPO_DIR = get_value('general.dir.dir_repo_promise', - 'PROMISE_REPO_DIR') -PROMISE_TENANT_NAME = get_value('promise.tenant_name', - 'PROMISE_TENANT_NAME') -TENANT_DESCRIPTION = get_value('promise.tenant_description', - 'TENANT_DESCRIPTION') -PROMISE_USER_NAME = get_value('promise.user_name', 'PROMISE_USER_NAME') -PROMISE_USER_PWD = get_value('promise.user_pwd', 'PROMISE_USER_PWD') -PROMISE_IMAGE_NAME = get_value('promise.image_name', - 'PROMISE_IMAGE_NAME') -PROMISE_FLAVOR_NAME = get_value('promise.flavor_name', - 'PROMISE_FLAVOR_NAME') -PROMISE_FLAVOR_VCPUS = get_value('promise.flavor_vcpus', - 'PROMISE_FLAVOR_VCPUS') -PROMISE_FLAVOR_RAM = get_value('promise.flavor_ram', - 'PROMISE_FLAVOR_RAM') -PROMISE_FLAVOR_DISK = get_value('promise.flavor_disk', - 'PROMISE_FLAVOR_DISK') -PROMISE_NET_NAME = get_value('promise.network_name', 'PROMISE_NET_NAME') -PROMISE_SUBNET_NAME = get_value('promise.subnet_name', - 'PROMISE_SUBNET_NAME') -PROMISE_SUBNET_CIDR = get_value('promise.subnet_cidr', - 'PROMISE_SUBNET_CIDR') -PROMISE_ROUTER_NAME = get_value('promise.router_name', - 'PROMISE_ROUTER_NAME') -COPPER_REPO_DIR = get_value('general.dir.repo_copper', - 'COPPER_REPO_DIR') EXAMPLE_INSTANCE_NAME = get_value('example.vm_name', 'EXAMPLE_INSTANCE_NAME') EXAMPLE_FLAVOR = get_value('example.flavor', 'EXAMPLE_FLAVOR') |