aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docker/parser/testcases.yaml3
-rw-r--r--functest/opnfv_tests/openstack/rally/rally.py12
-rw-r--r--functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py16
-rw-r--r--functest/opnfv_tests/vnf/ims/orchestra_openims.py16
4 files changed, 23 insertions, 24 deletions
diff --git a/docker/parser/testcases.yaml b/docker/parser/testcases.yaml
index 4ab3fae2..45ccb0be 100644
--- a/docker/parser/testcases.yaml
+++ b/docker/parser/testcases.yaml
@@ -9,14 +9,13 @@ tiers:
testcases:
-
case_name: parser-basics
- enabled: false
project_name: parser
criteria: 100
blocking: false
description: >-
Test suite from Parser project.
dependencies:
- installer: 'fuel'
+ installer: ''
scenario: '^((?!bgpvpn|noha).)*$'
run:
module: 'functest.core.feature'
diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py
index 5aba3882..44c7f2ba 100644
--- a/functest/opnfv_tests/openstack/rally/rally.py
+++ b/functest/opnfv_tests/openstack/rally/rally.py
@@ -102,6 +102,7 @@ class RallyBase(testcase.TestCase):
self.mode = ''
self.summary = []
self.scenario_dir = ''
+ self.image_name = None
self.ext_net_name = None
self.priv_net_id = None
self.smoke = None
@@ -112,7 +113,7 @@ class RallyBase(testcase.TestCase):
def _build_task_args(self, test_file_name):
task_args = {'service_list': [test_file_name]}
- task_args['image_name'] = self.GLANCE_IMAGE_NAME
+ task_args['image_name'] = self.image_name
task_args['flavor_name'] = self.FLAVOR_NAME
task_args['glance_image_location'] = self.GLANCE_IMAGE_PATH
task_args['glance_image_format'] = self.GLANCE_IMAGE_FORMAT
@@ -467,24 +468,23 @@ class RallyBase(testcase.TestCase):
if self.test_name not in self.TESTS:
raise Exception("Test name '%s' is invalid" % self.test_name)
- image_name = self.GLANCE_IMAGE_NAME + self.guid
network_name = self.RALLY_PRIVATE_NET_NAME + self.guid
subnet_name = self.RALLY_PRIVATE_SUBNET_NAME + self.guid
router_name = self.RALLY_ROUTER_NAME + self.guid
+ self.image_name = self.GLANCE_IMAGE_NAME + self.guid
self.ext_net_name = snaps_utils.get_ext_net_name(self.os_creds)
- LOGGER.debug('Getting or creating image...')
+ LOGGER.debug("Creating image '%s'...", self.image_name)
image_creator = deploy_utils.create_image(
self.os_creds, ImageSettings(
- name=image_name,
+ name=self.image_name,
image_file=self.GLANCE_IMAGE_PATH,
img_format=self.GLANCE_IMAGE_FORMAT,
image_user=self.GLANCE_IMAGE_USERNAME,
public=True,
extra_properties=self.GLANCE_IMAGE_EXTRA_PROPERTIES))
if image_creator is None:
- raise Exception("Failed to get or create image '%s'" %
- image_name)
+ raise Exception("Failed to create image")
self.creators.append(image_creator)
LOGGER.debug("Creating network '%s'...", network_name)
diff --git a/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py b/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py
index 5b2e585e..6a111603 100644
--- a/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py
+++ b/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py
@@ -494,7 +494,7 @@ class ClearwaterImsVnf(vnf.VnfOnBoarding):
self.logger.info("Waiting for Open Baton NFVO to be up and running...")
timeout = 0
- while timeout < 200:
+ while timeout < 45:
if servertest(
self.mano['details']['fip'].ip,
"8080"):
@@ -502,11 +502,11 @@ class ClearwaterImsVnf(vnf.VnfOnBoarding):
else:
self.logger.info(
"Open Baton NFVO is not started yet (%ss)",
- (timeout * 5))
- time.sleep(5)
+ (timeout * 60))
+ time.sleep(60)
timeout += 1
- if timeout >= 200:
+ if timeout >= 45:
duration = time.time() - start_time
self.details["orchestrator"].update(
status='FAIL', duration=duration)
@@ -599,13 +599,13 @@ class ClearwaterImsVnf(vnf.VnfOnBoarding):
while self.mano['details']['nsr'].get("status") != 'ACTIVE' \
and self.mano['details']['nsr'].get("status") != 'ERROR':
timeout += 1
- self.logger.info("NSR is not yet ACTIVE... (%ss)", 5 * timeout)
- if timeout == 300:
- self.logger.error("INACTIVE NSR after %s sec..", 5 * timeout)
+ self.logger.info("NSR is not yet ACTIVE... (%ss)", 60 * timeout)
+ if timeout == 30:
+ self.logger.error("INACTIVE NSR after %s sec..", 60 * timeout)
duration = time.time() - start_time
self.details["vnf"].update(status='FAIL', duration=duration)
return False
- time.sleep(5)
+ time.sleep(60)
self.mano['details']['nsr'] = json.loads(
nsr_agent.find(self.mano['details']['nsr'].get('id')))
diff --git a/functest/opnfv_tests/vnf/ims/orchestra_openims.py b/functest/opnfv_tests/vnf/ims/orchestra_openims.py
index fa700890..0821e42a 100644
--- a/functest/opnfv_tests/vnf/ims/orchestra_openims.py
+++ b/functest/opnfv_tests/vnf/ims/orchestra_openims.py
@@ -488,18 +488,18 @@ class OpenImsVnf(vnf.VnfOnBoarding):
self.logger.info("Waiting for Open Baton NFVO to be up and running...")
timeout = 0
- while timeout < 200:
+ while timeout < 45:
if servertest(
self.mano['details']['fip'].ip,
"8080"):
break
else:
self.logger.info("Open Baton NFVO is not started yet (%ss)",
- (timeout * 5))
- time.sleep(5)
+ (timeout * 60))
+ time.sleep(60)
timeout += 1
- if timeout >= 200:
+ if timeout >= 45:
duration = time.time() - start_time
self.details["orchestrator"].update(
status='FAIL', duration=duration)
@@ -592,13 +592,13 @@ class OpenImsVnf(vnf.VnfOnBoarding):
while self.mano['details']['nsr'].get("status") != 'ACTIVE' \
and self.mano['details']['nsr'].get("status") != 'ERROR':
timeout += 1
- self.logger.info("NSR is not yet ACTIVE... (%ss)", 5 * timeout)
- if timeout == 300:
- self.logger.error("INACTIVE NSR after %s sec..", 5 * timeout)
+ self.logger.info("NSR is not yet ACTIVE... (%ss)", 60 * timeout)
+ if timeout == 30:
+ self.logger.error("INACTIVE NSR after %s sec..", 60 * timeout)
duration = time.time() - start_time
self.details["vnf"].update(status='FAIL', duration=duration)
return False
- time.sleep(5)
+ time.sleep(60)
self.mano['details']['nsr'] = json.loads(
nsr_agent.find(self.mano['details']['nsr'].get('id')))