summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2016-08-10 14:07:57 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-10 14:07:57 +0000
commitc9dd12b85b2513c9ec576ed579a86ca901860397 (patch)
treea6c25bbb4b89cb9bf05dee8e203a1beac10961af
parentda52e30ffe53f3fa961b5c432380d3e3d934b8de (diff)
parent376a9d68e3b5fd4956fb6cb5e6faa2fa746a6d80 (diff)
Merge "parser integration bugfix"
-rw-r--r--ci/config_functest.yaml16
-rw-r--r--docker/Dockerfile6
-rw-r--r--testcases/vnf/vRNC/parser.py (renamed from testcases/vnf/RNC/parser.py)2
3 files changed, 2 insertions, 22 deletions
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/vRNC/parser.py
index 91d5bb06a..d5d3f78a1 100644
--- a/testcases/vnf/RNC/parser.py
+++ b/testcases/vnf/vRNC/parser.py
@@ -40,7 +40,7 @@ def main():
ret = functest_utils.execute_command(cmd, logger, exit_on_error=False)
stop_time = time.time()
- status, details = functest_utils.check_test_result(case_name,
+ status, details = functest_utils.check_test_result(project,
ret,
start_time,
stop_time)