Merge "Update read and write data path in cinder test"

diff --git a/functest/ci/logging.ini b/functest/ci/logging.ini
index d014725..bed048f 100644 (file)
--- a/functest/ci/logging.ini
+++ b/functest/ci/logging.ini
@@ -1,25 +1,15 @@
 [loggers]
-keys=root,functest,api,ci,core,cli,opnfv_tests,utils,xtesting,xci,xcore,energy,xutils
+keys=root,ci,core,xci,xcore
 
 [handlers]
-keys=console,wconsole,file,null
+keys=console,wconsole,file
 
 [formatters]
 keys=standard
 
 [logger_root]
 level=NOTSET
-handlers=null
-
-[logger_functest]
-level=NOTSET
-handlers=file
-qualname=functest
-
-[logger_api]
-level=NOTSET
-handlers=wconsole
-qualname=functest.api
+handlers=wconsole,file
 
 [logger_ci]
 level=NOTSET
@@ -31,26 +21,6 @@ level=NOTSET
 handlers=console
 qualname=functest.core
 
-[logger_cli]
-level=NOTSET
-handlers=wconsole
-qualname=functest.cli
-
-[logger_opnfv_tests]
-level=NOTSET
-handlers=wconsole
-qualname=functest.opnfv_tests
-
-[logger_utils]
-level=NOTSET
-handlers=wconsole
-qualname=functest.utils
-
-[logger_xtesting]
-level=NOTSET
-handlers=file
-qualname=xtesting
-
 [logger_xci]
 level=NOTSET
 handlers=console
@@ -61,22 +31,6 @@ level=NOTSET
 handlers=console
 qualname=xtesting.core
 
-[logger_energy]
-level=NOTSET
-handlers=wconsole
-qualname=xtesting.energy
-
-[logger_xutils]
-level=NOTSET
-handlers=wconsole
-qualname=xtesting.utils
-
-[handler_null]
-class=NullHandler
-level=NOTSET
-formatter=standard
-args=()
-
 [handler_console]
 class=StreamHandler
 level=INFO

diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index 11de144..7f1baeb 100644 (file)
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -213,7 +213,7 @@ class TempestCommon(testcase.TestCase):
                     return
 
             with open(os.path.join(self.res_dir,
-                                   "tempest.log"), 'r') as logfile:
+                                   "tempest-error.log"), 'r') as logfile:
                 output = logfile.read()
 
             success_testcases = []

diff --git a/functest/opnfv_tests/openstack/vping/vping_ssh.py b/functest/opnfv_tests/openstack/vping/vping_ssh.py
index dd864e0..1dfca89 100644 (file)
--- a/functest/opnfv_tests/openstack/vping/vping_ssh.py
+++ b/functest/opnfv_tests/openstack/vping/vping_ssh.py
@@ -114,7 +114,7 @@ class VPingSSH(vping_base.VPingBase):
                 time.sleep(10)
         else:
             self.logger.error("cannot connect to %s", self.vm2.public_v4)
-            return False
+            return testcase.TestCase.EX_RUN_ERROR
 
         self.logger.debug("ssh: %s", self.ssh)
         (_, stdout, _) = self.ssh.exec_command(

diff --git a/functest/opnfv_tests/vnf/ims/cloudify_ims.py b/functest/opnfv_tests/vnf/ims/cloudify_ims.py
index b3b0ee4..a0386f1 100644 (file)
--- a/functest/opnfv_tests/vnf/ims/cloudify_ims.py
+++ b/functest/opnfv_tests/vnf/ims/cloudify_ims.py
@@ -296,7 +296,8 @@ class CloudifyIms(clearwater_ims_base.ClearwaterOnBoardingBase):
             self.run_blocking_ssh_command(ssh, cmd)
             cmd = "sudo chmod 444 /etc/cloudify/cloudify_ims.pem"
             self.run_blocking_ssh_command(ssh, cmd)
-            cmd = "sudo yum install -y gcc python-devel"
+            # cmd2 is badly unpinned by Cloudify
+            cmd = "sudo yum install -y gcc python-devel python-cmd2"
             self.run_blocking_ssh_command(
                 ssh, cmd, "Unable to install packages on manager")
             self.run_blocking_ssh_command(ssh, 'cfy status')

diff --git a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
index 11f30bf..f23906b 100644 (file)
--- a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
+++ b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
@@ -297,7 +297,8 @@ class CloudifyVrouter(vrouter_base.VrouterOnBoardingBase):
             self.run_blocking_ssh_command(ssh, cmd)
             cmd = "sudo chmod 444 /etc/cloudify/cloudify_vrouter.pem"
             self.run_blocking_ssh_command(ssh, cmd)
-            cmd = "sudo yum install -y gcc python-devel"
+            # cmd2 is badly unpinned by Cloudify
+            cmd = "sudo yum install -y gcc python-devel python-cmd2"
             self.run_blocking_ssh_command(
                 ssh, cmd, "Unable to install packages on manager")
         else:

diff --git a/upper-constraints.txt b/upper-constraints.txt
index 9eb6829..c0763db 100644 (file)
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -19,6 +19,6 @@ robotframework-sshlibrary===2.1.3;python_version=='2.7'
 IPy===0.83
 ansible===2.3.2.0
 flasgger===0.6.6
-xtesting===0.41.0
+xtesting===0.42.0
 networking-bgpvpn===8.0.0
 sphinx-opnfv-theme===0.1.1