summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--functest/ci/download_images.sh4
-rw-r--r--functest/ci/run_tests.py4
-rw-r--r--functest/ci/testcases.yaml6
-rw-r--r--functest/opnfv_tests/openstack/vping/vping_base.py6
4 files changed, 9 insertions, 11 deletions
diff --git a/functest/ci/download_images.sh b/functest/ci/download_images.sh
index 88474d3a7..cc0abc142 100644
--- a/functest/ci/download_images.sh
+++ b/functest/ci/download_images.sh
@@ -20,6 +20,4 @@ https://cloud-images.ubuntu.com/releases/14.04/release/ubuntu-14.04-server-cloud
http://cloud.centos.org/altarch/7/images/aarch64/CentOS-7-aarch64-GenericCloud.qcow2.xz
EOF
-xz --decompress --force ${1:-/home/opnfv/functest/images}/CentOS-7-aarch64-GenericCloud.qcow2.xz
-
-exit $?
+xz --decompress --force --keep ${1:-/home/opnfv/functest/images}/CentOS-7-aarch64-GenericCloud.qcow2.xz
diff --git a/functest/ci/run_tests.py b/functest/ci/run_tests.py
index 87e3d37ba..feafa89e6 100644
--- a/functest/ci/run_tests.py
+++ b/functest/ci/run_tests.py
@@ -189,9 +189,9 @@ class Runner(object):
def main(self, **kwargs):
if 'noclean' in kwargs:
- self.clean_flag = False
+ self.clean_flag = not kwargs['noclean']
if 'report' in kwargs:
- self.report_flag = True
+ self.report_flag = kwargs['report']
try:
if 'test' in kwargs:
self.source_rc_file()
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index fac81267f..ce71c9b6f 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -324,10 +324,10 @@ tiers:
criteria: 100
blocking: false
description: >-
- Test suite for odl-sfc to test two chains and two SFs
+ Test suite for odl-sfc to test two chains with one SF and one chain with two SFs
dependencies:
- installer: '(apex)|(fuel)'
- scenario: 'odl_l2-sfc'
+ installer: ''
+ scenario: 'odl.*sfc'
run:
module: 'functest.core.feature'
class: 'BashFeature'
diff --git a/functest/opnfv_tests/openstack/vping/vping_base.py b/functest/opnfv_tests/openstack/vping/vping_base.py
index 40fcb07f0..6e9080654 100644
--- a/functest/opnfv_tests/openstack/vping/vping_base.py
+++ b/functest/opnfv_tests/openstack/vping/vping_base.py
@@ -113,13 +113,13 @@ class VPingBase(testcase.TestCase):
vping_physical_network = None
vping_segmentation_id = None
- if (hasattr(CONST, 'network_type')):
+ if (hasattr(CONST, 'vping_network_type')):
vping_network_type = CONST.__getattribute__(
'vping_network_type')
- if (hasattr(CONST, 'physical_network')):
+ if (hasattr(CONST, 'vping_physical_network')):
vping_physical_network = CONST.__getattribute__(
'vping_physical_network')
- if (hasattr(CONST, 'segmentation_id')):
+ if (hasattr(CONST, 'vping_segmentation_id')):
vping_segmentation_id = CONST.__getattribute__(
'vping_segmentation_id')