diff options
| author |   boucherv <valentin.boucher@orange.com> | 2017-02-14 11:22:19 +0100 |
|---|---|---|
| committer | boucherv <valentin.boucher@orange.com> | 2017-02-15 10:57:37 +0100 |
| commit | 8de29e4130fe18398d59692a6fcb492321ad3c60 (patch) | |
| tree | 3d9674a6aa618ca6c0c83b0d91c8a1adc2996e04 | |
| parent | 8b9cd64a7b26a8259fd39801ebe77089a10e33d5 (diff) | |
update cloudify_ims case
bug fixes
Provisional change of the ci loop var to daily for VNF testcase.
JIRA: FUNCTEST-710
Change-Id: I6dc8072b4e56c96473a2b09f1881b96024259db5
Signed-off-by: boucherv <valentin.boucher@orange.com>
| -rwxr-xr-x | functest/ci/testcases.yaml | 8 | ||||
| -rw-r--r-- | functest/core/vnf_base.py | 4 | ||||
| -rw-r--r-- | functest/opnfv_tests/vnf/ims/cloudify_ims.py | 5 | ||||
| -rw-r--r-- | functest/utils/functest_utils.py | 2 |
4 files changed, 7 insertions, 12 deletions
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index 6007f972..e692c008 100755 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -354,7 +354,7 @@ tiers: - name: vnf order: 4 - ci_loop: 'weekly' + ci_loop: '(daily)|(weekly)' description : >- Collection of VNF test cases. testcases: @@ -367,7 +367,7 @@ tiers: using the Cloudify orchestrator. It also runs some signaling traffic. dependencies: installer: '' - scenario: '(ocl)|(nosdn)|^(os-odl)((?!bgpvpn).)*$' + scenario: 'nosdn-nofeature' run: module: 'functest.opnfv_tests.vnf.ims.cloudify_ims' class: 'ImsVnf' @@ -378,8 +378,8 @@ tiers: description: >- Test suite from Parser project. dependencies: - installer: '' - scenario: '' + installer: 'unknown' + scenario: 'unknown' run: module: 'functest.opnfv_tests.vnf.aaa.aaa' class: 'AaaVnf' diff --git a/functest/core/vnf_base.py b/functest/core/vnf_base.py index 44b4ae04..8e98d8ed 100644 --- a/functest/core/vnf_base.py +++ b/functest/core/vnf_base.py @@ -67,8 +67,8 @@ class VnfOnBoardingBase(base.TestcaseBase): res_orchestrator['result']) self.details['orchestrator']['duration'] = round( orchestrator_ready_time - self.start_time, 1) - except: - self.logger.warn("Problem with the Orchestrator") + except Exception: + self.logger.warn("Problem with the Orchestrator", exc_info=True) # Deploy VNF try: diff --git a/functest/opnfv_tests/vnf/ims/cloudify_ims.py b/functest/opnfv_tests/vnf/ims/cloudify_ims.py index e2508c22..efde44a0 100644 --- a/functest/opnfv_tests/vnf/ims/cloudify_ims.py +++ b/functest/opnfv_tests/vnf/ims/cloudify_ims.py @@ -176,11 +176,6 @@ class ImsVnf(vnf_base.VnfOnBoardingBase): cfy.set_nameservers(ns) self.logger.debug("Resolvconf set") - if 'compute' in self.nova_client.client.services_url: - cfy.set_nova_url(self.nova_client.client.services_url['compute']) - if self.neutron_client.httpclient.endpoint_url is not None: - cfy.set_neutron_url(self.neutron_client.httpclient.endpoint_url) - self.logger.info("Prepare virtualenv for cloudify-cli") cmd = "chmod +x " + self.case_dir + "create_venv.sh" ft_utils.execute_command(cmd) diff --git a/functest/utils/functest_utils.py b/functest/utils/functest_utils.py index 04055464..7c5c4fcc 100644 --- a/functest/utils/functest_utils.py +++ b/functest/utils/functest_utils.py @@ -300,7 +300,7 @@ def get_resolvconf_ns(): while line: ip = re.search(r"\b(?:[0-9]{1,3}\.){3}[0-9]{1,3}\b", line) if ip: - resolver.nameservers = [str(ip)] + resolver.nameservers = [ip.group(0)] try: result = resolver.query('opnfv.org')[0] if result != "": |