diff options
Diffstat (limited to 'functest/ci')
| -rw-r--r-- | functest/ci/check_deployment.py | 4 | ||||
| -rw-r--r-- | functest/ci/config_functest.yaml | 11 | ||||
| -rw-r--r-- | functest/ci/run_tests.py | 3 | ||||
| -rw-r--r-- | functest/ci/testcases.yaml | 16 |
4 files changed, 29 insertions, 5 deletions
diff --git a/functest/ci/check_deployment.py b/functest/ci/check_deployment.py index ae016a80..8cc522f6 100644 --- a/functest/ci/check_deployment.py +++ b/functest/ci/check_deployment.py @@ -19,16 +19,16 @@ import logging import logging.config import os import pkg_resources +from six.moves.urllib.parse import urlparse import socket -from urlparse import urlparse from functest.opnfv_tests.openstack.snaps import snaps_utils +from snaps.openstack.tests import openstack_tests from snaps.openstack.utils import glance_utils from snaps.openstack.utils import keystone_utils from snaps.openstack.utils import neutron_utils from snaps.openstack.utils import nova_utils -from snaps.openstack.tests import openstack_tests __author__ = "Jose Lausuch <jose.lausuch@ericsson.com>" diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml index 8f9bd0d3..315c6c9c 100644 --- a/functest/ci/config_functest.yaml +++ b/functest/ci/config_functest.yaml @@ -141,9 +141,16 @@ rally: vnf: juju_epc: - tenant_name: epc + config: juju_epc.yaml tenant_description: OAI EPC deployed with Juju - tenant_images: {} + tenant_name: abotepc + private_net_name: abot-net + private_subnet_cidr: 172.16.0.0/24 + private_subnet_name: abot-subnet + external_router: abot-router + external_network_name: ext-net + dns_nameserver: ['8.8.8.8'] + cloudify_ims: tenant_name: cloudify_ims tenant_description: vIMS diff --git a/functest/ci/run_tests.py b/functest/ci/run_tests.py index d476bded..67a6f142 100644 --- a/functest/ci/run_tests.py +++ b/functest/ci/run_tests.py @@ -19,6 +19,7 @@ import sys import textwrap import prettytable +import six import yaml import functest.ci.tier_builder as tb @@ -118,7 +119,7 @@ class Runner(object): raise Exception("RC file %s does not exist..." % rc_file) logger.debug("Sourcing the OpenStack RC file...") os_utils.source_credentials(rc_file) - for key, value in os.environ.iteritems(): + for key, value in six.iteritems(os.environ): if re.search("OS_", key): if key == 'OS_AUTH_URL': CONST.__setattr__('OS_AUTH_URL', value) diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index 7ea03e15..5245079e 100644 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -405,3 +405,19 @@ tiers: module: 'functest.opnfv_tests.vnf.ims.orchestra_clearwaterims' class: 'ClearwaterImsVnf' + + - + case_name: juju_epc + enabled: true + project_name: functest + criteria: 100 + blocking: false + description: >- + vEPC validation with Juju as VNF manager and ABoT as test + executor. + dependencies: + installer: '' + scenario: 'os-nosdn-nofeature-ha' + run: + module: 'functest.opnfv_tests.vnf.epc.juju_epc' + class: 'JujuEpc' |