From 376a9d68e3b5fd4956fb6cb5e6faa2fa746a6d80 Mon Sep 17 00:00:00 2001 From: SerenaFeng Date: Wed, 10 Aug 2016 16:03:04 +0800 Subject: parser integration bugfix JIRA: FUNCTEST-407 Change-Id: I9f202cb09935d9b77c5a977234bec6b505e296fd Signed-off-by: SerenaFeng --- ci/config_functest.yaml | 16 ----------- docker/Dockerfile | 6 +---- testcases/vnf/RNC/parser.py | 64 -------------------------------------------- testcases/vnf/vRNC/parser.py | 64 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 65 insertions(+), 85 deletions(-) delete mode 100644 testcases/vnf/RNC/parser.py create mode 100644 testcases/vnf/vRNC/parser.py diff --git a/ci/config_functest.yaml b/ci/config_functest.yaml index fb4103d34..8e45b1d27 100644 --- a/ci/config_functest.yaml +++ b/ci/config_functest.yaml @@ -176,22 +176,6 @@ 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/docker/Dockerfile b/docker/Dockerfile index bc6d03936..9e4697897 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -88,12 +88,8 @@ 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 /bin/bash ${repos_dir}/parser/tests/parser_install.sh ${repos_dir} RUN ${repos_dir}/rally/install_rally.sh --yes ADD http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img /home/opnfv/functest/data/ diff --git a/testcases/vnf/RNC/parser.py b/testcases/vnf/RNC/parser.py deleted file mode 100644 index 91d5bb06a..000000000 --- a/testcases/vnf/RNC/parser.py +++ /dev/null @@ -1,64 +0,0 @@ -#!/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') - -logger = ft_logger.Logger("parser").getLogger() - - -def main(): - project = 'parser' - case_name = 'parser-basics' - 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() - - status, details = functest_utils.check_test_result(case_name, - ret, - start_time, - stop_time) - - functest_utils.logger_test_results(logger, - project, - case_name, - status, - details) - - functest_utils.push_results_to_db(project, - case_name, - logger, - start_time, - stop_time, - status, - details) - exit(ret) - -if __name__ == '__main__': - main() diff --git a/testcases/vnf/vRNC/parser.py b/testcases/vnf/vRNC/parser.py new file mode 100644 index 000000000..d5d3f78a1 --- /dev/null +++ b/testcases/vnf/vRNC/parser.py @@ -0,0 +1,64 @@ +#!/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') + +logger = ft_logger.Logger("parser").getLogger() + + +def main(): + project = 'parser' + case_name = 'parser-basics' + 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() + + status, details = functest_utils.check_test_result(project, + ret, + start_time, + stop_time) + + functest_utils.logger_test_results(logger, + project, + case_name, + status, + details) + + functest_utils.push_results_to_db(project, + case_name, + logger, + start_time, + stop_time, + status, + details) + exit(ret) + +if __name__ == '__main__': + main() -- cgit 1.2.3-korg