From: jose.lausuch <jose.lausuch@ericsson.com>
Date: Fri, 18 Dec 2015 17:31:48 +0000 (+0100)
Subject: Add cinder check to support NoneType object
X-Git-Tag: brahmaputra.1.0~237
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=1603c0810fbfc872dada41e5af84e7b5587169e9;p=functest.git

Add cinder check to support NoneType object

Change-Id: Ic8606479b8f5ea28cd8884414a6f4a3b76685107
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
---

diff --git a/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py b/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py
index 5d76a70b3..4dadcbfb6 100644
--- a/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py
+++ b/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py
@@ -115,7 +115,7 @@ def remove_volumes(cinder_client, nova_client):
             time.sleep(1)
 
     volumes = functest_utils.get_volumes(cinder_client)
-    if len(volumes) == 0:
+    if volumes is None or len(volumes) == 0:
         logger.debug("No volumes found.")
         return