aboutsummaryrefslogtreecommitdiffstats
path: root/testcases
diff options
context:
space:
mode:
authorSerenaFeng <feng.xiaowei@zte.com.cn>2016-08-23 14:27:51 +0800
committerSerenaFeng <feng.xiaowei@zte.com.cn>2016-08-23 18:05:14 +0800
commit3e95a1cd0721924e89e2cfd2960d4736bc6c5588 (patch)
treebdf6513aab04c9ed1ed5f7bcabf10b9a72e93490 /testcases
parent43a98904445a7151b586f996ae5d0e858fa24b98 (diff)
when create/get/update failed return None rather than False
In openstack_util.py, when create/get/update network or other resources failed, False is returned, which is incompatible with success return value such as id, network_nic. JIRA: FUNCTEST-427 Change-Id: Id2f55d8524e5aff150ba6bfb799085377a63baa4 Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
Diffstat (limited to 'testcases')
-rwxr-xr-xtestcases/OpenStack/tempest/run_tempest.py4
-rwxr-xr-xtestcases/features/promise.py6
-rwxr-xr-xtestcases/vnf/vIMS/vIMS.py4
3 files changed, 7 insertions, 7 deletions
diff --git a/testcases/OpenStack/tempest/run_tempest.py b/testcases/OpenStack/tempest/run_tempest.py
index c143fffa..e41eec6a 100755
--- a/testcases/OpenStack/tempest/run_tempest.py
+++ b/testcases/OpenStack/tempest/run_tempest.py
@@ -132,12 +132,12 @@ def create_tempest_resources():
tenant_id = os_utils.create_tenant(keystone_client,
TENANT_NAME,
TENANT_DESCRIPTION)
- if tenant_id == '':
+ if not tenant_id:
logger.error("Error : Failed to create %s tenant" % TENANT_NAME)
user_id = os_utils.create_user(keystone_client, USER_NAME, USER_PASSWORD,
None, tenant_id)
- if user_id == '':
+ if not user_id:
logger.error("Error : Failed to create %s user" % USER_NAME)
logger.debug("Creating private network for Tempest suite")
diff --git a/testcases/features/promise.py b/testcases/features/promise.py
index 170f7549..f5db0261 100755
--- a/testcases/features/promise.py
+++ b/testcases/features/promise.py
@@ -87,7 +87,7 @@ def main():
logger.info("Creating tenant '%s'..." % TENANT_NAME)
tenant_id = openstack_utils.create_tenant(
keystone, TENANT_NAME, TENANT_DESCRIPTION)
- if tenant_id == '':
+ if not tenant_id:
logger.error("Error : Failed to create %s tenant" % TENANT_NAME)
exit(-1)
logger.debug("Tenant '%s' created successfully." % TENANT_NAME)
@@ -114,7 +114,7 @@ def main():
user_id = openstack_utils.create_user(
keystone, USER_NAME, USER_PWD, None, tenant_id)
- if user_id == '':
+ if not user_id:
logger.error("Error : Failed to create %s user" % USER_NAME)
exit(-1)
logger.debug("User '%s' created successfully." % USER_NAME)
@@ -171,7 +171,7 @@ def main():
SUBNET_NAME,
ROUTER_NAME,
SUBNET_CIDR)
- if network_dic is False:
+ if not network_dic:
logger.error("Failed to create the private network...")
exit(-1)
diff --git a/testcases/vnf/vIMS/vIMS.py b/testcases/vnf/vIMS/vIMS.py
index dfbb6759..37376179 100755
--- a/testcases/vnf/vIMS/vIMS.py
+++ b/testcases/vnf/vIMS/vIMS.py
@@ -277,7 +277,7 @@ def main():
tenant_id = os_utils.create_tenant(
keystone, TENANT_NAME, TENANT_DESCRIPTION)
- if tenant_id == '':
+ if not tenant_id:
step_failure("init", "Error : Failed to create " +
TENANT_NAME + " tenant")
@@ -296,7 +296,7 @@ def main():
user_id = os_utils.create_user(
keystone, TENANT_NAME, TENANT_NAME, None, tenant_id)
- if user_id == '':
+ if not user_id:
logger.error("Error : Failed to create %s user" % TENANT_NAME)
logger.info("Update OpenStack creds informations")