aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/testing/user/configguide/configguide.rst2
-rwxr-xr-xfunctest/ci/run_tests.py2
-rw-r--r--functest/cli/commands/cli_os.py5
-rw-r--r--functest/opnfv_tests/openstack/tempest/tempest.py2
-rw-r--r--functest/opnfv_tests/sdn/onos/onos.py8
-rw-r--r--functest/tests/unit/cli/commands/test_cli_os.py15
6 files changed, 15 insertions, 19 deletions
diff --git a/docs/testing/user/configguide/configguide.rst b/docs/testing/user/configguide/configguide.rst
index 9a174978..12dfd105 100644
--- a/docs/testing/user/configguide/configguide.rst
+++ b/docs/testing/user/configguide/configguide.rst
@@ -74,7 +74,7 @@ executing the following sequence
#. Log in to container and execute the following command. Replace
the IP with installer address after the "-a" parameter::
- $REPOS_DIR/releng/utils/fetch_os_creds.sh \
+ fetch_os_creds.sh \
-d /home/opnfv/functest/conf/openstack.creds \
-i fuel \
-a 10.20.0.2 \
diff --git a/functest/ci/run_tests.py b/functest/ci/run_tests.py
index 95353c87..8317df54 100755
--- a/functest/ci/run_tests.py
+++ b/functest/ci/run_tests.py
@@ -221,7 +221,7 @@ class Runner(object):
try:
if kwargs['test']:
self.source_rc_file()
- logger.error(kwargs['test'])
+ logger.debug("Test args: %s", kwargs['test'])
if _tiers.get_tier(kwargs['test']):
self.run_tier(_tiers.get_tier(kwargs['test']))
elif _tiers.get_test(kwargs['test']):
diff --git a/functest/cli/commands/cli_os.py b/functest/cli/commands/cli_os.py
index e54eb423..5e6e1109 100644
--- a/functest/cli/commands/cli_os.py
+++ b/functest/cli/commands/cli_os.py
@@ -67,9 +67,8 @@ class CliOpenStack(object):
if installer_ip is None:
click.echo("The environment variable 'INSTALLER_IP' is not"
"defined. Please export it")
- cmd = ("%s/releng/utils/fetch_os_creds.sh -d %s -i %s -a %s"
- % (CONST.__getattribute__('dir_repos'),
- self.openstack_creds,
+ cmd = ("fetch_os_creds.sh -d %s -i %s -a %s"
+ % (self.openstack_creds,
installer_type,
installer_ip))
click.echo("Fetching credentials from installer node '%s' with IP=%s.."
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index 233ceb48..f5f194e6 100644
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -148,7 +148,7 @@ class TempestCommon(testcase.TestCase):
first_pos = line.index("UUID=") + len("UUID=")
last_pos = line.index(") for deployment")
self.VERIFICATION_ID = line[first_pos:last_pos]
- logger.debug('Verication UUID: %s' % self.VERIFICATION_ID)
+ logger.debug('Verification UUID: %s', self.VERIFICATION_ID)
f_stdout.write(line)
p.wait()
diff --git a/functest/opnfv_tests/sdn/onos/onos.py b/functest/opnfv_tests/sdn/onos/onos.py
index 5dfff036..adcb4166 100644
--- a/functest/opnfv_tests/sdn/onos/onos.py
+++ b/functest/opnfv_tests/sdn/onos/onos.py
@@ -209,10 +209,10 @@ class OnosSfc(OnosBase):
self.onos_sfc_image_name, image_id)
def set_sfc_conf(self):
- self.update_sfc_onos_file("keystone_ip", self.get_ip("keystone"))
- self.update_sfc_onos_file("neutron_ip", self.get_ip("neutron"))
- self.update_sfc_onos_file("nova_ip", self.get_ip("nova"))
- self.update_sfc_onos_file("glance_ip", self.get_ip("glance"))
+ self.update_sfc_onos_file("keystone_ip", self.get_ip("identity"))
+ self.update_sfc_onos_file("neutron_ip", self.get_ip("network"))
+ self.update_sfc_onos_file("nova_ip", self.get_ip("compute"))
+ self.update_sfc_onos_file("glance_ip", self.get_ip("image"))
self.update_sfc_onos_file("console",
CONST.__getattribute__('OS_PASSWORD'))
neutron_client = openstack_utils.get_neutron_client()
diff --git a/functest/tests/unit/cli/commands/test_cli_os.py b/functest/tests/unit/cli/commands/test_cli_os.py
index 7ab4ddc3..b551ee4d 100644
--- a/functest/tests/unit/cli/commands/test_cli_os.py
+++ b/functest/tests/unit/cli/commands/test_cli_os.py
@@ -70,9 +70,8 @@ class CliOpenStackTesting(unittest.TestCase):
mock_ftutils_execute):
CONST.__setattr__('INSTALLER_TYPE', self.installer_type)
CONST.__setattr__('INSTALLER_IP', self.installer_ip)
- cmd = ("%s/releng/utils/fetch_os_creds.sh -d %s -i %s -a %s"
- % (CONST.__getattribute__('dir_repos'),
- self.openstack_creds,
+ cmd = ("fetch_os_creds.sh -d %s -i %s -a %s"
+ % (self.openstack_creds,
self.installer_type,
self.installer_ip))
self.cli_os.openstack_creds = self.openstack_creds
@@ -93,9 +92,8 @@ class CliOpenStackTesting(unittest.TestCase):
mock_ftutils_execute):
CONST.__setattr__('INSTALLER_TYPE', None)
CONST.__setattr__('INSTALLER_IP', self.installer_ip)
- cmd = ("%s/releng/utils/fetch_os_creds.sh -d %s -i %s -a %s"
- % (CONST.__getattribute__('dir_repos'),
- self.openstack_creds,
+ cmd = ("fetch_os_creds.sh -d %s -i %s -a %s"
+ % (self.openstack_creds,
None,
self.installer_ip))
self.cli_os.openstack_creds = self.openstack_creds
@@ -121,9 +119,8 @@ class CliOpenStackTesting(unittest.TestCase):
installer_ip = None
CONST.__setattr__('INSTALLER_TYPE', installer_type)
CONST.__setattr__('INSTALLER_IP', installer_ip)
- cmd = ("%s/releng/utils/fetch_os_creds.sh -d %s -i %s -a %s"
- % (CONST.__getattribute__('dir_repos'),
- self.openstack_creds,
+ cmd = ("fetch_os_creds.sh -d %s -i %s -a %s"
+ % (self.openstack_creds,
installer_type,
installer_ip))
self.cli_os.openstack_creds = self.openstack_creds