aboutsummaryrefslogtreecommitdiffstats
path: root/functest
diff options
context:
space:
mode:
Diffstat (limited to 'functest')
-rw-r--r--functest/ci/config_functest.yaml1
-rw-r--r--functest/ci/testcases.yaml2
-rw-r--r--functest/opnfv_tests/sdn/odl/odl.py3
-rw-r--r--functest/opnfv_tests/vnf/router/cloudify_vrouter.py16
-rw-r--r--functest/tests/unit/odl/test_odl.py3
5 files changed, 9 insertions, 16 deletions
diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index 5ff5c824..cfcc728a 100644
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -7,7 +7,6 @@ general:
dir_repo_releng: /home/opnfv/repos/releng
repo_vims_test: /src/vims-test
repo_barometer: /home/opnfv/repos/barometer
- repo_doctor: /home/opnfv/repos/doctor
repo_odl_test: /src/odl_test
repo_fds: /src/fds
repo_securityscan: /home/opnfv/repos/securityscanning
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 64bcf616..0dce47e3 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -266,7 +266,7 @@ tiers:
module: 'functest.core.feature'
class: 'BashFeature'
args:
- cmd: 'cd /home/opnfv/repos/doctor/tests && ./run.sh'
+ cmd: '(cd /src/doctor-test/tests && run.sh)'
-
case_name: bgpvpn
diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py
index 841da834..ab70ba10 100644
--- a/functest/opnfv_tests/sdn/odl/odl.py
+++ b/functest/opnfv_tests/sdn/odl/odl.py
@@ -225,7 +225,8 @@ class ODLTests(testcase.TestCase):
kwargs['osauthurl'] = os.environ['OS_AUTH_URL']
kwargs['ospassword'] = os.environ['OS_PASSWORD']
if installer_type == 'fuel':
- kwargs['odlwebport'] = '8282'
+ kwargs['odlwebport'] = '8181'
+ kwargs['odlrestconfport'] = '8282'
elif installer_type == 'apex' or installer_type == 'netvirt':
kwargs['odlip'] = os.environ['SDN_CONTROLLER_IP']
kwargs['odlwebport'] = '8081'
diff --git a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
index c3cccb98..edbdb495 100644
--- a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
+++ b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
@@ -25,7 +25,6 @@ import functest.utils.openstack_utils as os_utils
from git import Repo
-from snaps.openstack.os_credentials import OSCreds
from snaps.openstack.create_network import (NetworkSettings, SubnetSettings,
OpenStackNetwork)
from snaps.openstack.create_security_group import (SecurityGroupSettings,
@@ -110,17 +109,10 @@ class CloudifyVrouter(vrouter_base.VrouterOnBoardingBase):
self.__logger.info("Additional pre-configuration steps")
- self.snaps_creds = OSCreds(
- username=self.creds['username'],
- password=self.creds['password'],
- auth_url=self.creds['auth_url'],
- project_name=self.creds['tenant'],
- identity_api_version=int(os_utils.get_keystone_client_version()))
-
- self.util.set_credentials(self.creds["username"],
- self.creds["password"],
- self.creds["auth_url"],
- self.creds["tenant"])
+ self.util.set_credentials(self.snaps_creds.username,
+ self.snaps_creds.password,
+ self.snaps_creds.auth_url,
+ self.snaps_creds.project_name)
# needs some images
self.__logger.info("Upload some OS images if it doesn't exist")
diff --git a/functest/tests/unit/odl/test_odl.py b/functest/tests/unit/odl/test_odl.py
index 8aeea41d..878d47dd 100644
--- a/functest/tests/unit/odl/test_odl.py
+++ b/functest/tests/unit/odl/test_odl.py
@@ -462,7 +462,8 @@ class ODLRunTesting(ODLTesting):
def test_fuel(self):
os.environ["INSTALLER_TYPE"] = "fuel"
self._test_run(testcase.TestCase.EX_OK,
- odlip=self._neutron_ip, odlwebport='8282')
+ odlip=self._neutron_ip, odlwebport='8181',
+ odlrestconfport='8282')
def test_apex_no_controller_ip(self):
with mock.patch('functest.utils.openstack_utils.get_endpoint',