From 4f9781e7970e8f22ba6a29ae2a5448f289af1696 Mon Sep 17 00:00:00 2001 From: SerenaFeng Date: Thu, 28 Jul 2016 12:20:21 +0800 Subject: Functional testing for tosca2heat translation in Dockerfile, add parser related work in config_functest.yaml/testcase.yaml, add parser related configuration in exec_test.sh to run parser test add vnf/RNC/parser.py script JIRA: FUNCTEST-187 Change-Id: I8b53774da00f13b630ec5d9f750817db892a82bb Signed-off-by: SerenaFeng --- ci/config_functest.yaml | 17 +++++++++ ci/exec_test.sh | 3 ++ ci/testcases.yaml | 9 +++++ docker/Dockerfile | 6 ++++ testcases/vnf/RNC/parser.py | 86 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 121 insertions(+) create mode 100644 testcases/vnf/RNC/parser.py diff --git a/ci/config_functest.yaml b/ci/config_functest.yaml index ecfa79a73..24c7084f2 100644 --- a/ci/config_functest.yaml +++ b/ci/config_functest.yaml @@ -22,6 +22,7 @@ general: dir_repo_doctor: /home/opnfv/repos/doctor dir_repo_copper: /home/opnfv/repos/copper dir_repo_ovno: /home/opnfv/repos/ovno + dir_repo_parser: /home/opnfv/repos/parser dir_functest: /home/opnfv/functest dir_results: /home/opnfv/functest/results dir_functest_conf: /home/opnfv/functest/conf @@ -169,6 +170,22 @@ promise: subnet_cidr: 192.168.121.0/24 router_name: promise-router +parser: + general: + tenant_name: parser + tenant_description: parser Functionality Testing + user_name: parser + user_pwd: parser + image_name: parser-img + flavor_name: parser-flavor + flavor_vcpus: 1 + flavor_ram: 512 + flavor_disk: 0 + network_name: parser-net + subnet_name: parser-subnet + subnet_cidr: 192.168.160.0/24 + router_name: parser-router + example: example_vm_name: example-vm example_flavor: m1.small diff --git a/ci/exec_test.sh b/ci/exec_test.sh index 26067a5d3..f168697c1 100755 --- a/ci/exec_test.sh +++ b/ci/exec_test.sh @@ -169,6 +169,9 @@ function run_test(){ "odl-sfc") python ${FUNCTEST_REPO_DIR}/testcases/features/sfc/sfc.py ;; + "parser") + python ${FUNCTEST_REPO_DIR}/testcases/vnf/RNC/parser.py + ;; *) echo "The test case '${test_name}' does not exist." exit 1 diff --git a/ci/testcases.yaml b/ci/testcases.yaml index e5182c19a..634d041b0 100644 --- a/ci/testcases.yaml +++ b/ci/testcases.yaml @@ -245,3 +245,12 @@ tiers: dependencies: installer: '' scenario: '(ocl)|(nosdn)|^(os-odl)((?!bgpvpn).)*$' + - + name: parser + criteria: 'status == "PASS"' + blocking: false + description: >- + Test suite from Parser project. + dependencies: + installer: 'fuel' + scenario: '' diff --git a/docker/Dockerfile b/docker/Dockerfile index e138c73dc..bc6d03936 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -83,10 +83,16 @@ RUN git clone https://gerrit.opnfv.org/gerrit/moon ${repos_dir}/moon RUN git clone https://gerrit.opnfv.org/gerrit/sdnvpn ${repos_dir}/sdnvpn RUN git clone https://github.com/openstack/kingbird.git ${repos_dir}/kingbird RUN git clone https://gerrit.opnfv.org/gerrit/domino ${repos_dir}/domino +RUN git clone https://gerrit.opnfv.org/gerrit/parser ${repos_dir}/parser RUN pip install -r ${repos_dir}/functest/docker/requirements.pip RUN pip install -r ${repos_dir}/rally/requirements.txt RUN pip install -r ${repos_dir}/tempest/requirements.txt +RUN pip install -r ${repos_dir}/parser/tosca2heat/tosca-parser/requirements.txt +RUN pip install -r ${repos_dir}/parser/tosca2heat/heat-translator/requirements.txt +RUN cd ${repos_dir}/parser/tosca2heat/tosca-parser && python setup.py install +RUN cd ${repos_dir}/parser/tosca2heat/heat-translator && python setup.py install + RUN ${repos_dir}/rally/install_rally.sh --yes diff --git a/testcases/vnf/RNC/parser.py b/testcases/vnf/RNC/parser.py new file mode 100644 index 000000000..7def5bf82 --- /dev/null +++ b/testcases/vnf/RNC/parser.py @@ -0,0 +1,86 @@ +#!/usr/bin/python +# +# Copyright 2016 ZTE Corporation +# +# 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 +# +# 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 os +import time +import yaml + +import functest.utils.functest_logger as ft_logger +import functest.utils.functest_utils as functest_utils + +with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f: + functest_yaml = yaml.safe_load(f) + +dirs = functest_yaml.get('general').get('directories') +FUNCTEST_REPO = dirs.get('dir_repo_functest') +PARSER_REPO = dirs.get('dir_repo_parser') +TEST_DB_URL = functest_yaml.get('results').get('test_db_url') + +logger = ft_logger.Logger("parser").getLogger() + + +def main(): + EXIT_CODE = -1 + cmd = 'cd %s/tests && ./functest_run.sh' % PARSER_REPO + start_time = time.time() + + ret = functest_utils.execute_command(cmd, logger, exit_on_error=False) + + stop_time = time.time() + duration = round(stop_time - start_time, 1) + if ret == 0: + EXIT_CODE = 0 + logger.info("parser OK") + test_status = 'OK' + else: + logger.info("parser FAILED") + test_status = 'NOK' + + details = { + 'timestart': start_time, + 'duration': duration, + 'status': test_status, + } + pod_name = functest_utils.get_pod_name(logger) + scenario = functest_utils.get_scenario(logger) + version = functest_utils.get_version(logger) + build_tag = functest_utils.get_build_tag(logger) + + status = "FAIL" + if details['status'] == "OK": + status = "PASS" + + logger.info("Pushing Parser results: TEST_DB_URL=%(db)s pod_name=%(pod)s " + "version=%(v)s scenario=%(s)s criteria=%(c)s details=%(d)s" % { + 'db': TEST_DB_URL, + 'pod': pod_name, + 'v': version, + 's': scenario, + 'c': status, + 'b': build_tag, + 'd': details, + }) + functest_utils.push_results_to_db("parser", + "parser-basics", + logger, + start_time, + stop_time, + status, + details) + exit(EXIT_CODE) + +if __name__ == '__main__': + main() -- cgit 1.2.3-korg